From bea8a8c8c864a01584e74ba1b003488ebb4247b7 Mon Sep 17 00:00:00 2001
From: YANGJIANKUAN <tim.yee@hotmail.com>
Date: Thu, 27 Nov 2025 11:28:50 +0800
Subject: [PATCH] feat: ui opt

---
 .../module_base/bean/GjcCheckInRecord.kt      |  16 +-
 .../ui/weight/data/layout/PadDataLayoutNew.kt |   6 +
 .../gjc/holder/GjcCheckInRecordViewHolder.kt  |  30 --
 .../activity_gjc_weighing_record_details.xml  | 331 ++++++++++--------
 .../res/layout/item_gjc_check_in_record.xml   | 130 ++-----
 5 files changed, 236 insertions(+), 277 deletions(-)

diff --git a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcCheckInRecord.kt b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcCheckInRecord.kt
index b048138..488afec 100644
--- a/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcCheckInRecord.kt
+++ b/module_base/src/main/java/com/lukouguoji/module_base/bean/GjcCheckInRecord.kt
@@ -18,4 +18,18 @@ data class GjcCheckInRecord(
     var weight: Double = 0.0,      // 运抵重量
     var volume: Double = 0.0,      // 运抵体积
     var whId: Long = 0             // GJC_WAREHOUSE.ID
-)
+) {
+    // 件数的字符串表示（用于双向绑定）
+    var pcStr: String
+        get() = if (pc == 0L) "" else pc.toString()
+        set(value) {
+            pc = value.toLongOrNull() ?: 0L
+        }
+
+    // 重量的字符串表示（用于双向绑定）
+    var weightStr: String
+        get() = if (weight == 0.0) "" else weight.toString()
+        set(value) {
+            weight = value.toDoubleOrNull() ?: 0.0
+        }
+}
diff --git a/module_base/src/main/java/com/lukouguoji/module_base/ui/weight/data/layout/PadDataLayoutNew.kt b/module_base/src/main/java/com/lukouguoji/module_base/ui/weight/data/layout/PadDataLayoutNew.kt
index 1446182..d0497b9 100644
--- a/module_base/src/main/java/com/lukouguoji/module_base/ui/weight/data/layout/PadDataLayoutNew.kt
+++ b/module_base/src/main/java/com/lukouguoji/module_base/ui/weight/data/layout/PadDataLayoutNew.kt
@@ -119,6 +119,12 @@ class PadDataLayoutNew : FrameLayout {
             loadImage(iv, value)
         }
 
+    var inputType: Int = android.text.InputType.TYPE_CLASS_TEXT
+        set(value) {
+            field = value
+            et.inputType = value
+        }
+
     /**
      * 刷新事件回调
      */
diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/holder/GjcCheckInRecordViewHolder.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/holder/GjcCheckInRecordViewHolder.kt
index 562247f..38c084c 100644
--- a/module_gjc/src/main/java/com/lukouguoji/gjc/holder/GjcCheckInRecordViewHolder.kt
+++ b/module_gjc/src/main/java/com/lukouguoji/gjc/holder/GjcCheckInRecordViewHolder.kt
@@ -1,7 +1,5 @@
 package com.lukouguoji.gjc.holder
 
-import android.text.Editable
-import android.text.TextWatcher
 import android.view.View
 import com.lukouguoji.gjc.databinding.ItemGjcCheckInRecordBinding
 import com.lukouguoji.module_base.base.BaseViewHolder
@@ -14,8 +12,6 @@ class GjcCheckInRecordViewHolder(view: View) :
     BaseViewHolder<GjcCheckInRecord, ItemGjcCheckInRecordBinding>(view) {
 
     private var isEditMode: Boolean = false
-    private var pcTextWatcher: TextWatcher? = null
-    private var weightTextWatcher: TextWatcher? = null
 
     fun updateEditMode(editMode: Boolean) {
         this.isEditMode = editMode
@@ -26,32 +22,6 @@ class GjcCheckInRecordViewHolder(view: View) :
         binding.record = record
         binding.isEditMode = isEditMode
         binding.position = position  // 传入位置用于显示序号
-
-        // 移除旧的监听器
-        pcTextWatcher?.let { binding.etPc.removeTextChangedListener(it) }
-        weightTextWatcher?.let { binding.etWeight.removeTextChangedListener(it) }
-
-        // 在编辑模式下监听EditText输入
-        if (isEditMode) {
-            pcTextWatcher = object : TextWatcher {
-                override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-                override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-                override fun afterTextChanged(s: Editable?) {
-                    record.pc = s?.toString()?.toLongOrNull() ?: 0L
-                }
-            }
-            binding.etPc.addTextChangedListener(pcTextWatcher)
-
-            weightTextWatcher = object : TextWatcher {
-                override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-                override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-                override fun afterTextChanged(s: Editable?) {
-                    record.weight = s?.toString()?.toDoubleOrNull() ?: 0.0
-                }
-            }
-            binding.etWeight.addTextChangedListener(weightTextWatcher)
-        }
-
         binding.executePendingBindings()
     }
 }
