diff --git a/.idea/misc.xml b/.idea/misc.xml index c645fb9..bb2448b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -51,6 +51,7 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index c645fb9..bb2448b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -51,6 +51,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index bf56610..1867566 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -14,7 +14,6 @@ import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -194,10 +193,11 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); - //获取案卷大类 commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + //清空大小类 + viewBinding.caseLargeClassView.setText(""); + viewBinding.caseSmallClassView.setText(""); } }).build().show(); } @@ -220,7 +220,8 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + //清空小类 + viewBinding.caseSmallClassView.setText(""); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -254,8 +255,6 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); - typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); diff --git a/.idea/misc.xml b/.idea/misc.xml index c645fb9..bb2448b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -51,6 +51,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index bf56610..1867566 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -14,7 +14,6 @@ import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -194,10 +193,11 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); - //获取案卷大类 commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + //清空大小类 + viewBinding.caseLargeClassView.setText(""); + viewBinding.caseSmallClassView.setText(""); } }).build().show(); } @@ -220,7 +220,8 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + //清空小类 + viewBinding.caseSmallClassView.setText(""); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -254,8 +255,6 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); - typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 842f58c..8525e8c 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -14,7 +14,6 @@ import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -83,7 +82,6 @@ viewBinding.latitudeView.setText(String.valueOf(latitude)); viewBinding.communityNameView.setText(community); viewBinding.shopView.setText(shopName); - viewBinding.shopView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); } } }); diff --git a/.idea/misc.xml b/.idea/misc.xml index c645fb9..bb2448b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -51,6 +51,7 @@ + diff --git a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java index bf56610..1867566 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BriefCaseActivity.java @@ -14,7 +14,6 @@ import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -194,10 +193,11 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); - //获取案卷大类 commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + //清空大小类 + viewBinding.caseLargeClassView.setText(""); + viewBinding.caseSmallClassView.setText(""); } }).build().show(); } @@ -220,7 +220,8 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + //清空小类 + viewBinding.caseSmallClassView.setText(""); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -254,8 +255,6 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); - typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); diff --git a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java index 842f58c..8525e8c 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/BusinessCaseActivity.java @@ -14,7 +14,6 @@ import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -83,7 +82,6 @@ viewBinding.latitudeView.setText(String.valueOf(latitude)); viewBinding.communityNameView.setText(community); viewBinding.shopView.setText(shopName); - viewBinding.shopView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); } } }); diff --git a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java index 2a8f272..762ecf5 100644 --- a/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/upload/CommonCaseActivity.java @@ -25,7 +25,6 @@ import androidx.activity.result.ActivityResultLauncher; import androidx.activity.result.contract.ActivityResultContracts; import androidx.annotation.NonNull; -import androidx.core.content.ContextCompat; import androidx.core.content.res.ResourcesCompat; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; @@ -394,10 +393,11 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseClassView.setText(tag); - viewBinding.caseClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); - //获取案卷大类 commonDataViewModel.obtainLargeType(String.valueOf(position + 1)); + //清空大小类 + viewBinding.caseLargeClassView.setText(""); + viewBinding.caseSmallClassView.setText(""); } }).build().show(); } @@ -420,7 +420,8 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseLargeClassView.setText(tag); - viewBinding.caseLargeClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); + //清空小类 + viewBinding.caseSmallClassView.setText(""); //获取案卷小类 CaseLargeTypeBean.DataBean dataBean = largeTypeBeans.get(position); @@ -454,8 +455,6 @@ public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { dialog.dismiss(); viewBinding.caseSmallClassView.setText(tag); - viewBinding.caseSmallClassView.setTextColor(ContextCompat.getColor(context, R.color.mainTextColor)); - typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show();