临时提交

app/src/main/java/com/grkj/iscs/presentation/CurrentTicketActivity.kt

@@ -12,6 +12,12 @@ class CurrentTicketActivity : BaseActivity<ActivityCurrentTicketBinding>() {
         get() = ActivityCurrentTicketBinding.inflate(layoutInflater)
 
     override fun initView() {
+        mBinding?.loTitile?.tvNumber?.text = resources.getString(R.string.sop_number)
+        mBinding?.loTitile?.tvName?.text = resources.getString(R.string.sop_name)
+        mBinding?.loTitile?.tvType?.text = resources.getString(R.string.sop_type)
+        mBinding?.loTitile?.tvStartTime?.text = resources.getString(R.string.start_time)
+        mBinding?.loTitile?.tvEndTime?.text = resources.getString(R.string.end_time)
+
         mBinding?.rvCurrent?.adapter = object : CommonAdapter<PresentationManager.PServerTicket>(this, R.layout.item_rv_sop, PresentationManager.workTicketList) {
             override fun convert(holder: ViewHolder, ticket: PresentationManager.PServerTicket?, position: Int) {
                 holder.setText(R.id.tv_number, "${ticket?.ticketId}")

app/src/main/java/com/grkj/iscs/presentation/PresentationActivity.kt

@@ -43,7 +43,7 @@ class PresentationActivity :
                 mBinding?.siTicketName?.setText(sop.ticketName)
                 mBinding?.siTicketNumber?.setText(sop.ticketNumber)
                 mBinding?.siTicketType?.setText(sop.type)
-                mBinding?.siSegregationPoint?.setText(sop.pointList.toString())
+                mBinding?.siSegregationPoint?.setText(sop.pointList.map { it.name }.toString())
             }
         })
 
@@ -91,6 +91,10 @@ class PresentationActivity :
     }
 
     private fun confirm() {
+        if (mSelectedSopIdx == null) {
+            ToastUtils.tip("请选择SOP")
+            return
+        }
         // 蓝牙钥匙
         val keyList = ModBusController.getKeyByDockType(DeviceConst.DOCK_TYPE_PORTABLE)
         if (keyList.isNullOrEmpty()) {
@@ -135,10 +139,6 @@ class PresentationActivity :
      * 创建工作票
      */
     private fun createWorkTicket(lockList: List<DockBean.LockBean>) {
-        if (mSelectedSopIdx == null) {
-            ToastUtils.tip("请选择SOP")
-            return
-        }
         val ticket = WorkTicketBean()
         ticket.cardNo = cardRfid
         ticket.effectiveTime = 24

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

@@ -1,15 +1,23 @@
 <?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:padding="20dp"
     tools:context=".presentation.CurrentTicketActivity">
 
+    <include
+        android:id="@+id/lo_titile"
+        layout="@layout/item_rv_sop"
+        android:background="@color/main_color" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_current"
         style="@style/CommonRecyclerView"
+        android:background="@color/main_color"
         tools:itemCount="100"
         tools:listitem="@layout/item_rv_sop" />
 
-</RelativeLayout>
+</LinearLayout>