八大步骤item说明字段变更；作业进度页补充开关状态

app/src/main/java/com/grkj/iscs/model/vo/ticket/StepDetailRespVO.kt

@@ -11,6 +11,8 @@ data class StepDetailRespVO(
 
     val stepContent: String?,
 
+    val androidStepContent: String?,
+
     val lockNum: Int?,
 
     val userNum: Int?,

app/src/main/java/com/grkj/iscs/model/vo/ticket/TicketDetailMonitorRespVO.kt

@@ -55,6 +55,7 @@ data class TicketDetailMonitorRespVO(
         val unlockTime: String?,
         val prePointId: Long?,
         val locksetName: String?,
-        val remark: String?
+        val remark: String?,
+        val switchStatus: String?   // 0：开 1：关
     )
 }

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

@@ -1,6 +1,7 @@
 package com.grkj.iscs.view.fragment
 
 import android.view.View
+import android.widget.ImageView
 import android.widget.LinearLayout
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentJobProgressBinding
@@ -35,9 +36,11 @@ class JobProgressFragment(val goBack: () -> Unit) :
         mBinding?.rvPoint?.adapter =
             object : CommonAdapter<TicketDetailMonitorRespVO.IsJobTicketPointsVO>(requireActivity(), R.layout.item_rv_point, mPointList) {
                 override fun convert(holder: ViewHolder, point: TicketDetailMonitorRespVO.IsJobTicketPointsVO, position: Int) {
-                    // TODO 缺开关状态
                     holder.setText(R.id.tv_name, point.pointName)
                     holder.setText(R.id.tv_function, point.remark)
+                    holder.setVisible(R.id.iv_status, point.switchStatus != null)
+                    holder.getView<ImageView>(R.id.iv_status)
+                        .setBackgroundResource(if (point.switchStatus == "1") R.mipmap.switch_off else R.mipmap.switch_on)
                     when(point.pointStatus) {
                         "1" -> {
                             holder.setVisible(R.id.ll_lock_status, true)

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

@@ -64,7 +64,7 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
                 holder.setVisible(R.id.iv_arrow_bottom, step.index == 4)
                 holder.getView<ImageView>(R.id.iv_arrow_right).rotation = if (step.index > 5) 180f else 0f
                 holder.getView<ImageView>(R.id.iv_icon).setImageResource(step.pic)
-                holder.setText(R.id.tv_name, step.stepDetail?.stepContent)
+                holder.setText(R.id.tv_name, step.stepDetail?.androidStepContent)
                 holder.setText(R.id.tv_index, step.indexStr)
                 holder.getView<ImageView>(R.id.iv_status).setImageResource(if (step.stepDetail?.stepStatus == "1") R.mipmap.step_executed else R.mipmap.step_not_executed)
                 holder.setText(R.id.tv_status,

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

@@ -35,11 +35,17 @@
             android:layout_marginVertical="@dimen/common_spacing_small"
             android:background="@color/common_bg_white_30" />
 
-        <ImageView
-            android:id="@+id/iv_status"
+        <RelativeLayout
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1" />
+            android:layout_weight="1">
+
+            <ImageView
+                android:id="@+id/iv_status"
+                android:layout_width="35dp"
+                android:layout_height="15dp"
+                android:layout_centerInParent="true"/>
+        </RelativeLayout>
 
         <View
             android:layout_width="@dimen/divider_line_width"
@@ -57,10 +63,10 @@
                 android:id="@+id/ll_lock_status"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_marginVertical="@dimen/common_spacing_small"
                 android:background="@drawable/lock_status_bg_selector"
                 android:gravity="center"
                 android:orientation="horizontal"
-                android:layout_marginVertical="@dimen/common_spacing_small"
                 android:visibility="invisible">
 
                 <ImageView