Quellcode durchsuchen

上锁人状态更新bug修复

Frankensteinly vor 1 Jahr
Ursprung
Commit
54d325d7fa

+ 1 - 0
app/src/main/java/com/grkj/iscs/presentation/PresentationActivity.kt

@@ -134,6 +134,7 @@ class PresentationActivity :
             return
         }
         createWorkTicket(lockList)
+        finish()
 
 //        // 操作设备
 //        ModBusController.controlLockBuckle(true, dockList[0].addr.toInt() - 1, lockIdxList) { res ->

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

@@ -87,7 +87,7 @@ object PresentationManager {
 
     fun updateLockerStatus(rfid: String, rst: Int) {
         if (rst == 1 || rst == 0) {
-            workTicketList.find { it.locker?.rfid == rfid }?.status == rst + 1
+            workTicketList.find { it.locker?.rfid == rfid }?.locker?.status == rst + 1
         } else {
             ToastUtils.tip("未知上锁人状态更新")
         }

+ 10 - 2
app/src/main/res/layout/activity_locker_together.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main"
@@ -7,4 +7,12 @@
     android:layout_height="match_parent"
     tools:context=".presentation.LockerTogetherActivity">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="请刷卡进行操作"
+        android:textColor="@color/main_color"
+        android:textSize="30sp" />
+
+</RelativeLayout>