diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 5b8e458..a5ed964 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -4,12 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#FFE37B" + android:pathData="M667.8,729.45c-19.87,-20.12 -52.28,-20.28 -72.4,-0.41l-28.57,28.26v-200.91c0,-28.26 -22.94,-51.2 -51.2,-51.2s-51.2,22.94 -51.2,51.2v201.01l-28.52,-28.31c-20.07,-19.92 -52.48,-19.81 -72.4,0.26 -19.92,20.07 -19.81,52.48 0.26,72.4L479.28,916.48c9.98,9.93 23.04,14.85 36.1,14.85 13,0 26.01,-4.92 35.99,-14.8l116.02,-114.74c20.12,-19.81 20.28,-52.28 0.41,-72.35z" /> - + android:pathData="M819.61,470.12h-5.32c-3.07,-162.51 -135.68,-293.32 -298.91,-293.32S219.49,307.61 216.47,470.12h-5.32c-100.2,0 -181.4,81.2 -181.4,181.4s81.2,181.4 181.4,181.4H344.37l-5.84,-5.79c-34.05,-33.79 -34.25,-89.04 -0.46,-123.08 24.37,-24.52 59.85,-31.49 90.52,-20.84v-126.92c0,-47.97 39.07,-87.04 87.04,-87.04s87.04,39.07 87.04,87.04v126.92c30.72,-10.7 66.25,-3.69 90.62,20.94 33.74,34.15 33.43,89.34 -0.72,123.08l-5.73,5.63h132.76c100.2,0 181.4,-81.2 181.4,-181.4 0,-100.1 -81.2,-181.35 -181.4,-181.35z" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 5b8e458..a5ed964 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -4,12 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#FFE37B" + android:pathData="M667.8,729.45c-19.87,-20.12 -52.28,-20.28 -72.4,-0.41l-28.57,28.26v-200.91c0,-28.26 -22.94,-51.2 -51.2,-51.2s-51.2,22.94 -51.2,51.2v201.01l-28.52,-28.31c-20.07,-19.92 -52.48,-19.81 -72.4,0.26 -19.92,20.07 -19.81,52.48 0.26,72.4L479.28,916.48c9.98,9.93 23.04,14.85 36.1,14.85 13,0 26.01,-4.92 35.99,-14.8l116.02,-114.74c20.12,-19.81 20.28,-52.28 0.41,-72.35z" /> - + android:pathData="M819.61,470.12h-5.32c-3.07,-162.51 -135.68,-293.32 -298.91,-293.32S219.49,307.61 216.47,470.12h-5.32c-100.2,0 -181.4,81.2 -181.4,181.4s81.2,181.4 181.4,181.4H344.37l-5.84,-5.79c-34.05,-33.79 -34.25,-89.04 -0.46,-123.08 24.37,-24.52 59.85,-31.49 90.52,-20.84v-126.92c0,-47.97 39.07,-87.04 87.04,-87.04s87.04,39.07 87.04,87.04v126.92c30.72,-10.7 66.25,-3.69 90.62,20.94 33.74,34.15 33.43,89.34 -0.72,123.08l-5.73,5.63h132.76c100.2,0 181.4,-81.2 181.4,-181.4 0,-100.1 -81.2,-181.35 -181.4,-181.35z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 0000000..8c4a29d --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 5b8e458..a5ed964 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -4,12 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#FFE37B" + android:pathData="M667.8,729.45c-19.87,-20.12 -52.28,-20.28 -72.4,-0.41l-28.57,28.26v-200.91c0,-28.26 -22.94,-51.2 -51.2,-51.2s-51.2,22.94 -51.2,51.2v201.01l-28.52,-28.31c-20.07,-19.92 -52.48,-19.81 -72.4,0.26 -19.92,20.07 -19.81,52.48 0.26,72.4L479.28,916.48c9.98,9.93 23.04,14.85 36.1,14.85 13,0 26.01,-4.92 35.99,-14.8l116.02,-114.74c20.12,-19.81 20.28,-52.28 0.41,-72.35z" /> - + android:pathData="M819.61,470.12h-5.32c-3.07,-162.51 -135.68,-293.32 -298.91,-293.32S219.49,307.61 216.47,470.12h-5.32c-100.2,0 -181.4,81.2 -181.4,181.4s81.2,181.4 181.4,181.4H344.37l-5.84,-5.79c-34.05,-33.79 -34.25,-89.04 -0.46,-123.08 24.37,-24.52 59.85,-31.49 90.52,-20.84v-126.92c0,-47.97 39.07,-87.04 87.04,-87.04s87.04,39.07 87.04,87.04v126.92c30.72,-10.7 66.25,-3.69 90.62,20.94 33.74,34.15 33.43,89.34 -0.72,123.08l-5.73,5.63h132.76c100.2,0 181.4,-81.2 181.4,-181.4 0,-100.1 -81.2,-181.35 -181.4,-181.35z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 0000000..8c4a29d --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml new file mode 100644 index 0000000..35ee33d --- /dev/null +++ b/app/src/main/res/drawable/ic_zgry.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 5b8e458..a5ed964 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -4,12 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#FFE37B" + android:pathData="M667.8,729.45c-19.87,-20.12 -52.28,-20.28 -72.4,-0.41l-28.57,28.26v-200.91c0,-28.26 -22.94,-51.2 -51.2,-51.2s-51.2,22.94 -51.2,51.2v201.01l-28.52,-28.31c-20.07,-19.92 -52.48,-19.81 -72.4,0.26 -19.92,20.07 -19.81,52.48 0.26,72.4L479.28,916.48c9.98,9.93 23.04,14.85 36.1,14.85 13,0 26.01,-4.92 35.99,-14.8l116.02,-114.74c20.12,-19.81 20.28,-52.28 0.41,-72.35z" /> - + android:pathData="M819.61,470.12h-5.32c-3.07,-162.51 -135.68,-293.32 -298.91,-293.32S219.49,307.61 216.47,470.12h-5.32c-100.2,0 -181.4,81.2 -181.4,181.4s81.2,181.4 181.4,181.4H344.37l-5.84,-5.79c-34.05,-33.79 -34.25,-89.04 -0.46,-123.08 24.37,-24.52 59.85,-31.49 90.52,-20.84v-126.92c0,-47.97 39.07,-87.04 87.04,-87.04s87.04,39.07 87.04,87.04v126.92c30.72,-10.7 66.25,-3.69 90.62,20.94 33.74,34.15 33.43,89.34 -0.72,123.08l-5.73,5.63h132.76c100.2,0 181.4,-81.2 181.4,-181.4 0,-100.1 -81.2,-181.35 -181.4,-181.35z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 0000000..8c4a29d --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml new file mode 100644 index 0000000..35ee33d --- /dev/null +++ b/app/src/main/res/drawable/ic_zgry.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 379a81b..a2b7f65 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 5b8e458..a5ed964 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -4,12 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#FFE37B" + android:pathData="M667.8,729.45c-19.87,-20.12 -52.28,-20.28 -72.4,-0.41l-28.57,28.26v-200.91c0,-28.26 -22.94,-51.2 -51.2,-51.2s-51.2,22.94 -51.2,51.2v201.01l-28.52,-28.31c-20.07,-19.92 -52.48,-19.81 -72.4,0.26 -19.92,20.07 -19.81,52.48 0.26,72.4L479.28,916.48c9.98,9.93 23.04,14.85 36.1,14.85 13,0 26.01,-4.92 35.99,-14.8l116.02,-114.74c20.12,-19.81 20.28,-52.28 0.41,-72.35z" /> - + android:pathData="M819.61,470.12h-5.32c-3.07,-162.51 -135.68,-293.32 -298.91,-293.32S219.49,307.61 216.47,470.12h-5.32c-100.2,0 -181.4,81.2 -181.4,181.4s81.2,181.4 181.4,181.4H344.37l-5.84,-5.79c-34.05,-33.79 -34.25,-89.04 -0.46,-123.08 24.37,-24.52 59.85,-31.49 90.52,-20.84v-126.92c0,-47.97 39.07,-87.04 87.04,-87.04s87.04,39.07 87.04,87.04v126.92c30.72,-10.7 66.25,-3.69 90.62,20.94 33.74,34.15 33.43,89.34 -0.72,123.08l-5.73,5.63h132.76c100.2,0 181.4,-81.2 181.4,-181.4 0,-100.1 -81.2,-181.35 -181.4,-181.35z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 0000000..8c4a29d --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml new file mode 100644 index 0000000..35ee33d --- /dev/null +++ b/app/src/main/res/drawable/ic_zgry.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 379a81b..a2b7f65 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index 19b5c57..a7c4334 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 5b8e458..a5ed964 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -4,12 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#FFE37B" + android:pathData="M667.8,729.45c-19.87,-20.12 -52.28,-20.28 -72.4,-0.41l-28.57,28.26v-200.91c0,-28.26 -22.94,-51.2 -51.2,-51.2s-51.2,22.94 -51.2,51.2v201.01l-28.52,-28.31c-20.07,-19.92 -52.48,-19.81 -72.4,0.26 -19.92,20.07 -19.81,52.48 0.26,72.4L479.28,916.48c9.98,9.93 23.04,14.85 36.1,14.85 13,0 26.01,-4.92 35.99,-14.8l116.02,-114.74c20.12,-19.81 20.28,-52.28 0.41,-72.35z" /> - + android:pathData="M819.61,470.12h-5.32c-3.07,-162.51 -135.68,-293.32 -298.91,-293.32S219.49,307.61 216.47,470.12h-5.32c-100.2,0 -181.4,81.2 -181.4,181.4s81.2,181.4 181.4,181.4H344.37l-5.84,-5.79c-34.05,-33.79 -34.25,-89.04 -0.46,-123.08 24.37,-24.52 59.85,-31.49 90.52,-20.84v-126.92c0,-47.97 39.07,-87.04 87.04,-87.04s87.04,39.07 87.04,87.04v126.92c30.72,-10.7 66.25,-3.69 90.62,20.94 33.74,34.15 33.43,89.34 -0.72,123.08l-5.73,5.63h132.76c100.2,0 181.4,-81.2 181.4,-181.4 0,-100.1 -81.2,-181.35 -181.4,-181.35z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 0000000..8c4a29d --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml new file mode 100644 index 0000000..35ee33d --- /dev/null +++ b/app/src/main/res/drawable/ic_zgry.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 379a81b..a2b7f65 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index 19b5c57..a7c4334 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index de0e201..46f233e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 5b8e458..a5ed964 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -4,12 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#FFE37B" + android:pathData="M667.8,729.45c-19.87,-20.12 -52.28,-20.28 -72.4,-0.41l-28.57,28.26v-200.91c0,-28.26 -22.94,-51.2 -51.2,-51.2s-51.2,22.94 -51.2,51.2v201.01l-28.52,-28.31c-20.07,-19.92 -52.48,-19.81 -72.4,0.26 -19.92,20.07 -19.81,52.48 0.26,72.4L479.28,916.48c9.98,9.93 23.04,14.85 36.1,14.85 13,0 26.01,-4.92 35.99,-14.8l116.02,-114.74c20.12,-19.81 20.28,-52.28 0.41,-72.35z" /> - + android:pathData="M819.61,470.12h-5.32c-3.07,-162.51 -135.68,-293.32 -298.91,-293.32S219.49,307.61 216.47,470.12h-5.32c-100.2,0 -181.4,81.2 -181.4,181.4s81.2,181.4 181.4,181.4H344.37l-5.84,-5.79c-34.05,-33.79 -34.25,-89.04 -0.46,-123.08 24.37,-24.52 59.85,-31.49 90.52,-20.84v-126.92c0,-47.97 39.07,-87.04 87.04,-87.04s87.04,39.07 87.04,87.04v126.92c30.72,-10.7 66.25,-3.69 90.62,20.94 33.74,34.15 33.43,89.34 -0.72,123.08l-5.73,5.63h132.76c100.2,0 181.4,-81.2 181.4,-181.4 0,-100.1 -81.2,-181.35 -181.4,-181.35z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 0000000..8c4a29d --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml new file mode 100644 index 0000000..35ee33d --- /dev/null +++ b/app/src/main/res/drawable/ic_zgry.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 379a81b..a2b7f65 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index 19b5c57..a7c4334 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index de0e201..46f233e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index adbc3aa..0b34dbf 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 5b8e458..a5ed964 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -4,12 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#FFE37B" + android:pathData="M667.8,729.45c-19.87,-20.12 -52.28,-20.28 -72.4,-0.41l-28.57,28.26v-200.91c0,-28.26 -22.94,-51.2 -51.2,-51.2s-51.2,22.94 -51.2,51.2v201.01l-28.52,-28.31c-20.07,-19.92 -52.48,-19.81 -72.4,0.26 -19.92,20.07 -19.81,52.48 0.26,72.4L479.28,916.48c9.98,9.93 23.04,14.85 36.1,14.85 13,0 26.01,-4.92 35.99,-14.8l116.02,-114.74c20.12,-19.81 20.28,-52.28 0.41,-72.35z" /> - + android:pathData="M819.61,470.12h-5.32c-3.07,-162.51 -135.68,-293.32 -298.91,-293.32S219.49,307.61 216.47,470.12h-5.32c-100.2,0 -181.4,81.2 -181.4,181.4s81.2,181.4 181.4,181.4H344.37l-5.84,-5.79c-34.05,-33.79 -34.25,-89.04 -0.46,-123.08 24.37,-24.52 59.85,-31.49 90.52,-20.84v-126.92c0,-47.97 39.07,-87.04 87.04,-87.04s87.04,39.07 87.04,87.04v126.92c30.72,-10.7 66.25,-3.69 90.62,20.94 33.74,34.15 33.43,89.34 -0.72,123.08l-5.73,5.63h132.76c100.2,0 181.4,-81.2 181.4,-181.4 0,-100.1 -81.2,-181.35 -181.4,-181.35z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 0000000..8c4a29d --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml new file mode 100644 index 0000000..35ee33d --- /dev/null +++ b/app/src/main/res/drawable/ic_zgry.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 379a81b..a2b7f65 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index 19b5c57..a7c4334 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index de0e201..46f233e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index adbc3aa..0b34dbf 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 5a116be..be3fc76 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -138,7 +138,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 5b8e458..a5ed964 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -4,12 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#FFE37B" + android:pathData="M667.8,729.45c-19.87,-20.12 -52.28,-20.28 -72.4,-0.41l-28.57,28.26v-200.91c0,-28.26 -22.94,-51.2 -51.2,-51.2s-51.2,22.94 -51.2,51.2v201.01l-28.52,-28.31c-20.07,-19.92 -52.48,-19.81 -72.4,0.26 -19.92,20.07 -19.81,52.48 0.26,72.4L479.28,916.48c9.98,9.93 23.04,14.85 36.1,14.85 13,0 26.01,-4.92 35.99,-14.8l116.02,-114.74c20.12,-19.81 20.28,-52.28 0.41,-72.35z" /> - + android:pathData="M819.61,470.12h-5.32c-3.07,-162.51 -135.68,-293.32 -298.91,-293.32S219.49,307.61 216.47,470.12h-5.32c-100.2,0 -181.4,81.2 -181.4,181.4s81.2,181.4 181.4,181.4H344.37l-5.84,-5.79c-34.05,-33.79 -34.25,-89.04 -0.46,-123.08 24.37,-24.52 59.85,-31.49 90.52,-20.84v-126.92c0,-47.97 39.07,-87.04 87.04,-87.04s87.04,39.07 87.04,87.04v126.92c30.72,-10.7 66.25,-3.69 90.62,20.94 33.74,34.15 33.43,89.34 -0.72,123.08l-5.73,5.63h132.76c100.2,0 181.4,-81.2 181.4,-181.4 0,-100.1 -81.2,-181.35 -181.4,-181.35z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 0000000..8c4a29d --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml new file mode 100644 index 0000000..35ee33d --- /dev/null +++ b/app/src/main/res/drawable/ic_zgry.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 379a81b..a2b7f65 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index 19b5c57..a7c4334 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index de0e201..46f233e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index adbc3aa..0b34dbf 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 5a116be..be3fc76 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -138,7 +138,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index 4879680..9012ed3 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -125,7 +125,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:layout_toStartOf="@id/locationMapView" android:paddingHorizontal="3dp" android:paddingVertical="5dp" @@ -137,6 +136,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="@dimen/margin_10dp" android:background="@drawable/ic_map" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 5b8e458..a5ed964 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -4,12 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#FFE37B" + android:pathData="M667.8,729.45c-19.87,-20.12 -52.28,-20.28 -72.4,-0.41l-28.57,28.26v-200.91c0,-28.26 -22.94,-51.2 -51.2,-51.2s-51.2,22.94 -51.2,51.2v201.01l-28.52,-28.31c-20.07,-19.92 -52.48,-19.81 -72.4,0.26 -19.92,20.07 -19.81,52.48 0.26,72.4L479.28,916.48c9.98,9.93 23.04,14.85 36.1,14.85 13,0 26.01,-4.92 35.99,-14.8l116.02,-114.74c20.12,-19.81 20.28,-52.28 0.41,-72.35z" /> - + android:pathData="M819.61,470.12h-5.32c-3.07,-162.51 -135.68,-293.32 -298.91,-293.32S219.49,307.61 216.47,470.12h-5.32c-100.2,0 -181.4,81.2 -181.4,181.4s81.2,181.4 181.4,181.4H344.37l-5.84,-5.79c-34.05,-33.79 -34.25,-89.04 -0.46,-123.08 24.37,-24.52 59.85,-31.49 90.52,-20.84v-126.92c0,-47.97 39.07,-87.04 87.04,-87.04s87.04,39.07 87.04,87.04v126.92c30.72,-10.7 66.25,-3.69 90.62,20.94 33.74,34.15 33.43,89.34 -0.72,123.08l-5.73,5.63h132.76c100.2,0 181.4,-81.2 181.4,-181.4 0,-100.1 -81.2,-181.35 -181.4,-181.35z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 0000000..8c4a29d --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml new file mode 100644 index 0000000..35ee33d --- /dev/null +++ b/app/src/main/res/drawable/ic_zgry.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 379a81b..a2b7f65 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index 19b5c57..a7c4334 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index de0e201..46f233e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index adbc3aa..0b34dbf 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 5a116be..be3fc76 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -138,7 +138,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index 4879680..9012ed3 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -125,7 +125,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:layout_toStartOf="@id/locationMapView" android:paddingHorizontal="3dp" android:paddingVertical="5dp" @@ -137,6 +136,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="@dimen/margin_10dp" android:background="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 39020df..f89548a 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -24,28 +24,32 @@ android:id="@+id/userNameView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableStart="@mipmap/user" + android:drawableStart="@drawable/ic_user" android:drawablePadding="5dp" android:hint="请输入手机号/用户名" android:paddingHorizontal="5dp" android:singleLine="true" - android:textColorHint="@color/hintColor" /> + android:textColorHint="@color/hintColor" + android:theme="@style/EditTextTheme" /> + android:textColorHint="@color/hintColor" + android:theme="@style/EditTextTheme" /> + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/margin_10dp"> diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 5b8e458..a5ed964 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -4,12 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#FFE37B" + android:pathData="M667.8,729.45c-19.87,-20.12 -52.28,-20.28 -72.4,-0.41l-28.57,28.26v-200.91c0,-28.26 -22.94,-51.2 -51.2,-51.2s-51.2,22.94 -51.2,51.2v201.01l-28.52,-28.31c-20.07,-19.92 -52.48,-19.81 -72.4,0.26 -19.92,20.07 -19.81,52.48 0.26,72.4L479.28,916.48c9.98,9.93 23.04,14.85 36.1,14.85 13,0 26.01,-4.92 35.99,-14.8l116.02,-114.74c20.12,-19.81 20.28,-52.28 0.41,-72.35z" /> - + android:pathData="M819.61,470.12h-5.32c-3.07,-162.51 -135.68,-293.32 -298.91,-293.32S219.49,307.61 216.47,470.12h-5.32c-100.2,0 -181.4,81.2 -181.4,181.4s81.2,181.4 181.4,181.4H344.37l-5.84,-5.79c-34.05,-33.79 -34.25,-89.04 -0.46,-123.08 24.37,-24.52 59.85,-31.49 90.52,-20.84v-126.92c0,-47.97 39.07,-87.04 87.04,-87.04s87.04,39.07 87.04,87.04v126.92c30.72,-10.7 66.25,-3.69 90.62,20.94 33.74,34.15 33.43,89.34 -0.72,123.08l-5.73,5.63h132.76c100.2,0 181.4,-81.2 181.4,-181.4 0,-100.1 -81.2,-181.35 -181.4,-181.35z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 0000000..8c4a29d --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml new file mode 100644 index 0000000..35ee33d --- /dev/null +++ b/app/src/main/res/drawable/ic_zgry.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 379a81b..a2b7f65 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index 19b5c57..a7c4334 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index de0e201..46f233e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index adbc3aa..0b34dbf 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 5a116be..be3fc76 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -138,7 +138,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index 4879680..9012ed3 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -125,7 +125,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:layout_toStartOf="@id/locationMapView" android:paddingHorizontal="3dp" android:paddingVertical="5dp" @@ -137,6 +136,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="@dimen/margin_10dp" android:background="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 39020df..f89548a 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -24,28 +24,32 @@ android:id="@+id/userNameView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableStart="@mipmap/user" + android:drawableStart="@drawable/ic_user" android:drawablePadding="5dp" android:hint="请输入手机号/用户名" android:paddingHorizontal="5dp" android:singleLine="true" - android:textColorHint="@color/hintColor" /> + android:textColorHint="@color/hintColor" + android:theme="@style/EditTextTheme" /> + android:textColorHint="@color/hintColor" + android:theme="@style/EditTextTheme" /> + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/margin_10dp"> diff --git a/app/src/main/res/layout/include_case_base_layout.xml b/app/src/main/res/layout/include_case_base_layout.xml index 327096d..b4d3e6a 100644 --- a/app/src/main/res/layout/include_case_base_layout.xml +++ b/app/src/main/res/layout/include_case_base_layout.xml @@ -171,7 +171,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 5b8e458..a5ed964 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -4,12 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#FFE37B" + android:pathData="M667.8,729.45c-19.87,-20.12 -52.28,-20.28 -72.4,-0.41l-28.57,28.26v-200.91c0,-28.26 -22.94,-51.2 -51.2,-51.2s-51.2,22.94 -51.2,51.2v201.01l-28.52,-28.31c-20.07,-19.92 -52.48,-19.81 -72.4,0.26 -19.92,20.07 -19.81,52.48 0.26,72.4L479.28,916.48c9.98,9.93 23.04,14.85 36.1,14.85 13,0 26.01,-4.92 35.99,-14.8l116.02,-114.74c20.12,-19.81 20.28,-52.28 0.41,-72.35z" /> - + android:pathData="M819.61,470.12h-5.32c-3.07,-162.51 -135.68,-293.32 -298.91,-293.32S219.49,307.61 216.47,470.12h-5.32c-100.2,0 -181.4,81.2 -181.4,181.4s81.2,181.4 181.4,181.4H344.37l-5.84,-5.79c-34.05,-33.79 -34.25,-89.04 -0.46,-123.08 24.37,-24.52 59.85,-31.49 90.52,-20.84v-126.92c0,-47.97 39.07,-87.04 87.04,-87.04s87.04,39.07 87.04,87.04v126.92c30.72,-10.7 66.25,-3.69 90.62,20.94 33.74,34.15 33.43,89.34 -0.72,123.08l-5.73,5.63h132.76c100.2,0 181.4,-81.2 181.4,-181.4 0,-100.1 -81.2,-181.35 -181.4,-181.35z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 0000000..8c4a29d --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml new file mode 100644 index 0000000..35ee33d --- /dev/null +++ b/app/src/main/res/drawable/ic_zgry.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 379a81b..a2b7f65 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index 19b5c57..a7c4334 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index de0e201..46f233e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index adbc3aa..0b34dbf 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 5a116be..be3fc76 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -138,7 +138,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index 4879680..9012ed3 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -125,7 +125,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:layout_toStartOf="@id/locationMapView" android:paddingHorizontal="3dp" android:paddingVertical="5dp" @@ -137,6 +136,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="@dimen/margin_10dp" android:background="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 39020df..f89548a 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -24,28 +24,32 @@ android:id="@+id/userNameView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableStart="@mipmap/user" + android:drawableStart="@drawable/ic_user" android:drawablePadding="5dp" android:hint="请输入手机号/用户名" android:paddingHorizontal="5dp" android:singleLine="true" - android:textColorHint="@color/hintColor" /> + android:textColorHint="@color/hintColor" + android:theme="@style/EditTextTheme" /> + android:textColorHint="@color/hintColor" + android:theme="@style/EditTextTheme" /> + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/margin_10dp"> diff --git a/app/src/main/res/layout/include_case_base_layout.xml b/app/src/main/res/layout/include_case_base_layout.xml index 327096d..b4d3e6a 100644 --- a/app/src/main/res/layout/include_case_base_layout.xml +++ b/app/src/main/res/layout/include_case_base_layout.xml @@ -171,7 +171,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index 01fdede..c32fde3 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -130,7 +130,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 5b8e458..a5ed964 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -4,12 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#FFE37B" + android:pathData="M667.8,729.45c-19.87,-20.12 -52.28,-20.28 -72.4,-0.41l-28.57,28.26v-200.91c0,-28.26 -22.94,-51.2 -51.2,-51.2s-51.2,22.94 -51.2,51.2v201.01l-28.52,-28.31c-20.07,-19.92 -52.48,-19.81 -72.4,0.26 -19.92,20.07 -19.81,52.48 0.26,72.4L479.28,916.48c9.98,9.93 23.04,14.85 36.1,14.85 13,0 26.01,-4.92 35.99,-14.8l116.02,-114.74c20.12,-19.81 20.28,-52.28 0.41,-72.35z" /> - + android:pathData="M819.61,470.12h-5.32c-3.07,-162.51 -135.68,-293.32 -298.91,-293.32S219.49,307.61 216.47,470.12h-5.32c-100.2,0 -181.4,81.2 -181.4,181.4s81.2,181.4 181.4,181.4H344.37l-5.84,-5.79c-34.05,-33.79 -34.25,-89.04 -0.46,-123.08 24.37,-24.52 59.85,-31.49 90.52,-20.84v-126.92c0,-47.97 39.07,-87.04 87.04,-87.04s87.04,39.07 87.04,87.04v126.92c30.72,-10.7 66.25,-3.69 90.62,20.94 33.74,34.15 33.43,89.34 -0.72,123.08l-5.73,5.63h132.76c100.2,0 181.4,-81.2 181.4,-181.4 0,-100.1 -81.2,-181.35 -181.4,-181.35z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 0000000..8c4a29d --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml new file mode 100644 index 0000000..35ee33d --- /dev/null +++ b/app/src/main/res/drawable/ic_zgry.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 379a81b..a2b7f65 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index 19b5c57..a7c4334 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index de0e201..46f233e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index adbc3aa..0b34dbf 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 5a116be..be3fc76 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -138,7 +138,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index 4879680..9012ed3 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -125,7 +125,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:layout_toStartOf="@id/locationMapView" android:paddingHorizontal="3dp" android:paddingVertical="5dp" @@ -137,6 +136,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="@dimen/margin_10dp" android:background="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 39020df..f89548a 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -24,28 +24,32 @@ android:id="@+id/userNameView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableStart="@mipmap/user" + android:drawableStart="@drawable/ic_user" android:drawablePadding="5dp" android:hint="请输入手机号/用户名" android:paddingHorizontal="5dp" android:singleLine="true" - android:textColorHint="@color/hintColor" /> + android:textColorHint="@color/hintColor" + android:theme="@style/EditTextTheme" /> + android:textColorHint="@color/hintColor" + android:theme="@style/EditTextTheme" /> + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/margin_10dp"> diff --git a/app/src/main/res/layout/include_case_base_layout.xml b/app/src/main/res/layout/include_case_base_layout.xml index 327096d..b4d3e6a 100644 --- a/app/src/main/res/layout/include_case_base_layout.xml +++ b/app/src/main/res/layout/include_case_base_layout.xml @@ -171,7 +171,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index 01fdede..c32fde3 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -130,7 +130,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/tag_bottom_navigation.xml b/app/src/main/res/layout/tag_bottom_navigation.xml deleted file mode 100644 index da34754..0000000 --- a/app/src/main/res/layout/tag_bottom_navigation.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 5b8e458..a5ed964 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -4,12 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#FFE37B" + android:pathData="M667.8,729.45c-19.87,-20.12 -52.28,-20.28 -72.4,-0.41l-28.57,28.26v-200.91c0,-28.26 -22.94,-51.2 -51.2,-51.2s-51.2,22.94 -51.2,51.2v201.01l-28.52,-28.31c-20.07,-19.92 -52.48,-19.81 -72.4,0.26 -19.92,20.07 -19.81,52.48 0.26,72.4L479.28,916.48c9.98,9.93 23.04,14.85 36.1,14.85 13,0 26.01,-4.92 35.99,-14.8l116.02,-114.74c20.12,-19.81 20.28,-52.28 0.41,-72.35z" /> - + android:pathData="M819.61,470.12h-5.32c-3.07,-162.51 -135.68,-293.32 -298.91,-293.32S219.49,307.61 216.47,470.12h-5.32c-100.2,0 -181.4,81.2 -181.4,181.4s81.2,181.4 181.4,181.4H344.37l-5.84,-5.79c-34.05,-33.79 -34.25,-89.04 -0.46,-123.08 24.37,-24.52 59.85,-31.49 90.52,-20.84v-126.92c0,-47.97 39.07,-87.04 87.04,-87.04s87.04,39.07 87.04,87.04v126.92c30.72,-10.7 66.25,-3.69 90.62,20.94 33.74,34.15 33.43,89.34 -0.72,123.08l-5.73,5.63h132.76c100.2,0 181.4,-81.2 181.4,-181.4 0,-100.1 -81.2,-181.35 -181.4,-181.35z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 0000000..8c4a29d --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml new file mode 100644 index 0000000..35ee33d --- /dev/null +++ b/app/src/main/res/drawable/ic_zgry.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 379a81b..a2b7f65 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index 19b5c57..a7c4334 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index de0e201..46f233e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index adbc3aa..0b34dbf 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 5a116be..be3fc76 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -138,7 +138,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index 4879680..9012ed3 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -125,7 +125,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:layout_toStartOf="@id/locationMapView" android:paddingHorizontal="3dp" android:paddingVertical="5dp" @@ -137,6 +136,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="@dimen/margin_10dp" android:background="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 39020df..f89548a 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -24,28 +24,32 @@ android:id="@+id/userNameView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableStart="@mipmap/user" + android:drawableStart="@drawable/ic_user" android:drawablePadding="5dp" android:hint="请输入手机号/用户名" android:paddingHorizontal="5dp" android:singleLine="true" - android:textColorHint="@color/hintColor" /> + android:textColorHint="@color/hintColor" + android:theme="@style/EditTextTheme" /> + android:textColorHint="@color/hintColor" + android:theme="@style/EditTextTheme" /> + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/margin_10dp"> diff --git a/app/src/main/res/layout/include_case_base_layout.xml b/app/src/main/res/layout/include_case_base_layout.xml index 327096d..b4d3e6a 100644 --- a/app/src/main/res/layout/include_case_base_layout.xml +++ b/app/src/main/res/layout/include_case_base_layout.xml @@ -171,7 +171,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index 01fdede..c32fde3 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -130,7 +130,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/tag_bottom_navigation.xml b/app/src/main/res/layout/tag_bottom_navigation.xml deleted file mode 100644 index da34754..0000000 --- a/app/src/main/res/layout/tag_bottom_navigation.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-xhdpi/lock.png b/app/src/main/res/mipmap-xhdpi/lock.png deleted file mode 100644 index 6f4fa0f..0000000 --- a/app/src/main/res/mipmap-xhdpi/lock.png +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 5b8e458..a5ed964 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -4,12 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#FFE37B" + android:pathData="M667.8,729.45c-19.87,-20.12 -52.28,-20.28 -72.4,-0.41l-28.57,28.26v-200.91c0,-28.26 -22.94,-51.2 -51.2,-51.2s-51.2,22.94 -51.2,51.2v201.01l-28.52,-28.31c-20.07,-19.92 -52.48,-19.81 -72.4,0.26 -19.92,20.07 -19.81,52.48 0.26,72.4L479.28,916.48c9.98,9.93 23.04,14.85 36.1,14.85 13,0 26.01,-4.92 35.99,-14.8l116.02,-114.74c20.12,-19.81 20.28,-52.28 0.41,-72.35z" /> - + android:pathData="M819.61,470.12h-5.32c-3.07,-162.51 -135.68,-293.32 -298.91,-293.32S219.49,307.61 216.47,470.12h-5.32c-100.2,0 -181.4,81.2 -181.4,181.4s81.2,181.4 181.4,181.4H344.37l-5.84,-5.79c-34.05,-33.79 -34.25,-89.04 -0.46,-123.08 24.37,-24.52 59.85,-31.49 90.52,-20.84v-126.92c0,-47.97 39.07,-87.04 87.04,-87.04s87.04,39.07 87.04,87.04v126.92c30.72,-10.7 66.25,-3.69 90.62,20.94 33.74,34.15 33.43,89.34 -0.72,123.08l-5.73,5.63h132.76c100.2,0 181.4,-81.2 181.4,-181.4 0,-100.1 -81.2,-181.35 -181.4,-181.35z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 0000000..8c4a29d --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml new file mode 100644 index 0000000..35ee33d --- /dev/null +++ b/app/src/main/res/drawable/ic_zgry.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 379a81b..a2b7f65 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index 19b5c57..a7c4334 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index de0e201..46f233e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index adbc3aa..0b34dbf 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 5a116be..be3fc76 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -138,7 +138,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index 4879680..9012ed3 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -125,7 +125,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:layout_toStartOf="@id/locationMapView" android:paddingHorizontal="3dp" android:paddingVertical="5dp" @@ -137,6 +136,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="@dimen/margin_10dp" android:background="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 39020df..f89548a 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -24,28 +24,32 @@ android:id="@+id/userNameView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableStart="@mipmap/user" + android:drawableStart="@drawable/ic_user" android:drawablePadding="5dp" android:hint="请输入手机号/用户名" android:paddingHorizontal="5dp" android:singleLine="true" - android:textColorHint="@color/hintColor" /> + android:textColorHint="@color/hintColor" + android:theme="@style/EditTextTheme" /> + android:textColorHint="@color/hintColor" + android:theme="@style/EditTextTheme" /> + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/margin_10dp"> diff --git a/app/src/main/res/layout/include_case_base_layout.xml b/app/src/main/res/layout/include_case_base_layout.xml index 327096d..b4d3e6a 100644 --- a/app/src/main/res/layout/include_case_base_layout.xml +++ b/app/src/main/res/layout/include_case_base_layout.xml @@ -171,7 +171,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index 01fdede..c32fde3 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -130,7 +130,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/tag_bottom_navigation.xml b/app/src/main/res/layout/tag_bottom_navigation.xml deleted file mode 100644 index da34754..0000000 --- a/app/src/main/res/layout/tag_bottom_navigation.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-xhdpi/lock.png b/app/src/main/res/mipmap-xhdpi/lock.png deleted file mode 100644 index 6f4fa0f..0000000 --- a/app/src/main/res/mipmap-xhdpi/lock.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/user.png b/app/src/main/res/mipmap-xhdpi/user.png deleted file mode 100644 index ad26cec..0000000 --- a/app/src/main/res/mipmap-xhdpi/user.png +++ /dev/null Binary files differ diff --git a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java index 1d00bfc..b3868d0 100644 --- a/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java +++ b/app/src/main/java/com/casic/dcms/adapter/HomeRecycleAdapter.java @@ -74,7 +74,7 @@ } void bindView(String name) { - imageView.setBackgroundResource(StringHelper.obtainIcon(name)); + imageView.setBackgroundResource(StringHelper.obtainDrawableIcon(name)); textView.setText(name); } } diff --git a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java index 5fb348b..8bcdb86 100644 --- a/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CleanResultListActivity.java @@ -103,10 +103,17 @@ List dataRows = resultBean.getData().getRows(); if (isNotify) { dataBeans.clear(); - dataBeans = dataRows; + //后台返回的数据不是倒叙的，需要手动反序过来 + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } isNotify = false; } else { - dataBeans = dataRows; + int size = dataRows.size(); + for (int i = 0; i < size; i++) { + dataBeans.add(i, dataRows.get(size - 1 - i)); + } } weakReferenceHandler.sendEmptyMessage(20210601); } diff --git a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java index 224f8d3..ea4750d 100644 --- a/app/src/main/java/com/casic/dcms/ui/LoginActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/LoginActivity.java @@ -80,7 +80,11 @@ @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (!isChecked) { - SaveKeyValues.removeKey("userPassword"); + try { + SaveKeyValues.removeKey("userPassword"); + } catch (NullPointerException e) { + e.printStackTrace(); + } } } }); diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index 6c30583..a1669d7 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -216,6 +216,9 @@ break; case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; + if (mainActivity.uploadPositionPresenter == null) { + return; + } mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); break; @@ -238,12 +241,13 @@ int size = list.size(); if (size <= 0) { messageNumView.setVisibility(View.GONE); - } else if (size > 9) { - messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText("9+"); } else { messageNumView.setVisibility(View.VISIBLE); - messageNumView.setText(String.valueOf(size)); + if (size > 9) { + messageNumView.setText("9+"); + } else { + messageNumView.setText(String.valueOf(size)); + } } } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java index f2dcb62..d7f3565 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/NoticePageFragment.java @@ -83,7 +83,6 @@ MainActivity.sendEmptyMessage(Constant.MESSAGE_NUMBER); int position = viewHolder.getAdapterPosition(); - viewHolder.getAdapterPosition(); daoSession.delete(noticeBeans.get(position)); swipeViewAdapter.remove(position); } 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 254c847..90ea2fc 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -210,4 +210,40 @@ return R.mipmap.app_logo; } } + + /** + * 根据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; + default: + return 0; + } + } } diff --git a/app/src/main/res/drawable/ic_ajcl.xml b/app/src/main/res/drawable/ic_ajcl.xml new file mode 100644 index 0000000..1040719 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcl.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_ajcx.xml b/app/src/main/res/drawable/ic_ajcx.xml new file mode 100644 index 0000000..843e7a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajcx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhc.xml b/app/src/main/res/drawable/ic_ajhc.xml new file mode 100644 index 0000000..f27e49b --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhc.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_ajhs.xml b/app/src/main/res/drawable/ic_ajhs.xml new file mode 100644 index 0000000..36f47d4 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajhs.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_ajsb.xml b/app/src/main/res/drawable/ic_ajsb.xml new file mode 100644 index 0000000..327c0c8 --- /dev/null +++ b/app/src/main/res/drawable/ic_ajsb.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml index 84b2857..9c81bdd 100644 --- a/app/src/main/res/drawable/ic_camera.xml +++ b/app/src/main/res/drawable/ic_camera.xml @@ -5,5 +5,8 @@ android:viewportHeight="1024"> + android:pathData="M838.71,257.95h-40.5c-28.21,0 -53.45,-17.61 -63.23,-44.08l-18.48,-50.07a67.45,67.45 0,0 0,-63.23 -44.08H376.88c-27.6,0 -52.38,16.79 -62.62,42.44L292.97,215.55c-10.24,25.6 -35.02,42.44 -62.62,42.44h-34.46c-79.72,0 -144.38,64.67 -144.38,144.38v358.76c0,79.72 64.67,144.38 144.38,144.38H838.66c79.72,0 144.38,-64.67 144.38,-144.38V402.33c0.05,-79.72 -64.61,-144.38 -144.33,-144.38z" /> + diff --git a/app/src/main/res/drawable/ic_csdb.xml b/app/src/main/res/drawable/ic_csdb.xml new file mode 100644 index 0000000..f5da6dd --- /dev/null +++ b/app/src/main/res/drawable/ic_csdb.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_dtck.xml b/app/src/main/res/drawable/ic_dtck.xml new file mode 100644 index 0000000..6cac201 --- /dev/null +++ b/app/src/main/res/drawable/ic_dtck.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_jjyj.xml b/app/src/main/res/drawable/ic_jjyj.xml new file mode 100644 index 0000000..e58f135 --- /dev/null +++ b/app/src/main/res/drawable/ic_jjyj.xml @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_kssb.xml b/app/src/main/res/drawable/ic_kssb.xml new file mode 100644 index 0000000..afbf7b6 --- /dev/null +++ b/app/src/main/res/drawable/ic_kssb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml new file mode 100644 index 0000000..f0a5610 --- /dev/null +++ b/app/src/main/res/drawable/ic_lock.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/ic_map.xml b/app/src/main/res/drawable/ic_map.xml index 8fa4af8..81bde65 100644 --- a/app/src/main/res/drawable/ic_map.xml +++ b/app/src/main/res/drawable/ic_map.xml @@ -1,18 +1,15 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M845.77,386.87c0,-182.48 -147.92,-330.44 -330.44,-330.44S184.93,204.34 184.93,386.87c0,142.95 156.72,308.12 294.66,427.52 20.43,17.72 50.89,17.05 70.91,-1.13 168.76,-153.65 295.27,-305.92 295.27,-426.39z" /> + android:fillColor="#FFE37B" + android:pathData="M515.38,548.86c-92.21,0 -167.27,-75.01 -167.27,-167.27 0,-92.21 75.01,-167.22 167.27,-167.22s167.27,75.01 167.27,167.22c-0.05,92.26 -75.06,167.27 -167.27,167.27zM515.38,318.05c-35.07,0 -63.59,28.52 -63.59,63.54 0,35.07 28.52,63.59 63.59,63.59s63.59,-28.52 63.59,-63.59c-0.05,-35.02 -28.57,-63.54 -63.59,-63.54z" /> - + android:fillColor="@color/mainThemeColor" + android:pathData="M515.38,964.56c-74.44,0 -445.75,-7.22 -445.75,-149.66 0,-62 66.3,-104.4 202.75,-129.59 27.14,-4.97 53.3,12.95 58.32,40.09 5.02,27.19 -12.95,53.3 -40.09,58.32 -55.65,10.29 -88.93,22.37 -106.96,31.39 42.96,21.3 157.54,49.41 331.78,49.41s288.82,-28.11 331.78,-49.41c-18.89,-9.42 -54.48,-22.22 -114.89,-32.77 -27.24,-4.76 -45.41,-30.67 -40.65,-57.91 4.76,-27.24 30.67,-45.41 57.91,-40.65 142.39,24.93 211.61,67.84 211.61,131.17 -0.05,142.39 -371.4,149.61 -445.8,149.61zM864.2,826.37z" /> diff --git a/app/src/main/res/drawable/ic_sbsb.xml b/app/src/main/res/drawable/ic_sbsb.xml new file mode 100644 index 0000000..69a2d0e --- /dev/null +++ b/app/src/main/res/drawable/ic_sbsb.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index f1d8414..0e98e9d 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,12 +1,14 @@ + android:fillColor="@color/mainThemeColor" + android:pathData="M767.13,808.65c16.84,0 32.97,2.82 48.03,8.04 20.68,7.12 43.52,1.08 57.19,-15.97a459.92,459.92 0,0 0,70.5 -122.88c7.83,-20.48 1.08,-43.26 -15.97,-57.09 -49.61,-40.19 -65.08,-125.39 -31.39,-185.86a146.89,146.89 0,0 1,30.31 -37.99c16.23,-14.54 22.17,-37.38 13.93,-57.6a461.27,461.27 0,0 0,-67.53 -115c-13.62,-17 -36.45,-22.94 -57.04,-15.82a146.33,146.33 0,0 1,-48.03 8.04c-70.14,0 -132.35,-50.89 -145.2,-118.73 -4.1,-21.61 -20.74,-38.55 -42.44,-41.83 -22.07,-3.28 -44.65,-5.02 -67.69,-5.02 -21.45,0 -42.55,1.54 -63.23,4.4 -22.32,3.12 -40.24,20.48 -43.52,42.75 -6.91,46.69 -36.04,118.02 -145.72,118.43 -17.31,0.05 -33.89,-2.97 -49.31,-8.45 -21.04,-7.48 -44.39,-1.48 -58.37,15.92A462.15,462.15 0,0 0,80.49 348.16c-7.63,20.02 -2.76,43.01 13.47,56.93 55.5,47.82 71.78,122.88 37.07,185.14a146.73,146.73 0,0 1,-31.64 39.17c-16.84,14.75 -23.09,38.2 -14.54,58.93 16.9,41.01 39.58,79 66.97,113.05 13.93,17.31 37.27,23.19 58.21,15.72 15.41,-5.48 32,-8.5 49.31,-8.5 71.27,0 124.77,49.41 142.13,121.29 4.97,20.48 21.4,36.04 42.24,39.17 22.22,3.33 44.95,5.07 68.1,5.07 23.4,0 46.44,-1.79 68.86,-5.17 21.35,-3.23 38.14,-19.46 42.7,-40.55 14.9,-68.81 73.16,-119.76 143.77,-119.76z" + tools:ignore="VectorPath" /> + android:fillColor="#FFE37B" + android:pathData="M511.85,696.37c-101.32,0 -183.76,-82.43 -183.76,-183.76s82.43,-183.76 183.76,-183.76 183.76,82.43 183.76,183.76 -82.43,183.76 -183.76,183.76zM511.85,431.21c-44.85,0 -81.36,36.51 -81.36,81.36S467,593.92 511.85,593.92s81.36,-36.51 81.36,-81.36 -36.51,-81.36 -81.36,-81.36z" /> diff --git a/app/src/main/res/drawable/ic_tjfx.xml b/app/src/main/res/drawable/ic_tjfx.xml new file mode 100644 index 0000000..6f7ff28 --- /dev/null +++ b/app/src/main/res/drawable/ic_tjfx.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_toilet.xml b/app/src/main/res/drawable/ic_toilet.xml index 0297e00..676b7b8 100644 --- a/app/src/main/res/drawable/ic_toilet.xml +++ b/app/src/main/res/drawable/ic_toilet.xml @@ -3,9 +3,12 @@ android:height="156px" android:viewportWidth="1024" android:viewportHeight="1024"> + + + android:fillColor="@color/mainThemeColor" + android:pathData="M186.03,0h651.95Q1024,0 1024,186.03v651.95Q1024,1024 837.97,1024H186.03Q0,1024 0,837.97V186.03Q0,0 186.03,0z" /> + diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 5b8e458..a5ed964 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -4,12 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#FFE37B" + android:pathData="M667.8,729.45c-19.87,-20.12 -52.28,-20.28 -72.4,-0.41l-28.57,28.26v-200.91c0,-28.26 -22.94,-51.2 -51.2,-51.2s-51.2,22.94 -51.2,51.2v201.01l-28.52,-28.31c-20.07,-19.92 -52.48,-19.81 -72.4,0.26 -19.92,20.07 -19.81,52.48 0.26,72.4L479.28,916.48c9.98,9.93 23.04,14.85 36.1,14.85 13,0 26.01,-4.92 35.99,-14.8l116.02,-114.74c20.12,-19.81 20.28,-52.28 0.41,-72.35z" /> - + android:pathData="M819.61,470.12h-5.32c-3.07,-162.51 -135.68,-293.32 -298.91,-293.32S219.49,307.61 216.47,470.12h-5.32c-100.2,0 -181.4,81.2 -181.4,181.4s81.2,181.4 181.4,181.4H344.37l-5.84,-5.79c-34.05,-33.79 -34.25,-89.04 -0.46,-123.08 24.37,-24.52 59.85,-31.49 90.52,-20.84v-126.92c0,-47.97 39.07,-87.04 87.04,-87.04s87.04,39.07 87.04,87.04v126.92c30.72,-10.7 66.25,-3.69 90.62,20.94 33.74,34.15 33.43,89.34 -0.72,123.08l-5.73,5.63h132.76c100.2,0 181.4,-81.2 181.4,-181.4 0,-100.1 -81.2,-181.35 -181.4,-181.35z" /> diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml new file mode 100644 index 0000000..8c4a29d --- /dev/null +++ b/app/src/main/res/drawable/ic_user.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_zgry.xml b/app/src/main/res/drawable/ic_zgry.xml new file mode 100644 index 0000000..35ee33d --- /dev/null +++ b/app/src/main/res/drawable/ic_zgry.xml @@ -0,0 +1,17 @@ + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 379a81b..a2b7f65 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index 19b5c57..a7c4334 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index de0e201..46f233e 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_todo_handled_detail.xml b/app/src/main/res/layout/activity_case_todo_handled_detail.xml index adbc3aa..0b34dbf 100644 --- a/app/src/main/res/layout/activity_case_todo_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_handled_detail.xml @@ -168,7 +168,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload.xml b/app/src/main/res/layout/activity_case_upload.xml index 5a116be..be3fc76 100644 --- a/app/src/main/res/layout/activity_case_upload.xml +++ b/app/src/main/res/layout/activity_case_upload.xml @@ -138,7 +138,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_case_upload_quickly.xml b/app/src/main/res/layout/activity_case_upload_quickly.xml index 4879680..9012ed3 100644 --- a/app/src/main/res/layout/activity_case_upload_quickly.xml +++ b/app/src/main/res/layout/activity_case_upload_quickly.xml @@ -125,7 +125,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="100dp" - android:layout_marginEnd="@dimen/margin_10dp" android:layout_toStartOf="@id/locationMapView" android:paddingHorizontal="3dp" android:paddingVertical="5dp" @@ -137,6 +136,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" + android:layout_marginStart="@dimen/margin_10dp" android:background="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 39020df..f89548a 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -24,28 +24,32 @@ android:id="@+id/userNameView" android:layout_width="match_parent" android:layout_height="wrap_content" - android:drawableStart="@mipmap/user" + android:drawableStart="@drawable/ic_user" android:drawablePadding="5dp" android:hint="请输入手机号/用户名" android:paddingHorizontal="5dp" android:singleLine="true" - android:textColorHint="@color/hintColor" /> + android:textColorHint="@color/hintColor" + android:theme="@style/EditTextTheme" /> + android:textColorHint="@color/hintColor" + android:theme="@style/EditTextTheme" /> + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/margin_10dp"> diff --git a/app/src/main/res/layout/include_case_base_layout.xml b/app/src/main/res/layout/include_case_base_layout.xml index 327096d..b4d3e6a 100644 --- a/app/src/main/res/layout/include_case_base_layout.xml +++ b/app/src/main/res/layout/include_case_base_layout.xml @@ -171,7 +171,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index 01fdede..c32fde3 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -130,7 +130,7 @@ android:layout_height="wrap_content" android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:padding="@dimen/padding_10dp" + android:layout_marginStart="@dimen/margin_10dp" android:src="@drawable/ic_map" /> diff --git a/app/src/main/res/layout/tag_bottom_navigation.xml b/app/src/main/res/layout/tag_bottom_navigation.xml deleted file mode 100644 index da34754..0000000 --- a/app/src/main/res/layout/tag_bottom_navigation.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-xhdpi/lock.png b/app/src/main/res/mipmap-xhdpi/lock.png deleted file mode 100644 index 6f4fa0f..0000000 --- a/app/src/main/res/mipmap-xhdpi/lock.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/mipmap-xhdpi/user.png b/app/src/main/res/mipmap-xhdpi/user.png deleted file mode 100644 index ad26cec..0000000 --- a/app/src/main/res/mipmap-xhdpi/user.png +++ /dev/null Binary files differ diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 662a156..68f0a12 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -45,4 +45,9 @@ @anim/activity_in @anim/activity_out + +