登录弹框在账号模式下，消失时清除账号密码；接入作业票名称显示；优化八大步骤页显示

app/src/main/java/com/grkj/iscs/view/dialog/LoginDialog.kt

@@ -44,7 +44,7 @@ class LoginDialog(val presenter: LoginPresenter?, val ctx: Context, private var
     /**
      * 根据类型显示弹框
      *
-     * @param loginType 1:人脸 2:指纹 3:工卡 4:账号
+     * @param loginType 0:人脸 1:指纹 2:工卡 3:账号
      */
     fun showByType(loginType: Int) {
         mLoginType = loginType
@@ -90,4 +90,12 @@ class LoginDialog(val presenter: LoginPresenter?, val ctx: Context, private var
         }
         return super.dispatchKeyEvent(event)
     }
+
+    override fun dismiss() {
+        super.dismiss()
+        if (mLoginType == 3) {
+            mBinding?.etAccount?.text?.clear()
+            mBinding?.etPassword?.text?.clear()
+        }
+    }
 }

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

@@ -2,6 +2,7 @@ package com.grkj.iscs.view.fragment
 
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.FragmentJobProgressBinding
+import com.grkj.iscs.model.bo.PageChangeBO
 import com.grkj.iscs.view.base.BaseMvpFragment
 import com.grkj.iscs.view.iview.IJobProgressVIew
 import com.grkj.iscs.view.presenter.JobProgressPresenter
@@ -35,6 +36,12 @@ class JobProgressFragment : BaseMvpFragment<IJobProgressVIew, JobProgressPresent
         }
     }
 
+    fun refreshPage(pageChangeBO: PageChangeBO) {
+        presenter?.getTicketDetail(pageChangeBO.ticketId) {
+            mBinding?.tvTitle?.text = it?.ticketName
+        }
+    }
+
     override fun initPresenter(): JobProgressPresenter {
         return JobProgressPresenter()
     }

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

@@ -93,6 +93,9 @@ class StepFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> Uni
     fun refreshPage(changeBO: PageChangeBO) {
         LogUtil.i("$changeBO")
         mChangePage = changeBO
+        presenter?.getTicketDetail(changeBO.ticketId) {
+            mBinding?.tvTitle?.text = it?.ticketName
+        }
         presenter?.getStepDetail(changeBO.ticketId!!) {
             mStepList.forEach { step ->
                 step.stepDetail = it?.find { it.stepIndex == step.index }

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

@@ -74,6 +74,12 @@ class WorkerFragment(val goBack: () -> Unit, val changePage: (PageChangeBO) -> U
             }
     }
 
+    fun refreshPage(pageChangeBO: PageChangeBO) {
+        presenter?.getTicketDetail(pageChangeBO.ticketId) {
+            mBinding?.tvTitle?.text = it?.ticketName
+        }
+    }
+
     override fun initPresenter(): WorkerPresenter {
         return WorkerPresenter()
     }

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

@@ -1,7 +1,26 @@
 package com.grkj.iscs.view.presenter
 
+import com.grkj.iscs.R
+import com.grkj.iscs.model.vo.ticket.TicketDetailRespVO
+import com.grkj.iscs.util.Executor
+import com.grkj.iscs.util.NetApi
+import com.grkj.iscs.util.ToastUtils
 import com.grkj.iscs.view.base.BasePresenter
 import com.grkj.iscs.view.iview.IJobProgressVIew
 
 class JobProgressPresenter : BasePresenter<IJobProgressVIew>() {
+    /**
+     * 获取作业票详细信息
+     */
+    fun getTicketDetail(ticketId: Long?, callBack: (TicketDetailRespVO?) -> Unit) {
+        if (ticketId == null) {
+            ToastUtils.tip(mContext!!.resources.getString(R.string.ticket_id_is_null))
+            return
+        }
+        NetApi.getTicketDetail(ticketId) {
+            Executor.runOnMain {
+                callBack.invoke(it)
+            }
+        }
+    }
 }

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

@@ -1,11 +1,14 @@
 package com.grkj.iscs.view.presenter
 
+import com.grkj.iscs.R
 import com.grkj.iscs.model.vo.machinery.MachineryDetailRespVO
 import com.grkj.iscs.model.vo.machinery.MachineryPageRespVO
 import com.grkj.iscs.model.vo.ticket.LotoMapRespVO
 import com.grkj.iscs.model.vo.ticket.StepDetailRespVO
+import com.grkj.iscs.model.vo.ticket.TicketDetailRespVO
 import com.grkj.iscs.util.Executor
 import com.grkj.iscs.util.NetApi
+import com.grkj.iscs.util.ToastUtils
 import com.grkj.iscs.view.base.BasePresenter
 import com.grkj.iscs.view.iview.IStepView
 
@@ -39,4 +42,19 @@ class StepPresenter : BasePresenter<IStepView>() {
             }
         }
     }