diff --git a/module_gjc/src/main/res/layout/activity_gjc_weighing_record_details.xml b/module_gjc/src/main/res/layout/activity_gjc_weighing_record_details.xml
index b712db1..72a13e4 100644
--- a/module_gjc/src/main/res/layout/activity_gjc_weighing_record_details.xml
+++ b/module_gjc/src/main/res/layout/activity_gjc_weighing_record_details.xml
@@ -22,145 +22,205 @@
 
         <include layout="@layout/title_tool_bar" />
 
-        <!-- 第一部分：运单信息区域 -->
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="15dp"
             android:background="@drawable/bg_white_radius_8"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginVertical="8dp"
+                android:text="运单信息"
+                android:textColor="@color/color_33"
+                android:textSize="17sp"
+                android:textStyle="bold" />
+
+            <com.google.android.material.divider.MaterialDivider
+                android:layout_width="match_parent"
+                android:layout_height="1dp" />
+
+
+            <!-- 第一部分：运单信息区域 -->
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:padding="15dp">
+
+                <!-- 运单号 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="运单号："
+                        android:textColor="@color/text_gray"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{viewModel.waybillNo}"
+                        android:textColor="@color/text_normal"
+                        android:textSize="16sp" />
+                </LinearLayout>
+
+                <!-- 预配件数 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="预配件数："
+                        android:textColor="@color/text_gray"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{viewModel.prePc}"
+                        android:textColor="@color/text_normal"
+                        android:textSize="16sp" />
+                </LinearLayout>
+
+                <!-- 预配重量 -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="预配重量："
+                        android:textColor="@color/text_gray"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{viewModel.preWeight}"
+                        android:textColor="@color/text_normal"
+                        android:textSize="16sp" />
+                </LinearLayout>
+
+                <!-- 品名(中) -->
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:layout_weight="1"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="品名(中)："
+                        android:textColor="@color/text_gray"
+                        android:textSize="16sp" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@{viewModel.goodsName}"
+                        android:textColor="@color/text_normal"
+                        android:textSize="16sp" />
+                </LinearLayout>
+
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginBottom="15dp"
+            android:layout_weight="1"
+            android:background="@drawable/bg_white_radius_8"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginHorizontal="15dp"
+                android:layout_marginVertical="8dp"
+                android:text="称重信息"
+                android:textColor="@color/color_33"
+                android:textSize="17sp"
+                android:textStyle="bold" />
+
+            <com.google.android.material.divider.MaterialDivider
+                android:layout_width="match_parent"
+                android:layout_height="1dp" />
+
+            <!-- 第二部分：计重记录列表 -->
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:paddingStart="15dp"
+                android:paddingEnd="15dp"
+                tools:listitem="@layout/item_gjc_check_in_record" />
+        </LinearLayout>
+
+
+        <!-- 取消+保存按钮组（编辑模式，居中） -->
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginHorizontal="15dp"
+            android:layout_marginBottom="15dp"
             android:orientation="horizontal"
-            android:padding="15dp">
+            android:visibility="@{viewModel.isEditMode ? View.VISIBLE : View.GONE}">
 
