refactor(更新) :

- 设置界面显示姓名
- 强制上传数据

app/src/main/java/com/grkj/iscs_mars/model/bo/LoginUserBO.kt

@@ -3,6 +3,7 @@ package com.grkj.iscs_mars.model.bo
 data class LoginUserBO(
     val userId: Long?,
     val userName: String?,
+    val nickName: String?,
     val keyCode: String?,
     val roleKeyList: MutableList<String>?,
     val userCardList: MutableList<String>?

app/src/main/java/com/grkj/iscs_mars/model/bo/WorkTicketGetBO.kt

@@ -121,7 +121,8 @@ class WorkTicketGetBO {
                         cont.resume(true to true)
                     } else {
                         // 否则，用本地 dataList 的所有 closed 字段判断 localTicketFinish，本地没完成就返回 false
-                        val allClosed = item.dataList?.all { it.closed == 1 } == true
+                        val allClosed =
+                            item.dataList?.all { it.closed == 1 && it.status == it.target } == true
                         cont.resume(allClosed to false)
                     }
                 }

app/src/main/java/com/grkj/iscs_mars/util/SPUtils.kt

@@ -30,6 +30,7 @@ object SPUtils {
     private const val KEY_LOGIN_USER_CARD_TYPE = "card_type"
     private const val KEY_LOGIN_USER_USER_ID = "user_id"
     private const val KEY_LOGIN_USER_USER_NAME = "user_name"
+    private const val KEY_LOGIN_USER_NICK_NAME = "nick_name"
     private const val KEY_LOGIN_USER_KEY_CODE = "key_code"
     private const val KEY_LOGIN_USER_ROLE_KEY = "role_key"
 
@@ -58,6 +59,7 @@ object SPUtils {
         return LoginUserBO(
             userId = sp.getLong(KEY_LOGIN_USER_USER_ID, 0),
             userName = sp.getString(KEY_LOGIN_USER_USER_NAME, null),
+            nickName = sp.getString(KEY_LOGIN_USER_NICK_NAME, null),
             keyCode = sp.getString(KEY_LOGIN_USER_KEY_CODE, null),
             roleKeyList = sp.getString(KEY_LOGIN_USER_ROLE_KEY, null)?.split(",")?.toMutableList(),
             userCardList = sp.getString(KEY_LOGIN_USER_CARD_NFC, null)?.split(",")?.toMutableList()
@@ -73,6 +75,9 @@ object SPUtils {
         userInfoRespVO.user?.userName?.let {
             edit.putString(KEY_LOGIN_USER_USER_NAME, it)
         }
+        userInfoRespVO.user?.nickName?.let {
+            edit.putString(KEY_LOGIN_USER_NICK_NAME, it)
+        }
         userInfoRespVO.user?.keyCode?.let {
             edit.putString(KEY_LOGIN_USER_KEY_CODE, it)
         }

app/src/main/java/com/grkj/iscs_mars/view/fragment/SettingFragment.kt

@@ -5,6 +5,8 @@ import com.grkj.iscs_mars.BusinessManager
 import com.grkj.iscs_mars.R
 import com.grkj.iscs_mars.databinding.FragmentSettingBinding
 import com.grkj.iscs_mars.extentions.setSelected
+import com.grkj.iscs_mars.model.ISCSDomainData
+import com.grkj.iscs_mars.util.SPUtils
 import com.grkj.iscs_mars.view.adapter.SettingAdapter
 import com.grkj.iscs_mars.view.base.BaseFragment
 import com.zhy.adapter.recyclerview.CommonAdapter
@@ -26,7 +28,7 @@ class SettingFragment : BaseFragment<FragmentSettingBinding>() {
             mSelectIndex = 0
             BusinessManager.logout(requireContext())
         }
-
+        mBinding?.nickname?.text = SPUtils.getLoginUser(requireContext())?.nickName
         mBinding?.rvFunc?.adapter = object : CommonAdapter<String>(
             requireContext(),
             R.layout.item_rv_setting,
@@ -46,7 +48,8 @@ class SettingFragment : BaseFragment<FragmentSettingBinding>() {
         mFragmentList.add(FingerprintConfigFragment())
         mFragmentList.add(FaceConfigFragment())
 
-        val pageAdapter = SettingAdapter(requireActivity().supportFragmentManager, lifecycle, mFragmentList)
+        val pageAdapter =
+            SettingAdapter(requireActivity().supportFragmentManager, lifecycle, mFragmentList)
 
         mBinding?.vp?.isUserInputEnabled = false
         mBinding?.vp?.offscreenPageLimit = 2

app/src/main/java/com/grkj/iscs_mars/view/presenter/JobProgressPresenter.kt

@@ -148,8 +148,7 @@ class JobProgressPresenter : BasePresenter<IJobProgressView>() {
                         ToastUtils.tip(R.string.please_take_out_ready_device_first)
                     }
                     val isNeedKey =
-                        ticketDetail.ticketKeyVOList?.filter { it.keyId == null }?.size != 1
-                                &&
+                        ticketDetail.ticketKeyVOList?.filter { it.keyId == null }?.size != 1 &&
                                 BusinessManager.mDeviceTakeList.none { it.deviceType == DEVICE_TYPE_KEY && it.ticketId == ticketId }
                     LogUtil.i("needLockCount = $needLockCount , readyLockCount = $readyLockCount, realCount = $realCount, isNeedKey = $isNeedKey")
                     BusinessManager.checkEquipCount(realCount, isNeedKey) { keyPair, lockMap ->

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

@@ -64,7 +64,7 @@
             android:id="@+id/item_setting"
             layout="@layout/item_rv_menu"
             android:layout_width="@dimen/item_rv_menu_size"
-            android:layout_height="@dimen/item_rv_menu_size"
+            android:layout_height="@dimen/item_rv_menu_height"
             android:layout_above="@id/v_divider_time" />
 
         <androidx.recyclerview.widget.RecyclerView

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

@@ -22,6 +22,27 @@
             style="@style/CommonTextView"
             android:layout_marginLeft="@dimen/common_spacing"
             android:text="@string/settings" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1" />
+
+        <ImageView
+            android:layout_width="@dimen/common_icon_size"
+            android:layout_height="@dimen/common_icon_size"
+            android:layout_marginRight="@dimen/common_spacing"
+            android:background="@mipmap/worker_selected" />
+
+        <TextView
+            android:id="@+id/nickname"
+            style="@style/CommonTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLength="4"
+            android:singleLine="true"
+            android:textSize="@dimen/common_text_size" />
     </LinearLayout>
 
     <com.grkj.iscs_mars.view.widget.CommonBtn

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/root"
     android:layout_width="@dimen/item_rv_menu_size"
-    android:layout_height="@dimen/item_rv_menu_size"
+    android:layout_height="@dimen/item_rv_menu_height"
     android:gravity="center"
     android:orientation="vertical">
 

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

@@ -71,6 +71,7 @@
     <string name="make_sure_to_colock">Confirm to co-lock?</string>
     <string name="make_sure_to_unlock">Confirm to unlock?</string>
     <string name="key_return_tip">Permit not completed, key return prohibited</string>
+    <string name="key_return_force_tip">The work order has not been completed. Do you want to force data upload</string>
 
     <!--  Presentation Page  -->
     <string name="presentation_select_sop">Select SOP</string>
@@ -397,4 +398,5 @@
     <string name="switch_close">Close</string>
     <string name="positioning">Positioning</string>
     <string name="operation">Operation</string>
+    <string name="ticket_get_failed">Ticket get failed，Please reposition the key</string>
 </resources>

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

@@ -71,6 +71,7 @@
     <string name="make_sure_to_colock">确定要共锁吗？</string>
     <string name="make_sure_to_unlock">确定要解锁吗？</string>
     <string name="key_return_tip">作业票尚未完成，禁止归还钥匙</string>
+    <string name="key_return_force_tip">作业票尚未完成，是否强制上传数据</string>
 
     <!--  演示页  -->
     <string name="presentation_select_sop">选择SOP</string>
@@ -397,4 +398,5 @@
     <string name="switch_close">关闭</string>
     <string name="positioning">定位</string>
     <string name="operation">操作</string>
+    <string name="ticket_get_failed">作业票获取失败，请重新放置钥匙</string>
 </resources>

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

@@ -80,6 +80,7 @@
     <dimen name="item_rv_step_width">80dp</dimen>
     <dimen name="item_rv_step_height">110dp</dimen>
     <dimen name="item_rv_menu_size">58dp</dimen>
+    <dimen name="item_rv_menu_height">50dp</dimen>
     <dimen name="item_rv_menu_icon_size">20dp</dimen>
     <dimen name="item_rv_login_width">100dp</dimen>
     <dimen name="item_rv_login_height">130dp</dimen>

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

@@ -71,6 +71,7 @@
     <string name="make_sure_to_colock">确定要共锁吗？</string>
     <string name="make_sure_to_unlock">确定要解锁吗？</string>
     <string name="key_return_tip">作业票尚未完成，禁止归还钥匙</string>
+    <string name="key_return_force_tip">作业票尚未完成，是否强制上传数据</string>
 
     <!--  演示页  -->
     <string name="presentation_select_sop">选择SOP</string>
@@ -397,4 +398,5 @@
     <string name="switch_close">关闭</string>
     <string name="positioning">定位</string>
     <string name="operation">操作</string>
+    <string name="ticket_get_failed">作业票获取失败，请重新放置钥匙</string>
 </resources>