diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index d0ca1cf..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -45,7 +45,7 @@ /** * 双重锁单例 */ - public static BaseApplication getInstance() { + public static BaseApplication get() { if (instance == null) { synchronized (BaseApplication.class) { if (instance == null) { diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index d0ca1cf..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -45,7 +45,7 @@ /** * 双重锁单例 */ - public static BaseApplication getInstance() { + public static BaseApplication get() { if (instance == null) { synchronized (BaseApplication.class) { if (instance == null) { diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 35cff13..2b1236c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,7 +27,7 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.getInstance().queryNoticeByUser(StringHelper.getUserBean().getId()); + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); if (dataBeans.size() == 0) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { @@ -47,7 +47,7 @@ viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { @Override public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); dataBeans.remove(position); adapter.notifyItemRemoved(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); @@ -59,7 +59,7 @@ String caseId = item.getCasePrimaryKey(); ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); adapter.notifyItemChanged(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index d0ca1cf..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -45,7 +45,7 @@ /** * 双重锁单例 */ - public static BaseApplication getInstance() { + public static BaseApplication get() { if (instance == null) { synchronized (BaseApplication.class) { if (instance == null) { diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 35cff13..2b1236c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,7 +27,7 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.getInstance().queryNoticeByUser(StringHelper.getUserBean().getId()); + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); if (dataBeans.size() == 0) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { @@ -47,7 +47,7 @@ viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { @Override public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); dataBeans.remove(position); adapter.notifyItemRemoved(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); @@ -59,7 +59,7 @@ String caseId = item.getCasePrimaryKey(); ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); adapter.notifyItemChanged(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 3ff0dbc..af6b9f7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -90,7 +90,7 @@ noticeBean.setPushDate(LongHub.timestampToCompleteDate(System.currentTimeMillis())); noticeBean.setIsRead("1"); //存本地一份 - DataBaseManager.getInstance().savePushNotice(noticeBean); + DataBaseManager.get().savePushNotice(noticeBean); } // 通知点击，只有个推通道下发的通知会回调此方法 diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index d0ca1cf..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -45,7 +45,7 @@ /** * 双重锁单例 */ - public static BaseApplication getInstance() { + public static BaseApplication get() { if (instance == null) { synchronized (BaseApplication.class) { if (instance == null) { diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 35cff13..2b1236c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,7 +27,7 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.getInstance().queryNoticeByUser(StringHelper.getUserBean().getId()); + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); if (dataBeans.size() == 0) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { @@ -47,7 +47,7 @@ viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { @Override public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); dataBeans.remove(position); adapter.notifyItemRemoved(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); @@ -59,7 +59,7 @@ String caseId = item.getCasePrimaryKey(); ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); adapter.notifyItemChanged(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 3ff0dbc..af6b9f7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -90,7 +90,7 @@ noticeBean.setPushDate(LongHub.timestampToCompleteDate(System.currentTimeMillis())); noticeBean.setIsRead("1"); //存本地一份 - DataBaseManager.getInstance().savePushNotice(noticeBean); + DataBaseManager.get().savePushNotice(noticeBean); } // 通知点击，只有个推通道下发的通知会回调此方法 diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4546685..4b4c2f5 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -22,7 +22,7 @@ @Override public void onCreate() { super.onCreate(); - NotificationHelper notificationHelper = NotificationHelper.getInstance(this); + NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index d0ca1cf..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -45,7 +45,7 @@ /** * 双重锁单例 */ - public static BaseApplication getInstance() { + public static BaseApplication get() { if (instance == null) { synchronized (BaseApplication.class) { if (instance == null) { diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 35cff13..2b1236c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,7 +27,7 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.getInstance().queryNoticeByUser(StringHelper.getUserBean().getId()); + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); if (dataBeans.size() == 0) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { @@ -47,7 +47,7 @@ viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { @Override public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); dataBeans.remove(position); adapter.notifyItemRemoved(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); @@ -59,7 +59,7 @@ String caseId = item.getCasePrimaryKey(); ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); adapter.notifyItemChanged(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 3ff0dbc..af6b9f7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -90,7 +90,7 @@ noticeBean.setPushDate(LongHub.timestampToCompleteDate(System.currentTimeMillis())); noticeBean.setIsRead("1"); //存本地一份 - DataBaseManager.getInstance().savePushNotice(noticeBean); + DataBaseManager.get().savePushNotice(noticeBean); } // 通知点击，只有个推通道下发的通知会回调此方法 diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4546685..4b4c2f5 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -22,7 +22,7 @@ @Override public void onCreate() { super.onCreate(); - NotificationHelper notificationHelper = NotificationHelper.getInstance(this); + NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { diff --git a/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java b/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java index ebe7709..9d782d4 100644 --- a/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java +++ b/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java @@ -16,7 +16,7 @@ * 创建带网格的ArcGIS底图 */ public static ArcGISTiledLayer createBaseLayer() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ArcGISTiledLayer("/"); @@ -34,7 +34,7 @@ * 创建不带网格的ArcGIS底图 */ public static ArcGISTiledLayer createNoGridLayer() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ArcGISTiledLayer("/"); @@ -51,7 +51,7 @@ * 创建网格图层或者社区图层ServiceFeatureTable */ public static ServiceFeatureTable createGridFeatureTable() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ServiceFeatureTable("/"); @@ -68,7 +68,7 @@ * 创建其他图层ServiceFeatureTable */ public static ServiceFeatureTable createOtherFeatureTable(String layerName) { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ServiceFeatureTable("/"); diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index d0ca1cf..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -45,7 +45,7 @@ /** * 双重锁单例 */ - public static BaseApplication getInstance() { + public static BaseApplication get() { if (instance == null) { synchronized (BaseApplication.class) { if (instance == null) { diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 35cff13..2b1236c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,7 +27,7 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.getInstance().queryNoticeByUser(StringHelper.getUserBean().getId()); + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); if (dataBeans.size() == 0) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { @@ -47,7 +47,7 @@ viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { @Override public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); dataBeans.remove(position); adapter.notifyItemRemoved(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); @@ -59,7 +59,7 @@ String caseId = item.getCasePrimaryKey(); ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); adapter.notifyItemChanged(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 3ff0dbc..af6b9f7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -90,7 +90,7 @@ noticeBean.setPushDate(LongHub.timestampToCompleteDate(System.currentTimeMillis())); noticeBean.setIsRead("1"); //存本地一份 - DataBaseManager.getInstance().savePushNotice(noticeBean); + DataBaseManager.get().savePushNotice(noticeBean); } // 通知点击，只有个推通道下发的通知会回调此方法 diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4546685..4b4c2f5 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -22,7 +22,7 @@ @Override public void onCreate() { super.onCreate(); - NotificationHelper notificationHelper = NotificationHelper.getInstance(this); + NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { diff --git a/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java b/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java index ebe7709..9d782d4 100644 --- a/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java +++ b/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java @@ -16,7 +16,7 @@ * 创建带网格的ArcGIS底图 */ public static ArcGISTiledLayer createBaseLayer() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ArcGISTiledLayer("/"); @@ -34,7 +34,7 @@ * 创建不带网格的ArcGIS底图 */ public static ArcGISTiledLayer createNoGridLayer() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ArcGISTiledLayer("/"); @@ -51,7 +51,7 @@ * 创建网格图层或者社区图层ServiceFeatureTable */ public static ServiceFeatureTable createGridFeatureTable() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ServiceFeatureTable("/"); @@ -68,7 +68,7 @@ * 创建其他图层ServiceFeatureTable */ public static ServiceFeatureTable createOtherFeatureTable(String layerName) { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ServiceFeatureTable("/"); diff --git a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java index f8cd630..bbb5dca 100644 --- a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java @@ -60,7 +60,7 @@ chart.setScaleYEnabled(false);//Y轴不可缩放 //设置x轴 XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setAxisMinimum(1f); xAxis.setAxisMaximum(maxDay); @@ -78,7 +78,7 @@ legend.setVerticalAlignment(Legend.LegendVerticalAlignment.TOP); legend.setHorizontalAlignment(Legend.LegendHorizontalAlignment.CENTER); //添加自定义Marker - DetailsMarkerView detailsMarkerView = new DetailsMarkerView(BaseApplication.getInstance()); + DetailsMarkerView detailsMarkerView = new DetailsMarkerView(BaseApplication.get()); detailsMarkerView.setChartView(chart); chart.setMarker(detailsMarkerView); } @@ -87,13 +87,13 @@ List lineDataSets = new ArrayList<>(); //设置数据 LineDataSet totalDataSet = new LineDataSet(totalEntries, "上报案卷"); - totalDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//线条颜色 - totalDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//圆点颜色 + totalDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//线条颜色 + totalDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//圆点颜色 lineDataSets.add(totalDataSet); LineDataSet handleDataSet = new LineDataSet(handleEntries, "已处理案卷"); - handleDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//线条颜色 - handleDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//圆点颜色 + handleDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//线条颜色 + handleDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//圆点颜色 lineDataSets.add(handleDataSet); LineData lineData = new LineData(lineDataSets); @@ -106,18 +106,18 @@ List lineDataSets = new ArrayList<>(); //设置数据 LineDataSet commonDataSet = new LineDataSet(commonEntries, "普通上报"); - commonDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//线条颜色 - commonDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//圆点颜色 + commonDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//线条颜色 + commonDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//圆点颜色 lineDataSets.add(commonDataSet); LineDataSet quickDataSet = new LineDataSet(quickEntries, "快速上报"); - quickDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//线条颜色 - quickDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//圆点颜色 + quickDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//线条颜色 + quickDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//圆点颜色 lineDataSets.add(quickDataSet); LineDataSet packageDataSet = new LineDataSet(packageEntries, "三包上报"); - packageDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainThemeColor));//线条颜色 - packageDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainThemeColor));//圆点颜色 + packageDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainThemeColor));//线条颜色 + packageDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainThemeColor));//圆点颜色 lineDataSets.add(packageDataSet); LineData lineData = new LineData(lineDataSets); @@ -136,7 +136,7 @@ chart.getLegend().setEnabled(false); XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setDrawLabels(true);//绘制标签 指x轴上的对应数值 xAxis.setLabelCount(labelName.length); // 设置x轴上的标签个数 @@ -161,7 +161,7 @@ public static void setBarChartData(BarChart chart, List entries) { //绑定数据 BarDataSet barDataSet = new BarDataSet(entries, ""); - barDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.barChartColor)); + barDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.barChartColor)); barDataSet.setValueFormatter(new ValueFormatter() { @Override public String getFormattedValue(float value) { @@ -184,7 +184,7 @@ chart.getLegend().setEnabled(false); XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setDrawLabels(true);//绘制标签 指x轴上的对应数值 xAxis.setLabelCount(labelName.size()); // 设置x轴上的标签个数 @@ -209,7 +209,7 @@ public static void setBarChartData(HorizontalBarChart chart, List entries) { //绑定数据 BarDataSet barDataSet = new BarDataSet(entries, ""); - barDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.barChartColor)); + barDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.barChartColor)); barDataSet.setValueFormatter(new ValueFormatter() { @Override public String getFormattedValue(float value) { @@ -252,7 +252,7 @@ //设置饼图块颜色 List colors = new ArrayList<>(); for (int i = 0; i < entries.size(); i++) { - colors.add(ContextCompat.getColor(BaseApplication.getInstance(), LocaleConstant.PIE_COLORS.get(i))); + colors.add(ContextCompat.getColor(BaseApplication.get(), LocaleConstant.PIE_COLORS.get(i))); } dataSet.setColors(colors); //设置标签显示在饼图块外面 diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index d0ca1cf..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -45,7 +45,7 @@ /** * 双重锁单例 */ - public static BaseApplication getInstance() { + public static BaseApplication get() { if (instance == null) { synchronized (BaseApplication.class) { if (instance == null) { diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 35cff13..2b1236c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,7 +27,7 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.getInstance().queryNoticeByUser(StringHelper.getUserBean().getId()); + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); if (dataBeans.size() == 0) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { @@ -47,7 +47,7 @@ viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { @Override public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); dataBeans.remove(position); adapter.notifyItemRemoved(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); @@ -59,7 +59,7 @@ String caseId = item.getCasePrimaryKey(); ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); adapter.notifyItemChanged(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 3ff0dbc..af6b9f7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -90,7 +90,7 @@ noticeBean.setPushDate(LongHub.timestampToCompleteDate(System.currentTimeMillis())); noticeBean.setIsRead("1"); //存本地一份 - DataBaseManager.getInstance().savePushNotice(noticeBean); + DataBaseManager.get().savePushNotice(noticeBean); } // 通知点击，只有个推通道下发的通知会回调此方法 diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4546685..4b4c2f5 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -22,7 +22,7 @@ @Override public void onCreate() { super.onCreate(); - NotificationHelper notificationHelper = NotificationHelper.getInstance(this); + NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { diff --git a/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java b/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java index ebe7709..9d782d4 100644 --- a/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java +++ b/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java @@ -16,7 +16,7 @@ * 创建带网格的ArcGIS底图 */ public static ArcGISTiledLayer createBaseLayer() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ArcGISTiledLayer("/"); @@ -34,7 +34,7 @@ * 创建不带网格的ArcGIS底图 */ public static ArcGISTiledLayer createNoGridLayer() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ArcGISTiledLayer("/"); @@ -51,7 +51,7 @@ * 创建网格图层或者社区图层ServiceFeatureTable */ public static ServiceFeatureTable createGridFeatureTable() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ServiceFeatureTable("/"); @@ -68,7 +68,7 @@ * 创建其他图层ServiceFeatureTable */ public static ServiceFeatureTable createOtherFeatureTable(String layerName) { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ServiceFeatureTable("/"); diff --git a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java index f8cd630..bbb5dca 100644 --- a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java @@ -60,7 +60,7 @@ chart.setScaleYEnabled(false);//Y轴不可缩放 //设置x轴 XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setAxisMinimum(1f); xAxis.setAxisMaximum(maxDay); @@ -78,7 +78,7 @@ legend.setVerticalAlignment(Legend.LegendVerticalAlignment.TOP); legend.setHorizontalAlignment(Legend.LegendHorizontalAlignment.CENTER); //添加自定义Marker - DetailsMarkerView detailsMarkerView = new DetailsMarkerView(BaseApplication.getInstance()); + DetailsMarkerView detailsMarkerView = new DetailsMarkerView(BaseApplication.get()); detailsMarkerView.setChartView(chart); chart.setMarker(detailsMarkerView); } @@ -87,13 +87,13 @@ List lineDataSets = new ArrayList<>(); //设置数据 LineDataSet totalDataSet = new LineDataSet(totalEntries, "上报案卷"); - totalDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//线条颜色 - totalDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//圆点颜色 + totalDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//线条颜色 + totalDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//圆点颜色 lineDataSets.add(totalDataSet); LineDataSet handleDataSet = new LineDataSet(handleEntries, "已处理案卷"); - handleDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//线条颜色 - handleDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//圆点颜色 + handleDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//线条颜色 + handleDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//圆点颜色 lineDataSets.add(handleDataSet); LineData lineData = new LineData(lineDataSets); @@ -106,18 +106,18 @@ List lineDataSets = new ArrayList<>(); //设置数据 LineDataSet commonDataSet = new LineDataSet(commonEntries, "普通上报"); - commonDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//线条颜色 - commonDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//圆点颜色 + commonDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//线条颜色 + commonDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//圆点颜色 lineDataSets.add(commonDataSet); LineDataSet quickDataSet = new LineDataSet(quickEntries, "快速上报"); - quickDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//线条颜色 - quickDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//圆点颜色 + quickDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//线条颜色 + quickDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//圆点颜色 lineDataSets.add(quickDataSet); LineDataSet packageDataSet = new LineDataSet(packageEntries, "三包上报"); - packageDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainThemeColor));//线条颜色 - packageDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainThemeColor));//圆点颜色 + packageDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainThemeColor));//线条颜色 + packageDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainThemeColor));//圆点颜色 lineDataSets.add(packageDataSet); LineData lineData = new LineData(lineDataSets); @@ -136,7 +136,7 @@ chart.getLegend().setEnabled(false); XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setDrawLabels(true);//绘制标签 指x轴上的对应数值 xAxis.setLabelCount(labelName.length); // 设置x轴上的标签个数 @@ -161,7 +161,7 @@ public static void setBarChartData(BarChart chart, List entries) { //绑定数据 BarDataSet barDataSet = new BarDataSet(entries, ""); - barDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.barChartColor)); + barDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.barChartColor)); barDataSet.setValueFormatter(new ValueFormatter() { @Override public String getFormattedValue(float value) { @@ -184,7 +184,7 @@ chart.getLegend().setEnabled(false); XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setDrawLabels(true);//绘制标签 指x轴上的对应数值 xAxis.setLabelCount(labelName.size()); // 设置x轴上的标签个数 @@ -209,7 +209,7 @@ public static void setBarChartData(HorizontalBarChart chart, List entries) { //绑定数据 BarDataSet barDataSet = new BarDataSet(entries, ""); - barDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.barChartColor)); + barDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.barChartColor)); barDataSet.setValueFormatter(new ValueFormatter() { @Override public String getFormattedValue(float value) { @@ -252,7 +252,7 @@ //设置饼图块颜色 List colors = new ArrayList<>(); for (int i = 0; i < entries.size(); i++) { - colors.add(ContextCompat.getColor(BaseApplication.getInstance(), LocaleConstant.PIE_COLORS.get(i))); + colors.add(ContextCompat.getColor(BaseApplication.get(), LocaleConstant.PIE_COLORS.get(i))); } dataSet.setColors(colors); //设置标签显示在饼图块外面 diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 33244a1..8ed178e 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -23,7 +23,7 @@ /** * 双重锁单例 */ - public static DataBaseManager getInstance() { + public static DataBaseManager get() { if (instance == null) { synchronized (DataBaseManager.class) { if (instance == null) { @@ -44,7 +44,7 @@ public void savePushNotice(NoticeLocaleBean noticeBean) { noticeBeanDao.save(noticeBean); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } @@ -68,7 +68,7 @@ ).list(); noticeBeanDao.deleteInTx(result); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } @@ -80,7 +80,7 @@ noticeLocaleBean.setIsRead("0"); noticeBeanDao.update(noticeLocaleBean); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index d0ca1cf..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -45,7 +45,7 @@ /** * 双重锁单例 */ - public static BaseApplication getInstance() { + public static BaseApplication get() { if (instance == null) { synchronized (BaseApplication.class) { if (instance == null) { diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 35cff13..2b1236c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,7 +27,7 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.getInstance().queryNoticeByUser(StringHelper.getUserBean().getId()); + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); if (dataBeans.size() == 0) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { @@ -47,7 +47,7 @@ viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { @Override public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); dataBeans.remove(position); adapter.notifyItemRemoved(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); @@ -59,7 +59,7 @@ String caseId = item.getCasePrimaryKey(); ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); adapter.notifyItemChanged(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 3ff0dbc..af6b9f7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -90,7 +90,7 @@ noticeBean.setPushDate(LongHub.timestampToCompleteDate(System.currentTimeMillis())); noticeBean.setIsRead("1"); //存本地一份 - DataBaseManager.getInstance().savePushNotice(noticeBean); + DataBaseManager.get().savePushNotice(noticeBean); } // 通知点击，只有个推通道下发的通知会回调此方法 diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4546685..4b4c2f5 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -22,7 +22,7 @@ @Override public void onCreate() { super.onCreate(); - NotificationHelper notificationHelper = NotificationHelper.getInstance(this); + NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { diff --git a/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java b/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java index ebe7709..9d782d4 100644 --- a/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java +++ b/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java @@ -16,7 +16,7 @@ * 创建带网格的ArcGIS底图 */ public static ArcGISTiledLayer createBaseLayer() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ArcGISTiledLayer("/"); @@ -34,7 +34,7 @@ * 创建不带网格的ArcGIS底图 */ public static ArcGISTiledLayer createNoGridLayer() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ArcGISTiledLayer("/"); @@ -51,7 +51,7 @@ * 创建网格图层或者社区图层ServiceFeatureTable */ public static ServiceFeatureTable createGridFeatureTable() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ServiceFeatureTable("/"); @@ -68,7 +68,7 @@ * 创建其他图层ServiceFeatureTable */ public static ServiceFeatureTable createOtherFeatureTable(String layerName) { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ServiceFeatureTable("/"); diff --git a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java index f8cd630..bbb5dca 100644 --- a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java @@ -60,7 +60,7 @@ chart.setScaleYEnabled(false);//Y轴不可缩放 //设置x轴 XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setAxisMinimum(1f); xAxis.setAxisMaximum(maxDay); @@ -78,7 +78,7 @@ legend.setVerticalAlignment(Legend.LegendVerticalAlignment.TOP); legend.setHorizontalAlignment(Legend.LegendHorizontalAlignment.CENTER); //添加自定义Marker - DetailsMarkerView detailsMarkerView = new DetailsMarkerView(BaseApplication.getInstance()); + DetailsMarkerView detailsMarkerView = new DetailsMarkerView(BaseApplication.get()); detailsMarkerView.setChartView(chart); chart.setMarker(detailsMarkerView); } @@ -87,13 +87,13 @@ List lineDataSets = new ArrayList<>(); //设置数据 LineDataSet totalDataSet = new LineDataSet(totalEntries, "上报案卷"); - totalDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//线条颜色 - totalDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//圆点颜色 + totalDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//线条颜色 + totalDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//圆点颜色 lineDataSets.add(totalDataSet); LineDataSet handleDataSet = new LineDataSet(handleEntries, "已处理案卷"); - handleDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//线条颜色 - handleDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//圆点颜色 + handleDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//线条颜色 + handleDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//圆点颜色 lineDataSets.add(handleDataSet); LineData lineData = new LineData(lineDataSets); @@ -106,18 +106,18 @@ List lineDataSets = new ArrayList<>(); //设置数据 LineDataSet commonDataSet = new LineDataSet(commonEntries, "普通上报"); - commonDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//线条颜色 - commonDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//圆点颜色 + commonDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//线条颜色 + commonDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//圆点颜色 lineDataSets.add(commonDataSet); LineDataSet quickDataSet = new LineDataSet(quickEntries, "快速上报"); - quickDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//线条颜色 - quickDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//圆点颜色 + quickDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//线条颜色 + quickDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//圆点颜色 lineDataSets.add(quickDataSet); LineDataSet packageDataSet = new LineDataSet(packageEntries, "三包上报"); - packageDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainThemeColor));//线条颜色 - packageDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainThemeColor));//圆点颜色 + packageDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainThemeColor));//线条颜色 + packageDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainThemeColor));//圆点颜色 lineDataSets.add(packageDataSet); LineData lineData = new LineData(lineDataSets); @@ -136,7 +136,7 @@ chart.getLegend().setEnabled(false); XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setDrawLabels(true);//绘制标签 指x轴上的对应数值 xAxis.setLabelCount(labelName.length); // 设置x轴上的标签个数 @@ -161,7 +161,7 @@ public static void setBarChartData(BarChart chart, List entries) { //绑定数据 BarDataSet barDataSet = new BarDataSet(entries, ""); - barDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.barChartColor)); + barDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.barChartColor)); barDataSet.setValueFormatter(new ValueFormatter() { @Override public String getFormattedValue(float value) { @@ -184,7 +184,7 @@ chart.getLegend().setEnabled(false); XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setDrawLabels(true);//绘制标签 指x轴上的对应数值 xAxis.setLabelCount(labelName.size()); // 设置x轴上的标签个数 @@ -209,7 +209,7 @@ public static void setBarChartData(HorizontalBarChart chart, List entries) { //绑定数据 BarDataSet barDataSet = new BarDataSet(entries, ""); - barDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.barChartColor)); + barDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.barChartColor)); barDataSet.setValueFormatter(new ValueFormatter() { @Override public String getFormattedValue(float value) { @@ -252,7 +252,7 @@ //设置饼图块颜色 List colors = new ArrayList<>(); for (int i = 0; i < entries.size(); i++) { - colors.add(ContextCompat.getColor(BaseApplication.getInstance(), LocaleConstant.PIE_COLORS.get(i))); + colors.add(ContextCompat.getColor(BaseApplication.get(), LocaleConstant.PIE_COLORS.get(i))); } dataSet.setColors(colors); //设置标签显示在饼图块外面 diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 33244a1..8ed178e 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -23,7 +23,7 @@ /** * 双重锁单例 */ - public static DataBaseManager getInstance() { + public static DataBaseManager get() { if (instance == null) { synchronized (DataBaseManager.class) { if (instance == null) { @@ -44,7 +44,7 @@ public void savePushNotice(NoticeLocaleBean noticeBean) { noticeBeanDao.save(noticeBean); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } @@ -68,7 +68,7 @@ ).list(); noticeBeanDao.deleteInTx(result); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } @@ -80,7 +80,7 @@ noticeLocaleBean.setIsRead("0"); noticeBeanDao.update(noticeLocaleBean); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java index df0e4da..5893053 100644 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java @@ -35,7 +35,7 @@ * 绘制文字到右下角并压缩图片 */ public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.getInstance(); + Context context = BaseApplication.get(); //初始化画笔 TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index d0ca1cf..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -45,7 +45,7 @@ /** * 双重锁单例 */ - public static BaseApplication getInstance() { + public static BaseApplication get() { if (instance == null) { synchronized (BaseApplication.class) { if (instance == null) { diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 35cff13..2b1236c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,7 +27,7 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.getInstance().queryNoticeByUser(StringHelper.getUserBean().getId()); + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); if (dataBeans.size() == 0) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { @@ -47,7 +47,7 @@ viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { @Override public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); dataBeans.remove(position); adapter.notifyItemRemoved(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); @@ -59,7 +59,7 @@ String caseId = item.getCasePrimaryKey(); ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); adapter.notifyItemChanged(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 3ff0dbc..af6b9f7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -90,7 +90,7 @@ noticeBean.setPushDate(LongHub.timestampToCompleteDate(System.currentTimeMillis())); noticeBean.setIsRead("1"); //存本地一份 - DataBaseManager.getInstance().savePushNotice(noticeBean); + DataBaseManager.get().savePushNotice(noticeBean); } // 通知点击，只有个推通道下发的通知会回调此方法 diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4546685..4b4c2f5 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -22,7 +22,7 @@ @Override public void onCreate() { super.onCreate(); - NotificationHelper notificationHelper = NotificationHelper.getInstance(this); + NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { diff --git a/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java b/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java index ebe7709..9d782d4 100644 --- a/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java +++ b/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java @@ -16,7 +16,7 @@ * 创建带网格的ArcGIS底图 */ public static ArcGISTiledLayer createBaseLayer() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ArcGISTiledLayer("/"); @@ -34,7 +34,7 @@ * 创建不带网格的ArcGIS底图 */ public static ArcGISTiledLayer createNoGridLayer() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ArcGISTiledLayer("/"); @@ -51,7 +51,7 @@ * 创建网格图层或者社区图层ServiceFeatureTable */ public static ServiceFeatureTable createGridFeatureTable() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ServiceFeatureTable("/"); @@ -68,7 +68,7 @@ * 创建其他图层ServiceFeatureTable */ public static ServiceFeatureTable createOtherFeatureTable(String layerName) { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ServiceFeatureTable("/"); diff --git a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java index f8cd630..bbb5dca 100644 --- a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java @@ -60,7 +60,7 @@ chart.setScaleYEnabled(false);//Y轴不可缩放 //设置x轴 XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setAxisMinimum(1f); xAxis.setAxisMaximum(maxDay); @@ -78,7 +78,7 @@ legend.setVerticalAlignment(Legend.LegendVerticalAlignment.TOP); legend.setHorizontalAlignment(Legend.LegendHorizontalAlignment.CENTER); //添加自定义Marker - DetailsMarkerView detailsMarkerView = new DetailsMarkerView(BaseApplication.getInstance()); + DetailsMarkerView detailsMarkerView = new DetailsMarkerView(BaseApplication.get()); detailsMarkerView.setChartView(chart); chart.setMarker(detailsMarkerView); } @@ -87,13 +87,13 @@ List lineDataSets = new ArrayList<>(); //设置数据 LineDataSet totalDataSet = new LineDataSet(totalEntries, "上报案卷"); - totalDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//线条颜色 - totalDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//圆点颜色 + totalDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//线条颜色 + totalDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//圆点颜色 lineDataSets.add(totalDataSet); LineDataSet handleDataSet = new LineDataSet(handleEntries, "已处理案卷"); - handleDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//线条颜色 - handleDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//圆点颜色 + handleDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//线条颜色 + handleDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//圆点颜色 lineDataSets.add(handleDataSet); LineData lineData = new LineData(lineDataSets); @@ -106,18 +106,18 @@ List lineDataSets = new ArrayList<>(); //设置数据 LineDataSet commonDataSet = new LineDataSet(commonEntries, "普通上报"); - commonDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//线条颜色 - commonDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//圆点颜色 + commonDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//线条颜色 + commonDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//圆点颜色 lineDataSets.add(commonDataSet); LineDataSet quickDataSet = new LineDataSet(quickEntries, "快速上报"); - quickDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//线条颜色 - quickDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//圆点颜色 + quickDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//线条颜色 + quickDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//圆点颜色 lineDataSets.add(quickDataSet); LineDataSet packageDataSet = new LineDataSet(packageEntries, "三包上报"); - packageDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainThemeColor));//线条颜色 - packageDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainThemeColor));//圆点颜色 + packageDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainThemeColor));//线条颜色 + packageDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainThemeColor));//圆点颜色 lineDataSets.add(packageDataSet); LineData lineData = new LineData(lineDataSets); @@ -136,7 +136,7 @@ chart.getLegend().setEnabled(false); XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setDrawLabels(true);//绘制标签 指x轴上的对应数值 xAxis.setLabelCount(labelName.length); // 设置x轴上的标签个数 @@ -161,7 +161,7 @@ public static void setBarChartData(BarChart chart, List entries) { //绑定数据 BarDataSet barDataSet = new BarDataSet(entries, ""); - barDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.barChartColor)); + barDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.barChartColor)); barDataSet.setValueFormatter(new ValueFormatter() { @Override public String getFormattedValue(float value) { @@ -184,7 +184,7 @@ chart.getLegend().setEnabled(false); XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setDrawLabels(true);//绘制标签 指x轴上的对应数值 xAxis.setLabelCount(labelName.size()); // 设置x轴上的标签个数 @@ -209,7 +209,7 @@ public static void setBarChartData(HorizontalBarChart chart, List entries) { //绑定数据 BarDataSet barDataSet = new BarDataSet(entries, ""); - barDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.barChartColor)); + barDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.barChartColor)); barDataSet.setValueFormatter(new ValueFormatter() { @Override public String getFormattedValue(float value) { @@ -252,7 +252,7 @@ //设置饼图块颜色 List colors = new ArrayList<>(); for (int i = 0; i < entries.size(); i++) { - colors.add(ContextCompat.getColor(BaseApplication.getInstance(), LocaleConstant.PIE_COLORS.get(i))); + colors.add(ContextCompat.getColor(BaseApplication.get(), LocaleConstant.PIE_COLORS.get(i))); } dataSet.setColors(colors); //设置标签显示在饼图块外面 diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 33244a1..8ed178e 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -23,7 +23,7 @@ /** * 双重锁单例 */ - public static DataBaseManager getInstance() { + public static DataBaseManager get() { if (instance == null) { synchronized (DataBaseManager.class) { if (instance == null) { @@ -44,7 +44,7 @@ public void savePushNotice(NoticeLocaleBean noticeBean) { noticeBeanDao.save(noticeBean); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } @@ -68,7 +68,7 @@ ).list(); noticeBeanDao.deleteInTx(result); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } @@ -80,7 +80,7 @@ noticeLocaleBean.setIsRead("0"); noticeBeanDao.update(noticeLocaleBean); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java index df0e4da..5893053 100644 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java @@ -35,7 +35,7 @@ * 绘制文字到右下角并压缩图片 */ public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.getInstance(); + Context context = BaseApplication.get(); //初始化画笔 TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 diff --git a/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java b/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java index d0888bc..0197f91 100644 --- a/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java @@ -27,7 +27,7 @@ /** * 双重锁单例 */ - public static NotificationHelper getInstance(Context context) { + public static NotificationHelper get(Context context) { if (notificationHelper == null) { synchronized (NotificationHelper.class) { if (notificationHelper == null) { diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index d0ca1cf..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -45,7 +45,7 @@ /** * 双重锁单例 */ - public static BaseApplication getInstance() { + public static BaseApplication get() { if (instance == null) { synchronized (BaseApplication.class) { if (instance == null) { diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 35cff13..2b1236c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,7 +27,7 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.getInstance().queryNoticeByUser(StringHelper.getUserBean().getId()); + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); if (dataBeans.size() == 0) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { @@ -47,7 +47,7 @@ viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { @Override public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); dataBeans.remove(position); adapter.notifyItemRemoved(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); @@ -59,7 +59,7 @@ String caseId = item.getCasePrimaryKey(); ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); adapter.notifyItemChanged(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 3ff0dbc..af6b9f7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -90,7 +90,7 @@ noticeBean.setPushDate(LongHub.timestampToCompleteDate(System.currentTimeMillis())); noticeBean.setIsRead("1"); //存本地一份 - DataBaseManager.getInstance().savePushNotice(noticeBean); + DataBaseManager.get().savePushNotice(noticeBean); } // 通知点击，只有个推通道下发的通知会回调此方法 diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4546685..4b4c2f5 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -22,7 +22,7 @@ @Override public void onCreate() { super.onCreate(); - NotificationHelper notificationHelper = NotificationHelper.getInstance(this); + NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { diff --git a/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java b/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java index ebe7709..9d782d4 100644 --- a/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java +++ b/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java @@ -16,7 +16,7 @@ * 创建带网格的ArcGIS底图 */ public static ArcGISTiledLayer createBaseLayer() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ArcGISTiledLayer("/"); @@ -34,7 +34,7 @@ * 创建不带网格的ArcGIS底图 */ public static ArcGISTiledLayer createNoGridLayer() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ArcGISTiledLayer("/"); @@ -51,7 +51,7 @@ * 创建网格图层或者社区图层ServiceFeatureTable */ public static ServiceFeatureTable createGridFeatureTable() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ServiceFeatureTable("/"); @@ -68,7 +68,7 @@ * 创建其他图层ServiceFeatureTable */ public static ServiceFeatureTable createOtherFeatureTable(String layerName) { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ServiceFeatureTable("/"); diff --git a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java index f8cd630..bbb5dca 100644 --- a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java @@ -60,7 +60,7 @@ chart.setScaleYEnabled(false);//Y轴不可缩放 //设置x轴 XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setAxisMinimum(1f); xAxis.setAxisMaximum(maxDay); @@ -78,7 +78,7 @@ legend.setVerticalAlignment(Legend.LegendVerticalAlignment.TOP); legend.setHorizontalAlignment(Legend.LegendHorizontalAlignment.CENTER); //添加自定义Marker - DetailsMarkerView detailsMarkerView = new DetailsMarkerView(BaseApplication.getInstance()); + DetailsMarkerView detailsMarkerView = new DetailsMarkerView(BaseApplication.get()); detailsMarkerView.setChartView(chart); chart.setMarker(detailsMarkerView); } @@ -87,13 +87,13 @@ List lineDataSets = new ArrayList<>(); //设置数据 LineDataSet totalDataSet = new LineDataSet(totalEntries, "上报案卷"); - totalDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//线条颜色 - totalDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//圆点颜色 + totalDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//线条颜色 + totalDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//圆点颜色 lineDataSets.add(totalDataSet); LineDataSet handleDataSet = new LineDataSet(handleEntries, "已处理案卷"); - handleDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//线条颜色 - handleDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//圆点颜色 + handleDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//线条颜色 + handleDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//圆点颜色 lineDataSets.add(handleDataSet); LineData lineData = new LineData(lineDataSets); @@ -106,18 +106,18 @@ List lineDataSets = new ArrayList<>(); //设置数据 LineDataSet commonDataSet = new LineDataSet(commonEntries, "普通上报"); - commonDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//线条颜色 - commonDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//圆点颜色 + commonDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//线条颜色 + commonDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//圆点颜色 lineDataSets.add(commonDataSet); LineDataSet quickDataSet = new LineDataSet(quickEntries, "快速上报"); - quickDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//线条颜色 - quickDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//圆点颜色 + quickDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//线条颜色 + quickDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//圆点颜色 lineDataSets.add(quickDataSet); LineDataSet packageDataSet = new LineDataSet(packageEntries, "三包上报"); - packageDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainThemeColor));//线条颜色 - packageDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainThemeColor));//圆点颜色 + packageDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainThemeColor));//线条颜色 + packageDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainThemeColor));//圆点颜色 lineDataSets.add(packageDataSet); LineData lineData = new LineData(lineDataSets); @@ -136,7 +136,7 @@ chart.getLegend().setEnabled(false); XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setDrawLabels(true);//绘制标签 指x轴上的对应数值 xAxis.setLabelCount(labelName.length); // 设置x轴上的标签个数 @@ -161,7 +161,7 @@ public static void setBarChartData(BarChart chart, List entries) { //绑定数据 BarDataSet barDataSet = new BarDataSet(entries, ""); - barDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.barChartColor)); + barDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.barChartColor)); barDataSet.setValueFormatter(new ValueFormatter() { @Override public String getFormattedValue(float value) { @@ -184,7 +184,7 @@ chart.getLegend().setEnabled(false); XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setDrawLabels(true);//绘制标签 指x轴上的对应数值 xAxis.setLabelCount(labelName.size()); // 设置x轴上的标签个数 @@ -209,7 +209,7 @@ public static void setBarChartData(HorizontalBarChart chart, List entries) { //绑定数据 BarDataSet barDataSet = new BarDataSet(entries, ""); - barDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.barChartColor)); + barDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.barChartColor)); barDataSet.setValueFormatter(new ValueFormatter() { @Override public String getFormattedValue(float value) { @@ -252,7 +252,7 @@ //设置饼图块颜色 List colors = new ArrayList<>(); for (int i = 0; i < entries.size(); i++) { - colors.add(ContextCompat.getColor(BaseApplication.getInstance(), LocaleConstant.PIE_COLORS.get(i))); + colors.add(ContextCompat.getColor(BaseApplication.get(), LocaleConstant.PIE_COLORS.get(i))); } dataSet.setColors(colors); //设置标签显示在饼图块外面 diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 33244a1..8ed178e 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -23,7 +23,7 @@ /** * 双重锁单例 */ - public static DataBaseManager getInstance() { + public static DataBaseManager get() { if (instance == null) { synchronized (DataBaseManager.class) { if (instance == null) { @@ -44,7 +44,7 @@ public void savePushNotice(NoticeLocaleBean noticeBean) { noticeBeanDao.save(noticeBean); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } @@ -68,7 +68,7 @@ ).list(); noticeBeanDao.deleteInTx(result); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } @@ -80,7 +80,7 @@ noticeLocaleBean.setIsRead("0"); noticeBeanDao.update(noticeLocaleBean); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java index df0e4da..5893053 100644 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java @@ -35,7 +35,7 @@ * 绘制文字到右下角并压缩图片 */ public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.getInstance(); + Context context = BaseApplication.get(); //初始化画笔 TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 diff --git a/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java b/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java index d0888bc..0197f91 100644 --- a/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java @@ -27,7 +27,7 @@ /** * 双重锁单例 */ - public static NotificationHelper getInstance(Context context) { + public static NotificationHelper get(Context context) { if (notificationHelper == null) { synchronized (NotificationHelper.class) { if (notificationHelper == null) { diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 376e943..93e4a3d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -112,7 +112,7 @@ viewBinding.mainViewPager.setAdapter(mainPageAdapter); weakReferenceHandler = new WeakReferenceHandler(callback); - dataBaseManager = DataBaseManager.getInstance(); + dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); mapConfigViewModel.obtainMapConfig(); @@ -250,7 +250,7 @@ } private void updateMessageNumber() { - int unReadNotice = DataBaseManager.getInstance().queryUnReadNotice(); + int unReadNotice = DataBaseManager.get().queryUnReadNotice(); if (unReadNotice <= 0) { viewBinding.messageNumView.setVisibility(View.GONE); } else { diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index d0ca1cf..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -45,7 +45,7 @@ /** * 双重锁单例 */ - public static BaseApplication getInstance() { + public static BaseApplication get() { if (instance == null) { synchronized (BaseApplication.class) { if (instance == null) { diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 35cff13..2b1236c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,7 +27,7 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.getInstance().queryNoticeByUser(StringHelper.getUserBean().getId()); + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); if (dataBeans.size() == 0) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { @@ -47,7 +47,7 @@ viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { @Override public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); dataBeans.remove(position); adapter.notifyItemRemoved(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); @@ -59,7 +59,7 @@ String caseId = item.getCasePrimaryKey(); ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); adapter.notifyItemChanged(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 3ff0dbc..af6b9f7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -90,7 +90,7 @@ noticeBean.setPushDate(LongHub.timestampToCompleteDate(System.currentTimeMillis())); noticeBean.setIsRead("1"); //存本地一份 - DataBaseManager.getInstance().savePushNotice(noticeBean); + DataBaseManager.get().savePushNotice(noticeBean); } // 通知点击，只有个推通道下发的通知会回调此方法 diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4546685..4b4c2f5 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -22,7 +22,7 @@ @Override public void onCreate() { super.onCreate(); - NotificationHelper notificationHelper = NotificationHelper.getInstance(this); + NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { diff --git a/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java b/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java index ebe7709..9d782d4 100644 --- a/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java +++ b/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java @@ -16,7 +16,7 @@ * 创建带网格的ArcGIS底图 */ public static ArcGISTiledLayer createBaseLayer() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ArcGISTiledLayer("/"); @@ -34,7 +34,7 @@ * 创建不带网格的ArcGIS底图 */ public static ArcGISTiledLayer createNoGridLayer() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ArcGISTiledLayer("/"); @@ -51,7 +51,7 @@ * 创建网格图层或者社区图层ServiceFeatureTable */ public static ServiceFeatureTable createGridFeatureTable() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ServiceFeatureTable("/"); @@ -68,7 +68,7 @@ * 创建其他图层ServiceFeatureTable */ public static ServiceFeatureTable createOtherFeatureTable(String layerName) { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ServiceFeatureTable("/"); diff --git a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java index f8cd630..bbb5dca 100644 --- a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java @@ -60,7 +60,7 @@ chart.setScaleYEnabled(false);//Y轴不可缩放 //设置x轴 XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setAxisMinimum(1f); xAxis.setAxisMaximum(maxDay); @@ -78,7 +78,7 @@ legend.setVerticalAlignment(Legend.LegendVerticalAlignment.TOP); legend.setHorizontalAlignment(Legend.LegendHorizontalAlignment.CENTER); //添加自定义Marker - DetailsMarkerView detailsMarkerView = new DetailsMarkerView(BaseApplication.getInstance()); + DetailsMarkerView detailsMarkerView = new DetailsMarkerView(BaseApplication.get()); detailsMarkerView.setChartView(chart); chart.setMarker(detailsMarkerView); } @@ -87,13 +87,13 @@ List lineDataSets = new ArrayList<>(); //设置数据 LineDataSet totalDataSet = new LineDataSet(totalEntries, "上报案卷"); - totalDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//线条颜色 - totalDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//圆点颜色 + totalDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//线条颜色 + totalDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//圆点颜色 lineDataSets.add(totalDataSet); LineDataSet handleDataSet = new LineDataSet(handleEntries, "已处理案卷"); - handleDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//线条颜色 - handleDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//圆点颜色 + handleDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//线条颜色 + handleDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//圆点颜色 lineDataSets.add(handleDataSet); LineData lineData = new LineData(lineDataSets); @@ -106,18 +106,18 @@ List lineDataSets = new ArrayList<>(); //设置数据 LineDataSet commonDataSet = new LineDataSet(commonEntries, "普通上报"); - commonDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//线条颜色 - commonDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//圆点颜色 + commonDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//线条颜色 + commonDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//圆点颜色 lineDataSets.add(commonDataSet); LineDataSet quickDataSet = new LineDataSet(quickEntries, "快速上报"); - quickDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//线条颜色 - quickDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//圆点颜色 + quickDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//线条颜色 + quickDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//圆点颜色 lineDataSets.add(quickDataSet); LineDataSet packageDataSet = new LineDataSet(packageEntries, "三包上报"); - packageDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainThemeColor));//线条颜色 - packageDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainThemeColor));//圆点颜色 + packageDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainThemeColor));//线条颜色 + packageDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainThemeColor));//圆点颜色 lineDataSets.add(packageDataSet); LineData lineData = new LineData(lineDataSets); @@ -136,7 +136,7 @@ chart.getLegend().setEnabled(false); XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setDrawLabels(true);//绘制标签 指x轴上的对应数值 xAxis.setLabelCount(labelName.length); // 设置x轴上的标签个数 @@ -161,7 +161,7 @@ public static void setBarChartData(BarChart chart, List entries) { //绑定数据 BarDataSet barDataSet = new BarDataSet(entries, ""); - barDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.barChartColor)); + barDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.barChartColor)); barDataSet.setValueFormatter(new ValueFormatter() { @Override public String getFormattedValue(float value) { @@ -184,7 +184,7 @@ chart.getLegend().setEnabled(false); XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setDrawLabels(true);//绘制标签 指x轴上的对应数值 xAxis.setLabelCount(labelName.size()); // 设置x轴上的标签个数 @@ -209,7 +209,7 @@ public static void setBarChartData(HorizontalBarChart chart, List entries) { //绑定数据 BarDataSet barDataSet = new BarDataSet(entries, ""); - barDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.barChartColor)); + barDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.barChartColor)); barDataSet.setValueFormatter(new ValueFormatter() { @Override public String getFormattedValue(float value) { @@ -252,7 +252,7 @@ //设置饼图块颜色 List colors = new ArrayList<>(); for (int i = 0; i < entries.size(); i++) { - colors.add(ContextCompat.getColor(BaseApplication.getInstance(), LocaleConstant.PIE_COLORS.get(i))); + colors.add(ContextCompat.getColor(BaseApplication.get(), LocaleConstant.PIE_COLORS.get(i))); } dataSet.setColors(colors); //设置标签显示在饼图块外面 diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 33244a1..8ed178e 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -23,7 +23,7 @@ /** * 双重锁单例 */ - public static DataBaseManager getInstance() { + public static DataBaseManager get() { if (instance == null) { synchronized (DataBaseManager.class) { if (instance == null) { @@ -44,7 +44,7 @@ public void savePushNotice(NoticeLocaleBean noticeBean) { noticeBeanDao.save(noticeBean); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } @@ -68,7 +68,7 @@ ).list(); noticeBeanDao.deleteInTx(result); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } @@ -80,7 +80,7 @@ noticeLocaleBean.setIsRead("0"); noticeBeanDao.update(noticeLocaleBean); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java index df0e4da..5893053 100644 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java @@ -35,7 +35,7 @@ * 绘制文字到右下角并压缩图片 */ public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.getInstance(); + Context context = BaseApplication.get(); //初始化画笔 TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 diff --git a/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java b/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java index d0888bc..0197f91 100644 --- a/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java @@ -27,7 +27,7 @@ /** * 双重锁单例 */ - public static NotificationHelper getInstance(Context context) { + public static NotificationHelper get(Context context) { if (notificationHelper == null) { synchronized (NotificationHelper.class) { if (notificationHelper == null) { diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 376e943..93e4a3d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -112,7 +112,7 @@ viewBinding.mainViewPager.setAdapter(mainPageAdapter); weakReferenceHandler = new WeakReferenceHandler(callback); - dataBaseManager = DataBaseManager.getInstance(); + dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); mapConfigViewModel.obtainMapConfig(); @@ -250,7 +250,7 @@ } private void updateMessageNumber() { - int unReadNotice = DataBaseManager.getInstance().queryUnReadNotice(); + int unReadNotice = DataBaseManager.get().queryUnReadNotice(); if (unReadNotice <= 0) { viewBinding.messageNumView.setVisibility(View.GONE); } else { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index bfedccf..7260770 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -154,7 +154,7 @@ viewBinding.obtainToiletIdLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - List toiletBeanList = DataBaseManager.getInstance().getToilets(); + List toiletBeanList = DataBaseManager.get().getToilets(); if (toiletBeanList.size() == 0) { StringHub.show(context, "获取公厕数据失败，请联系管理员"); return; diff --git a/app/src/main/java/com/casic/dcms/base/BaseApplication.java b/app/src/main/java/com/casic/dcms/base/BaseApplication.java index d0ca1cf..da3d68f 100644 --- a/app/src/main/java/com/casic/dcms/base/BaseApplication.java +++ b/app/src/main/java/com/casic/dcms/base/BaseApplication.java @@ -45,7 +45,7 @@ /** * 双重锁单例 */ - public static BaseApplication getInstance() { + public static BaseApplication get() { if (instance == null) { synchronized (BaseApplication.class) { if (instance == null) { diff --git a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java index 35cff13..2b1236c 100644 --- a/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/NoticePageFragment.java @@ -27,7 +27,7 @@ @Override protected void initData() { - List dataBeans = DataBaseManager.getInstance().queryNoticeByUser(StringHelper.getUserBean().getId()); + List dataBeans = DataBaseManager.get().queryNoticeByUser(StringHelper.getUserBean().getId()); if (dataBeans.size() == 0) { viewBinding.emptyView.show(false, "没有任何通知", null, null, null); } else { @@ -47,7 +47,7 @@ viewHolder.setOnClickListener(R.id.deleteView, new View.OnClickListener() { @Override public void onClick(View v) { - DataBaseManager.getInstance().deleteNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().deleteNoticeByMessageId(item.getMessageId()); dataBeans.remove(position); adapter.notifyItemRemoved(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); @@ -59,7 +59,7 @@ String caseId = item.getCasePrimaryKey(); ContextHub.navigatePageTo(requireContext(), CaseDetailActivity.class, caseId); //更改数据库里通知状态 - DataBaseManager.getInstance().updateNoticeByMessageId(item.getMessageId()); + DataBaseManager.get().updateNoticeByMessageId(item.getMessageId()); adapter.notifyItemChanged(position); adapter.notifyItemRangeChanged(position, dataBeans.size() - position); } diff --git a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java index 3ff0dbc..af6b9f7 100644 --- a/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java +++ b/app/src/main/java/com/casic/dcms/service/GeTuiIntentService.java @@ -90,7 +90,7 @@ noticeBean.setPushDate(LongHub.timestampToCompleteDate(System.currentTimeMillis())); noticeBean.setIsRead("1"); //存本地一份 - DataBaseManager.getInstance().savePushNotice(noticeBean); + DataBaseManager.get().savePushNotice(noticeBean); } // 通知点击，只有个推通道下发的通知会回调此方法 diff --git a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java index 4546685..4b4c2f5 100644 --- a/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java +++ b/app/src/main/java/com/casic/dcms/service/UpdateLocationService.java @@ -22,7 +22,7 @@ @Override public void onCreate() { super.onCreate(); - NotificationHelper notificationHelper = NotificationHelper.getInstance(this); + NotificationHelper notificationHelper = NotificationHelper.get(this); Notification notification = notificationHelper.createKeepAlive(); startForeground(Integer.MAX_VALUE, notification); LocationHelper.obtainCurrentLocation(this, new ILocationListener() { diff --git a/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java b/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java index ebe7709..9d782d4 100644 --- a/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java +++ b/app/src/main/java/com/casic/dcms/utils/ArcGisMapCreator.java @@ -16,7 +16,7 @@ * 创建带网格的ArcGIS底图 */ public static ArcGISTiledLayer createBaseLayer() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ArcGISTiledLayer("/"); @@ -34,7 +34,7 @@ * 创建不带网格的ArcGIS底图 */ public static ArcGISTiledLayer createNoGridLayer() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ArcGISTiledLayer("/"); @@ -51,7 +51,7 @@ * 创建网格图层或者社区图层ServiceFeatureTable */ public static ServiceFeatureTable createGridFeatureTable() { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ServiceFeatureTable("/"); @@ -68,7 +68,7 @@ * 创建其他图层ServiceFeatureTable */ public static ServiceFeatureTable createOtherFeatureTable(String layerName) { - List mapConfigList = DataBaseManager.getInstance().getMapConfigList(); + List mapConfigList = DataBaseManager.get().getMapConfigList(); if (mapConfigList.size() == 0) { Log.d(TAG, "create: mapConfigList.size() == 0"); return new ServiceFeatureTable("/"); diff --git a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java index f8cd630..bbb5dca 100644 --- a/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ChartViewHelper.java @@ -60,7 +60,7 @@ chart.setScaleYEnabled(false);//Y轴不可缩放 //设置x轴 XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setAxisMinimum(1f); xAxis.setAxisMaximum(maxDay); @@ -78,7 +78,7 @@ legend.setVerticalAlignment(Legend.LegendVerticalAlignment.TOP); legend.setHorizontalAlignment(Legend.LegendHorizontalAlignment.CENTER); //添加自定义Marker - DetailsMarkerView detailsMarkerView = new DetailsMarkerView(BaseApplication.getInstance()); + DetailsMarkerView detailsMarkerView = new DetailsMarkerView(BaseApplication.get()); detailsMarkerView.setChartView(chart); chart.setMarker(detailsMarkerView); } @@ -87,13 +87,13 @@ List lineDataSets = new ArrayList<>(); //设置数据 LineDataSet totalDataSet = new LineDataSet(totalEntries, "上报案卷"); - totalDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//线条颜色 - totalDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//圆点颜色 + totalDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//线条颜色 + totalDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//圆点颜色 lineDataSets.add(totalDataSet); LineDataSet handleDataSet = new LineDataSet(handleEntries, "已处理案卷"); - handleDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//线条颜色 - handleDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//圆点颜色 + handleDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//线条颜色 + handleDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//圆点颜色 lineDataSets.add(handleDataSet); LineData lineData = new LineData(lineDataSets); @@ -106,18 +106,18 @@ List lineDataSets = new ArrayList<>(); //设置数据 LineDataSet commonDataSet = new LineDataSet(commonEntries, "普通上报"); - commonDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//线条颜色 - commonDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.onLineColor));//圆点颜色 + commonDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//线条颜色 + commonDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.onLineColor));//圆点颜色 lineDataSets.add(commonDataSet); LineDataSet quickDataSet = new LineDataSet(quickEntries, "快速上报"); - quickDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//线条颜色 - quickDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.warnColor));//圆点颜色 + quickDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//线条颜色 + quickDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.warnColor));//圆点颜色 lineDataSets.add(quickDataSet); LineDataSet packageDataSet = new LineDataSet(packageEntries, "三包上报"); - packageDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainThemeColor));//线条颜色 - packageDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainThemeColor));//圆点颜色 + packageDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainThemeColor));//线条颜色 + packageDataSet.setCircleColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainThemeColor));//圆点颜色 lineDataSets.add(packageDataSet); LineData lineData = new LineData(lineDataSets); @@ -136,7 +136,7 @@ chart.getLegend().setEnabled(false); XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setDrawLabels(true);//绘制标签 指x轴上的对应数值 xAxis.setLabelCount(labelName.length); // 设置x轴上的标签个数 @@ -161,7 +161,7 @@ public static void setBarChartData(BarChart chart, List entries) { //绑定数据 BarDataSet barDataSet = new BarDataSet(entries, ""); - barDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.barChartColor)); + barDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.barChartColor)); barDataSet.setValueFormatter(new ValueFormatter() { @Override public String getFormattedValue(float value) { @@ -184,7 +184,7 @@ chart.getLegend().setEnabled(false); XAxis xAxis = chart.getXAxis(); - xAxis.setTextColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.mainTextColor)); + xAxis.setTextColor(ContextCompat.getColor(BaseApplication.get(), R.color.mainTextColor)); xAxis.setTextSize(12f); xAxis.setDrawLabels(true);//绘制标签 指x轴上的对应数值 xAxis.setLabelCount(labelName.size()); // 设置x轴上的标签个数 @@ -209,7 +209,7 @@ public static void setBarChartData(HorizontalBarChart chart, List entries) { //绑定数据 BarDataSet barDataSet = new BarDataSet(entries, ""); - barDataSet.setColor(ContextCompat.getColor(BaseApplication.getInstance(), R.color.barChartColor)); + barDataSet.setColor(ContextCompat.getColor(BaseApplication.get(), R.color.barChartColor)); barDataSet.setValueFormatter(new ValueFormatter() { @Override public String getFormattedValue(float value) { @@ -252,7 +252,7 @@ //设置饼图块颜色 List colors = new ArrayList<>(); for (int i = 0; i < entries.size(); i++) { - colors.add(ContextCompat.getColor(BaseApplication.getInstance(), LocaleConstant.PIE_COLORS.get(i))); + colors.add(ContextCompat.getColor(BaseApplication.get(), LocaleConstant.PIE_COLORS.get(i))); } dataSet.setColors(colors); //设置标签显示在饼图块外面 diff --git a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java index 33244a1..8ed178e 100644 --- a/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java +++ b/app/src/main/java/com/casic/dcms/utils/DataBaseManager.java @@ -23,7 +23,7 @@ /** * 双重锁单例 */ - public static DataBaseManager getInstance() { + public static DataBaseManager get() { if (instance == null) { synchronized (DataBaseManager.class) { if (instance == null) { @@ -44,7 +44,7 @@ public void savePushNotice(NoticeLocaleBean noticeBean) { noticeBeanDao.save(noticeBean); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } @@ -68,7 +68,7 @@ ).list(); noticeBeanDao.deleteInTx(result); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } @@ -80,7 +80,7 @@ noticeLocaleBean.setIsRead("0"); noticeBeanDao.update(noticeLocaleBean); //角标设置 - BadeHelper.setBadgeNum(BaseApplication.getInstance(), queryUnReadNotice()); + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice()); //更新底部导航消息数量 MainActivity.weakReferenceHandler.sendEmptyMessage(LocaleConstant.MESSAGE_NUMBER); } diff --git a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java index df0e4da..5893053 100644 --- a/app/src/main/java/com/casic/dcms/utils/ImageHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/ImageHelper.java @@ -35,7 +35,7 @@ * 绘制文字到右下角并压缩图片 */ public static void drawTextToRightBottom(final Bitmap bitmap, IWaterMarkAddListener markAddListener) { - Context context = BaseApplication.getInstance(); + Context context = BaseApplication.get(); //初始化画笔 TextPaint textPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG | Paint.DEV_KERN_TEXT_FLAG); textPaint.setTypeface(Typeface.DEFAULT);// 采用默认的宽度 diff --git a/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java b/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java index d0888bc..0197f91 100644 --- a/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java @@ -27,7 +27,7 @@ /** * 双重锁单例 */ - public static NotificationHelper getInstance(Context context) { + public static NotificationHelper get(Context context) { if (notificationHelper == null) { synchronized (NotificationHelper.class) { if (notificationHelper == null) { diff --git a/app/src/main/java/com/casic/dcms/view/MainActivity.java b/app/src/main/java/com/casic/dcms/view/MainActivity.java index 376e943..93e4a3d 100644 --- a/app/src/main/java/com/casic/dcms/view/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/view/MainActivity.java @@ -112,7 +112,7 @@ viewBinding.mainViewPager.setAdapter(mainPageAdapter); weakReferenceHandler = new WeakReferenceHandler(callback); - dataBaseManager = DataBaseManager.getInstance(); + dataBaseManager = DataBaseManager.get(); MapConfigViewModel mapConfigViewModel = new ViewModelProvider(this).get(MapConfigViewModel.class); mapConfigViewModel.obtainMapConfig(); @@ -250,7 +250,7 @@ } private void updateMessageNumber() { - int unReadNotice = DataBaseManager.getInstance().queryUnReadNotice(); + int unReadNotice = DataBaseManager.get().queryUnReadNotice(); if (unReadNotice <= 0) { viewBinding.messageNumView.setVisibility(View.GONE); } else { diff --git a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java index bfedccf..7260770 100644 --- a/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/view/toilet/PublicToiletActivity.java @@ -154,7 +154,7 @@ viewBinding.obtainToiletIdLayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - List toiletBeanList = DataBaseManager.getInstance().getToilets(); + List toiletBeanList = DataBaseManager.get().getToilets(); if (toiletBeanList.size() == 0) { StringHub.show(context, "获取公厕数据失败，请联系管理员"); return; diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml index 1747ad0..8258fac 100644 --- a/app/src/main/res/layout/activity_permssion.xml +++ b/app/src/main/res/layout/activity_permssion.xml @@ -14,7 +14,6 @@