diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcHandoverViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcHandoverViewModel.kt index 9217af2..22bebf0 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcHandoverViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcHandoverViewModel.kt @@ -41,10 +41,10 @@ class GjcHandoverViewModel : BaseViewModel() { val cbEcFlag = MutableLiveData("1") // 默认选中"是" /** - * 跨境电商RadioButton点击 + * 跨境电商RadioButton点击(已禁用,仅根据expressName自动判断) */ fun onCbEcFlagClick(value: String) { - cbEcFlag.value = value + // 不允许手动点击修改,仅根据expressName自动判断 } // ========== 防止隐含危险品检查单 ========== @@ -132,8 +132,9 @@ class GjcHandoverViewModel : BaseViewModel() { * 根据Bean数据更新CheckBox状态 */ private fun updateCheckBoxState(bean: GjcHandoverSheetBean) { - // 跨境电商 - cbEcFlag.value = bean.cbEcFlag ?: "1" + // 跨境电商 - 根据expressName自动判断 + // 当expressName不为null且不为空时,为"是"(1),否则为"否"(0) + cbEcFlag.value = if (!bean.expressName.isNullOrEmpty()) "1" else "0" // 防止隐含危险品检查单 goodsNameYes.value = (bean.goodsName == "1") diff --git a/module_gjc/src/main/res/layout/activity_gjc_handover.xml b/module_gjc/src/main/res/layout/activity_gjc_handover.xml index 822bfc8..9abd2fb 100644 --- a/module_gjc/src/main/res/layout/activity_gjc_handover.xml +++ b/module_gjc/src/main/res/layout/activity_gjc_handover.xml @@ -256,7 +256,7 @@ android:layout_weight="1" android:background="@drawable/bg_table_cell" android:gravity="center" - android:text="计重重量" + android:text="计费重量" android:textColor="@color/color_33" android:textSize="14sp" /> @@ -378,18 +378,22 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:checked="@{viewModel.cbEcFlag.equals(`0`)}" - android:onClick="@{() -> viewModel.onCbEcFlagClick(`0`)}" + android:clickable="false" + android:focusable="false" android:text="否" - android:textSize="14sp" /> + android:textSize="14sp" + android:alpha="1.0" /> + android:textSize="14sp" + android:alpha="1.0" /> @@ -449,7 +453,7 @@ @@ -486,7 +490,6 @@ android:layout_weight="2" android:background="@drawable/bg_table_cell" android:gravity="center" - android:text="@{viewModel.displayAgentName}" android:textColor="@color/color_33" android:textSize="14sp" /> @@ -500,7 +503,7 @@ android:textColor="@color/color_33" android:textSize="14sp" /> - - @@ -636,7 +639,7 @@ @@ -1277,13 +1280,12 @@ android:textColor="@color/color_33" android:textSize="14sp" /> - @@ -1295,13 +1297,12 @@ android:orientation="horizontal"> - @@ -1315,13 +1316,12 @@ android:textColor="@color/color_33" android:textSize="14sp" /> -