调整工艺SOP页样式

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

@@ -1,5 +1,7 @@
 package com.grkj.iscs.model
 
+import com.grkj.iscs.R
+
 object Constants {
     const val DEVICE_TYPE = 1 // 1.机柜 2.物料柜 3.手提柜 4.混合柜
     const val DEVICE_TYPE_NORMAL = "Android_Normal"     // 机柜
@@ -28,7 +30,6 @@ object Constants {
     const val TICKET_STATUS_FINISHED = "5"            // 已结束
 
     /*************************  工作状态——上锁人包含0-5，共锁人包含0、4、5  *************************/
-
     const val JOB_STATUS_NOT_STARTED = 0            // 未开始
     const val JOB_STATUS_ACQUIRE_LOCK = 1           // 取锁具
     const val JOB_STATUS_ACQUIRE_KEY = 2            // 取钥匙
@@ -36,11 +37,14 @@ object Constants {
     const val JOB_STATUS_READY_TO_UNLOCK = 4        // 已上锁
     const val JOB_STATUS_UNLOCKED = 5               // 已解锁
 
-    /*************************  作业票类型  *************************/
+    /*************************  SOP类型  *************************/
+    data class SopType(val icon: Int, val type: Int, val title: String)
+
+    val SOP_REPAIR = SopType(R.mipmap.repair, 0, "维修")
+    val SOP_PRE_MAINTENANCE = SopType(R.mipmap.pre_maintenance, 1, "PM")
+    val SOP_CHANGE_SHIFTS = SopType(R.mipmap.change_shifts, 2, "开收班")
+    val SOP_CLEAN = SopType(R.mipmap.clean, 3, "清洗")
+    val SOP_SWITCH_PRODUCT = SopType(R.mipmap.switch_product, 4, "换产")
 
-    const val TICKET_TYPE_REPAIR = 0                // 维修
-    const val TICKET_TYPE_PRE_MAINTENANCE = 1       // PM
-    const val TICKET_TYPE_CHANGE_SHIFTS = 2         // 开收班
-    const val TICKET_TYPE_CLEAN = 3                 // 清洗
-    const val TICKET_TYPE_SWITCH_PRODUCT = 4        // 换产
+    val mSopTypeList = mutableListOf(SOP_REPAIR, SOP_PRE_MAINTENANCE, SOP_CHANGE_SHIFTS, SOP_CLEAN, SOP_SWITCH_PRODUCT)
 }

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

@@ -1,10 +1,13 @@
 package com.grkj.iscs.view.fragment
 
+import android.widget.ImageView
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentTechnologySopBinding
+import com.grkj.iscs.model.Constants.mSopTypeList
 import com.grkj.iscs.model.vo.machinery.MachineryPageRespVO
+import com.grkj.iscs.presentation.PresentationManager.mSopList
 import com.grkj.iscs.view.base.BaseMvpFragment
 import com.grkj.iscs.view.iview.ITechnologySopView
 import com.grkj.iscs.view.presenter.TechnologySopPresenter
@@ -41,6 +44,9 @@ class TechnologySopFragment :
                         type?.dictLabel?.let {
                             holder.setText(R.id.tv_name, it)
                         }
+                        mSopTypeList.find { it.type.toString() == type?.dictValue }?.icon?.let { icon ->
+                            holder.getView<ImageView>(R.id.iv_type).setImageResource(icon)
+                        }
                     }
                 }
             }

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

@@ -5,11 +5,7 @@ import android.graphics.BitmapFactory
 import android.widget.ImageView
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentWorkshopBinding
-import com.grkj.iscs.model.Constants.TICKET_TYPE_CHANGE_SHIFTS
-import com.grkj.iscs.model.Constants.TICKET_TYPE_CLEAN
-import com.grkj.iscs.model.Constants.TICKET_TYPE_PRE_MAINTENANCE
-import com.grkj.iscs.model.Constants.TICKET_TYPE_REPAIR
-import com.grkj.iscs.model.Constants.TICKET_TYPE_SWITCH_PRODUCT
+import com.grkj.iscs.model.Constants
 import com.grkj.iscs.util.ToastUtils
 import com.grkj.iscs.view.base.BaseMvpFragment
 import com.grkj.iscs.view.iview.IWorkshopView
