完成分配人员功能；修复错误的按钮显示

app/src/main/java/com/grkj/iscs/util/NetApi.kt

@@ -630,7 +630,11 @@ object NetApi {
                 "ticketUserDTOList" to userList
             ),
             { res, _, _ ->
-                println("haha : $res")
+                res?.let {
+                    callBack.invoke(true)
+                } ?: run {
+                    callBack.invoke(false)
+                }
             }, isGet = false, isAuth = true
         )
     }

app/src/main/java/com/grkj/iscs/view/fragment/WorkerFragment.kt

@@ -33,8 +33,12 @@ class WorkerFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> U
 
     override fun initView() {
         mBinding?.layoutLocker?.ivPhoto?.isSelected = true
-        mBinding?.cbBack?.setOnClickListener {
-            goBack()
+
+        mBinding?.cbCancel?.setOnClickListener { goBack() }
+        mBinding?.cbConfirm?.setOnClickListener {
+            presenter?.updateTicketUser(mPageChangeBO?.ticketId!!, mSelectedList) {
+                if (it) { goBack() }
+            }
         }
 
         mBinding?.rvColockerSelected?.adapter =

app/src/main/java/com/grkj/iscs/view/presenter/WorkerPresenter.kt

@@ -1,7 +1,9 @@
 package com.grkj.iscs.view.presenter
 
 import com.grkj.iscs.R
+import com.grkj.iscs.model.Constants.USER_ROLE_LOCKER
 import com.grkj.iscs.model.vo.ticket.TicketDetailRespVO
+import com.grkj.iscs.model.vo.ticket.TicketUserReqVO
 import com.grkj.iscs.model.vo.user.UserListRespVO
 import com.grkj.iscs.util.Executor
 import com.grkj.iscs.util.NetApi
@@ -41,4 +43,20 @@ class WorkerPresenter : BasePresenter<IWorkerView>() {
             }
         }
     }
+
+    fun updateTicketUser(
+        ticketId: Long,
+        userList: MutableList<TicketUserReqVO>,
+        callBack: (Boolean) -> Unit
+    ) {
+        if (userList.none { it.userRole == USER_ROLE_LOCKER }) {
+            ToastUtils.tip(R.string.please_select_locker)
+            return
+        }
+        NetApi.updateTicketUser(ticketId, userList) {
+            Executor.runOnMain {
+                callBack(it)
+            }
+        }
+    }
 }

app/src/main/java/com/grkj/iscs/view/widget/CommonBtn.kt

@@ -40,4 +40,8 @@ class CommonBtn(private val ctx: Context, attrs: AttributeSet) : LinearLayout(ct
     fun setText(text: String) {
         mBinding.tvName.text = text
     }
+
+    fun setIcon(icon: Int) {
+        mBinding.iv.setImageResource(icon)
+    }
 }

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

@@ -17,14 +17,15 @@
         app:btn_name="@string/back" />
 
     <com.grkj.iscs.view.widget.CommonBtn
+        android:id="@+id/cb_action"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_marginRight="@dimen/common_spacing"
         android:layout_toLeftOf="@id/cb_back"
         app:btn_bg="@drawable/common_btn_red_bg"
-        app:btn_icon="@mipmap/stop"
-        app:btn_name="@string/go_unlocking" />
+        app:btn_icon="@mipmap/ticket_lock"
+        app:btn_name="@string/go_locking" />
 
     <RelativeLayout
         android:layout_width="match_parent"

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

@@ -7,25 +7,25 @@
     tools:context=".view.fragment.WorkerFragment">
 
     <com.grkj.iscs.view.widget.CommonBtn
-        android:id="@+id/cb_back"
+        android:id="@+id/cb_cancel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_alignParentBottom="true"
-        app:btn_bg="@drawable/common_btn_blue_bg"
-        app:btn_icon="@mipmap/go_back"
-        app:btn_name="@string/back" />
+        app:btn_bg="@drawable/common_btn_red_bg"
+        app:btn_icon="@mipmap/cancel"
+        app:btn_name="@string/cancel" />
 
     <com.grkj.iscs.view.widget.CommonBtn
-        android:id="@+id/cb_cancel"
+        android:id="@+id/cb_confirm"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_marginRight="@dimen/common_spacing"
-        android:layout_toLeftOf="@id/cb_back"
-        app:btn_bg="@drawable/common_btn_red_bg"
-        app:btn_icon="@mipmap/stop"
-        app:btn_name="@string/cancel_the_job" />
+        android:layout_toLeftOf="@id/cb_cancel"
+        app:btn_bg="@drawable/common_btn_blue_bg"
+        app:btn_icon="@mipmap/confirm"
+        app:btn_name="@string/confirm" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"

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

@@ -40,7 +40,6 @@
     <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>
@@ -155,7 +154,10 @@
     <string name="colocked">已共锁</string>
     <string name="unlocked">已解锁</string>
     <string name="locked">未解锁</string>
+    <string name="go_locking">去上锁</string>
     <string name="go_unlocking">去解锁</string>
     <string name="please_select_machinery">请选择工艺</string>
     <string name="please_select_sop_type">请选择SOP类型</string>
+    <string name="confirm">确定</string>
+    <string name="please_select_locker">请选择上锁人</string>
 </resources>