Ver código fonte

补充部分辅助演示逻辑

Frankensteinly 11 meses atrás
pai
commit
39173aba18

+ 42 - 7
app/src/main/java/com/grkj/iscs/activity/test/ProcessDemoActivity.kt

@@ -4,6 +4,7 @@ import com.grkj.iscs.base.BaseActivity
 import com.grkj.iscs.databinding.ActivityProcessDemoBinding
 import com.grkj.iscs.extentions.serialNo
 import com.grkj.iscs.model.vo.lock.LockTakeUpdateReqVO
+import com.grkj.iscs.model.vo.ticket.TicketDetailRespVO
 import com.grkj.iscs.util.NetApi
 import com.grkj.iscs.util.SPUtils
 import com.grkj.iscs.util.ToastUtils
@@ -13,10 +14,13 @@ import com.grkj.iscs.util.ToastUtils
  */
 class ProcessDemoActivity : BaseActivity<ActivityProcessDemoBinding>() {
 
+    private var ticketDetail: TicketDetailRespVO? = null
+
     override val viewBinding: ActivityProcessDemoBinding
         get() = ActivityProcessDemoBinding.inflate(layoutInflater)
 
     override fun initView() {
+        mBinding?.etSerialNo?.setText(serialNo())
         mBinding?.login?.setOnClickListener { login() }
         mBinding?.logout?.setOnClickListener { NetApi.logout() }
         mBinding?.ticketDetail?.setOnClickListener { getTicketDetail() }
@@ -48,16 +52,29 @@ class ProcessDemoActivity : BaseActivity<ActivityProcessDemoBinding>() {
             return
         }
         NetApi.getTicketDetail(mBinding?.etTicketId?.text.toString().toLong()) {
-
+            ticketDetail = it
         }
     }
 
     private fun updateLockTake() {
-        if (mBinding?.etLockNfc?.text.isNullOrEmpty()) {
+        val str = mBinding?.etLockNfc?.text.toString()
+        if (str.isEmpty()) {
             ToastUtils.tip("请填写锁的NFC")
             return
         }
+        if (ticketDetail == null) {
+            ToastUtils.tip("请先获取工单详情")
+            return
+        }
+        if (mBinding?.etSerialNo?.text.isNullOrEmpty()) {
+            ToastUtils.tip("请填写序列号")
+            return
+        }
         val list = mutableListOf<LockTakeUpdateReqVO>()
+        str.split(',').forEach {
+            list.add(LockTakeUpdateReqVO(ticketDetail?.ticketId, it, mBinding?.etSerialNo?.text.toString()))
+        }
+
         NetApi.updateLockTake(list) {
 
         }
@@ -68,7 +85,11 @@ class ProcessDemoActivity : BaseActivity<ActivityProcessDemoBinding>() {
             ToastUtils.tip("请填写锁的NFC")
             return
         }
-        NetApi.updateLockReturn(mBinding?.etLockNfc?.text.toString(), serialNo()) {
+        if (mBinding?.etSerialNo?.text.isNullOrEmpty()) {
+            ToastUtils.tip("请填写序列号")
+            return
+        }
+        NetApi.updateLockReturn(mBinding?.etLockNfc?.text.toString(), mBinding?.etSerialNo?.text.toString()) {
 
         }
     }
@@ -78,8 +99,15 @@ class ProcessDemoActivity : BaseActivity<ActivityProcessDemoBinding>() {
             ToastUtils.tip("请填写钥匙的NFC")
             return
         }
-        // TODO ticketId
-        NetApi.updateKeyTake(0, mBinding?.etKeyNfc?.text.toString(), serialNo()) {
+        if (ticketDetail == null) {
+            ToastUtils.tip("请先获取工单详情")
+            return
+        }
+        if (mBinding?.etSerialNo?.text.isNullOrEmpty()) {
+            ToastUtils.tip("请填写序列号")
+            return
+        }
+        NetApi.updateKeyTake(ticketDetail?.ticketId!!, mBinding?.etKeyNfc?.text.toString(), mBinding?.etSerialNo?.text.toString()) {
 
         }
     }
@@ -89,8 +117,15 @@ class ProcessDemoActivity : BaseActivity<ActivityProcessDemoBinding>() {
             ToastUtils.tip("请填写钥匙的NFC")
             return
         }
-        // TODO ticketId
-        NetApi.updateKeyReturn(0, mBinding?.etKeyNfc?.text.toString(), serialNo()) {
+        if (ticketDetail == null) {
+            ToastUtils.tip("请先获取工单详情")
+            return
+        }
+        if (mBinding?.etSerialNo?.text.isNullOrEmpty()) {
+            ToastUtils.tip("请填写序列号")
+            return
+        }
+        NetApi.updateKeyReturn(ticketDetail?.ticketId!!, mBinding?.etKeyNfc?.text.toString(), mBinding?.etSerialNo?.text.toString()) {
 
         }
     }

+ 13 - 0
app/src/main/res/layout/activity_process_demo.xml

@@ -46,6 +46,19 @@
             android:textSize="10sp" />
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/et_serial_no"
+            android:layout_width="200dp"
+            android:layout_height="wrap_content"
+            android:hint="Serial Number" />
+    </LinearLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"