完善业务逻辑

app/src/main/java/com/grkj/iscs/activity/test/BleActivity.kt

@@ -43,6 +43,7 @@ class BleActivity : BaseActivity<ActivityBleBinding>() {
 
     override fun initView() {
 
+        BleManager.getInstance().disconnectAllDevice()
         mBinding?.srl?.setEnableRefresh(true)
         mBinding?.srl?.setEnableLoadMore(false)
         mBinding?.srl?.autoRefresh()

app/src/main/java/com/grkj/iscs/presentation/PresentationManager.kt

@@ -478,10 +478,16 @@ object PresentationManager {
                     }
                 }
                 it.isAllLocksReturned = dockLockRfidList.containsAll(ticketLockRfidList)
-                if (it.isAllLocksReturned && it.status == 4) {
-                    ToastUtils.tip(R.string.simple_ticket_is_done)
-                    it.status = 5
-                    updateStep(5)
+
+                if (it.status == 3 || it.status == 4) {
+                    if (it.isAllLocksReturned) {
+                        ToastUtils.tip(R.string.simple_ticket_is_done)
+                        it.status = 5
+                        updateStep(7)
+                    } else {
+                        it.status = 4
+                        updateStep(6)
+                    }
                 }
             }
         }

app/src/main/java/com/grkj/iscs/presentation/simple/SimpleProcessActivity.kt

@@ -61,6 +61,12 @@ class SimpleProcessActivity : BaseActivity<ActivitySimpleProcessBinding>() {
             changeStep(PresentationManager.mStep)
             PresentationManager.checkSimpleEquip(this)
         }
+
+        mBinding?.llConfirmComplete?.setOnClickListener {
+            PresentationManager.mStep = 6
+            changeStep(6)
+            PresentationManager.checkSimpleEquip(this)
+        }
     }
 
     override fun onResume() {
@@ -98,12 +104,12 @@ class SimpleProcessActivity : BaseActivity<ActivitySimpleProcessBinding>() {
                                         val ticketStatusBean = Gson().fromJson(ticket, WorkTicketStatusBean::class.java)
                                         PresentationManager.updateSimpleTicket(ticketStatusBean)
                                         // TODO 更新mStep
-                                        if (PresentationManager.mSimpleTicket!!.status!! < 3) {
+                                        if (PresentationManager.mSimpleTicket!!.status!! < 2) {
                                             PresentationManager.mSimpleTicket?.status = 2
                                             PresentationManager.updateStep(3)
                                         } else {
                                             PresentationManager.mSimpleTicket?.status = 4
-                                            PresentationManager.updateStep(5)
+                                            PresentationManager.updateStep(6)
                                         }
                                     }
                                 }
@@ -124,6 +130,15 @@ class SimpleProcessActivity : BaseActivity<ActivitySimpleProcessBinding>() {
         }
     }
 
+    private fun updateSharedStatus() {
+        val doneCount = PresentationManager.mSimpleTicket?.lockerTogetherList?.filter { it.status == 2 }?.size ?: 0
+        mBinding?.tvShared?.text = "${getString(R.string.simple_shared)} $doneCount/2"
+        if (doneCount == 2) {
+            PresentationManager.mStep = 5
+            changeStep(5)
+        }
+    }
+
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {
         if (event.action == KeyEvent.ACTION_UP && event.source == InputDevice.SOURCE_KEYBOARD) {
             // 检测到回车开始处理
@@ -140,6 +155,7 @@ class SimpleProcessActivity : BaseActivity<ActivitySimpleProcessBinding>() {
                     } else if (it.status == 1) {
                         it.status = 2
                     }
+                    updateSharedStatus()
                 }
                 return super.dispatchKeyEvent(event)
             }

app/src/main/res/layout/activity_simple_process.xml

@@ -276,6 +276,7 @@
                 android:layout_marginRight="5dp"/>
 
             <TextView
+                android:id="@+id/tv_shared"
                 style="@style/SimpleTextView"
                 android:text="@string/simple_shared"/>
         </LinearLayout>