From c63f6085d27a02b8bdfc0228079df2d60e35f954 Mon Sep 17 00:00:00 2001
From: chenglifeng <clf_cheng@163.com>
Date: Wed, 6 Nov 2024 17:02:13 +0800
Subject: [PATCH] update ui

---
 .../ui/pointmeasure/PointMeasureListActivity.kt   | 15 +++++++++++----
 .../adapter/PointMeasureListAdapter.kt            | 10 ++--------
 app/src/main/res/color/text_color_measure.xml     |  5 +++++
 .../res/drawable/bg_point_measure_selector.xml    |  6 ++----
 app/src/main/res/layout/item_lofting_list.xml     |  2 +-
 .../main/res/layout/item_point_measure_list.xml   |  6 +++---
 6 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/res/color/text_color_measure.xml

diff --git a/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt b/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt
index 419b4c7..36d00fb 100644
--- a/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt
+++ b/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt
@@ -98,6 +98,13 @@ class PointMeasureListActivity : BaseBindingActivity<ActivityPointMeasureListBin
         // 生成报验单
         viewModel.createInspectionReportResponse.observe(this) {
             navigation2BaoYanDan(it.BD_CLJH_ID)
+            val position = adapter.items.indexOfFirst { bean -> bean.BD_CLJH_ID == it.BD_CLJH_ID }
+            if (position > -1) {
+                adapter.getItem(position)?.let { bean ->
+                    bean.CLJH_WORKSTATUS = "报验单已生成"
+                    adapter.notifyItemChanged(position, AdapterConstants.WORK_STATUS)
+                }
+            }
         }
         //
         viewModel.updateMeasureWorkStatusResponse.observe(this) {
@@ -125,11 +132,11 @@ class PointMeasureListActivity : BaseBindingActivity<ActivityPointMeasureListBin
         // 生成报验单
         adapter.addOnItemChildClickListener(R.id.tvGenerateForm) { adapter, _, position ->
             adapter.getItem(position)?.let { bean ->
-                if ("报验单已生成" == bean.CLJH_WORKSTATUS){
-                    navigation2BaoYanDan(bean.BD_CLJH_ID)
-                } else {
+//                if ("报验单已生成" == bean.CLJH_WORKSTATUS){
+//                    navigation2BaoYanDan(bean.BD_CLJH_ID)
+//                } else {
                     viewModel.createInspectionReport(bean.BD_CLJH_ID)
-                }
+//                }
             }
         }
         // 结束测量
diff --git a/app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt b/app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt
index e8baa64..335cc5d 100644
--- a/app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt
+++ b/app/src/main/java/com/project/survey/ui/pointmeasure/adapter/PointMeasureListAdapter.kt
@@ -29,10 +29,7 @@ class PointMeasureListAdapter(val type: String) : BaseQuickAdapter<MeasureBean,
             .setText(R.id.tvApplyUser, item.SY_CREATEUSERNAME)
             .setVisible(R.id.tvGenerateForm, isCLJH)
 
-            .setEnabled(
-                R.id.tvGenerateForm,
-                "已结束" == item.CLJH_WORKSTATUS || "报验单已生成" == item.CLJH_WORKSTATUS
-            )
+            .setEnabled(R.id.tvGenerateForm, "已结束" == item.CLJH_WORKSTATUS)
         if (isCLJH) {
             holder.setEnabled(R.id.tvStopMeasure, "执行中" == item.CLJH_WORKSTATUS)
                 .setEnabled(
@@ -68,10 +65,7 @@ class PointMeasureListAdapter(val type: String) : BaseQuickAdapter<MeasureBean,
             val isCLJH = type == Constants.TYPE_BD_CLJH
             val type = payloads[0] as Int
             if (type == AdapterConstants.WORK_STATUS) {
-                holder.setEnabled(
-                    R.id.tvGenerateForm,
-                    "已结束" == item.CLJH_WORKSTATUS || "报验单已生成" == item.CLJH_WORKSTATUS
-                )
+                holder.setEnabled(R.id.tvGenerateForm, "已结束" == item.CLJH_WORKSTATUS)
                 if (isCLJH) {
                     holder.setEnabled(R.id.tvStopMeasure, "执行中" == item.CLJH_WORKSTATUS)
                         .setEnabled(
diff --git a/app/src/main/res/color/text_color_measure.xml b/app/src/main/res/color/text_color_measure.xml
new file mode 100644
index 0000000..ba0ba26
--- /dev/null
+++ b/app/src/main/res/color/text_color_measure.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#FFFFFF" android:state_enabled="true" />
+    <item android:color="#A5A8AA" android:state_enabled="false" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_point_measure_selector.xml b/app/src/main/res/drawable/bg_point_measure_selector.xml
index af88cdf..2d480d9 100644
--- a/app/src/main/res/drawable/bg_point_measure_selector.xml
+++ b/app/src/main/res/drawable/bg_point_measure_selector.xml
@@ -2,17 +2,15 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_enabled="true">
         <shape android:shape="rectangle">
-            <solid android:color="#E9F1FC" />
+            <solid android:color="#396BD0" />
             <corners android:radius="@dimen/sw_15dp" />
-            <stroke android:width="@dimen/sw_0_5dp" android:color="#1F396BD0" />
         </shape>
     </item>
 
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
-            <solid android:color="#59BBBBBB" />
+            <solid android:color="#E8EAEE" />
             <corners android:radius="@dimen/sw_15dp" />
-            <stroke android:width="@dimen/sw_0_5dp" android:color="#59999999" />
         </shape>
     </item>
 
diff --git a/app/src/main/res/layout/item_lofting_list.xml b/app/src/main/res/layout/item_lofting_list.xml
index 76c8e8a..de84a37 100644
--- a/app/src/main/res/layout/item_lofting_list.xml
+++ b/app/src/main/res/layout/item_lofting_list.xml
@@ -123,7 +123,7 @@
         android:paddingHorizontal="@dimen/sw_28dp"
         android:paddingVertical="@dimen/sw_6dp"
         android:text="@string/lofting"
-        android:textColor="@color/text_color_20"
+        android:textColor="@color/text_color_measure"
         android:textSize="@dimen/sw_12sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/viewLine" />
diff --git a/app/src/main/res/layout/item_point_measure_list.xml b/app/src/main/res/layout/item_point_measure_list.xml
index ca333e8..3d1f695 100644
--- a/app/src/main/res/layout/item_point_measure_list.xml
+++ b/app/src/main/res/layout/item_point_measure_list.xml
@@ -126,7 +126,7 @@
         android:paddingHorizontal="@dimen/sw_16dp"
         android:paddingVertical="@dimen/sw_6dp"
         android:text="生成报验单"
-        android:textColor="@color/text_color_20"
+        android:textColor="@color/text_color_measure"
         android:textSize="@dimen/sw_12sp"
         app:layout_constraintBaseline_toBaselineOf="@id/tvEnterMeasure"
         app:layout_constraintEnd_toStartOf="@id/tvStopMeasure" />
@@ -140,7 +140,7 @@
         android:paddingHorizontal="@dimen/sw_16dp"
         android:paddingVertical="@dimen/sw_6dp"
         android:text="结束测量"
-        android:textColor="@color/text_color_20"
+        android:textColor="@color/text_color_measure"
         android:textSize="@dimen/sw_12sp"
         app:layout_constraintBaseline_toBaselineOf="@id/tvEnterMeasure"
         app:layout_constraintEnd_toStartOf="@id/tvEnterMeasure" />
@@ -154,7 +154,7 @@
         android:paddingHorizontal="@dimen/sw_16dp"
         android:paddingVertical="@dimen/sw_6dp"
         android:text="进入测量"
-        android:textColor="@color/text_color_20"
+        android:textColor="@color/text_color_measure"
         android:textSize="@dimen/sw_12sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/viewLine" />