更换点位

app/src/main/java/com/iscs/bozzys/ui/pages/detail/task/PageDetailTask.kt

@@ -504,7 +504,7 @@ class PageDetailTask : PageBase() {
                         )
                         Column {
                             Text(
-                                "E-1",
+                                "E-53",
                                 fontSize = 14.sp,
                                 lineHeight = 16.sp,
                                 fontWeight = FontWeight.Bold,
@@ -547,7 +547,7 @@ class PageDetailTask : PageBase() {
                         )
                         Column {
                             Text(
-                                "E-2",
+                                "E-56",
                                 fontSize = 14.sp,
                                 lineHeight = 16.sp,
                                 fontWeight = FontWeight.Bold,

app/src/main/java/com/iscs/bozzys/ui/pages/vm/VMDetailTask.kt

@@ -174,9 +174,9 @@ class VMDetailTask : VMBase() {
             // 校验是上锁过程还是解锁过程
             if (_state.value.step == 1) {
                 task.dataList.forEach {
-                    if (it.equipRfidNo == "C4BB220A") {
+                    if (it.equipRfidNo == "E45EE23B") {
                         pointsF = it
-                    } else if (it.equipRfidNo == "E4FE160A") {
+                    } else if (it.equipRfidNo == "14B1E33B") {
                         pointsS = it
                     }
                 }
@@ -205,9 +205,9 @@ class VMDetailTask : VMBase() {
                 _state.value = _state.value.copy(step = step, useLocks = useLocks)
             } else if (step == 3) {
                 task.dataList.forEach {
-                    if (it.equipRfidNo == "C4BB220A") {
+                    if (it.equipRfidNo == "E45EE23B") {
                         pointsF = it
-                    } else if (it.equipRfidNo == "E4FE160A") {
+                    } else if (it.equipRfidNo == "14B1E33B") {
                         pointsS = it
                     }
                 }
@@ -241,20 +241,20 @@ class VMDetailTask : VMBase() {
         if (step == 0) {
             var spl = ""
             if (points.first.closed == 0) {
-                sb.append("{\"dataId\":87,\"equipName\":\"E_1\",\"equipRfidNo\":\"C4BB220A\",\"infoRfidNo\":\"\",\"target\":0}")
+                sb.append("{\"dataId\":87,\"equipName\":\"E_53\",\"equipRfidNo\":\"E45EE23B\",\"infoRfidNo\":\"\",\"target\":0}")
                 spl = ","
             }
             if (points.second.closed == 0) {
-                sb.append("$spl{\"dataId\":88,\"equipName\":\"E_2\",\"equipRfidNo\":\"E4FE160A\",\"infoRfidNo\":\"\",\"target\":0}")
+                sb.append("$spl{\"dataId\":88,\"equipName\":\"E_56\",\"equipRfidNo\":\"14B1E33B\",\"infoRfidNo\":\"\",\"target\":0}")
             }
         } else if (step == 2) {
             var spl = ""
             if ((points.first.closed == 1 && points.first.target == 0) || (points.first.closed == 0 && points.first.target == 1)) {
-                sb.append("{\"dataId\":87,\"equipName\":\"E_1\",\"equipRfidNo\":\"C4BB220A\",\"infoRfidNo\":\"${points.first.infoRfidNo}\",\"target\":1}")
+                sb.append("{\"dataId\":87,\"equipName\":\"E_53\",\"equipRfidNo\":\"E45EE23B\",\"infoRfidNo\":\"${points.first.infoRfidNo}\",\"target\":1}")
                 spl = ","
             }
             if ((points.second.closed == 1 && points.second.target == 0) || (points.second.closed == 0 && points.second.target == 1)) {
-                sb.append("$spl{\"dataId\":88,\"equipName\":\"E_2\",\"equipRfidNo\":\"E4FE160A\",\"infoRfidNo\":\"${points.second.infoRfidNo}\",\"target\":1}")
+                sb.append("$spl{\"dataId\":88,\"equipName\":\"E_56\",\"equipRfidNo\":\"14B1E33B\",\"infoRfidNo\":\"${points.second.infoRfidNo}\",\"target\":1}")
             }
         }
         // 所需挂锁
@@ -289,7 +289,7 @@ data class StateDetailTask(
     val mbForms: List<FormField> = listOf(),
     val node: Node = Node(),
     val step: Int = 0,
-    val points: Pair<Point, Point> = Point(equipRfidNo = "C4BB220A") to Point(equipRfidNo = "E4FE160A"),
+    val points: Pair<Point, Point> = Point(equipRfidNo = "E45EE23B") to Point(equipRfidNo = "14B1E33B"),
     val keys: MutableList<String> = mutableListOf("9C7B02F9"),
     val locks: MutableList<String> = mutableListOf("0351B1E4", "4353B1E4"),
     val useLocks: MutableList<String> = mutableListOf("0351B1E4", "4353B1E4")