+
+    /**
+     * 获取作业票详细信息
+     */
+    fun getTicketDetail(ticketId: Long?, callBack: (TicketDetailRespVO?) -> Unit) {
+        if (ticketId == null) {
+            ToastUtils.tip(mContext!!.resources.getString(R.string.ticket_id_is_null))
+            return
+        }
+        NetApi.getTicketDetail(ticketId) {
+            Executor.runOnMain {
+                callBack.invoke(it)
+            }
+        }
+    }
 }

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

@@ -1,7 +1,26 @@
 package com.grkj.iscs.view.presenter
 
+import com.grkj.iscs.R
+import com.grkj.iscs.model.vo.ticket.TicketDetailRespVO
+import com.grkj.iscs.util.Executor
+import com.grkj.iscs.util.NetApi
+import com.grkj.iscs.util.ToastUtils
 import com.grkj.iscs.view.base.BasePresenter
 import com.grkj.iscs.view.iview.IWorkerView
 
 class WorkerPresenter : BasePresenter<IWorkerView>() {
+    /**
+     * 获取作业票详细信息
+     */
+    fun getTicketDetail(ticketId: Long?, callBack: (TicketDetailRespVO?) -> Unit) {
+        if (ticketId == null) {
+            ToastUtils.tip(mContext!!.resources.getString(R.string.ticket_id_is_null))
+            return
+        }
+        NetApi.getTicketDetail(ticketId) {
+            Executor.runOnMain {
+                callBack.invoke(it)
+            }
+        }
+    }
 }

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

@@ -46,8 +46,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="@id/tv_title"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintTop_toTopOf="@id/tv_title">
 
             <ImageView
                 android:id="@+id/iv_worker"
@@ -74,6 +75,7 @@
             android:id="@+id/ll_container"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_marginTop="@dimen/common_spacing_small"
             android:background="@drawable/item_rv_technology_sop_bg_normal"
             android:orientation="vertical"
             android:padding="2dp"
@@ -142,11 +144,11 @@
             android:layout_height="0dp"
             android:layout_marginLeft="@dimen/common_spacing_small"
             app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toBottomOf="@id/ll_container"
             app:layout_constraintHorizontal_weight="1150"
             app:layout_constraintLeft_toRightOf="@id/ll_container"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_title"
+            app:layout_constraintTop_toTopOf="@id/ll_container"
             app:spanCount="4" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </RelativeLayout>

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

@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/root"
     android:layout_width="15dp"
-    android:layout_height="20dp"
+    android:layout_height="18dp"
     android:layout_margin="@dimen/divider_line_width">
 
     <LinearLayout

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

@@ -41,12 +41,12 @@
                 android:id="@+id/iv_icon"
                 android:layout_width="55dp"
                 android:layout_height="26dp"
-                android:layout_marginTop="5dp" />
+                android:layout_marginTop="3dp" />
 
             <TextView
                 android:id="@+id/tv_name"
                 style="@style/CommonTextView"
-                android:layout_marginVertical="5dp"
+                android:layout_marginVertical="4dp"
                 android:textSize="@dimen/common_text_size_small" />
 
             <TextView
@@ -66,11 +66,11 @@
 
     <ImageView
         android:id="@+id/iv_arrow_bottom"
-        android:layout_width="11dp"
-        android:layout_height="11dp"
+        android:layout_width="9dp"
+        android:layout_height="9dp"
         android:layout_below="@id/cv_step"
         android:layout_centerHorizontal="true"
-        android:layout_marginVertical="5dp"
+        android:layout_marginVertical="4dp"
         android:rotation="90"
         android:src="@mipmap/arrow" />
 </RelativeLayout>

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

@@ -75,7 +75,7 @@
     <dimen name="dialog_tip_height">144dp</dimen>
     
     <dimen name="item_rv_step_width">80dp</dimen>
-    <dimen name="item_rv_step_height">111dp</dimen>
+    <dimen name="item_rv_step_height">110dp</dimen>
     <dimen name="item_rv_menu_size">58dp</dimen>
     <dimen name="item_rv_menu_icon_size">20dp</dimen>
     <dimen name="item_rv_login_width">100dp</dimen>