补充共锁人人名显示

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

@@ -42,6 +42,8 @@ class SimpleLoginActivity : BaseActivity<ActivitySimpleLoginBinding>() {
         PresentationManager.cardList = configJson.worker
         PresentationManager.mConfigKeyList = configJson.key
 
+        val nameList = mutableListOf(getString(R.string.simple_colocker_sam), getString(R.string.simple_colocker_robin))
+
         mLockerList = PresentationManager.cardList.filter { it.isLocker }
         for (i in mLockerList.indices) {
             PresentationManager.mLockerList.add(PresentationManager.PLockerBean("${getString(R.string.simple_locker)}${i + 1}}", mLockerList[i].rfid, 0))
@@ -50,7 +52,7 @@ class SimpleLoginActivity : BaseActivity<ActivitySimpleLoginBinding>() {
         for (i in togetherList.indices) {
             PresentationManager.mLockerTogetherList.add(
                 PresentationManager.PLockerTogetherBean(
-                    "${getString(R.string.simple_colocker)}${i + 1}",
+                    nameList[i],
                     false,
                     togetherList[i].rfid,
                     0

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

@@ -93,6 +93,9 @@ class SimpleProcessActivity : BaseActivity<ActivitySimpleProcessBinding>() {
                 mStepList[i].visibility = View.GONE
             }
         }
+        if (step == 3) {
+            updateSharedName()
+        }
     }
 
 
@@ -155,6 +158,30 @@ class SimpleProcessActivity : BaseActivity<ActivitySimpleProcessBinding>() {
             mBinding?.ivShared1?.background = ContextCompat.getDrawable(this, R.mipmap.lock)
             mBinding?.ivShared2?.background = ContextCompat.getDrawable(this, R.mipmap.lock)
         }
+        updateSharedName()
+    }
+
+    private fun updateSharedName() {
+        val samName = getString(R.string.simple_colocker_sam)
+        val samStatus = PresentationManager.mLockerTogetherList.find { it.name == samName }?.status
+        val samText = when (samStatus) {
+            1 -> getString(R.string.simple_colocker_sam, getString(R.string.simple_lock_shared))
+            2 -> getString(R.string.simple_colocker_sam, getString(R.string.simple_lock_unlocked))
+            else -> getString(R.string.simple_colocker_sam, " ")
+        }
+
+        val robinName = getString(R.string.simple_colocker_robin)
+        val robinStatus = PresentationManager.mLockerTogetherList.find { it.name == robinName }?.status
+        val robinText = when (robinStatus) {
+            1 -> getString(R.string.simple_colocker_robin, getString(R.string.simple_lock_shared))
+            2 -> getString(R.string.simple_colocker_robin, getString(R.string.simple_lock_unlocked))
+            else -> getString(R.string.simple_colocker_robin, " ")
+        }
+
+        val text = "${getString(R.string.simple_wati_for_lock_share)}\n1. $samText\n2. $robinText"
+
+        mBinding?.tvLockShared1?.text = text
+        mBinding?.tvLockShared2?.text = text
     }
 
     override fun dispatchKeyEvent(event: KeyEvent): Boolean {

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

@@ -183,6 +183,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
             <TextView
+                android:id="@+id/tv_lock_shared1"
                 style="@style/SimpleTextView"
                 android:layout_width="0dp"
                 android:layout_weight="1"
@@ -244,6 +245,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
             <TextView
+                android:id="@+id/tv_lock_shared2"
                 style="@style/SimpleTextView"
                 android:layout_width="0dp"
                 android:layout_weight="1"

app/src/main/res/values-zh/strings.xml

@@ -170,4 +170,8 @@
     <string name="simple_tip_complete">作业票流程已技术，请返回首页</string>
     <string name="simple_please_wait_for_colocker_to_finish">请等待维修人员完成操作</string>
     <string name="simple_key_is_not_connected">钥匙未连接</string>
+    <string name="simple_colocker_sam">山姆（%s）</string>
+    <string name="simple_colocker_robin">罗宾（%s）</string>
+    <string name="simple_lock_shared">已共锁</string>
+    <string name="simple_lock_unlocked">已解锁</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -170,4 +170,8 @@
     <string name="simple_tip_complete">The work permit process has been completed.\nPlease return to the homepage.</string>
     <string name="simple_please_wait_for_colocker_to_finish">Waiting for maintenance workers to finish</string>
     <string name="simple_key_is_not_connected">Key is not connected</string>
+    <string name="simple_colocker_sam">Sam</string>
+    <string name="simple_colocker_robin">Robin</string>
+    <string name="simple_lock_shared">Lock shared</string>
+    <string name="simple_lock_unlocked">Unlocked</string>
 </resources>