界面调整

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

@@ -28,10 +28,6 @@ class SimpleLoginActivity : BaseActivity<ActivitySimpleLoginBinding>() {
         get() = ActivitySimpleLoginBinding.inflate(layoutInflater)
 
     override fun initView() {
-        mBinding?.tvSetting?.setOnClickListener {
-            startActivity(Intent(this, SimpleSettingActivity::class.java))
-        }
-
         val path =
             Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).absolutePath + "/presentation/presentation.txt"
         val str = FileUtil.readTxt(path)

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

@@ -28,10 +28,10 @@ class SimpleProcessActivity : BaseActivity<ActivitySimpleProcessBinding>() {
         get() = ActivitySimpleProcessBinding.inflate(layoutInflater)
 
     override fun initView() {
-        mStepList = mutableListOf(mBinding!!.rlContainer0, mBinding!!.rlContainer1,
-            mBinding!!.rlContainer2, mBinding!!.rlContainer3, mBinding!!.rlContainer4, mBinding!!.rlContainer5)
+        mStepList = mutableListOf(mBinding!!.llContainer0, mBinding!!.llContainer1,
+            mBinding!!.llContainer2, mBinding!!.llContainer3, mBinding!!.llContainer4, mBinding!!.llContainer5, mBinding!!.llContainer6, mBinding!!.llContainer7)
 
-        mBinding?.tvReturnHome?.setOnClickListener {
+        mBinding?.rlHome?.setOnClickListener {
             finish()
         }
 
@@ -43,7 +43,7 @@ class SimpleProcessActivity : BaseActivity<ActivitySimpleProcessBinding>() {
         changeStep(step)
 
 
-        mBinding?.tvStart?.setOnClickListener {
+        mBinding?.rlConfirm?.setOnClickListener {
             PresentationManager.initTicket()
             PresentationManager.mStep = 1
             PresentationManager.mSimpleTicket?.status = 1
@@ -69,7 +69,6 @@ class SimpleProcessActivity : BaseActivity<ActivitySimpleProcessBinding>() {
                 mStepList[i].visibility = View.GONE
             }
         }
-        mBinding?.tvReturnHome?.visibility = if (step == 0) View.GONE else View.VISIBLE
     }
 
 

app/src/main/res/drawable/tip_bg_white.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/white" />
+    <corners android:radius="@dimen/selectable_input_radius" />
+    <stroke
+        android:width="@dimen/simple_btn_stroke"
+        android:color="#535B67" />
+</shape>

app/src/main/res/drawable/tip_bg_yellow.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/simple_tip_bg" />
+    <corners android:radius="@dimen/selectable_input_radius" />
+    <stroke
+        android:width="@dimen/simple_btn_stroke"
+        android:color="#1affffff" />
+</shape>

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

@@ -1,22 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center"
     tools:context=".presentation.simple.SimpleLoginActivity">
 
     <TextView
         style="@style/SimpleTextView"
-        android:layout_centerInParent="true"
-        android:text="@string/simple_please_swipe_card" />
+        android:textSize="40dp"
+        android:text="@string/simple_title" />
 
-    <TextView
-        android:id="@+id/tv_setting"
-        style="@style/SimpleButton"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentBottom="true"
-        android:layout_margin="10dp"
-        android:text="@string/simple_setting" />
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 
-</RelativeLayout>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/simple_please_swipe_card"
+        android:background="#a4adb3"
+        android:textColor="@color/white"
+        android:layout_marginTop="5dp"
+        android:padding="10dp"/>
+</LinearLayout>

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

@@ -4,153 +4,384 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:padding="20dp"
+    android:background="@color/white"
     tools:context=".presentation.simple.SimpleProcessActivity">
 
     <!--  步骤0：开始执行按钮  -->
-    <RelativeLayout
-        android:id="@+id/rl_container_0"
+    <LinearLayout
+        android:id="@+id/ll_container_0"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center"
         android:visibility="gone">
+
         <TextView
-            android:id="@+id/tv_start"
-            style="@style/SimpleButton"
-            android:text="@string/simple_start_ticket"/>
-    </RelativeLayout>
+            style="@style/SimpleTextView"
+            android:text="@string/simple_start_ticket"
+            android:textSize="@dimen/simple_large_text"
+            android:textStyle="bold"/>
+
+        <TextView
+            style="@style/SimpleTextView"
+            android:background="@drawable/tip_bg_white"
+            android:text="@string/simpe_tip_execute"
+            android:padding="20dp"
+            android:layout_marginVertical="20dp"/>
+
+        <RelativeLayout
+            android:id="@+id/rl_execute"
+            style="@style/SimpleBtnContainer">
+            <TextView
+                android:id="@+id/tv_execute"
+                style="@style/SimpleTextView"
+                android:text="@string/simple_execute"/>
+        </RelativeLayout>
+    </LinearLayout>
 
     <!--  步骤1  -->
-    <RelativeLayout
-        android:id="@+id/rl_container_1"
+    <LinearLayout
+        android:id="@+id/ll_container_1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="@dimen/simple_container_padding"
+        android:orientation="vertical"
+        android:gravity="center"
         android:visibility="gone">
 
         <TextView
             style="@style/SimpleTextView"
             android:text="@string/simple_ticket_content"
-            android:layout_centerHorizontal="true"/>
+            android:textSize="@dimen/simple_large_text"
+            android:textStyle="bold"/>
 
-        <TextView
-            style="@style/SimpleTextView"
-            android:layout_width="@dimen/simple_ticket_tip_width"
-            android:layout_height="match_parent"
-            android:gravity="left"
-            android:text="@string/simple_ticket_tip"
-            android:layout_alignParentRight="true"
-            android:background="@color/simple_tip_bg"
-            android:padding="10dp"/>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <TextView
+                style="@style/SimpleTextView"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:background="@drawable/tip_bg_white"
+                android:text="@string/simple_tip_content"
+                android:padding="10dp"
+                android:layout_gravity="center_vertical"
+                android:layout_margin="10dp"/>
 
-        <TextView
-            android:id="@+id/tv_confirm"
-            style="@style/SimpleButton"
-            android:text="@string/simple_confirm"
-            android:layout_alignParentBottom="true"
-            android:layout_margin="50dp"/>
-    </RelativeLayout>
+            <TextView
+                style="@style/SimpleTextView"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:gravity="left"
+                android:textSize="@dimen/simple_small_text"
+                android:background="@drawable/tip_bg_yellow"
+                android:text="@string/simple_tip_process"
+                android:padding="10dp"
+                android:layout_margin="10dp"/>
+        </LinearLayout>
+
+        <RelativeLayout
+            android:id="@+id/rl_confirm"
+            style="@style/SimpleBtnContainer">
+            <TextView
+                style="@style/SimpleTextView"
+                android:text="@string/simple_confirm"/>
+        </RelativeLayout>
+    </LinearLayout>
 
     <!--  步骤2  -->
-    <RelativeLayout
-        android:id="@+id/rl_container_2"
+    <LinearLayout
+        android:id="@+id/ll_container_2"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="@dimen/simple_container_padding"
+        android:orientation="vertical"
+        android:gravity="center"
         android:visibility="gone">
         <TextView
             style="@style/SimpleTextView"
             android:text="@string/simple_locking"
-            android:layout_centerHorizontal="true"/>
+            android:textSize="@dimen/simple_large_text"
+            android:textStyle="bold"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <TextView
+                style="@style/SimpleTextView"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:background="@drawable/tip_bg_white"
+                android:text="@string/simple_wait_for_key_return"
+                android:padding="10dp"
+                android:layout_gravity="center_vertical"
+                android:layout_margin="10dp"/>
 
+            <TextView
+                style="@style/SimpleTextView"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:gravity="left"
+                android:background="@drawable/tip_bg_yellow"
+                android:text="@string/simple_tip_process2"
+                android:padding="10dp"
+                android:layout_margin="10dp"/>
+        </LinearLayout>
+
+        <RelativeLayout
+            android:id="@+id/rl_waiting"
+            style="@style/SimpleBtnContainer">
+            <TextView
+                style="@style/SimpleTextView"
+                android:text="@string/simple_waiting"/>
+        </RelativeLayout>
+
+    </LinearLayout>
+
+    <!--  步骤3  -->
+    <LinearLayout
+        android:id="@+id/ll_container_3"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center"
+        android:visibility="gone">
         <TextView
             style="@style/SimpleTextView"
-            android:text="@string/simple_wait_for_key_return"
+            android:text="@string/simple_wait_for_colockers_confirm"
             android:textSize="@dimen/simple_large_text"
-            android:layout_centerInParent="true"/>
+            android:textStyle="bold"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <TextView
+                style="@style/SimpleTextView"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:background="@drawable/tip_bg_white"
+                android:text="@string/simple_wati_for_lock_share"
+                android:padding="10dp"
+                android:layout_gravity="center_vertical"
+                android:layout_margin="10dp"/>
+
+            <TextView
+                style="@style/SimpleTextView"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:gravity="left"
+                android:background="@drawable/tip_bg_yellow"
+                android:text="@string/simple_tip_process2"
+                android:padding="10dp"
+                android:layout_margin="10dp"/>
+        </LinearLayout>
 
         <TextView
             style="@style/SimpleTextView"
-            android:layout_width="@dimen/simple_ticket_tip_width"
-            android:gravity="left"
-            android:text="@string/simple_ticket_tip"
-            android:layout_alignParentRight="true"
-            android:background="@color/simple_tip_bg"
+            android:background="@drawable/tip_bg_white"
+            android:text="@string/simple_shared"
             android:padding="10dp"/>
-    </RelativeLayout>
+    </LinearLayout>
 
-    <!--  步骤3  -->
-    <RelativeLayout
-        android:id="@+id/rl_container_3"
+    <!--  步骤4  -->
+    <LinearLayout
+        android:id="@+id/ll_container_4"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="@dimen/simple_container_padding"
+        android:orientation="vertical"
+        android:gravity="center"
         android:visibility="gone">
         <TextView
             style="@style/SimpleTextView"
-            android:text="@string/simple_wait_for_colockers_confirm"
-            android:layout_centerHorizontal="true"/>
+            android:text="@string/simple_in_maintenance"
+            android:textSize="@dimen/simple_large_text"
+            android:textStyle="bold"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <TextView
+                style="@style/SimpleTextView"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:background="@drawable/tip_bg_white"
+                android:text="@string/simple_maintenance_workers"
+                android:padding="10dp"
+                android:layout_gravity="center_vertical"
+                android:layout_margin="10dp"/>
+
+            <TextView
+                style="@style/SimpleTextView"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:gravity="left"
+                android:background="@drawable/tip_bg_yellow"
+                android:text="@string/simple_tip_process4"
+                android:padding="10dp"
+                android:layout_margin="10dp"/>
+        </LinearLayout>
 
         <TextView
             style="@style/SimpleTextView"
-            android:layout_width="150dp"
-            android:text="@string/simple_colocker_tip"
-            android:gravity="left"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="50dp"/>
+            android:background="@drawable/tip_bg_white"
+            android:text="@string/simple_shared"
+            android:padding="10dp"/>
+    </LinearLayout>
 
+    <!--  步骤5  -->
+    <LinearLayout
+        android:id="@+id/ll_container_5"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center"
+        android:visibility="gone">
         <TextView
             style="@style/SimpleTextView"
-            android:text="@string/simple_wait_for_colockers_action"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="50dp"/>
-    </RelativeLayout>
+            android:text="@string/simple_maintenance_finished"
+            android:textSize="@dimen/simple_large_text"
+            android:textStyle="bold"/>
 
-    <!--  步骤4  -->
-    <RelativeLayout
-        android:id="@+id/rl_container_4"
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <TextView
+                style="@style/SimpleTextView"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:background="@drawable/tip_bg_white"
+                android:text="@string/simple_locker_get_key"
+                android:padding="10dp"
+                android:layout_gravity="center_vertical"
+                android:layout_margin="10dp"/>
+
+            <TextView
+                style="@style/SimpleTextView"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:gravity="left"
+                android:background="@drawable/tip_bg_yellow"
+                android:text="@string/simple_tip_process5"
+                android:padding="10dp"
+                android:layout_margin="10dp"/>
+        </LinearLayout>
+
+        <RelativeLayout
+            android:id="@+id/rl_confirm_complete"
+            style="@style/SimpleBtnContainer">
+            <TextView
+                style="@style/SimpleTextView"
+                android:text="@string/simple_confirm"/>
+        </RelativeLayout>
+    </LinearLayout>
+
+
+    <!--  步骤6  -->
+    <LinearLayout
+        android:id="@+id/ll_container_6"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="@dimen/simple_container_padding"
+        android:orientation="vertical"
+        android:gravity="center"
         android:visibility="gone">
+
         <TextView
             style="@style/SimpleTextView"
-            android:text="@string/simple_in_maintenance"
-            android:layout_centerHorizontal="true"/>
+            android:text="@string/simple_unlock_in_progress"
+            android:textSize="@dimen/simple_large_text"
+            android:textStyle="bold"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <TextView
+                style="@style/SimpleTextView"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:background="@drawable/tip_bg_white"
+                android:text="@string/simple_wait_for_device_return"
+                android:padding="10dp"
+                android:layout_gravity="center_vertical"
+                android:layout_margin="10dp"/>
+
+            <TextView
+                style="@style/SimpleTextView"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:gravity="left"
+                android:background="@drawable/tip_bg_yellow"
+                android:text="@string/simple_tip_process6"
+                android:padding="10dp"
+                android:layout_margin="10dp"/>
+        </LinearLayout>
+
+        <RelativeLayout
+            style="@style/SimpleBtnContainer">
+            <TextView
+                style="@style/SimpleTextView"
+                android:text="@string/simple_waiting"/>
+        </RelativeLayout>
+    </LinearLayout>
+
+
+    <!--  步骤7  -->
+    <LinearLayout
+        android:id="@+id/ll_container_7"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center"
+        android:visibility="gone">
 
         <TextView
             style="@style/SimpleTextView"
-            android:layout_width="@dimen/simple_ticket_tip_width"
-            android:layout_height="match_parent"
-            android:gravity="left"
-            android:text="@string/simple_maintenance_tip"
-            android:layout_alignParentRight="true"
-            android:background="@color/simple_tip_bg"
-            android:padding="10dp"/>
+            android:text="@string/simple_ticket_is_done"
+            android:textSize="@dimen/simple_large_text"
+            android:textStyle="bold"/>
 
         <TextView
             style="@style/SimpleTextView"
-            android:text="@string/simple_wait_for_colockers_action"
-            android:layout_centerHorizontal="true"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="50dp"/>
-    </RelativeLayout>
+            android:background="@drawable/tip_bg_white"
+            android:text="@string/simple_tip_complete"
+            android:padding="50dp"
+            android:layout_margin="10dp"/>
+    </LinearLayout>
 
-    <!--  步骤5  -->
+
+    <!--  通用  -->
     <RelativeLayout
-        android:id="@+id/rl_container_5"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="@dimen/simple_container_padding"
-        android:visibility="gone">
+        android:id="@+id/rl_home"
+        style="@style/SimpleBtnContainer"
+        android:layout_alignParentBottom="true">
         <TextView
             style="@style/SimpleTextView"
-            android:text="@string/simple_maintenance_finished"
-            android:layout_centerHorizontal="true"/>
+            android:text="@string/simple_return_home"/>
     </RelativeLayout>
 
-    <TextView
-        android:id="@+id/tv_return_home"
-        style="@style/SimpleButton"
+    <RelativeLayout
+        android:id="@+id/rl_setting"
+        style="@style/SimpleBtnContainer"
         android:layout_alignParentBottom="true"
-        android:text="@string/simple_return_home"/>
+        android:layout_alignParentRight="true">
+        <TextView
+            style="@style/SimpleTextView"
+            android:text="@string/simple_setting"/>
+    </RelativeLayout>
 </RelativeLayout>

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

@@ -0,0 +1,171 @@
+<resources>
+    <string name="app_name">ISCS</string>
+
+    <string name="common_net_dis">请确认网络状态正常后重试！</string>
+    <string name="common_net_download">请确认网络状态正常且下载地址无误后重试！</string>
+    <string name="common_download_erro_notag">下载失败！请确认文件存储位置后重试</string>
+
+    <string name="title_bar_current_work_ticket_num">当前作业数：%d</string>
+    <string name="home_page">主页</string>
+
+    <string name="enter_system">进入系统</string>
+
+    <string name="swipe_card_on_machine">请在机器上刷卡</string>
+    <string name="auth_success">认证通过！</string>
+    <string name="auth_fail">认证失败，请重试！</string>
+
+    <string name="selectable_input_prefix">*</string>
+
+    <string name="sop_number">作业编号</string>
+    <string name="sop_name">作业名称</string>
+    <string name="sop_type">作业类型</string>
+    <string name="start_time">开始时间</string>
+    <string name="end_time">结束时间</string>
+    <string name="current_time">当前时间</string>
+    <string name="current_sop_number">当前作业票数量</string>
+
+    <string name="ble_no_device_found">没有扫描到设备</string>
+    <string name="ble_connecting">连接中，请稍后...</string>
+    <string name="ble_connect_fail">连接失败，请重试！</string>
+    <string name="ble_disconnect">连接断开了，请重试！</string>
+
+    <string name="ticket_code_is_null">请填写作业票编号</string>
+    <string name="ticket_name_is_null">请填写作业票名称</string>
+    <string name="work_shop_is_null">请选择所属车间</string>
+    <string name="work_area_is_null">请选择所属区域</string>
+    <string name="sop_is_null">请选择SOP</string>
+    <string name="ticket_type_is_null">请选择作业票类型</string>
+
+    <string name="login_tip">请输入用户名和密码或者刷卡进行登录</string>
+    <string name="please_input_account">请输入账户</string>
+    <string name="please_input_password">请输入密码</string>
+    <string name="account_or_password_error">账号或密码错误</string>
+    <string name="confirm">确定</string>
+    <string name="device_is_initializing">正在初始化设备……</string>
+    <string name="create_ticket">开作业票</string>
+    <string name="current_tickets">当前作业票</string>
+    <string name="history_tickets">历史作业票</string>
+    <string name="please_login">请登录</string>
+
+    <string name="exit">退出</string>
+
+    <string name="not_started">未开始</string>
+    <string name="ready_to_lock">待上锁</string>
+    <string name="on_process">进行中</string>
+    <string name="ready_to_unlock">待解锁</string>
+    <string name="unlocked">已解锁</string>
+    <string name="finished">已结束</string>
+    <string name="key_return_confirm_tip">工作票尚未完成，是否确认归还钥匙？</string>
+    <string name="cancel">取消</string>
+    <string name="ticket_id_is_null">作业票编号不能为空</string>
+    <string name="lock_is_not_enough">锁具数量不足</string>
+    <string name="key_is_not_enough">钥匙数量不足</string>
+    <string name="get_key_info_fail">获取钥匙信息失败</string>
+
+    <string name="ticket_is_finished">工作票已完成</string>
+    <string name="ticket_is_locker_part_finished">工作票上锁人部分已完成</string>
+    <string name="ticket_is_colocker_part_finished">工作票共锁人部分已完成</string>
+
+    <string name="key_not_exists">钥匙不存在</string>
+
+    <string name="make_sure_to_colock">确定要共锁吗？</string>
+    <string name="make_sure_to_unlock">确定要解锁吗？</string>
+    <string name="key_return_tip">将读取工作票完成情况</string>
+
+    <!--  演示页  -->
+    <string name="presentation_select_sop">选择SOP</string>
+    <string name="presentation_select_workshop">选择车间</string>
+    <string name="presentation_select_line">选择产线</string>
+    <string name="presentation_ticket_name">作业票名称</string>
+    <string name="presentation_ticket_number">作业票编号</string>
+    <string name="presentation_ticket_type">作业票类型</string>
+    <string name="presentation_segregation_point">隔离点</string>
+    <string name="presentation_person_lock">上锁人</string>
+    <string name="presentation_person_lock_together">共锁人</string>
+    <string name="presentation_person_safety">安全员</string>
+    <string name="presentation_ticket_content">作业内容</string>
+
+    <string name="presentation_hint_workshop">请选择车间</string>
+    <string name="presentation_hint_line">请选择产线</string>
+    <string name="presentation_hint_sop">请选择...</string>
+    <string name="presentation_hint_name">请选择</string>
+    <string name="presentation_hint_number">请输入作业编号</string>
+    <string name="presentation_hint_type">请选择作业类型</string>
+    <string name="presentation_hint_point">请输入隔离点</string>
+    <string name="presentation_hint_locker">请选择上锁人</string>
+    <string name="presentation_hint_together">请输入共锁人</string>
+    <string name="presentation_hint_safety">请选择安全员</string>
+    <string name="presentation_hint_content">请输入作业内容</string>
+
+    <string name="presentation_login_tip">请刷卡登录</string>
+
+    <!--  简易版单机演示Demo  -->
+    <string name="simple_config_file_tip">未找到 presentation.txt 文件，请先在手机Download目录创建 presentation 文件夹，并将 presentation.txt 文件放入</string>
+    <string name="simple_please_swipe_card">请主锁人刷卡</string>
+    <string name="simple_device_is_initializing">正在初始化设备...</string>
+    <string name="simple_login_success_welcome">登录成功，欢迎 %s</string>
+    <string name="simple_setting">设置</string>
+    <string name="simple_return_home">首页</string>
+    <string name="simple_start_ticket">执行作业票</string>
+    <string name="simple_ticket_content">作业票内容</string>
+    <string name="simple_ticket_tip">流程提⽰\n1、主锁⼈去挂锁，钥匙去隔离点上锁\n2、通知维修⼯，维修⼯去 现场确认是否已锁定并能源隔离\n3、维修⼯确认共锁\n4、维修⼯进场维修\n5、维修结束，维修⼯解除共锁\n6、主锁⼈解锁，并归还钥匙与挂锁</string>
+    <string name="simple_confirm">确认</string>
+    <string name="simple_locking">上锁中</string>
+    <string name="simple_wait_for_key_return">等待钥匙归还</string>
+    <string name="simple_wait_for_colockers_confirm">等待维修工确认并共锁</string>
+    <string name="simple_colocker_tip">作业票已开始执⾏，请维修⼯确认现场是否已锁定，并能源是否已隔离\n确认后请打卡共锁</string>
+    <string name="simple_wait_for_colockers_action">等待维修工共锁</string>
+    <string name="simple_colocker">共锁人</string>
+    <string name="simple_locker">上锁人</string>
+    <string name="simple_in_maintenance">维修进行中</string>
+    <string name="simple_maintenance_tip">请维修⼈员，维修作业结束后，打卡解除共锁</string>
+    <string name="simple_maintenance_finished">维修结束</string>
+    <string name="simple_finish_ticket">结束作业票</string>
+    <string name="simple_close_all_lock_buckles">挂锁仓关</string>
+    <string name="simple_open_all_lock_buckles">挂锁仓开</string>
+    <string name="simple_close_all_key_buckles">钥匙仓关</string>
+    <string name="simple_open_all_key_buckles">钥匙仓开</string>
+    <string name="simple_setting_tip">设置⻚⾯，请专⼈操作</string>
+    <string name="simple_step_error">步骤异常</string>
+    <string name="simple_lock_no_ticket_to_handle">暂无可处理的工作票</string>
+    <string name="simple_workshop_assemble">组装车间</string>
+    <string name="simple_sop_type">保养</string>
+    <string name="simple_line">打包线</string>
+
+    <string name="simple_no_lock_dock">没有找到挂锁底座</string>
+    <string name="simple_lock_count_not_enough">挂锁数量不够</string>
+    <string name="simple_key_count_not_enough">钥匙数量不够</string>
+    <string name="simple_key_rfid_is_null">没有找到钥匙的RFID</string>
+    <string name="simple_locker_finished">解锁已完成</string>
+    <string name="simple_start_send_ticket">开始下发工作票...</string>
+    <string name="simple_sending_ticket">工作票下发中...</string>
+    <string name="simple_send_ticket_fail">工作票下发失败</string>
+    <string name="simple_switch_work_mode">切换钥匙为工作模式</string>
+    <string name="simple_key_not_found">未找到钥匙</string>
+    <string name="simple_key_not_exists">钥匙不存在</string>
+    <string name="simple_switch_work_mode_success">切换工作模式成功</string>
+    <string name="simple_switch_standby_mode_success">切换待机模式成功</string>
+    <string name="simple_get_ticket_part">获取工作票分包</string>
+    <string name="simple_get_ticket_status_done">工作票完成状态读取完成</string>
+    <string name="simple_no_key_ticket_data">钥匙无工作票数据</string>
+    <string name="simple_ticket_is_done">作业票结束</string>
+
+    <string name="simple_title">智 能 锁 控 系 统</string>
+    <string name="simple_execute">执行作业票</string>
+    <string name="simpe_tip_execute">主锁人登录后，可以:\n1.执行作业票，进行作业流程演示\n2.进入设置，进行其他功能演示\n3. 回到首页，退出登录</string>
+    <string name="simple_tip_content">作业票内容\n取 2把挂锁(绿灯)\n取1把钥匙(绿灯)\n锁定 2个隔离点\n2 名维修工共锁</string>
+    <string name="simple_tip_process">流程提示n1.主锁人取钥匙和挂锁，确认隔离点位，并进行上锁。n2.主锁人归还钥匙，上锁状态更新。n3.维修工确认现场锁定和能源隔离后，打卡共锁。\n4.维修工进行维修。\n5.维修结束，维修工解除共锁。\n6.主锁人解锁，并归还钥匙和挂锁。</string>
+    <string name="simple_tip_process2">流程提示\n主锁人使用钥匙，确认隔离点位，并进行上锁。\n全部上锁后，归还钥匙。</string>
+    <string name="simple_waiting">等待中</string>
+    <string name="simple_wati_for_lock_share">等待共锁</string>
+    <string name="simple_tip_process3">流程提示\n作业票已经开始执行，请维修工确认现场是否已锁定并确认能量源已隔离，确认后请打卡共锁。</string>
+    <string name="simple_shared">共锁人</string>
+    <string name="simple_maintenance_workers">现场人员</string>
+    <string name="simple_tip_process4">流程提示\n请维修人员，在维修作业后，打卡解除共锁。</string>
+    <string name="simple_locker_get_key">主锁人领取钥匙</string>
+    <string name="simple_tip_process5">流程提示\n维修结束，主锁人取钥匙，进行解锁。</string>
+    <string name="simple_unlock_in_progress">解锁中</string>
+    <string name="simple_wait_for_device_return">等待归还钥匙和挂锁</string>
+    <string name="simple_tip_process6">流程提示\n等待主锁人解锁后，归还钥匙和挂锁，结束作业票。</string>
+    <string name="simple_tip_complete">作业票流程已技术，请返回首页</string>
+</resources>

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

@@ -52,8 +52,9 @@
     <dimen name="dialog_card_login_width">320dp</dimen>
     <dimen name="dialog_card_login_height">180dp</dimen>
 
-    <dimen name="simple_btn_stroke">2dp</dimen>
+    <dimen name="simple_btn_stroke">1dp</dimen>
     <dimen name="simple_container_padding">20dp</dimen>
     <dimen name="simple_ticket_tip_width">180dp</dimen>
-    <dimen name="simple_large_text">30dp</dimen>
+    <dimen name="simple_large_text">25dp</dimen>
+    <dimen name="simple_small_text">10dp</dimen>
 </resources>

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

@@ -101,25 +101,25 @@
 
     <!--  简易版单机演示Demo  -->
     <string name="simple_config_file_tip">未找到 presentation.txt 文件，请先在手机Download目录创建 presentation 文件夹，并将 presentation.txt 文件放入</string>
-    <string name="simple_please_swipe_card">请刷卡</string>
+    <string name="simple_please_swipe_card">Card Swipe Login</string>
     <string name="simple_device_is_initializing">正在初始化设备...</string>
     <string name="simple_login_success_welcome">登录成功，欢迎 %s</string>
-    <string name="simple_setting">设置</string>
-    <string name="simple_return_home">回首页</string>
-    <string name="simple_start_ticket">执行作业票</string>
-    <string name="simple_ticket_content">作业票内容</string>
+    <string name="simple_setting">Settings</string>
+    <string name="simple_return_home">Home</string>
+    <string name="simple_start_ticket">Execute Work Permit</string>
+    <string name="simple_ticket_content">Work Permit Content</string>
     <string name="simple_ticket_tip">流程提⽰\n1、主锁⼈去挂锁，钥匙去隔离点上锁\n2、通知维修⼯，维修⼯去 现场确认是否已锁定并能源隔离\n3、维修⼯确认共锁\n4、维修⼯进场维修\n5、维修结束，维修⼯解除共锁\n6、主锁⼈解锁，并归还钥匙与挂锁</string>
-    <string name="simple_confirm">确认</string>
-    <string name="simple_locking">上锁中</string>
-    <string name="simple_wait_for_key_return">待钥匙归还</string>
-    <string name="simple_wait_for_colockers_confirm">等待维修工确认并共锁</string>
+    <string name="simple_confirm">Confirm</string>
+    <string name="simple_locking">Locking in progress</string>
+    <string name="simple_wait_for_key_return">Waiting for key return.</string>
+    <string name="simple_wait_for_colockers_confirm">Waiting for maintenance workers to confrm and share lock</string>
     <string name="simple_colocker_tip">作业票已开始执⾏，请维修⼯确认现场是否已锁定，并能源是否已隔离\n确认后请打卡共锁</string>
     <string name="simple_wait_for_colockers_action">等待维修工共锁</string>
     <string name="simple_colocker">共锁人</string>
     <string name="simple_locker">上锁人</string>
-    <string name="simple_in_maintenance">维修进行中</string>
+    <string name="simple_in_maintenance">Maintenance in progress</string>
     <string name="simple_maintenance_tip">请维修⼈员，维修作业结束后，打卡解除共锁</string>
-    <string name="simple_maintenance_finished">维修结束，主锁⼈解锁并归还锁具</string>
+    <string name="simple_maintenance_finished">Maintenance Completed</string>
     <string name="simple_finish_ticket">结束作业票</string>
     <string name="simple_close_all_lock_buckles">挂锁仓关</string>
     <string name="simple_open_all_lock_buckles">挂锁仓开</string>
@@ -148,5 +148,24 @@
     <string name="simple_get_ticket_part">获取工作票分包</string>
     <string name="simple_get_ticket_status_done">工作票完成状态读取完成</string>
     <string name="simple_no_key_ticket_data">钥匙无工作票数据</string>
-    <string name="simple_ticket_is_done">工作票已完成</string>
+    <string name="simple_ticket_is_done">Work Permit Completed</string>
+
+    <string name="simple_title">Intelligent LOTO System</string>
+    <string name="simple_execute">Execute</string>
+    <string name="simpe_tip_execute">After login, you can:\n1. Execute work permit to demonstrate the workflow.\n2.Access settings to demonstrate other features.\n3. Return to the homepage to log out.</string>
+    <string name="simple_tip_content">Work Permit Content\nTake 2 locks (Green Light)\nTake 1 key (Green Light)\nLock 2 isolation points\n2 maintenance workers share lock</string>
+    <string name="simple_tip_process">Process Instructions\nThe primary lock owner takes the key and locks, confrms the isolationpoints, and locks them.\nThe primary lock owner returns the key, and the locks status are updated\nThe maintenance workers confrm the on-site lock and energy isolation.then clock in to share lock.\nThe maintenance workers perform their work. After work fnished, the maintenance workers remove the shared lock.\nThe primary lock owner unlocks and returns the key and locks.</string>
+    <string name="simple_tip_process2">Process Instructions:\nThe primary lock owner uses the key to confrm theisolation points and locks them.\nOnce all points are locked, the key should bereturned.</string>
+    <string name="simple_waiting">Waiting</string>
+    <string name="simple_wati_for_lock_share">Waiting for lock-share:</string>
+    <string name="simple_tip_process3">Process Instructions:\nThe work permit has been started. Please have themaintenance workers confrm whether the site islocked and the energy sources are isolated. Onceconfrmed, please clock in to share lock.</string>
+    <string name="simple_shared">Shared</string>
+    <string name="simple_maintenance_workers">Maintenance Workers:</string>
+    <string name="simple_tip_process4">Process Instructions:\nAfter the maintenance work, please have themaintenance personnel clock out to unshare lock</string>
+    <string name="simple_locker_get_key">Primary lock owner retrieves the key.</string>
+    <string name="simple_tip_process5">Process Instructions:\nAfter the maintenance is completed, the primary lockowner retrieves the key to unlock.</string>
+    <string name="simple_unlock_in_progress">Unlocking in progress</string>
+    <string name="simple_wait_for_device_return">Waiting for the return ofthe key and lock</string>
+    <string name="simple_tip_process6">Process Instructions:\nWait for the primary lock owner to unlock and returnthe key and lock to complete the work permit.</string>
+    <string name="simple_tip_complete">The work permit process has been completed.\nPlease return to the homepage.</string>
 </resources>

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

@@ -62,4 +62,14 @@
         <item name="android:background">@drawable/simple_btn_bg</item>
         <item name="android:layout_margin">10dp</item>
     </style>
+
+    <style name="SimpleBtnContainer">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:padding">5dp</item>
+        <item name="android:layout_margin">10dp</item>
+        <item name="android:background">@drawable/simple_btn_bg</item>
+    </style>
 </resources>