接口调试、增加人脸识别后主副屏支付金额逻辑、其它优化

app/src/main/java/com/sw/dualscreen/activity/PayActivity.kt

@@ -1,6 +1,5 @@
 package com.sw.dualscreen.activity
 
-import android.view.View
 import androidx.activity.viewModels
 import androidx.fragment.app.Fragment
 import com.sw.dualscreen.R
@@ -11,7 +10,7 @@ import com.sw.dualscreen.activity.fragment.pay.PayResultFragment
 import com.sw.dualscreen.activity.fragment.pay.ScanQrCodePayFragment
 import com.sw.dualscreen.databinding.ActivityPayBinding
 import com.sw.dualscreen.model.response.FoodInfo
-import com.sw.dualscreen.presentation.pay.FacePayPresentation
+import com.sw.dualscreen.model.response.MemberInfo
 import com.sw.dualscreen.presentation.pay.ScanQrCodePayPresentation
 import com.sw.dualscreen.viewmodel.BaseViewModel
 import com.sw.dualscreen.viewmodel.UserViewModel
@@ -22,6 +21,10 @@ class PayActivity : BaseActivity<ActivityPayBinding>() {
     companion object {
 
         const val FOOD_INFO = "foodInfo"
+        const val TOTAL_AMOUNT = "totalAmount"
+        const val FOOD_ORDER_ID = "foodOrderId"
+
+        //        const val MEMBER_INFO = "memberInfo"
         const val TAG_PAY_QR_CODE = "tagPayQrCode"
         const val TAG_PAY_CASH = "tagPayCash"
         const val TAG_PAY_NUMBER = "tagPayNumber"
@@ -42,16 +45,22 @@ class PayActivity : BaseActivity<ActivityPayBinding>() {
 
     var foodInfo: FoodInfo? = null
 
+    //    var totalAmount:Double = 0.0
     private var qrCodePayFragment: ScanQrCodePayFragment? = null
     private var cashPayFragment: CashPayFragment? = null
     private var numberPayFragment: NumberPayFragment? = null
     var facePayFragment: FacePayFragment? = null
     private var payResultFragment: PayResultFragment? = null
 
+    var foodOrderId:String = ""
+
     @Suppress("DEPRECATION")
     override fun initialize() {
         super.initialize()
         foodInfo = intent.getParcelableExtra(FOOD_INFO)
+        foodOrderId = intent.getStringExtra(FOOD_ORDER_ID)?:""
+//        totalAmount = intent.getDoubleExtra(TOTAL_AMOUNT,0.0)
+//        memberInfo = intent.getParcelableExtra(MEMBER_INFO)
         binding.tvFoodName.text = foodInfo?.foodName
         binding.include.ivPageBack.setOnClickListener { finish() }
         binding.include.tvPageTitle.text = "下单结算"
@@ -140,10 +149,10 @@ class PayActivity : BaseActivity<ActivityPayBinding>() {
 //        }
 //    }
 
-    fun showPayResult() {
-        payResultFragment = PayResultFragment()
-        showFragment(payResultFragment!!, TAG_PAY_RESULT)
-    }
+//    fun showPayResult() {
+//        payResultFragment = PayResultFragment.instance(1, memberInfo)
+//        showFragment(payResultFragment!!, TAG_PAY_RESULT)
+//    }
 
     override fun onDestroy() {
         qrCodePayFragment?.presentation?.dismiss()
@@ -154,8 +163,29 @@ class PayActivity : BaseActivity<ActivityPayBinding>() {
     }
 
     private var scanQrCodePayPresentation: ScanQrCodePayPresentation? = null
-    fun paySuccess() {
-        showFragment(PayResultFragment(), "")
+    var memberInfo: MemberInfo? = null
+    fun showPayInfo(memberInfo: MemberInfo) {
+        this.memberInfo = memberInfo
+        payResultFragment = PayResultFragment.instance(1, memberInfo)
+        showFragment(payResultFragment!!, TAG_PAY_RESULT)
+        if (displays.size > 1) {
+            scanQrCodePayPresentation = ScanQrCodePayPresentation(
+                activity = this,
+                display = displays[1],
+                type = 1
+            ) {
+                scanQrCodePayPresentation?.dismiss()
+            }.also {
+                it.foodName = foodInfo?.foodName
+                it.totalPrice = foodInfo?.vipPrice?:0.0
+            }
+            scanQrCodePayPresentation?.show()
+        }
+    }
+
+    fun showPaySuccess() {
+        payResultFragment = PayResultFragment.instance(2, memberInfo!!)
+        showFragment(payResultFragment!!, TAG_PAY_RESULT)
         if (displays.size > 1) {
             scanQrCodePayPresentation = ScanQrCodePayPresentation(
                 activity = this,
@@ -164,8 +194,8 @@ class PayActivity : BaseActivity<ActivityPayBinding>() {
             ) {
                 scanQrCodePayPresentation?.dismiss()
             }.also {
-//                it.foodName = foodName
-//                it.payAmount = payAmount
+                it.foodName = foodInfo?.foodName
+                it.totalPrice = foodInfo?.vipPrice?:0.0
             }
             scanQrCodePayPresentation?.show()
         }