-            <!-- 运单号 -->
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="horizontal">
+            <!-- 取消按钮 -->
+            <TextView
+                android:id="@+id/btnCancel"
+                style="@style/tv_bottom_btn"
+                android:layout_marginEnd="10dp"
+                android:onClick="@{() -> viewModel.onCancelClick()}"
+                android:text="取消" />
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="运单号："
-                    android:textColor="@color/text_gray"
-                    android:textSize="16sp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@{viewModel.waybillNo}"
-                    android:textColor="@color/text_normal"
-                    android:textSize="16sp" />
-            </LinearLayout>
-
-            <!-- 预配件数 -->
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="预配件数："
-                    android:textColor="@color/text_gray"
-                    android:textSize="16sp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@{viewModel.prePc}"
-                    android:textColor="@color/text_normal"
-                    android:textSize="16sp" />
-            </LinearLayout>
-
-            <!-- 预配重量 -->
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="预配重量："
-                    android:textColor="@color/text_gray"
-                    android:textSize="16sp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@{viewModel.preWeight}"
-                    android:textColor="@color/text_normal"
-                    android:textSize="16sp" />
-            </LinearLayout>
-
-            <!-- 品名(中) -->
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="10dp"
-                android:layout_weight="1"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="品名(中)："
-                    android:textColor="@color/text_gray"
-                    android:textSize="16sp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@{viewModel.goodsName}"
-                    android:textColor="@color/text_normal"
-                    android:textSize="16sp" />
-            </LinearLayout>
+            <!-- 保存按钮 -->
+            <TextView
+                android:id="@+id/btnSave"
+                style="@style/tv_bottom_btn"
+                android:onClick="@{() -> viewModel.onSaveClick()}"
+                android:text="保存" />
 
         </LinearLayout>
 
-        <!-- 称重信息标题 -->
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="15dp"
-            android:layout_marginEnd="15dp"
-            android:layout_marginBottom="10dp"
-            android:text="称重信息"
-            android:textColor="@color/text_normal"
-            android:textSize="18sp"
-            android:textStyle="bold" />
-
-        <!-- 第二部分：计重记录列表 -->
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            tools:listitem="@layout/item_gjc_check_in_record"
-            android:paddingStart="15dp"
-            android:paddingEnd="15dp" />
 
         <!-- 第三部分：底部统计与按钮区域 -->
-        <RelativeLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="15dp"
-            android:background="@drawable/bg_white_radius_8"
-            android:padding="15dp">
+            android:layout_height="64dp"
+            android:background="@color/white"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingHorizontal="15dp">
 
             <!-- 统计信息（左侧） -->
             <LinearLayout
                 android:id="@+id/statsLayout"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_centerVertical="true"
                 android:orientation="horizontal">
 
                 <!-- 总件数 -->
@@ -191,42 +251,21 @@
 
             </LinearLayout>
 
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
             <!-- 修改按钮（只读模式，右侧） -->
             <TextView
                 android:id="@+id/btnModify"
                 style="@style/tv_bottom_btn"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
                 android:onClick="@{() -> viewModel.onModifyClick()}"
                 android:text="修改"
                 android:visibility="@{viewModel.isEditMode ? View.GONE : View.VISIBLE}" />
 
-            <!-- 取消+保存按钮组（编辑模式，居中） -->
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:orientation="horizontal"
-                android:visibility="@{viewModel.isEditMode ? View.VISIBLE : View.GONE}">
 
-                <!-- 取消按钮 -->
-                <TextView
-                    android:id="@+id/btnCancel"
-                    style="@style/tv_bottom_btn"
-                    android:layout_marginEnd="10dp"
-                    android:onClick="@{() -> viewModel.onCancelClick()}"
-                    android:text="取消" />
-
-                <!-- 保存按钮 -->
-                <TextView
-                    android:id="@+id/btnSave"
-                    style="@style/tv_bottom_btn"
-                    android:onClick="@{() -> viewModel.onSaveClick()}"
-                    android:text="保存" />
-
-            </LinearLayout>
-
-        </RelativeLayout>
+        </LinearLayout>
 
     </LinearLayout>
 </layout>
diff --git a/module_gjc/src/main/res/layout/item_gjc_check_in_record.xml b/module_gjc/src/main/res/layout/item_gjc_check_in_record.xml
index 77fb588..1696bd7 100644
--- a/module_gjc/src/main/res/layout/item_gjc_check_in_record.xml
+++ b/module_gjc/src/main/res/layout/item_gjc_check_in_record.xml
@@ -5,6 +5,8 @@
 
         <import type="android.view.View" />
 
