修正工作票状态显示

app/src/main/java/com/grkj/iscs/fragment/TicketListFragment.kt

@@ -4,6 +4,11 @@ import com.grkj.iscs.R
 import com.grkj.iscs.base.BaseMvpFragment
 import com.grkj.iscs.databinding.FragmentTicketListBinding
 import com.grkj.iscs.iview.ITicketListView
+import com.grkj.iscs.model.Constants.TICKET_STATUS_FINISHED
+import com.grkj.iscs.model.Constants.TICKET_STATUS_NOT_STARTED
+import com.grkj.iscs.model.Constants.TICKET_STATUS_PROCESSING
+import com.grkj.iscs.model.Constants.TICKET_STATUS_READY_TO_LOCK
+import com.grkj.iscs.model.Constants.TICKET_STATUS_READY_TO_UNLOCK
 import com.grkj.iscs.model.vo.ticket.TicketPageRespVO
 import com.grkj.iscs.presenter.TicketListPresenter
 import com.grkj.iscs.util.SPUtils
@@ -37,17 +42,14 @@ class TicketListFragment(var type: Int) :
                 holder.setText(R.id.tv_type, presenter?.getTicketTypeName(ticket?.ticketType))
                 holder.setText(R.id.tv_start_time, ticket?.ticketStartTime)
                 holder.setText(R.id.tv_end_time, ticket?.ticketEndTime)
-//                holder.setText(
-//                    R.id.tv_action, when(ticket?.status) {
-//                    0 -> "待上锁人上锁"
-//                    1 -> "部分共锁人上锁"
-//                    2 -> "待共锁人解锁"
-//                    3 -> "部分共锁人解锁"
-//                    4 -> "待上锁人解锁"
-//                    5 -> "待归还设备"
-//                    6 -> "已完成"
-//                    else -> ""
-//                })
+                holder.setText(R.id.tv_action, when(ticket?.ticketStatus) {
+                    TICKET_STATUS_NOT_STARTED -> resources.getString(R.string.not_started)
+                    TICKET_STATUS_READY_TO_LOCK -> resources.getString(R.string.ready_to_lock)
+                    TICKET_STATUS_PROCESSING -> resources.getString(R.string.on_process)
+                    TICKET_STATUS_READY_TO_UNLOCK -> resources.getString(R.string.ready_to_unlock)
+                    TICKET_STATUS_FINISHED -> resources.getString(R.string.finished)
+                    else -> ""
+                })
             }
         }
 

app/src/main/java/com/grkj/iscs/model/Constants.kt

@@ -11,9 +11,9 @@ object Constants {
     const val USER_ROLE_GUARD = "jtguard"           // 作业观察员/安全员
 
     /*************************  作业票状态  *************************/
-    const val TICKET_STATUS_NOT_STARTED = 0         // 未开始
-    const val TICKET_STATUS_READY_TO_LOCK = 1       // 待上锁
-    const val TICKET_STATUS_PROCESSING = 2          // 进行中
-    const val TICKET_STATUS_READY_TO_UNLOCK = 3     // 待解锁
-    const val TICKET_STATUS_FINISHED = 4            // 已结束
+    const val TICKET_STATUS_NOT_STARTED = "0"         // 未开始
+    const val TICKET_STATUS_READY_TO_LOCK = "1"       // 待上锁
+    const val TICKET_STATUS_PROCESSING = "2"          // 进行中
+    const val TICKET_STATUS_READY_TO_UNLOCK = "3"     // 待解锁
+    const val TICKET_STATUS_FINISHED = "4"            // 已结束
 }

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

@@ -49,6 +49,12 @@
 
     <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="finished">已结束</string>
+
 
     <!--  演示页  -->
     <string name="presentation_select_sop">选择SOP</string>