Jelajahi Sumber

修复部分文字显示问题

Frankensteinly 10 bulan lalu
induk
melakukan
0e3aa73948

+ 7 - 0
app/src/main/java/com/grkj/iscs/presentation/simple/SimpleSettingActivity.kt

@@ -1,10 +1,12 @@
 package com.grkj.iscs.presentation.simple
 
 import android.content.Intent
+import com.grkj.iscs.R
 import com.grkj.iscs.base.BaseActivity
 import com.grkj.iscs.databinding.ActivitySimpleSettingBinding
 import com.grkj.iscs.modbus.ModBusController
 import com.grkj.iscs.presentation.PresentationManager
+import com.grkj.iscs.util.ToastUtils
 
 class SimpleSettingActivity : BaseActivity<ActivitySimpleSettingBinding>() {
 
@@ -14,22 +16,27 @@ class SimpleSettingActivity : BaseActivity<ActivitySimpleSettingBinding>() {
     override fun initView() {
         mBinding?.llFinishTicket?.setOnClickListener {
             PresentationManager.initTicket()
+            ToastUtils.tip(R.string.simple_ticket_tip)
         }
 
         mBinding?.llCloseAllLockBuckles?.setOnClickListener {
             ModBusController.controlAllLockBuckles(false)
+            ToastUtils.tip(R.string.simple_close_lock_tip)
         }
 
         mBinding?.llOpenAllLockBuckles?.setOnClickListener {
             ModBusController.controlAllLockBuckles(true)
+            ToastUtils.tip(R.string.simple_open_lock_tip)
         }
 
         mBinding?.llCloseAllKeyBuckles?.setOnClickListener {
             ModBusController.controlAllKeyBuckles(false)
+            ToastUtils.tip(R.string.simple_close_key_tip)
         }
 
         mBinding?.llOpenAllKeyBuckles?.setOnClickListener {
             ModBusController.controlAllKeyBuckles(true)
+            ToastUtils.tip(R.string.simple_open_key_tip)
         }
 
         mBinding?.llHome?.setOnClickListener {

+ 5 - 0
app/src/main/res/values-zh/strings.xml

@@ -185,4 +185,9 @@
     <string name="get_ticket_success">工作票获取成功</string>
     <string name="get_ticket_fail">工作票获取失败</string>
     <string name="ticket_is_done">工作票已完成</string>
+    <string name="simple_open_lock_tip">全部挂锁仓已打开</string>
+    <string name="simple_close_lock_tip">全部挂锁仓已关闭</string>
+    <string name="simple_open_key_tip">全部钥匙仓已打开</string>
+    <string name="simple_close_key_tip">全部钥匙仓已关闭</string>
+    <string name="simple_reset_ticket_tip">作业票已重置</string>
 </resources>

+ 7 - 2
app/src/main/res/values/strings.xml

@@ -170,8 +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_colocker_sam">Sam(%s)</string>
+    <string name="simple_colocker_robin">Robin(%s)</string>
     <string name="simple_lock_shared">Lock shared</string>
     <string name="simple_lock_unlocked">Unlocked</string>
     <string name="start_scanning_for_devices">Scanning for devices...</string>
@@ -185,4 +185,9 @@
     <string name="get_ticket_success">Work permit obtained successfully</string>
     <string name="get_ticket_fail">Failed to obtain work permit</string>
     <string name="ticket_is_done">Work permit completed</string>
+    <string name="simple_open_lock_tip">All lock storage opened</string>
+    <string name="simple_close_lock_tip">All lock storage closed</string>
+    <string name="simple_open_key_tip">All key storage opened</string>
+    <string name="simple_close_key_tip">All key storage closed</string>
+    <string name="simple_reset_ticket_tip">Work permit reset</string>
 </resources>