+        <import type="com.lukouguoji.module_base.ui.weight.data.layout.DataLayoutType" />
+
         <variable
             name="record"
             type="com.lukouguoji.module_base.bean.GjcCheckInRecord" />
@@ -39,128 +41,56 @@
             android:textStyle="bold" />
 
         <!-- 件数字段 -->
-        <LinearLayout
+        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:layout_weight="1"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="件数 "
-                android:textColor="@color/text_gray"
-                android:textSize="16sp" />
-
-            <!-- 非编辑模式：TextView -->
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@{String.valueOf(record.pc)}"
-                android:textColor="@color/text_normal"
-                android:textSize="16sp"
-                android:visibility="@{isEditMode ? View.GONE : View.VISIBLE}" />
-
-            <!-- 编辑模式：EditText -->
-            <EditText
-                android:id="@+id/etPc"
-                android:layout_width="80dp"
-                android:layout_height="wrap_content"
-                android:background="@drawable/bg_white_radius_8"
-                android:hint="件数"
-                android:inputType="number"
-                android:padding="8dp"
-                android:text="@{String.valueOf(record.pc)}"
-                android:textColor="@color/text_normal"
-                android:textSize="16sp"
-                android:visibility="@{isEditMode ? View.VISIBLE : View.GONE}" />
-        </LinearLayout>
+            enable="@{isEditMode}"
+            hint="@{`件数`}"
+            inputType="@{android.text.InputType.TYPE_CLASS_NUMBER}"
+            title="@{`件数`}"
+            titleLength="@{5}"
+            type="@{DataLayoutType.INPUT}"
+            value="@={record.pcStr}" />
 
         <!-- 重量字段 -->
-        <LinearLayout
+        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:layout_weight="1"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="重量 "
-                android:textColor="@color/text_gray"
-                android:textSize="16sp" />
-
-            <!-- 非编辑模式：TextView -->
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@{String.valueOf(record.weight)}"
-                android:textColor="@color/text_normal"
-                android:textSize="16sp"
-                android:visibility="@{isEditMode ? View.GONE : View.VISIBLE}" />
-
-            <!-- 编辑模式：EditText -->
-            <EditText
-                android:id="@+id/etWeight"
-                android:layout_width="80dp"
-                android:layout_height="wrap_content"
-                android:background="@drawable/bg_white_radius_8"
-                android:hint="重量"
-                android:inputType="numberDecimal"
-                android:padding="8dp"
-                android:text="@{String.valueOf(record.weight)}"
-                android:textColor="@color/text_normal"
-                android:textSize="16sp"
-                android:visibility="@{isEditMode ? View.VISIBLE : View.GONE}" />
-        </LinearLayout>
+            enable="@{isEditMode}"
+            hint="@{`重量`}"
+            inputType="@{android.text.InputType.TYPE_CLASS_NUMBER | android.text.InputType.TYPE_NUMBER_FLAG_DECIMAL}"
+            title="@{`重量`}"
+            titleLength="@{5}"
+            type="@{DataLayoutType.INPUT}"
+            value="@={record.weightStr}" />
 
         <!-- 托盘自重字段（只读） -->
-        <LinearLayout
+        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:layout_weight="1"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="托盘自重 "
-                android:textColor="@color/text_gray"
-                android:textSize="16sp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="100"
-                android:textColor="@color/text_normal"
-                android:textSize="16sp" />
-        </LinearLayout>
+            enable="@{false}"
+            title="@{`托盘自重`}"
+            titleLength="@{5}"
+            type="@{DataLayoutType.INPUT}"
+            value="@{`100`}" />
 
         <!-- 计重时间字段（只读） -->
-        <LinearLayout
+        <com.lukouguoji.module_base.ui.weight.data.layout.PadDataLayoutNew
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
             android:layout_weight="1.5"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="计重时间 "
-                android:textColor="@color/text_gray"
-                android:textSize="16sp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@{record.opDate}"
-                android:textColor="@color/text_normal"
-                android:textSize="16sp" />
-        </LinearLayout>
+            enable="@{false}"
+            title="@{`计重时间`}"
+            titleLength="@{5}"
+            type="@{DataLayoutType.INPUT}"
+            value="@{record.opDate}" />
 
     </LinearLayout>
 </layout>