fix 界面修改

app/src/main/java/com/doverfuelingsolutions/issp/view/fragment/FragmentPayScanCode.kt

@@ -48,8 +48,9 @@ class FragmentPayScanCode(private val dc: DeviceClass, private val posTrx: PosTr
             binding.lifecycleOwner = this
             binding.viewModel = viewModel.apply {
                 nozzle.value = dc.nozzleNo
-                amount.value = dc.amount.toDouble()
-                amountText.value = StringUtil.get(R.string.amount_rmb, dc.amount.toString())
+                amount.value = dc.myAmount
+                netAmount.value = posTrx.myNetAmount
+                discount.value = posTrx.myDiscount
                 volume.value = dc.volume
                 oil.value = dc.productName
                 time.value = dc.endTimeStamp.substring(5)
@@ -62,8 +63,6 @@ class FragmentPayScanCode(private val dc: DeviceClass, private val posTrx: PosTr
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        viewModel.amountText.value = StringUtil.get(R.string.amount_with_discount, posTrx.netAmount.toString(), posTrx.discount.toString())
-
         startPay()
     }
 
@@ -121,8 +120,9 @@ class FragmentPayScanCode(private val dc: DeviceClass, private val posTrx: PosTr
 
     class PayScanCodeViewModel : ViewModel() {
         val nozzle = MutableLiveData(1)
-        val amount = MutableLiveData(0.0)
-        val amountText = MutableLiveData("￥0.00")
+        val amount = MutableLiveData("0.00")
+        val netAmount = MutableLiveData("0.00")
+        val discount = MutableLiveData("0.00")
         val scanTip = MutableLiveData(StringUtil.get(R.string.plz_scan))
         val volume = MutableLiveData("0.00")
         val oil = MutableLiveData("")

app/src/main/java/com/doverfuelingsolutions/issp/view/fragment/FragmentPayType.kt

@@ -44,7 +44,9 @@ class FragmentPayType private constructor(private val dc: DeviceClass): Fragment
             binding.payTypeScanCode -> {
                 prepareBeforePay()
             }
-            binding.payTypeAliFace -> { prepareBeforePay() }
+            binding.payTypeAliFace -> {
+                DFSToastUtil.fail("未配置刷脸支付功能")
+            }
         }
     }
 
@@ -86,7 +88,6 @@ class FragmentPayType private constructor(private val dc: DeviceClass): Fragment
                 (activity as MainActivity).setFragment(FragmentPayScanCode.build(dc, posTrx!!), true)
             } else {
                 DFSToastUtil.fail(StringUtil.get(R.string.fail_behave_reason, StringUtil.get(R.string.lock_order), resultLock.message))
-                DFSLog.e(resultLock)
             }
         }
     }

app/src/main/res/layout/fragment_pay_scan_code.xml

@@ -16,7 +16,7 @@
             android:id="@+id/fragmentToolbar"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            app:countdownTime="60"
+            app:countdownTime="-1"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -37,21 +37,27 @@
                 android:layout_height="280dp"
                 android:src="@mipmap/ic_paying" />
 
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/wrap"
+                android:layout_marginTop="70dp"
+                android:text="@{@string/amount_with_discount(viewModel.amount, viewModel.discount), default=@string/amount_with_discount}"
+                android:textSize="42sp" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/wrap"
+                android:layout_marginTop="40dp"
+                android:text="@{@string/amount_pay(viewModel.netAmount), default=@string/amount_pay}"
+                android:textColor="@color/colorYellow"
+                android:textSize="72sp" />
+
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/wrap"
                 android:layout_marginTop="100dp"
-                android:layout_marginBottom="180dp"
                 android:paddingHorizontal="42dp"
                 android:paddingVertical="8dp"
                 android:text="@{viewModel.scanTip, default=@string/plz_scan}"
                 android:textSize="54sp" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/wrap"
-                android:text="@{viewModel.amountText, default=@string/amount_with_discount}"
-                android:textColor="@color/colorYellow"
-                android:textSize="52sp" />
-
             <androidx.appcompat.widget.LinearLayoutCompat
                 style="@style/wrap"
                 android:background="@drawable/border_gray"

app/src/main/res/values/strings.xml

@@ -110,7 +110,8 @@
     <string name="plz_scan">请将付款码对准下方的 「<b>扫描器</b>」</string>
     <string name="plz_scan_again">请重新扫码支付</string>
     <string name="make_cloud_order">生成云订单</string>
-    <string name="amount_with_discount">需付金额 ￥%1$s，已优惠 ￥%2$s</string>
+    <string name="amount_with_discount">加油金额 ￥%1$s，已优惠 ￥%2$s</string>
+    <string name="amount_pay">需付金额 ￥%1$s</string>
     <string name="in_pay">订单支付中&#8230;</string>
     <string name="order_lock_by_other">订单已被其他渠道锁定</string>