Browse Source

refactor(更新)
- 更新点弹窗新增工位名称显示
- 初始化标签注册页面列表添加分割线
- 修复钥匙信息检查任务协程已结束时依然调用resume的问题

周文健 2 months ago
parent
commit
b440b17275

+ 9 - 1
app/src/main/java/com/grkj/iscs/features/init/fragment/InitCardRegistrationFragment.kt

@@ -1,10 +1,13 @@
 package com.grkj.iscs.features.init.fragment
 
 import android.content.Context
+import android.graphics.Color
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
 import androidx.fragment.app.viewModels
 import com.drake.brv.BindingAdapter
+import com.drake.brv.annotaion.DividerOrientation
+import com.drake.brv.utils.divider
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.setup
 import com.grkj.data.data.EventConstants
@@ -59,7 +62,12 @@ class InitCardRegistrationFragment : BaseFragment<FragmentInitCardRegistrationBi
             cardRfidData.clear()
             navController.navigate(R.id.action_initCardRegistrationFragment_to_initPointRfidRegistrationFragment)
         }
-        binding.cardRv.linear().setup {
+        binding.cardRv.linear().divider {
+            this.setColor(Color.BLACK)
+            this.startVisible = false
+            this.endVisible = true
+            this.orientation = DividerOrientation.VERTICAL
+        }.setup {
             addType<String>(R.layout.item_init_hardware_rfid)
             onBind {
                 onInitHardwareBinding(this)

+ 9 - 1
app/src/main/java/com/grkj/iscs/features/init/fragment/InitPointRfidRegistrationFragment.kt

@@ -2,10 +2,13 @@ package com.grkj.iscs.features.init.fragment
 
 import android.content.Context
 import android.content.Intent
+import android.graphics.Color
 import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
 import androidx.fragment.app.viewModels
 import com.drake.brv.BindingAdapter
+import com.drake.brv.annotaion.DividerOrientation
+import com.drake.brv.utils.divider
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.setup
 import com.grkj.data.data.EventConstants
@@ -67,7 +70,12 @@ class InitPointRfidRegistrationFragment : BaseFragment<FragmentInitPointRfidRegi
             requireActivity().startActivity(Intent(requireActivity(), LoginActivity::class.java))
             requireActivity().finish()
         }
-        binding.pointRfidRv.linear().setup {
+        binding.pointRfidRv.linear().divider {
+            this.setColor(Color.BLACK)
+            this.startVisible = false
+            this.endVisible = true
+            this.orientation = DividerOrientation.VERTICAL
+        }.setup {
             addType<String>(R.layout.item_init_hardware_rfid)
             onBind {
                 onInitHardwareBinding(this)

+ 1 - 0
app/src/main/java/com/grkj/iscs/features/main/dialog/data_manage/UpdatePointDialog.kt

@@ -54,6 +54,7 @@ class UpdatePointDialog(
             IsolationPointPowerTypeEnum.values().find { it.name == pointVo.powerType }?.icon
                 ?: ""
         )
+        binding.workstationTv.text = pointVo.workstationName
         powerTypeList.find { it.getTag() == pointVo.powerType }?.also {
             binding.powerTypeTv.text = it.getShowText()
             binding.powerTypeTv.tag = it.getTag()

+ 3 - 2
ui-base/src/main/java/com/grkj/ui_base/service/CheckKeyInfoTask.kt

@@ -109,13 +109,14 @@ class CheckKeyInfoTask {
                 if (isInLogin) {
                     BleSendDispatcher.scheduleDisconnect(mac)
                 }
-                cont.resume(Unit) {}
+                if (cont.isActive) {
+                    cont.resume(Unit) {}
+                }
             }
         }
     }
 
 
-
     /**
      * 挂起直到登录页(isInLogin=true)
      * - 不 busy-wait;真正挂起,省电省 CPU