@@ -32,17 +28,20 @@ class WorkshopFragment :
 
     override fun initView() {
         jobStatisticList = mutableListOf(
-            JobStatistics(R.mipmap.repair, TICKET_TYPE_REPAIR, getString(R.string.repair), 0),
-            JobStatistics(R.mipmap.pre_maintenance, TICKET_TYPE_PRE_MAINTENANCE, getString(R.string.pre_maintenance), 0),
-            JobStatistics(R.mipmap.change_shifts, TICKET_TYPE_CHANGE_SHIFTS, getString(R.string.change_shifts), 0),
-            JobStatistics(R.mipmap.clean, TICKET_TYPE_CLEAN, getString(R.string.clean), 0),
-            JobStatistics(R.mipmap.switch_product, TICKET_TYPE_SWITCH_PRODUCT, getString(R.string.switch_product), 0),
+            JobStatistics(Constants.SOP_REPAIR, 0),
+            JobStatistics(Constants.SOP_PRE_MAINTENANCE, 0),
+            JobStatistics(Constants.SOP_CHANGE_SHIFTS, 0),
+            JobStatistics(Constants.SOP_CLEAN, 0),
+            JobStatistics(Constants.SOP_SWITCH_PRODUCT, 0)
         )
         
         mBinding?.rvStatistics?.adapter = object : CommonAdapter<JobStatistics>(requireActivity(), R.layout.item_rv_job_management, jobStatisticList) {
             override fun convert(holder: ViewHolder, statistic: JobStatistics, position: Int) {
-                holder.getView<ImageView>(R.id.iv).setImageResource(statistic.icon)
-                holder.setText(R.id.tv_name, if (statistic.count == 0) statistic.title else "${statistic.title}（${statistic.count}）")
+                holder.getView<ImageView>(R.id.iv).setImageResource(statistic.sopType.icon)
+                holder.setText(R.id.tv_name,
+                    if (statistic.count == 0) statistic.sopType.title
+                    else "${statistic.sopType.title}（${statistic.count}）"
+                )
             }
         }
 
@@ -57,7 +56,7 @@ class WorkshopFragment :
                 return@getWorkstationTicketList
             }
             jobStatisticList.forEach { itJob ->
-                itJob.count = it.count { it.ticketType == itJob.type.toString() }
+                itJob.count = it.count { it.ticketType == itJob.sopType.type.toString() }
             }
             mBinding?.rvStatistics?.adapter?.notifyDataSetChanged()
         }
@@ -103,5 +102,5 @@ class WorkshopFragment :
         return WorkshopPresenter()
     }
 
-    data class JobStatistics(val icon: Int, val type: Int, val title: String, var count: Int)
+    data class JobStatistics(var sopType: Constants.SopType, var count: Int)
 }

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

@@ -16,8 +16,8 @@
 
     <ImageView
         android:id="@+id/iv_pic"
-        android:layout_width="54dp"
-        android:layout_height="54dp"
+        android:layout_width="100dp"
+        android:layout_height="100dp"
         android:layout_marginTop="5dp"/>
 
     <androidx.recyclerview.widget.RecyclerView

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

@@ -6,15 +6,17 @@
     android:layout_margin="3dp"
     android:background="@drawable/item_rv_technology_sop_type_bg_selector"
     android:orientation="horizontal"
+    android:gravity="center_vertical"
     android:padding="@dimen/item_rv_technology_type_padding">
 
     <ImageView
         android:id="@+id/iv_type"
-        android:layout_width="15dp"
-        android:layout_height="15dp" />
+        android:layout_width="12dp"
+        android:layout_height="12dp" />
 
     <TextView
         android:id="@+id/tv_name"
         style="@style/CommonTextView"
+        android:layout_width="match_parent"
         android:textSize="@dimen/common_text_size_small" />
 </LinearLayout>

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

@@ -64,8 +64,8 @@
     <dimen name="item_rv_technology_height">207dp</dimen>
     <dimen name="item_rv_technology_width">118dp</dimen>
     <dimen name="item_rv_technology_type_height">18dp</dimen>
-    <dimen name="item_rv_technology_type_width">40dp</dimen>
-    <dimen name="item_rv_technology_type_padding">2dp</dimen>
+    <dimen name="item_rv_technology_type_width">46dp</dimen>
+    <dimen name="item_rv_technology_type_padding">3dp</dimen>
     <dimen name="dialog_tip_width">256dp</dimen>
     <dimen name="dialog_tip_height">144dp</dimen>