使用人脸接口中的member字段判断是否会员；逻辑优化；

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

@@ -956,7 +956,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                             model.userId, null, Base64.decode(model.faceFeatureStr)
                         ).also {
                             //1-会员、2-临时用户
-                            it.userType = if (model.isMember) "1" else "2"
+                            it.userType = if (model.member) "1" else "2"
                             it.cardNo = model.cardNo
                         }
                         faceList.add(faceEntity)

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

@@ -169,6 +169,7 @@ class PayActivity : BaseActivity<ActivityPayBinding>() {
 //            scanQrCodePayPresentation?.show()
 //        }
         presentation.let {
+            it.pageType = PayPresentation.QR_CODE_PAY
             it.type = type
             it.foodName = foodInfo?.foodName
             //确认使用vipPrice 还是 specPrice

app/src/main/java/com/sw/dualscreen/activity/fragment/pay/FacePayFragment.kt

@@ -27,17 +27,17 @@ class FacePayFragment : BaseFragment<FragmentFacePayBinding>() {
         }
         showSubScreen()
     }
-
-    override fun onHiddenChanged(hidden: Boolean) {
-        super.onHiddenChanged(hidden)
-        if (hidden) {
-//            dismissSubScreen()
-            payActivity.presentation.pauseCamera()
-            return
-        }
-        payActivity.presentation.resumeCamera()
-        //showSubScreen()
-    }
+//
+//    override fun onHiddenChanged(hidden: Boolean) {
+//        super.onHiddenChanged(hidden)
+//        if (hidden) {
+////            dismissSubScreen()
+//            payActivity.presentation.pauseCamera()
+//            return
+//        }
+//        payActivity.presentation.resumeCamera()
+//        //showSubScreen()
+//    }
 
 //    override fun onDestroy() {
 //        dismissSubScreen()
@@ -78,8 +78,24 @@ class FacePayFragment : BaseFragment<FragmentFacePayBinding>() {
             it.pageType = PayPresentation.FACE_PAY
             it.foodName = foodName
             it.payAmount = payAmount.format2String(2)
+            isResumeCamera = true
             it.initView()
         }
 
     }
+
+    override fun onPause() {
+        super.onPause()
+        payActivity.presentation.pauseCamera()
+    }
+
+    private var isResumeCamera = false
+
+    override fun onResume() {
+        super.onResume()
+        if (isResumeCamera) {
+            payActivity.presentation.resumeCamera()
+        }
+    }
+
 }

app/src/main/java/com/sw/dualscreen/activity/fragment/pay/PayResultFragment.kt

@@ -74,7 +74,7 @@ class PayResultFragment : BaseFragment<FragmentPayResultBinding>() {
             memberInfo = it.getParcelable(MEMBER_INFO)
         }
 
-        if (memberInfo != null) {
+        if (memberInfo != null && memberInfo!!.member) {
             totalPrice = (payActivity.foodInfo?.vipPrice ?: 0.0) * payActivity.eatNum
             binding.layoutVip.visible()
             balance = (memberInfo!!.topUpBalance ?: 0.0) + (memberInfo!!.rewardBalance ?: 0.0)
@@ -112,9 +112,15 @@ class PayResultFragment : BaseFragment<FragmentPayResultBinding>() {
                     )
                 )
 
-                binding.tvAccountInfo.text = SpannedUtils.getAmountText(
-                    getAmountList()
-                )
+                if (memberInfo != null && memberInfo!!.member) {
+                    binding.tvAccountInfo.text = SpannedUtils.getAmountText(
+                        getAmountList()
+                    )
+                } else {
+                    binding.tvAccountInfo.text = SpannedUtils.getAmountText(
+                        getAmountListNotMember()
+                    )
+                }
                 if (balance >= totalPrice) {
                     binding.ivPayQrCode.invisible()
                     binding.btnConfirmPay.run {
@@ -201,6 +207,21 @@ class PayResultFragment : BaseFragment<FragmentPayResultBinding>() {
     //扣除余额
     private var expensesBalance = 0.0
 
+    private fun getAmountListNotMember(): List<TextBean> {
+        val list: MutableList<TextBean> = mutableListOf()
+
+        list.add(TextBean(text = "应付金额 ", textSize = 30, textColor = "#FF889AC2"))
+        list.add(
+            TextBean(
+                text = "-${totalPrice.format2String(2)}",
+                textSize = 30,
+                textColor = "#FF0A1428",
+                isBold = true
+            )
+        )
+        list.add(TextBean(text = " 元", textSize = 30, textColor = "#FF889AC2"))
+        return list
+    }
     private fun getAmountList(): List<TextBean> {
         val list: MutableList<TextBean> = mutableListOf()