diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_wtly.xml b/app/src/main/res/drawable/ic_wtly.xml deleted file mode 100644 index 0a93108..0000000 --- a/app/src/main/res/drawable/ic_wtly.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_wtly.xml b/app/src/main/res/drawable/ic_wtly.xml deleted file mode 100644 index 0a93108..0000000 --- a/app/src/main/res/drawable/ic_wtly.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml deleted file mode 100644 index 35ee33d..0000000 --- a/app/src/main/res/drawable/ic_zgry.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_wtly.xml b/app/src/main/res/drawable/ic_wtly.xml deleted file mode 100644 index 0a93108..0000000 --- a/app/src/main/res/drawable/ic_wtly.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml deleted file mode 100644 index 35ee33d..0000000 --- a/app/src/main/res/drawable/ic_zgry.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/bmcz.png b/app/src/main/res/mipmap-xxhdpi/bmcz.png new file mode 100644 index 0000000..88877f0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/bmcz.png Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_wtly.xml b/app/src/main/res/drawable/ic_wtly.xml deleted file mode 100644 index 0a93108..0000000 --- a/app/src/main/res/drawable/ic_wtly.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml deleted file mode 100644 index 35ee33d..0000000 --- a/app/src/main/res/drawable/ic_zgry.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/bmcz.png b/app/src/main/res/mipmap-xxhdpi/bmcz.png new file mode 100644 index 0000000..88877f0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/bmcz.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/cffx.png b/app/src/main/res/mipmap-xxhdpi/cffx.png new file mode 100644 index 0000000..778e463 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/cffx.png Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_wtly.xml b/app/src/main/res/drawable/ic_wtly.xml deleted file mode 100644 index 0a93108..0000000 --- a/app/src/main/res/drawable/ic_wtly.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml deleted file mode 100644 index 35ee33d..0000000 --- a/app/src/main/res/drawable/ic_zgry.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/bmcz.png b/app/src/main/res/mipmap-xxhdpi/bmcz.png new file mode 100644 index 0000000..88877f0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/bmcz.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/cffx.png b/app/src/main/res/mipmap-xxhdpi/cffx.png new file mode 100644 index 0000000..778e463 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/cffx.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/czqk.png b/app/src/main/res/mipmap-xxhdpi/czqk.png new file mode 100644 index 0000000..4e9bb97 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/czqk.png Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_wtly.xml b/app/src/main/res/drawable/ic_wtly.xml deleted file mode 100644 index 0a93108..0000000 --- a/app/src/main/res/drawable/ic_wtly.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml deleted file mode 100644 index 35ee33d..0000000 --- a/app/src/main/res/drawable/ic_zgry.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/bmcz.png b/app/src/main/res/mipmap-xxhdpi/bmcz.png new file mode 100644 index 0000000..88877f0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/bmcz.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/cffx.png b/app/src/main/res/mipmap-xxhdpi/cffx.png new file mode 100644 index 0000000..778e463 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/cffx.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/czqk.png b/app/src/main/res/mipmap-xxhdpi/czqk.png new file mode 100644 index 0000000..4e9bb97 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/czqk.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gcbj.png b/app/src/main/res/mipmap-xxhdpi/gcbj.png new file mode 100644 index 0000000..20499ca --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gcbj.png Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_wtly.xml b/app/src/main/res/drawable/ic_wtly.xml deleted file mode 100644 index 0a93108..0000000 --- a/app/src/main/res/drawable/ic_wtly.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml deleted file mode 100644 index 35ee33d..0000000 --- a/app/src/main/res/drawable/ic_zgry.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/bmcz.png b/app/src/main/res/mipmap-xxhdpi/bmcz.png new file mode 100644 index 0000000..88877f0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/bmcz.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/cffx.png b/app/src/main/res/mipmap-xxhdpi/cffx.png new file mode 100644 index 0000000..778e463 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/cffx.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/czqk.png b/app/src/main/res/mipmap-xxhdpi/czqk.png new file mode 100644 index 0000000..4e9bb97 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/czqk.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gcbj.png b/app/src/main/res/mipmap-xxhdpi/gcbj.png new file mode 100644 index 0000000..20499ca --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gcbj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gfwt.png b/app/src/main/res/mipmap-xxhdpi/gfwt.png new file mode 100644 index 0000000..6d87b87 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gfwt.png Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_wtly.xml b/app/src/main/res/drawable/ic_wtly.xml deleted file mode 100644 index 0a93108..0000000 --- a/app/src/main/res/drawable/ic_wtly.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml deleted file mode 100644 index 35ee33d..0000000 --- a/app/src/main/res/drawable/ic_zgry.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/bmcz.png b/app/src/main/res/mipmap-xxhdpi/bmcz.png new file mode 100644 index 0000000..88877f0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/bmcz.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/cffx.png b/app/src/main/res/mipmap-xxhdpi/cffx.png new file mode 100644 index 0000000..778e463 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/cffx.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/czqk.png b/app/src/main/res/mipmap-xxhdpi/czqk.png new file mode 100644 index 0000000..4e9bb97 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/czqk.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gcbj.png b/app/src/main/res/mipmap-xxhdpi/gcbj.png new file mode 100644 index 0000000..20499ca --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gcbj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gfwt.png b/app/src/main/res/mipmap-xxhdpi/gfwt.png new file mode 100644 index 0000000..6d87b87 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gfwt.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gwgl.png b/app/src/main/res/mipmap-xxhdpi/gwgl.png new file mode 100644 index 0000000..7e5d207 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gwgl.png Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_wtly.xml b/app/src/main/res/drawable/ic_wtly.xml deleted file mode 100644 index 0a93108..0000000 --- a/app/src/main/res/drawable/ic_wtly.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml deleted file mode 100644 index 35ee33d..0000000 --- a/app/src/main/res/drawable/ic_zgry.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/bmcz.png b/app/src/main/res/mipmap-xxhdpi/bmcz.png new file mode 100644 index 0000000..88877f0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/bmcz.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/cffx.png b/app/src/main/res/mipmap-xxhdpi/cffx.png new file mode 100644 index 0000000..778e463 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/cffx.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/czqk.png b/app/src/main/res/mipmap-xxhdpi/czqk.png new file mode 100644 index 0000000..4e9bb97 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/czqk.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gcbj.png b/app/src/main/res/mipmap-xxhdpi/gcbj.png new file mode 100644 index 0000000..20499ca --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gcbj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gfwt.png b/app/src/main/res/mipmap-xxhdpi/gfwt.png new file mode 100644 index 0000000..6d87b87 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gfwt.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gwgl.png b/app/src/main/res/mipmap-xxhdpi/gwgl.png new file mode 100644 index 0000000..7e5d207 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gwgl.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/jcsj.png b/app/src/main/res/mipmap-xxhdpi/jcsj.png new file mode 100644 index 0000000..270c2a0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/jcsj.png Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_wtly.xml b/app/src/main/res/drawable/ic_wtly.xml deleted file mode 100644 index 0a93108..0000000 --- a/app/src/main/res/drawable/ic_wtly.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml deleted file mode 100644 index 35ee33d..0000000 --- a/app/src/main/res/drawable/ic_zgry.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/bmcz.png b/app/src/main/res/mipmap-xxhdpi/bmcz.png new file mode 100644 index 0000000..88877f0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/bmcz.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/cffx.png b/app/src/main/res/mipmap-xxhdpi/cffx.png new file mode 100644 index 0000000..778e463 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/cffx.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/czqk.png b/app/src/main/res/mipmap-xxhdpi/czqk.png new file mode 100644 index 0000000..4e9bb97 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/czqk.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gcbj.png b/app/src/main/res/mipmap-xxhdpi/gcbj.png new file mode 100644 index 0000000..20499ca --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gcbj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gfwt.png b/app/src/main/res/mipmap-xxhdpi/gfwt.png new file mode 100644 index 0000000..6d87b87 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gfwt.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gwgl.png b/app/src/main/res/mipmap-xxhdpi/gwgl.png new file mode 100644 index 0000000..7e5d207 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gwgl.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/jcsj.png b/app/src/main/res/mipmap-xxhdpi/jcsj.png new file mode 100644 index 0000000..270c2a0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/jcsj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ldgl.png b/app/src/main/res/mipmap-xxhdpi/ldgl.png new file mode 100644 index 0000000..a0600f4 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ldgl.png Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_wtly.xml b/app/src/main/res/drawable/ic_wtly.xml deleted file mode 100644 index 0a93108..0000000 --- a/app/src/main/res/drawable/ic_wtly.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml deleted file mode 100644 index 35ee33d..0000000 --- a/app/src/main/res/drawable/ic_zgry.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/bmcz.png b/app/src/main/res/mipmap-xxhdpi/bmcz.png new file mode 100644 index 0000000..88877f0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/bmcz.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/cffx.png b/app/src/main/res/mipmap-xxhdpi/cffx.png new file mode 100644 index 0000000..778e463 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/cffx.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/czqk.png b/app/src/main/res/mipmap-xxhdpi/czqk.png new file mode 100644 index 0000000..4e9bb97 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/czqk.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gcbj.png b/app/src/main/res/mipmap-xxhdpi/gcbj.png new file mode 100644 index 0000000..20499ca --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gcbj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gfwt.png b/app/src/main/res/mipmap-xxhdpi/gfwt.png new file mode 100644 index 0000000..6d87b87 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gfwt.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gwgl.png b/app/src/main/res/mipmap-xxhdpi/gwgl.png new file mode 100644 index 0000000..7e5d207 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gwgl.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/jcsj.png b/app/src/main/res/mipmap-xxhdpi/jcsj.png new file mode 100644 index 0000000..270c2a0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/jcsj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ldgl.png b/app/src/main/res/mipmap-xxhdpi/ldgl.png new file mode 100644 index 0000000..a0600f4 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ldgl.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/lqyh.png b/app/src/main/res/mipmap-xxhdpi/lqyh.png new file mode 100644 index 0000000..3c971ee --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/lqyh.png Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_wtly.xml b/app/src/main/res/drawable/ic_wtly.xml deleted file mode 100644 index 0a93108..0000000 --- a/app/src/main/res/drawable/ic_wtly.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml deleted file mode 100644 index 35ee33d..0000000 --- a/app/src/main/res/drawable/ic_zgry.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/bmcz.png b/app/src/main/res/mipmap-xxhdpi/bmcz.png new file mode 100644 index 0000000..88877f0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/bmcz.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/cffx.png b/app/src/main/res/mipmap-xxhdpi/cffx.png new file mode 100644 index 0000000..778e463 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/cffx.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/czqk.png b/app/src/main/res/mipmap-xxhdpi/czqk.png new file mode 100644 index 0000000..4e9bb97 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/czqk.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gcbj.png b/app/src/main/res/mipmap-xxhdpi/gcbj.png new file mode 100644 index 0000000..20499ca --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gcbj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gfwt.png b/app/src/main/res/mipmap-xxhdpi/gfwt.png new file mode 100644 index 0000000..6d87b87 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gfwt.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gwgl.png b/app/src/main/res/mipmap-xxhdpi/gwgl.png new file mode 100644 index 0000000..7e5d207 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gwgl.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/jcsj.png b/app/src/main/res/mipmap-xxhdpi/jcsj.png new file mode 100644 index 0000000..270c2a0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/jcsj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ldgl.png b/app/src/main/res/mipmap-xxhdpi/ldgl.png new file mode 100644 index 0000000..a0600f4 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ldgl.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/lqyh.png b/app/src/main/res/mipmap-xxhdpi/lqyh.png new file mode 100644 index 0000000..3c971ee --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/lqyh.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/lytj.png b/app/src/main/res/mipmap-xxhdpi/lytj.png new file mode 100644 index 0000000..21f12b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/lytj.png Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_wtly.xml b/app/src/main/res/drawable/ic_wtly.xml deleted file mode 100644 index 0a93108..0000000 --- a/app/src/main/res/drawable/ic_wtly.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml deleted file mode 100644 index 35ee33d..0000000 --- a/app/src/main/res/drawable/ic_zgry.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/bmcz.png b/app/src/main/res/mipmap-xxhdpi/bmcz.png new file mode 100644 index 0000000..88877f0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/bmcz.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/cffx.png b/app/src/main/res/mipmap-xxhdpi/cffx.png new file mode 100644 index 0000000..778e463 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/cffx.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/czqk.png b/app/src/main/res/mipmap-xxhdpi/czqk.png new file mode 100644 index 0000000..4e9bb97 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/czqk.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gcbj.png b/app/src/main/res/mipmap-xxhdpi/gcbj.png new file mode 100644 index 0000000..20499ca --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gcbj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gfwt.png b/app/src/main/res/mipmap-xxhdpi/gfwt.png new file mode 100644 index 0000000..6d87b87 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gfwt.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gwgl.png b/app/src/main/res/mipmap-xxhdpi/gwgl.png new file mode 100644 index 0000000..7e5d207 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gwgl.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/jcsj.png b/app/src/main/res/mipmap-xxhdpi/jcsj.png new file mode 100644 index 0000000..270c2a0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/jcsj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ldgl.png b/app/src/main/res/mipmap-xxhdpi/ldgl.png new file mode 100644 index 0000000..a0600f4 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ldgl.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/lqyh.png b/app/src/main/res/mipmap-xxhdpi/lqyh.png new file mode 100644 index 0000000..3c971ee --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/lqyh.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/lytj.png b/app/src/main/res/mipmap-xxhdpi/lytj.png new file mode 100644 index 0000000..21f12b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/lytj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/qsfx.png b/app/src/main/res/mipmap-xxhdpi/qsfx.png new file mode 100644 index 0000000..9152587 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/qsfx.png Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_wtly.xml b/app/src/main/res/drawable/ic_wtly.xml deleted file mode 100644 index 0a93108..0000000 --- a/app/src/main/res/drawable/ic_wtly.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml deleted file mode 100644 index 35ee33d..0000000 --- a/app/src/main/res/drawable/ic_zgry.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/bmcz.png b/app/src/main/res/mipmap-xxhdpi/bmcz.png new file mode 100644 index 0000000..88877f0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/bmcz.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/cffx.png b/app/src/main/res/mipmap-xxhdpi/cffx.png new file mode 100644 index 0000000..778e463 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/cffx.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/czqk.png b/app/src/main/res/mipmap-xxhdpi/czqk.png new file mode 100644 index 0000000..4e9bb97 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/czqk.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gcbj.png b/app/src/main/res/mipmap-xxhdpi/gcbj.png new file mode 100644 index 0000000..20499ca --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gcbj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gfwt.png b/app/src/main/res/mipmap-xxhdpi/gfwt.png new file mode 100644 index 0000000..6d87b87 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gfwt.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gwgl.png b/app/src/main/res/mipmap-xxhdpi/gwgl.png new file mode 100644 index 0000000..7e5d207 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gwgl.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/jcsj.png b/app/src/main/res/mipmap-xxhdpi/jcsj.png new file mode 100644 index 0000000..270c2a0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/jcsj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ldgl.png b/app/src/main/res/mipmap-xxhdpi/ldgl.png new file mode 100644 index 0000000..a0600f4 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ldgl.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/lqyh.png b/app/src/main/res/mipmap-xxhdpi/lqyh.png new file mode 100644 index 0000000..3c971ee --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/lqyh.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/lytj.png b/app/src/main/res/mipmap-xxhdpi/lytj.png new file mode 100644 index 0000000..21f12b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/lytj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/qsfx.png b/app/src/main/res/mipmap-xxhdpi/qsfx.png new file mode 100644 index 0000000..9152587 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/qsfx.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/sbcz.png b/app/src/main/res/mipmap-xxhdpi/sbcz.png new file mode 100644 index 0000000..4ed3853 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/sbcz.png Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_wtly.xml b/app/src/main/res/drawable/ic_wtly.xml deleted file mode 100644 index 0a93108..0000000 --- a/app/src/main/res/drawable/ic_wtly.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml deleted file mode 100644 index 35ee33d..0000000 --- a/app/src/main/res/drawable/ic_zgry.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/bmcz.png b/app/src/main/res/mipmap-xxhdpi/bmcz.png new file mode 100644 index 0000000..88877f0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/bmcz.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/cffx.png b/app/src/main/res/mipmap-xxhdpi/cffx.png new file mode 100644 index 0000000..778e463 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/cffx.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/czqk.png b/app/src/main/res/mipmap-xxhdpi/czqk.png new file mode 100644 index 0000000..4e9bb97 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/czqk.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gcbj.png b/app/src/main/res/mipmap-xxhdpi/gcbj.png new file mode 100644 index 0000000..20499ca --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gcbj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gfwt.png b/app/src/main/res/mipmap-xxhdpi/gfwt.png new file mode 100644 index 0000000..6d87b87 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gfwt.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gwgl.png b/app/src/main/res/mipmap-xxhdpi/gwgl.png new file mode 100644 index 0000000..7e5d207 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gwgl.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/jcsj.png b/app/src/main/res/mipmap-xxhdpi/jcsj.png new file mode 100644 index 0000000..270c2a0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/jcsj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ldgl.png b/app/src/main/res/mipmap-xxhdpi/ldgl.png new file mode 100644 index 0000000..a0600f4 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ldgl.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/lqyh.png b/app/src/main/res/mipmap-xxhdpi/lqyh.png new file mode 100644 index 0000000..3c971ee --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/lqyh.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/lytj.png b/app/src/main/res/mipmap-xxhdpi/lytj.png new file mode 100644 index 0000000..21f12b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/lytj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/qsfx.png b/app/src/main/res/mipmap-xxhdpi/qsfx.png new file mode 100644 index 0000000..9152587 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/qsfx.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/sbcz.png b/app/src/main/res/mipmap-xxhdpi/sbcz.png new file mode 100644 index 0000000..4ed3853 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/sbcz.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/spbg.png b/app/src/main/res/mipmap-xxhdpi/spbg.png new file mode 100644 index 0000000..26c3bf6 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/spbg.png Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 4869557..3e77980 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -119,14 +119,18 @@ + + + + @@ -136,6 +140,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 09c9e5e..2618027 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -66,7 +66,7 @@ implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.2' + implementation 'com.github.AndroidCoderPeng:Androidx-lite-lib:1.0.7.4' //Google官方授权框架 implementation 'pub.devrel:easypermissions:3.0.0' //腾讯Android UI框架 @@ -91,9 +91,9 @@ //Excel表格 implementation 'com.github.huangyanbin:SmartTable:1.7.1' //个推SDK - implementation 'com.getui:gtsdk:3.2.10.0' + implementation 'com.getui:gtsdk:3.2.15.0' //个推核心组件 - implementation 'com.getui:gtc:3.1.9.0' + implementation 'com.getui:gtc:3.2.1.0' //数据库框架 implementation 'org.greenrobot:greendao:3.3.0' //沉浸式状态栏。基础依赖包，必须要依赖 diff --git a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java index d12ff17..37cf1d5 100644 --- a/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java +++ b/app/src/main/java/com/casic/dcms/fragment/HomePageFragment.java @@ -99,7 +99,7 @@ NormalRecyclerAdapter recyclerAdapter = new NormalRecyclerAdapter(R.layout.item_home_recycleview, resultBean.getData().getMenus()) { @Override public void convertView(ViewHolder viewHolder, int position, HomePageBean.DataBean.MenusBean item) { - viewHolder.setImageResource(R.id.imageView, StringHelper.obtainDrawableIcon(item.getName())).setText(R.id.textView, item.getName()); + viewHolder.setImageResource(R.id.imageView, StringHelper.obtainIcon(item.getName())).setText(R.id.textView, item.getName()); } }; viewBinding.homeRecyclerView.setAdapter(recyclerAdapter); diff --git a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java index 932da05..43412f8 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java +++ b/app/src/main/java/com/casic/dcms/utils/LocaleConstant.java @@ -23,12 +23,14 @@ public static final String[] POPUP_OPTION_ITEMS = {"一键布防", "一键撤防"}; public static final List ANALYSIS_ICONS = Arrays.asList( - R.drawable.ic_wtly, R.drawable.ic_ajzt, R.drawable.ic_gfwt, - R.drawable.ic_jdtj, R.drawable.ic_cltj, R.drawable.ic_qsfx); + R.mipmap.jcsj, R.mipmap.lytj, R.mipmap.gfwt, + R.mipmap.czqk, R.mipmap.wgfx, R.mipmap.qsfx, + R.mipmap.cffx); public static final List ANALYSIS_ITEMS = Arrays.asList( - "问题来源", "案卷状态", "高发问题", - "街道统计", "处理统计", "趋势分析"); + "城管基础数据", "案卷来源统计", "高发案卷统计", + "单位处置情况", "网格分析", "案卷趋势分析", + "商铺处罚分析"); //饼图预置颜色，前三种作为街道统计饼图颜色 public static final List PIE_COLORS = Arrays.asList( diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 1a097cc..36d3d0c 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -215,69 +215,21 @@ case "案卷分布": return R.mipmap.dtck; case "公厕保洁": - return R.drawable.ic_toilet; + return R.mipmap.gcbj; case "三包处置": - return R.drawable.ic_sanbao; + return R.mipmap.sbcz; case "商铺变更": - return R.drawable.ic_shangpu; + return R.mipmap.spbg; case "部门处置": - return R.drawable.ic_dept; + return R.mipmap.bmcz; case "路桥养护": - return R.drawable.ic_bridge; + return R.mipmap.lqyh; case "管网管理": - return R.drawable.ic_pipe; + return R.mipmap.gwgl; case "路灯管理": - return R.drawable.ic_streetlight; + return R.mipmap.ldgl; default: - return R.drawable.ic_default_icon; - } - } - - /** - * 根据item名字获取icon - */ - public static int obtainDrawableIcon(String item) { - switch (item) { - case "案卷上报": - return R.drawable.ic_ajsb; - case "快速上报": - return R.drawable.ic_kssb; - case "三包上报": - return R.drawable.ic_sbsb; - case "案卷核实": - return R.drawable.ic_ajhs; - case "案卷核查": - return R.drawable.ic_ajhc; - case "案卷处理": - return R.drawable.ic_ajcl; - case "紧急要件": - return R.drawable.ic_jjyj; - case "超时督办": - return R.drawable.ic_csdb; - case "统计分析": - return R.drawable.ic_tjfx; - case "在岗人员": - return R.drawable.ic_zgry; - case "案卷查询": - return R.drawable.ic_ajcx; - case "案卷分布": - return R.drawable.ic_dtck; - case "公厕保洁": - return R.drawable.ic_toilet; - case "三包处置": - return R.drawable.ic_sanbao; - case "商铺变更": - return R.drawable.ic_shangpu; - case "部门处置": - return R.drawable.ic_dept; - case "路桥养护": - return R.drawable.ic_bridge; - case "管网管理": - return R.drawable.ic_pipe; - case "路灯管理": - return R.drawable.ic_streetlight; - default: - return R.drawable.ic_default_icon; + return R.mipmap.app_logo; } } } diff --git a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java index e1d258d..bc5e09a 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseDetailActivity.java @@ -84,8 +84,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.casePicGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.casePicGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -110,8 +109,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java index 0dc088e..1340c12 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java index 608bf3f..c7d281c 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseTodoHandledDetailActivity.java @@ -85,8 +85,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java index bb53a88..d8439f9 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageHandledDetailActivity.java @@ -82,8 +82,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -108,8 +107,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -136,8 +134,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.punishGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.punishGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java index ce49667..d2801f5 100644 --- a/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/business/PackageTodoDetailActivity.java @@ -120,8 +120,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java index b9aeeb7..ec73134 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckDetailActivity.java @@ -140,8 +140,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -190,8 +189,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java index 14e554b..9ad1466 100644 --- a/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/check/CheckedDetailActivity.java @@ -91,8 +91,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -117,8 +116,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -143,8 +141,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.checkGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.checkGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java index 72e82ed..ac02cb4 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAdjustDetailActivity.java @@ -100,8 +100,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -144,8 +143,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java index df21104..f429e82 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptAuthorizeDetailActivity.java @@ -106,8 +106,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -150,8 +149,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java index 09264ee..4a688e9 100644 --- a/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/department/DeptTodoDetailActivity.java @@ -102,8 +102,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -146,8 +145,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java index 1384f0c..8cf2edc 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandleDetailActivity.java @@ -114,8 +114,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java index 4dbedac..7b0a864 100644 --- a/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/handle/CaseHandledDetailActivity.java @@ -86,8 +86,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @@ -112,8 +111,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.handleGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.handleGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java index efbfb12..7cc5694 100644 --- a/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java +++ b/app/src/main/java/com/casic/dcms/view/statistics/DataAnalysisActivity.java @@ -43,7 +43,7 @@ @Override protected void initData() { ArrayList models = new ArrayList<>(); - for (int i = 0; i < 6; i++) { + for (int i = 0; i < 7; i++) { DataAnalysisGridModel model = new DataAnalysisGridModel(); model.setItemIcon(LocaleConstant.ANALYSIS_ICONS.get(i)); model.setItemTitle(LocaleConstant.ANALYSIS_ITEMS.get(i)); diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java index 2e1469d..b2d894a 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifiedDetailActivity.java @@ -92,8 +92,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java index da1c8bd..3f32567 100644 --- a/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/view/verify/VerifyDetailActivity.java @@ -204,8 +204,7 @@ urls.add(StringHelper.appendCompleteURL(s)); } } - ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context); - imageAdapter.setImageList(urls); + ReadOnlyImageAdapter imageAdapter = new ReadOnlyImageAdapter(context, urls); viewBinding.imageGridView.setAdapter(imageAdapter); //九宫格点击事件 viewBinding.imageGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() { diff --git a/app/src/main/res/drawable/begin_marker.xml b/app/src/main/res/drawable/begin_marker.xml deleted file mode 100644 index ee47fdb..0000000 --- a/app/src/main/res/drawable/begin_marker.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml deleted file mode 100644 index 1040719..0000000 --- a/app/src/main/res/drawable/ic_ajcl.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml deleted file mode 100644 index 843e7a4..0000000 --- a/app/src/main/res/drawable/ic_ajcx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml deleted file mode 100644 index f27e49b..0000000 --- a/app/src/main/res/drawable/ic_ajhc.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml deleted file mode 100644 index 36f47d4..0000000 --- a/app/src/main/res/drawable/ic_ajhs.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml deleted file mode 100644 index 327c0c8..0000000 --- a/app/src/main/res/drawable/ic_ajsb.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_ajzt.xml b/app/src/main/res/drawable/ic_ajzt.xml deleted file mode 100644 index c4b2f2b..0000000 --- a/app/src/main/res/drawable/ic_ajzt.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_bridge.xml b/app/src/main/res/drawable/ic_bridge.xml deleted file mode 100644 index b366c76..0000000 --- a/app/src/main/res/drawable/ic_bridge.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_cesuo.xml b/app/src/main/res/drawable/ic_cesuo.xml deleted file mode 100644 index 4c7fba9..0000000 --- a/app/src/main/res/drawable/ic_cesuo.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_cheliang.xml b/app/src/main/res/drawable/ic_cheliang.xml deleted file mode 100644 index 7b76835..0000000 --- a/app/src/main/res/drawable/ic_cheliang.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml deleted file mode 100644 index 7135ea4..0000000 --- a/app/src/main/res/drawable/ic_close.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cltj.xml b/app/src/main/res/drawable/ic_cltj.xml deleted file mode 100644 index a6a4368..0000000 --- a/app/src/main/res/drawable/ic_cltj.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml deleted file mode 100644 index f5da6dd..0000000 --- a/app/src/main/res/drawable/ic_csdb.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_dept.xml b/app/src/main/res/drawable/ic_dept.xml deleted file mode 100644 index dd4ac71..0000000 --- a/app/src/main/res/drawable/ic_dept.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml deleted file mode 100644 index 6cac201..0000000 --- a/app/src/main/res/drawable/ic_dtck.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/drawable/ic_gfwt.xml b/app/src/main/res/drawable/ic_gfwt.xml deleted file mode 100644 index 0a432a2..0000000 --- a/app/src/main/res/drawable/ic_gfwt.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_huanwei.xml b/app/src/main/res/drawable/ic_huanwei.xml deleted file mode 100644 index dec6893..0000000 --- a/app/src/main/res/drawable/ic_huanwei.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_jdtj.xml b/app/src/main/res/drawable/ic_jdtj.xml deleted file mode 100644 index 7db64ba..0000000 --- a/app/src/main/res/drawable/ic_jdtj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml deleted file mode 100644 index e58f135..0000000 --- a/app/src/main/res/drawable/ic_jjyj.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml deleted file mode 100644 index afbf7b6..0000000 --- a/app/src/main/res/drawable/ic_kssb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_pipe.xml b/app/src/main/res/drawable/ic_pipe.xml deleted file mode 100644 index b005f98..0000000 --- a/app/src/main/res/drawable/ic_pipe.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_qsfx.xml b/app/src/main/res/drawable/ic_qsfx.xml deleted file mode 100644 index fcf1f28..0000000 --- a/app/src/main/res/drawable/ic_qsfx.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_sanbao.xml b/app/src/main/res/drawable/ic_sanbao.xml deleted file mode 100644 index 1f1134d..0000000 --- a/app/src/main/res/drawable/ic_sanbao.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml deleted file mode 100644 index 69a2d0e..0000000 --- a/app/src/main/res/drawable/ic_sbsb.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml deleted file mode 100644 index 694165b..0000000 --- a/app/src/main/res/drawable/ic_scan.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_shangpu.xml b/app/src/main/res/drawable/ic_shangpu.xml deleted file mode 100644 index 3cc8807..0000000 --- a/app/src/main/res/drawable/ic_shangpu.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_streetlight.xml b/app/src/main/res/drawable/ic_streetlight.xml deleted file mode 100644 index 988b54c..0000000 --- a/app/src/main/res/drawable/ic_streetlight.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml deleted file mode 100644 index 6f7ff28..0000000 --- a/app/src/main/res/drawable/ic_tjfx.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml deleted file mode 100644 index 3679a2f..0000000 --- a/app/src/main/res/drawable/ic_toilet.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_wtly.xml b/app/src/main/res/drawable/ic_wtly.xml deleted file mode 100644 index 0a93108..0000000 --- a/app/src/main/res/drawable/ic_wtly.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml deleted file mode 100644 index 35ee33d..0000000 --- a/app/src/main/res/drawable/ic_zgry.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/mipmap-xxhdpi/bmcz.png b/app/src/main/res/mipmap-xxhdpi/bmcz.png new file mode 100644 index 0000000..88877f0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/bmcz.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/cffx.png b/app/src/main/res/mipmap-xxhdpi/cffx.png new file mode 100644 index 0000000..778e463 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/cffx.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/czqk.png b/app/src/main/res/mipmap-xxhdpi/czqk.png new file mode 100644 index 0000000..4e9bb97 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/czqk.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gcbj.png b/app/src/main/res/mipmap-xxhdpi/gcbj.png new file mode 100644 index 0000000..20499ca --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gcbj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gfwt.png b/app/src/main/res/mipmap-xxhdpi/gfwt.png new file mode 100644 index 0000000..6d87b87 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gfwt.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/gwgl.png b/app/src/main/res/mipmap-xxhdpi/gwgl.png new file mode 100644 index 0000000..7e5d207 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/gwgl.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/jcsj.png b/app/src/main/res/mipmap-xxhdpi/jcsj.png new file mode 100644 index 0000000..270c2a0 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/jcsj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/ldgl.png b/app/src/main/res/mipmap-xxhdpi/ldgl.png new file mode 100644 index 0000000..a0600f4 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/ldgl.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/lqyh.png b/app/src/main/res/mipmap-xxhdpi/lqyh.png new file mode 100644 index 0000000..3c971ee --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/lqyh.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/lytj.png b/app/src/main/res/mipmap-xxhdpi/lytj.png new file mode 100644 index 0000000..21f12b9 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/lytj.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/qsfx.png b/app/src/main/res/mipmap-xxhdpi/qsfx.png new file mode 100644 index 0000000..9152587 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/qsfx.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/sbcz.png b/app/src/main/res/mipmap-xxhdpi/sbcz.png new file mode 100644 index 0000000..4ed3853 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/sbcz.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/spbg.png b/app/src/main/res/mipmap-xxhdpi/spbg.png new file mode 100644 index 0000000..26c3bf6 --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/spbg.png Binary files differ diff --git a/app/src/main/res/mipmap-xxhdpi/wgfx.png b/app/src/main/res/mipmap-xxhdpi/wgfx.png new file mode 100644 index 0000000..05f7f9a --- /dev/null +++ b/app/src/main/res/mipmap-xxhdpi/wgfx.png Binary files differ