diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt index 812150c..b104056 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt @@ -436,7 +436,7 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() { }) { onSuccess = { result -> if (result.verifySuccess()) { - showToast("添加成功") + showToast("完成复磅") // 如果勾选了打印挂签,则执行打印 if (printTag.value == true) { diff --git a/module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml b/module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml index ef995b7..e74532a 100644 --- a/module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml +++ b/module_gjc/src/main/res/layout/activity_int_exp_assemble_start.xml @@ -416,7 +416,7 @@ android:layout_height="44dp" android:layout_marginEnd="8dp" android:alpha="@{viewModel.isUnloadEnabled ? 1.0f : 0.5f}" - android:background="@drawable/bg_blue_radius_4" + android:background="@drawable/bg_red_radius_4" android:enabled="@{viewModel.isUnloadEnabled}" android:onClick="@{() -> viewModel.onUnloadClick()}" android:text="卸货" @@ -428,7 +428,7 @@ android:layout_height="44dp" android:layout_marginStart="32dp" android:alpha="@{viewModel.isLoadEnabled ? 1.0f : 0.5f}" - android:background="@drawable/bg_red_radius_4" + android:background="@drawable/bg_blue_radius_4" android:enabled="@{viewModel.isLoadEnabled}" android:onClick="@{() -> viewModel.onLoadClick()}" android:text="装货"