接口联调

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

@@ -114,7 +114,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
     }
 
     private fun initData() {
-        viewModel.getEquipmentToken()
+//        viewModel.getEquipmentToken()
+        viewModel.getUserFaceCache(pageNo = 1)
 //        presentation?.step1()
         presentation?.step1FoodRecognizing()
     }
@@ -200,10 +201,14 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
         binding.tvFoodName.setOnClickListener {
             SensorScaleUtils.zero()
         }
-        binding.tvRescan.setOnClickListener {
-            debouncer.debounce { recognizeFood() }
-        }
+//        binding.tvRescan.setOnClickListener {
+//            debouncer.debounce { recognizeFood() }
+//        }
         binding.btnPay.setOnClickListener {
+            if (checkedItem == null) {
+                ToastUtils.showToast("暂无识别数据，请搜索选择")
+                return@setOnClickListener
+            }
             presentation?.dismiss()
             startActivity(Intent(this, PayActivity::class.java).apply {
                 putExtra(PayActivity.FOOD_INFO, checkedItem)
@@ -317,9 +322,14 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
                 if (TextUtils.isEmpty(foodName)) {
                     LightManager.closeGreenLight()
                     LightManager.closeRedLight()
-                    binding.layoutRescan.visibility = View.VISIBLE
+                    //binding.layoutRescan.visibility = View.VISIBLE
+                    binding.flPay.visible()
+                    binding.tvToSearch.let {
+                        it.text = "未识别到，去手动搜索"
+                        it.visible()
+                    }
                 } else {
-                    binding.layoutRescan.visibility = View.GONE
+                    //binding.layoutRescan.visibility = View.GONE
                     viewModel.getFoodInfo(foodName) { list ->
                         runOnUiThread {
                             updateFoodInfo(list.toMutableList(), scoreList)
@@ -367,7 +377,10 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
             LightManager.closeRedLight()
 
             binding.flPay.visible()
-            binding.tvToSearch.visible()
+            binding.tvToSearch.let {
+                it.text = "以上都不是，手动搜索"
+                it.visible()
+            }
         } else {
             binding.flPay.gone()
             binding.tvToSearch.gone()