餐盘柜优化-不绑定用户可多次取盘

app/src/main/java/com/sw/platecabinet/activity/BaseActivity.kt

@@ -113,24 +113,14 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
         if (scanInfo.length > 6) {
             plateNumber = scanInfo.take(6)
         }
-//        ToastUtils.showToast(plateNumber)
-        var item = MyApp.plateList?.firstOrNull { it.plateNumber == plateNumber }
+        //柜子未关联该餐盘，直接找空位置放入盘子
+        val item = MyApp.plateList?.firstOrNull { it.plateNumber.isNullOrBlank() }
         if (item == null) {
-            //柜子未关联该餐盘，直接找空位置放入盘子
-            item = MyApp.plateList?.firstOrNull { it.plateNumber.isNullOrBlank() }
-            if (item ==null) {
-                //柜子已满
-                MainActivity.start(context = context, pageType = PageType.PLATE_CABINET_FULL)
-                return
-            }
-            //找到位置，放入餐盘，清除已有id和时间
-            item.plateNumber = plateNumber
-            item.faceId = null
-            item.updateTime = null
-            PlateUtils.open(this, item.equipmentBoxCode, true)
+            //柜子已满
+            MainActivity.start(context = context, pageType = PageType.PLATE_CABINET_FULL)
             return
         }
-        //放入餐盘，清除已有id和时间
+        //找到位置，放入餐盘，清除已有id和时间
         item.plateNumber = plateNumber
         item.faceId = null
         item.updateTime = null
@@ -270,7 +260,9 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
         runOnUiThread {
             hideWaitingDialog()
             val view = View.inflate(this, R.layout.dialog_waiting, null)
-            if (!TextUtils.isEmpty(tip)) (view.findViewById<View?>(R.id.tvTip) as TextView).setText(tip)
+            if (!TextUtils.isEmpty(tip)) (view.findViewById<View?>(R.id.tvTip) as TextView).setText(
+                tip
+            )
             mDialogWaiting = CustomLoadingDialog(this, view, R.style.MyDialog)
             mDialogWaiting!!.show()
             mDialogWaiting!!.setCancelable(true)