补充工作票流程

app/src/main/AndroidManifest.xml

@@ -46,7 +46,7 @@
             android:name=".presentation.PresentationActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.SopActivity"
+            android:name=".activity.test.SopActivity"
             android:exported="false" />
         <activity
             android:name=".activity.HomeActivity"
@@ -55,10 +55,10 @@
             android:name=".activity.AuthActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.HttpActivity"
+            android:name=".activity.test.HttpActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.WebSocketActivity"
+            android:name=".activity.test.WebSocketActivity"
             android:exported="false" />
 
         <meta-data
@@ -69,10 +69,10 @@
             android:value="360" />
 
         <activity
-            android:name=".activity.ModbusActivity"
+            android:name=".activity.test.ModbusActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.BleActivity"
+            android:name=".activity.test.BleActivity"
             android:exported="false" />
         <activity
             android:name=".activity.MainActivity"

app/src/main/java/com/grkj/iscs/activity/MainActivity.kt

@@ -5,6 +5,11 @@ import com.grkj.iscs.base.BaseActivity
 import com.grkj.iscs.databinding.ActivityMainBinding
 import com.grkj.iscs.presentation.PresentationActivity
 import com.grkj.iscs.presentation.PresentationLoginActivity
+import com.grkj.iscs.activity.test.BleActivity
+import com.grkj.iscs.activity.test.HttpActivity
+import com.grkj.iscs.activity.test.ModbusActivity
+import com.grkj.iscs.activity.test.SopActivity
+import com.grkj.iscs.activity.test.WebSocketActivity
 
 class MainActivity : BaseActivity<ActivityMainBinding>() {
 

app/src/main/java/com/grkj/iscs/activity/BleActivity.kt → app/src/main/java/com/grkj/iscs/activity/test/BleActivity.kt

@@ -1,10 +1,5 @@
-package com.grkj.iscs.activity
+package com.grkj.iscs.activity.test
 
-import android.Manifest.permission.ACCESS_COARSE_LOCATION
-import android.Manifest.permission.ACCESS_FINE_LOCATION
-import android.Manifest.permission.BLUETOOTH_ADVERTISE
-import android.Manifest.permission.BLUETOOTH_CONNECT
-import android.Manifest.permission.BLUETOOTH_SCAN
 import android.app.Activity
 import android.bluetooth.BluetoothGatt
 import android.content.Intent
@@ -34,7 +29,6 @@ import com.leon.lfilepickerlibrary.LFilePicker
 import com.zhy.adapter.recyclerview.CommonAdapter
 import com.zhy.adapter.recyclerview.base.ViewHolder
 import pub.devrel.easypermissions.AfterPermissionGranted
-import pub.devrel.easypermissions.EasyPermissions
 import java.io.File
 
 class BleActivity : BaseActivity<ActivityBleBinding>() {

app/src/main/java/com/grkj/iscs/activity/HttpActivity.kt → app/src/main/java/com/grkj/iscs/activity/test/HttpActivity.kt

@@ -1,10 +1,8 @@
-package com.grkj.iscs.activity
+package com.grkj.iscs.activity.test
 
 import com.grkj.iscs.base.BaseActivity
 import com.grkj.iscs.databinding.ActivityHttpBinding
-import com.grkj.iscs.util.Executor
 import com.grkj.iscs.util.NetApi
-import com.grkj.iscs.util.log.LogUtil
 
 class HttpActivity : BaseActivity<ActivityHttpBinding>() {
 

app/src/main/java/com/grkj/iscs/activity/ModbusActivity.kt → app/src/main/java/com/grkj/iscs/activity/test/ModbusActivity.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.activity
+package com.grkj.iscs.activity.test
 
 import com.grkj.iscs.BusinessManager
 import com.grkj.iscs.base.BaseMvpActivity
@@ -7,18 +7,9 @@ import com.grkj.iscs.extentions.removeLeadingZeros
 import com.grkj.iscs.extentions.toHexStrings
 import com.grkj.iscs.iview.IModbusView
 import com.grkj.iscs.modbus.ModBusController
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_CARD
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_FINGERPRINT
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_KEY
-import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_LOCK
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_ELEC_LOCK_BOARD
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_KEY
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_LOCK
-import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_PORTABLE
 import com.grkj.iscs.presenter.ModBusPresenter
 import com.grkj.iscs.util.ToastUtils
 import com.grkj.iscs.util.log.LogUtil
-import java.util.stream.Collectors
 
 class ModbusActivity : BaseMvpActivity<IModbusView, ModBusPresenter, ActivityModbusBinding>() {
 

app/src/main/java/com/grkj/iscs/activity/SopActivity.kt → app/src/main/java/com/grkj/iscs/activity/test/SopActivity.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.activity
+package com.grkj.iscs.activity.test
 
 import com.grkj.iscs.base.BaseMvpActivity
 import com.grkj.iscs.databinding.ActivitySopBinding

app/src/main/java/com/grkj/iscs/activity/WebSocketActivity.kt → app/src/main/java/com/grkj/iscs/activity/test/WebSocketActivity.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.activity
+package com.grkj.iscs.activity.test
 
 import com.grkj.iscs.base.BaseActivity
 import com.grkj.iscs.databinding.ActivityWebSocketBinding

app/src/main/java/com/grkj/iscs/fragment/TicketListFragment.kt

@@ -25,7 +25,6 @@ class TicketListFragment(var type: Int) :
         get() = FragmentTicketListBinding.inflate(layoutInflater)
 
     override fun initView() {
-        presenter?.initData()
         mBinding?.tvFragment?.text = "Fragment $type"
 
         mBinding?.loTitile?.root?.setBackgroundColor(resources.getColor(R.color.main_color))
@@ -53,12 +52,7 @@ class TicketListFragment(var type: Int) :
             }
         }
 
-        val cardInfo = SPUtils.getLoginUser(requireContext())
-        if (cardInfo.cardNfc == null || cardInfo.userId == 0L) {
-            ToastUtils.tip(resources.getString(R.string.please_login))
-            return
-        }
-        presenter?.getTicketPage(cardInfo.userId!!, type) {
+        presenter?.initData(type) {
             if (!it?.records.isNullOrEmpty()) {
                 dataList.addAll(it?.records!!)
                 mBinding?.rvCurrent?.adapter?.notifyDataSetChanged()

app/src/main/java/com/grkj/iscs/presenter/TicketListPresenter.kt

@@ -1,16 +1,33 @@
 package com.grkj.iscs.presenter
 
+import com.grkj.iscs.R
 import com.grkj.iscs.base.BasePresenter
 import com.grkj.iscs.iview.ITicketListView
 import com.grkj.iscs.model.vo.ticket.TicketPageRespVO
 import com.grkj.iscs.model.vo.ticket.TicketTypeRespVO
 import com.grkj.iscs.util.Executor
 import com.grkj.iscs.util.NetApi
+import com.grkj.iscs.util.SPUtils
+import com.grkj.iscs.util.ToastUtils
 
 class TicketListPresenter : BasePresenter<ITicketListView>() {
 
     var mTicketTypeList = mutableListOf<TicketTypeRespVO>()
 
+    fun initData(ticketStatus: Int?, callBack: (TicketPageRespVO?) -> Unit) {
+        val cardInfo = SPUtils.getLoginUser(mContext!!)
+        if (cardInfo.cardNfc == null || cardInfo.userId == 0L) {
+            ToastUtils.tip(mContext!!.resources.getString(R.string.please_login))
+            return
+        }
+
+        NetApi.getTicketType {
+            mTicketTypeList = it as MutableList<TicketTypeRespVO>
+
+            getTicketPage(cardInfo.userId!!, ticketStatus, callBack)
+        }
+    }
+
     fun getTicketPage(userId: Long, ticketStatus: Int?, callBack: (TicketPageRespVO?) -> Unit) {
         NetApi.getTicketPage(0, 10, userId, ticketStatus) {
             Executor.runOnMain {
@@ -19,13 +36,20 @@ class TicketListPresenter : BasePresenter<ITicketListView>() {
         }
     }
 
-    fun initData() {
-        NetApi.getTicketType {
-            mTicketTypeList = it as MutableList<TicketTypeRespVO>
-        }
-    }
-
     fun getTicketTypeName(type: String?): String? {
         return mTicketTypeList.find { it.dictValue == type }?.dictLabel
     }
+
+    /**
+     * 获取作业票详细信息
+     */
+    fun getTicketDetail(ticketId: Long?) {
+        if (ticketId == null) {
+            ToastUtils.tip(mContext!!.resources.getString(R.string.ticket_id_is_null))
+            return
+        }
+        NetApi.getTicketDetail(ticketId) {
+            
+        }
+    }
 }

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

@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:background="@color/white"
     android:orientation="vertical"
-    tools:context=".activity.BleActivity">
+    tools:context=".activity.test.BleActivity">
 
     <com.scwang.smart.refresh.layout.SmartRefreshLayout
         android:id="@+id/srl"

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

@@ -5,6 +5,6 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activity.HttpActivity">
+    tools:context=".activity.test.HttpActivity">
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".activity.ModbusActivity">
+    tools:context=".activity.test.ModbusActivity">
 
 
     <LinearLayout

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activity.SopActivity">
+    tools:context=".activity.test.SopActivity">
 
     <com.grkj.iscs.widget.SelectableInput
         android:id="@+id/si_test"

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#123456"
-    tools:context=".activity.WebSocketActivity">
+    tools:context=".activity.test.WebSocketActivity">
 
     <com.grkj.iscs.widget.PageControl
         android:id="@+id/page"

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

@@ -56,6 +56,7 @@
     <string name="finished">已结束</string>
     <string name="key_return_confirm_tip">工作票尚未完成，是否确认归还钥匙？</string>
     <string name="cancel">取消</string>
+    <string name="ticket_id_is_null">作业票编号不能为空</string>
 
 
     <!--  演示页  -->