营养接口调试、支付接口联调

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

@@ -9,6 +9,7 @@ import com.sw.dualscreen.activity.fragment.pay.NumberPayFragment
 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.ext.gone
 import com.sw.dualscreen.model.response.FoodInfo
 import com.sw.dualscreen.model.response.MemberInfo
 import com.sw.dualscreen.presentation.pay.ScanQrCodePayPresentation
@@ -60,6 +61,7 @@ class PayActivity : BaseActivity<ActivityPayBinding>() {
         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
@@ -160,6 +162,7 @@ class PayActivity : BaseActivity<ActivityPayBinding>() {
         cashPayFragment?.presentation?.dismiss()
         numberPayFragment?.presentation?.dismiss()
         facePayFragment?.presentation?.dismiss()
+        scanQrCodePayPresentation?.dismiss()
         super.onDestroy()
     }
 
@@ -188,6 +191,7 @@ class PayActivity : BaseActivity<ActivityPayBinding>() {
 
     fun showPaySuccess(isVip: Boolean) {
         showPayInfo(type = 2, isVip = isVip, memberInfo = memberInfo)
+        hidePayTab()
     }
 
     fun getQrCodeImg(orderId: String, userId: String? = null, block: (String?) -> Unit) {
@@ -218,11 +222,31 @@ class PayActivity : BaseActivity<ActivityPayBinding>() {
         }
     }
 
-    fun paySuccessCallback(isVip: Boolean, block: () -> Unit = {}) {
-        userViewModel.paySuccessCallback(queryType = 1, orderId = foodOrderId) {
-            showPaySuccess(isVip)
-            block()
+    suspend fun queryOrderState(isVip: Boolean, block: (Boolean) -> Unit) {
+        userViewModel.queryOrderState(orderId = foodOrderId) { payResult ->
+            runOnUiThread {
+                if (payResult) {
+                    showPaySuccess(isVip)
+                    block(true)
+                } else {
+                    block(false)
+                }
+            }
         }
     }
 
+    fun hidePayTab() {
+        binding.llPayTab.gone()
+    }
+
+
+
+//    private val intervalExecutor by lazy { IntervalExecutor() }
+//    private var payTaskJob: Job? = null
+//    fun paySuccessCallback() {
+//        payTaskJob = intervalExecutor.startIntervalTaskWithInitialDelay(5000, 10000) {
+//
+//        }
+//    }
+
 }