调整项目代码目录结构

app/src/main/AndroidManifest.xml

@@ -30,22 +30,22 @@
         android:theme="@style/Theme.ISCS"
         tools:targetApi="31">
         <activity
-            android:name=".activity.HomeActivity"
+            android:name=".view.activity.HomeActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.test.ProcessDemoActivity"
+            android:name=".view.activity.test.ProcessDemoActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.TicketDetailActivity"
+            android:name=".view.activity.TicketDetailActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.TicketListActivity"
+            android:name=".view.activity.TicketListActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.LoginActivity"
+            android:name=".view.activity.LoginActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.CreateTicketActivity"
+            android:name=".view.activity.CreateTicketActivity"
             android:exported="false" />
         <activity
             android:name=".presentation.CurrentTicketActivity"
@@ -63,19 +63,19 @@
             android:name=".presentation.PresentationActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.test.SopActivity"
+            android:name=".view.activity.test.SopActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.CustomHomeActivity"
+            android:name=".view.activity.CustomHomeActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.AuthActivity"
+            android:name=".view.activity.AuthActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.test.RfidActivity"
+            android:name=".view.activity.test.RfidActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.test.WebSocketActivity"
+            android:name=".view.activity.test.WebSocketActivity"
             android:exported="false" />
 
         <meta-data
@@ -86,13 +86,13 @@
             android:value="360" />
 
         <activity
-            android:name=".activity.test.ModbusActivity"
+            android:name=".view.activity.test.ModbusActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.test.BleActivity"
+            android:name=".view.activity.test.BleActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.MainActivity"
+            android:name=".view.activity.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/com/grkj/iscs/BusinessManager.kt

@@ -6,7 +6,7 @@ import com.clj.fastble.BleManager
 import com.clj.fastble.data.BleDevice
 import com.clj.fastble.exception.BleException
 import com.google.gson.Gson
-import com.grkj.iscs.base.BaseActivity
+import com.grkj.iscs.view.base.BaseActivity
 import com.grkj.iscs.ble.BleBean
 import com.grkj.iscs.ble.BleCmdManager
 import com.grkj.iscs.ble.BleConst
@@ -17,7 +17,7 @@ import com.grkj.iscs.ble.CustomBleGattCallback
 import com.grkj.iscs.ble.CustomBleIndicateCallback
 import com.grkj.iscs.ble.CustomBleScanCallback
 import com.grkj.iscs.ble.CustomBleWriteCallback
-import com.grkj.iscs.dialog.TipDialog
+import com.grkj.iscs.view.dialog.TipDialog
 import com.grkj.iscs.extentions.removeLeadingZeros
 import com.grkj.iscs.extentions.serialNo
 import com.grkj.iscs.extentions.startsWith

app/src/main/java/com/grkj/iscs/iview/IAuthView.kt

@@ -1,5 +0,0 @@
-package com.grkj.iscs.iview
-
-import com.grkj.iscs.base.IView
-
-interface IAuthView : IView {}

app/src/main/java/com/grkj/iscs/iview/ICustomHomeView.kt

@@ -1,5 +0,0 @@
-package com.grkj.iscs.iview
-
-import com.grkj.iscs.base.IView
-
-interface ICustomHomeView : IView {}

app/src/main/java/com/grkj/iscs/iview/IHomeView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.iview
-
-import com.grkj.iscs.base.IView
-
-interface IHomeView : IView {
-}

app/src/main/java/com/grkj/iscs/iview/IJobManagementView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.iview
-
-import com.grkj.iscs.base.IView
-
-interface IJobManagementView : IView {
-}

app/src/main/java/com/grkj/iscs/iview/ILoginView.kt

@@ -1,5 +0,0 @@
-package com.grkj.iscs.iview
-
-import com.grkj.iscs.base.IView
-
-interface ILoginView : IView {}

app/src/main/java/com/grkj/iscs/iview/IMaterialManagementView.kt

@@ -1,6 +0,0 @@
-package com.grkj.iscs.iview
-
-import com.grkj.iscs.base.IView
-
-interface IMaterialManagementView : IView {
-}

app/src/main/java/com/grkj/iscs/iview/IModbusView.kt

@@ -1,5 +0,0 @@
-package com.grkj.iscs.iview
-
-import com.grkj.iscs.base.IView
-
-interface IModbusView : IView

app/src/main/java/com/grkj/iscs/iview/ISopView.kt

@@ -1,5 +0,0 @@
-package com.grkj.iscs.iview
-
-import com.grkj.iscs.base.IView
-
-interface ISopView : IView {}

app/src/main/java/com/grkj/iscs/iview/ITicketDetailView.kt

@@ -1,5 +0,0 @@
-package com.grkj.iscs.iview
-
-import com.grkj.iscs.base.IView
-
-interface ITicketDetailView : IView {}

app/src/main/java/com/grkj/iscs/iview/ITicketListView.kt

@@ -1,5 +0,0 @@
-package com.grkj.iscs.iview
-
-import com.grkj.iscs.base.IView
-
-interface ITicketListView : IView {}

app/src/main/java/com/grkj/iscs/presentation/CurrentTicketActivity.kt

@@ -1,7 +1,7 @@
 package com.grkj.iscs.presentation
 
 import com.grkj.iscs.R
-import com.grkj.iscs.base.BaseActivity
+import com.grkj.iscs.view.base.BaseActivity
 import com.grkj.iscs.databinding.ActivityCurrentTicketBinding
 import com.zhy.adapter.recyclerview.CommonAdapter
 import com.zhy.adapter.recyclerview.base.ViewHolder

app/src/main/java/com/grkj/iscs/presentation/ILockerTogetherView.kt

@@ -1,6 +1,6 @@
 package com.grkj.iscs.presentation
 
-import com.grkj.iscs.base.IView
+import com.grkj.iscs.view.base.IView
 
 interface ILockerTogetherView : IView {
 }

app/src/main/java/com/grkj/iscs/presentation/IPresentationView.kt

@@ -1,5 +1,5 @@
 package com.grkj.iscs.presentation
 
-import com.grkj.iscs.base.IView
+import com.grkj.iscs.view.base.IView
 
 interface IPresentationView : IView {}

app/src/main/java/com/grkj/iscs/presentation/LockerActivity.kt

@@ -3,7 +3,7 @@ package com.grkj.iscs.presentation
 import android.content.Intent
 import androidx.appcompat.app.AlertDialog
 import com.grkj.iscs.BusinessManager
-import com.grkj.iscs.base.BaseActivity
+import com.grkj.iscs.view.base.BaseActivity
 import com.grkj.iscs.databinding.ActivityLockerBinding
 import com.grkj.iscs.extentions.toHexStrings
 import com.grkj.iscs.modbus.ModBusController

app/src/main/java/com/grkj/iscs/presentation/LockerTogetherActivity.kt

@@ -1,7 +1,7 @@
 package com.grkj.iscs.presentation
 
 import androidx.appcompat.app.AlertDialog
-import com.grkj.iscs.base.BaseMvpActivity
+import com.grkj.iscs.view.base.BaseMvpActivity
 import com.grkj.iscs.databinding.ActivityLockerTogetherBinding
 import com.grkj.iscs.util.Executor
 import com.grkj.iscs.util.ToastUtils

app/src/main/java/com/grkj/iscs/presentation/LockerTogetherPresenter.kt

@@ -1,6 +1,6 @@
 package com.grkj.iscs.presentation
 
-import com.grkj.iscs.base.BasePresenter
+import com.grkj.iscs.view.base.BasePresenter
 
 class LockerTogetherPresenter : BasePresenter<ILockerTogetherView>() {
 }

app/src/main/java/com/grkj/iscs/presentation/PresentationActivity.kt

@@ -7,7 +7,7 @@ import com.clj.fastble.BleManager
 import com.google.gson.Gson
 import com.grkj.iscs.BusinessManager
 import com.grkj.iscs.R
-import com.grkj.iscs.base.BaseMvpActivity
+import com.grkj.iscs.view.base.BaseMvpActivity
 import com.grkj.iscs.databinding.ActivityPresentationBinding
 import com.grkj.iscs.extentions.toHexStrings
 import com.grkj.iscs.modbus.DockBean

app/src/main/java/com/grkj/iscs/presentation/PresentationLoginActivity.kt

@@ -6,7 +6,7 @@ import android.view.View
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.grkj.iscs.BusinessManager
-import com.grkj.iscs.base.BaseActivity
+import com.grkj.iscs.view.base.BaseActivity
 import com.grkj.iscs.databinding.ActivityPresentationLoginBinding
 import com.grkj.iscs.extentions.removeLeadingZeros
 import com.grkj.iscs.extentions.toHexStrings

app/src/main/java/com/grkj/iscs/presentation/PresentationPresenter.kt

@@ -1,7 +1,7 @@
 package com.grkj.iscs.presentation
 
 import com.grkj.iscs.BusinessManager
-import com.grkj.iscs.base.BasePresenter
+import com.grkj.iscs.view.base.BasePresenter
 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_PORTABLE

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

@@ -1,6 +0,0 @@
-package com.grkj.iscs.presenter
-
-import com.grkj.iscs.base.BasePresenter
-import com.grkj.iscs.iview.IAuthView
-
-class AuthPresenter : BasePresenter<IAuthView>() {}

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

@@ -1,7 +0,0 @@
-package com.grkj.iscs.presenter
-
-import com.grkj.iscs.base.BasePresenter
-import com.grkj.iscs.iview.IHomeView
-
-class HomePresenter : BasePresenter<IHomeView>() {
-}

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

@@ -1,7 +0,0 @@
-package com.grkj.iscs.presenter
-
-import com.grkj.iscs.base.BasePresenter
-import com.grkj.iscs.iview.IJobManagementView
-
-class JobManagementPresenter : BasePresenter<IJobManagementView>() {
-}

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

@@ -1,7 +0,0 @@
-package com.grkj.iscs.presenter
-
-import com.grkj.iscs.base.BasePresenter
-import com.grkj.iscs.iview.IMaterialManagementView
-
-class MaterialManagementPresenter : BasePresenter<IMaterialManagementView>() {
-}

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

@@ -1,8 +0,0 @@
-package com.grkj.iscs.presenter
-
-import com.grkj.iscs.base.BasePresenter
-import com.grkj.iscs.iview.IModbusView
-
-class ModBusPresenter: BasePresenter<IModbusView>() {
-
-}

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

@@ -1,6 +0,0 @@
-package com.grkj.iscs.presenter
-
-import com.grkj.iscs.base.BasePresenter
-import com.grkj.iscs.iview.ISopView
-
-class SopPresenter : BasePresenter<ISopView>() {}

app/src/main/java/com/grkj/iscs/activity/AuthActivity.kt → app/src/main/java/com/grkj/iscs/view/activity/AuthActivity.kt

@@ -1,9 +1,9 @@
-package com.grkj.iscs.activity
+package com.grkj.iscs.view.activity
 
-import com.grkj.iscs.base.BaseMvpActivity
+import com.grkj.iscs.view.base.BaseMvpActivity
 import com.grkj.iscs.databinding.ActivityAuthBinding
-import com.grkj.iscs.iview.IAuthView
-import com.grkj.iscs.presenter.AuthPresenter
+import com.grkj.iscs.view.iview.IAuthView
+import com.grkj.iscs.view.presenter.AuthPresenter
 
 class AuthActivity : BaseMvpActivity<IAuthView, AuthPresenter, ActivityAuthBinding>() {
 

app/src/main/java/com/grkj/iscs/activity/CreateTicketActivity.kt → app/src/main/java/com/grkj/iscs/view/activity/CreateTicketActivity.kt

@@ -1,13 +1,13 @@
-package com.grkj.iscs.activity
+package com.grkj.iscs.view.activity
 
 import android.view.Gravity
 import com.grkj.iscs.R
-import com.grkj.iscs.base.BaseMvpActivity
+import com.grkj.iscs.view.base.BaseMvpActivity
 import com.grkj.iscs.databinding.ActivityCreateTicketBinding
-import com.grkj.iscs.iview.ICreateTicketView
+import com.grkj.iscs.view.iview.ICreateTicketView
 import com.grkj.iscs.model.vo.ticket.CreateTicketReqVO
 import com.grkj.iscs.model.vo.sop.SopPageRespVO
-import com.grkj.iscs.presenter.CreateTicketPresenter
+import com.grkj.iscs.view.presenter.CreateTicketPresenter
 import com.grkj.iscs.util.ToastUtils
 import com.grkj.iscs.widget.SelectableInput
 import com.manu.mdatepicker.MDatePicker
@@ -15,7 +15,8 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.stream.Collectors
 
-class CreateTicketActivity : BaseMvpActivity<ICreateTicketView, CreateTicketPresenter, ActivityCreateTicketBinding>(),ICreateTicketView {
+class CreateTicketActivity : BaseMvpActivity<ICreateTicketView, CreateTicketPresenter, ActivityCreateTicketBinding>(),
+    ICreateTicketView {
 
     private var mSelectedSopIdx: Int? = null
 

app/src/main/java/com/grkj/iscs/activity/CustomHomeActivity.kt → app/src/main/java/com/grkj/iscs/view/activity/CustomHomeActivity.kt

@@ -1,16 +1,16 @@
-package com.grkj.iscs.activity
+package com.grkj.iscs.view.activity
 
 import android.content.Intent
 import android.view.View
-import com.grkj.iscs.base.BaseMvpActivity
+import com.grkj.iscs.view.base.BaseMvpActivity
 import com.grkj.iscs.databinding.ActivityCustomHomeBinding
-import com.grkj.iscs.iview.ICustomHomeView
+import com.grkj.iscs.view.iview.ICustomHomeView
 import com.grkj.iscs.model.Constants.USER_ROLE_COLOCKER
 import com.grkj.iscs.model.Constants.USER_ROLE_DRAWER
 import com.grkj.iscs.model.Constants.USER_ROLE_GUARD
 import com.grkj.iscs.model.Constants.USER_ROLE_LOCKER
 import com.grkj.iscs.model.vo.card.CardInfoRespVO
-import com.grkj.iscs.presenter.CustomHomePresenter
+import com.grkj.iscs.view.presenter.CustomHomePresenter
 import com.grkj.iscs.util.NetApi
 
 class CustomHomeActivity : BaseMvpActivity<ICustomHomeView, CustomHomePresenter, ActivityCustomHomeBinding>() {

app/src/main/java/com/grkj/iscs/activity/HomeActivity.kt → app/src/main/java/com/grkj/iscs/view/activity/HomeActivity.kt

@@ -1,9 +1,9 @@
-package com.grkj.iscs.activity
+package com.grkj.iscs.view.activity
 
-import com.grkj.iscs.base.BaseMvpActivity
+import com.grkj.iscs.view.base.BaseMvpActivity
 import com.grkj.iscs.databinding.ActivityHomeBinding
-import com.grkj.iscs.iview.IHomeView
-import com.grkj.iscs.presenter.HomePresenter
+import com.grkj.iscs.view.iview.IHomeView
+import com.grkj.iscs.view.presenter.HomePresenter
 
 /**
  * 首页

app/src/main/java/com/grkj/iscs/activity/LoginActivity.kt → app/src/main/java/com/grkj/iscs/view/activity/LoginActivity.kt

@@ -1,14 +1,11 @@
-package com.grkj.iscs.activity
+package com.grkj.iscs.view.activity
 
 import android.content.Intent
-import com.grkj.iscs.BusinessManager
-import com.grkj.iscs.R
-import com.grkj.iscs.base.BaseMvpActivity
+import com.grkj.iscs.view.base.BaseMvpActivity
 import com.grkj.iscs.databinding.ActivityLoginBinding
-import com.grkj.iscs.dialog.CardLoginDialog
-import com.grkj.iscs.iview.ILoginView
-import com.grkj.iscs.presenter.LoginPresenter
-import com.grkj.iscs.util.Executor
+import com.grkj.iscs.view.dialog.CardLoginDialog
+import com.grkj.iscs.view.iview.ILoginView
+import com.grkj.iscs.view.presenter.LoginPresenter
 import com.grkj.iscs.util.passwordStyle
 
 class LoginActivity : BaseMvpActivity<ILoginView, LoginPresenter, ActivityLoginBinding>() {
@@ -35,25 +32,25 @@ class LoginActivity : BaseMvpActivity<ILoginView, LoginPresenter, ActivityLoginB
         }
 
         // TODO 只适配armeabi-v7a
-        handleLoading(true, resources.getString(R.string.device_is_initializing))
-        BusinessManager.connectDock(true)
-        Executor.delayOnMain(2000) {
-            handleLoading(false)
-        }
-
-
-        cardLoginDialog = CardLoginDialog(this) {
-            presenter?.cardLogin(it) { itLoginRst, itCardInfo ->
-                if (itLoginRst) {
-                    cardLoginDialog?.dismiss()
-                    val intent = Intent(this, HomeActivity::class.java)
-                    if (itCardInfo != null) {
-                        intent.putExtra("cardInfo", itCardInfo)
-                    }
-                    startActivity(intent)
-                }
-            }
-        }
+//        handleLoading(true, resources.getString(R.string.device_is_initializing))
+//        BusinessManager.connectDock(true)
+//        Executor.delayOnMain(2000) {
+//            handleLoading(false)
+//        }
+//
+//
+//        cardLoginDialog = CardLoginDialog(this) {
+//            presenter?.cardLogin(it) { itLoginRst, itCardInfo ->
+//                if (itLoginRst) {
+//                    cardLoginDialog?.dismiss()
+//                    val intent = Intent(this, HomeActivity::class.java)
+//                    if (itCardInfo != null) {
+//                        intent.putExtra("cardInfo", itCardInfo)
+//                    }
+//                    startActivity(intent)
+//                }
+//            }
+//        }
 
         mBinding?.tvCardLogin?.setOnClickListener {
             cardLoginDialog?.show()

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

@@ -1,16 +1,16 @@
-package com.grkj.iscs.activity
+package com.grkj.iscs.view.activity
 
 import android.content.Intent
-import com.grkj.iscs.base.BaseActivity
+import com.grkj.iscs.view.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.RfidActivity
-import com.grkj.iscs.activity.test.ModbusActivity
-import com.grkj.iscs.activity.test.ProcessDemoActivity
-import com.grkj.iscs.activity.test.SopActivity
-import com.grkj.iscs.activity.test.WebSocketActivity
+import com.grkj.iscs.view.activity.test.BleActivity
+import com.grkj.iscs.view.activity.test.RfidActivity
+import com.grkj.iscs.view.activity.test.ModbusActivity
+import com.grkj.iscs.view.activity.test.ProcessDemoActivity
+import com.grkj.iscs.view.activity.test.SopActivity
+import com.grkj.iscs.view.activity.test.WebSocketActivity
 
 class MainActivity : BaseActivity<ActivityMainBinding>() {
 

app/src/main/java/com/grkj/iscs/activity/TicketDetailActivity.kt → app/src/main/java/com/grkj/iscs/view/activity/TicketDetailActivity.kt

@@ -1,12 +1,12 @@
-package com.grkj.iscs.activity
+package com.grkj.iscs.view.activity
 
 import com.google.gson.GsonBuilder
 import com.grkj.iscs.R
-import com.grkj.iscs.base.BaseMvpActivity
+import com.grkj.iscs.view.base.BaseMvpActivity
 import com.grkj.iscs.databinding.ActivityTicketDetailBinding
-import com.grkj.iscs.iview.ITicketDetailView
+import com.grkj.iscs.view.iview.ITicketDetailView
 import com.grkj.iscs.model.vo.ticket.TicketDetailRespVO
-import com.grkj.iscs.presenter.TicketDetailPresenter
+import com.grkj.iscs.view.presenter.TicketDetailPresenter
 import com.grkj.iscs.util.SPUtils
 import com.grkj.iscs.util.ToastUtils
 

app/src/main/java/com/grkj/iscs/activity/TicketListActivity.kt → app/src/main/java/com/grkj/iscs/view/activity/TicketListActivity.kt

@@ -1,11 +1,11 @@
-package com.grkj.iscs.activity
+package com.grkj.iscs.view.activity
 
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
-import com.grkj.iscs.base.BaseActivity
+import com.grkj.iscs.view.base.BaseActivity
 import com.grkj.iscs.databinding.ActivityTicketListBinding
-import com.grkj.iscs.fragment.TicketListFragment
+import com.grkj.iscs.view.fragment.TicketListFragment
 
 class TicketListActivity : BaseActivity<ActivityTicketListBinding>() {
 

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

@@ -1,4 +1,4 @@
-package com.grkj.iscs.activity.test
+package com.grkj.iscs.view.activity.test
 
 import android.app.Activity
 import android.bluetooth.BluetoothGatt
@@ -10,7 +10,7 @@ import com.clj.fastble.data.BleDevice
 import com.clj.fastble.exception.BleException
 import com.grkj.iscs.BusinessManager
 import com.grkj.iscs.R
-import com.grkj.iscs.base.BaseActivity
+import com.grkj.iscs.view.base.BaseActivity
 import com.grkj.iscs.ble.BleBean
 import com.grkj.iscs.ble.BleCmdManager
 import com.grkj.iscs.ble.BleConst.INDICATE_UUID

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

@@ -1,13 +1,13 @@
-package com.grkj.iscs.activity.test
+package com.grkj.iscs.view.activity.test
 
 import com.grkj.iscs.BusinessManager
-import com.grkj.iscs.base.BaseMvpActivity
+import com.grkj.iscs.view.base.BaseMvpActivity
 import com.grkj.iscs.databinding.ActivityModbusBinding
 import com.grkj.iscs.extentions.removeLeadingZeros
 import com.grkj.iscs.extentions.toHexStrings
-import com.grkj.iscs.iview.IModbusView
+import com.grkj.iscs.view.iview.IModbusView
 import com.grkj.iscs.modbus.ModBusController
-import com.grkj.iscs.presenter.ModBusPresenter
+import com.grkj.iscs.view.presenter.ModBusPresenter
 import com.grkj.iscs.util.ToastUtils
 import com.grkj.iscs.util.log.LogUtil
 

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

@@ -1,6 +1,6 @@
-package com.grkj.iscs.activity.test
+package com.grkj.iscs.view.activity.test
 
-import com.grkj.iscs.base.BaseActivity
+import com.grkj.iscs.view.base.BaseActivity
 import com.grkj.iscs.databinding.ActivityProcessDemoBinding
 import com.grkj.iscs.extentions.serialNo
 import com.grkj.iscs.model.vo.lock.LockTakeUpdateReqVO

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

@@ -1,6 +1,6 @@
-package com.grkj.iscs.activity.test
+package com.grkj.iscs.view.activity.test
 
-import com.grkj.iscs.base.BaseActivity
+import com.grkj.iscs.view.base.BaseActivity
 import com.grkj.iscs.databinding.ActivityRfidBinding
 
 class RfidActivity : BaseActivity<ActivityRfidBinding>() {

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

@@ -1,9 +1,9 @@
-package com.grkj.iscs.activity.test
+package com.grkj.iscs.view.activity.test
 
-import com.grkj.iscs.base.BaseMvpActivity
+import com.grkj.iscs.view.base.BaseMvpActivity
 import com.grkj.iscs.databinding.ActivitySopBinding
-import com.grkj.iscs.iview.ISopView
-import com.grkj.iscs.presenter.SopPresenter
+import com.grkj.iscs.view.iview.ISopView
+import com.grkj.iscs.view.presenter.SopPresenter
 import com.grkj.iscs.util.ToastUtils
 import com.grkj.iscs.widget.SelectableInput
 

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

@@ -1,6 +1,6 @@
-package com.grkj.iscs.activity.test
+package com.grkj.iscs.view.activity.test
 
-import com.grkj.iscs.base.BaseActivity
+import com.grkj.iscs.view.base.BaseActivity
 import com.grkj.iscs.databinding.ActivityWebSocketBinding
 import com.grkj.iscs.util.StompApi
 import com.grkj.iscs.util.log.LogUtil

app/src/main/java/com/grkj/iscs/base/BaseActivity.kt → app/src/main/java/com/grkj/iscs/view/base/BaseActivity.kt

@@ -1,10 +1,10 @@
-package com.grkj.iscs.base
+package com.grkj.iscs.view.base
 
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.viewbinding.ViewBinding
-import com.grkj.iscs.dialog.LoadingProgressDialog
+import com.grkj.iscs.view.dialog.LoadingProgressDialog
 import com.grkj.iscs.util.ActivityUtils
 import pub.devrel.easypermissions.EasyPermissions
 

app/src/main/java/com/grkj/iscs/base/BaseDialog.kt → app/src/main/java/com/grkj/iscs/view/base/BaseDialog.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.base
+package com.grkj.iscs.view.base
 
 import android.app.Dialog
 import android.content.Context

app/src/main/java/com/grkj/iscs/base/BaseFragment.kt → app/src/main/java/com/grkj/iscs/view/base/BaseFragment.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.base
+package com.grkj.iscs.view.base
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.viewbinding.ViewBinding
-import com.grkj.iscs.dialog.LoadingProgressDialog
+import com.grkj.iscs.view.dialog.LoadingProgressDialog
 
 abstract class BaseFragment<T : ViewBinding?> : Fragment() {
     protected var mBinding: T? = null

app/src/main/java/com/grkj/iscs/base/BaseMvpActivity.kt → app/src/main/java/com/grkj/iscs/view/base/BaseMvpActivity.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.base
+package com.grkj.iscs.view.base
 
 import android.os.Bundle
 import androidx.viewbinding.ViewBinding
@@ -6,7 +6,8 @@ import androidx.viewbinding.ViewBinding
 /**
  * MVP基类Activity
  */
-abstract class BaseMvpActivity<V : IView?, T : BasePresenter<V>?, B : ViewBinding> : BaseActivity<B>(), IView {
+abstract class BaseMvpActivity<V : IView?, T : BasePresenter<V>?, B : ViewBinding> : BaseActivity<B>(),
+    IView {
 
     var presenter: T? = null
 

app/src/main/java/com/grkj/iscs/base/BaseMvpFragment.kt → app/src/main/java/com/grkj/iscs/view/base/BaseMvpFragment.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.base
+package com.grkj.iscs.view.base
 
 import android.os.Bundle
 import androidx.viewbinding.ViewBinding
@@ -6,7 +6,8 @@ import androidx.viewbinding.ViewBinding
 /**
  * MVP基类Fragment
  */
-abstract class BaseMvpFragment<V : IView?, T : BasePresenter<V>?, B : ViewBinding> : BaseFragment<B>(), IView{
+abstract class BaseMvpFragment<V : IView?, T : BasePresenter<V>?, B : ViewBinding> : BaseFragment<B>(),
+    IView {
     var presenter: T? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/grkj/iscs/base/BasePresenter.kt → app/src/main/java/com/grkj/iscs/view/base/BasePresenter.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.base
+package com.grkj.iscs.view.base
 
 import android.content.Context
 

app/src/main/java/com/grkj/iscs/base/IView.kt → app/src/main/java/com/grkj/iscs/view/base/IView.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.base
+package com.grkj.iscs.view.base
 
 interface IView {
     /**

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

@@ -1,7 +1,7 @@
-package com.grkj.iscs.dialog
+package com.grkj.iscs.view.dialog
 
 import android.content.Context
-import com.grkj.iscs.base.BaseDialog
+import com.grkj.iscs.view.base.BaseDialog
 import com.grkj.iscs.databinding.DialogAuthBinding
 
 class AuthDialog(ctx: Context) : BaseDialog<DialogAuthBinding>(ctx) {

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

@@ -1,9 +1,9 @@
-package com.grkj.iscs.dialog
+package com.grkj.iscs.view.dialog
 
 import android.content.Context
 import android.view.InputDevice
 import android.view.KeyEvent
-import com.grkj.iscs.base.BaseDialog
+import com.grkj.iscs.view.base.BaseDialog
 import com.grkj.iscs.databinding.DialogCardLoginBinding
 import com.grkj.iscs.extentions.toByteArrays
 import com.grkj.iscs.extentions.toHexStrings

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

@@ -1,10 +1,10 @@
-package com.grkj.iscs.dialog
+package com.grkj.iscs.view.dialog
 
 import android.content.Context
 import com.clj.fastble.BleManager
 import com.clj.fastble.data.BleDevice
 import com.clj.fastble.exception.BleException
-import com.grkj.iscs.base.BaseDialog
+import com.grkj.iscs.view.base.BaseDialog
 import com.grkj.iscs.ble.BleCmdManager
 import com.grkj.iscs.ble.BleConst.STATUS_READY
 import com.grkj.iscs.ble.CustomBleWriteCallback

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

@@ -1,9 +1,9 @@
-package com.grkj.iscs.dialog
+package com.grkj.iscs.view.dialog
 
 import android.content.Context
 import android.view.View
 import android.view.View.GONE
-import com.grkj.iscs.base.BaseDialog
+import com.grkj.iscs.view.base.BaseDialog
 import com.grkj.iscs.databinding.CommonDialogLoadingProgressBinding
 
 class LoadingProgressDialog(context: Context) :

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

@@ -1,7 +1,7 @@
-package com.grkj.iscs.dialog
+package com.grkj.iscs.view.dialog
 
 import android.content.Context
-import com.grkj.iscs.base.BaseDialog
+import com.grkj.iscs.view.base.BaseDialog
 import com.grkj.iscs.databinding.DialogTipBinding
 
 /**

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

@@ -1,9 +1,9 @@
-package com.grkj.iscs.fragment
+package com.grkj.iscs.view.fragment
 
-import com.grkj.iscs.base.BaseMvpFragment
+import com.grkj.iscs.view.base.BaseMvpFragment
 import com.grkj.iscs.databinding.FragmentJobManagementBinding
-import com.grkj.iscs.iview.IJobManagementView
-import com.grkj.iscs.presenter.JobManagementPresenter
+import com.grkj.iscs.view.iview.IJobManagementView
+import com.grkj.iscs.view.presenter.JobManagementPresenter
 
 /**
  * 作业管理页

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

@@ -1,9 +1,9 @@
-package com.grkj.iscs.fragment
+package com.grkj.iscs.view.fragment
 
-import com.grkj.iscs.base.BaseMvpFragment
+import com.grkj.iscs.view.base.BaseMvpFragment
 import com.grkj.iscs.databinding.FragmentMaterialManagementBinding
-import com.grkj.iscs.iview.IMaterialManagementView
-import com.grkj.iscs.presenter.MaterialManagementPresenter
+import com.grkj.iscs.view.iview.IMaterialManagementView
+import com.grkj.iscs.view.presenter.MaterialManagementPresenter
 
 /**
  * 物资管理页

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

@@ -1,11 +1,11 @@
-package com.grkj.iscs.fragment
+package com.grkj.iscs.view.fragment
 
 import android.content.Intent
 import com.grkj.iscs.R
-import com.grkj.iscs.activity.TicketDetailActivity
-import com.grkj.iscs.base.BaseMvpFragment
+import com.grkj.iscs.view.activity.TicketDetailActivity
+import com.grkj.iscs.view.base.BaseMvpFragment
 import com.grkj.iscs.databinding.FragmentTicketListBinding
-import com.grkj.iscs.iview.ITicketListView
+import com.grkj.iscs.view.iview.ITicketListView
 import com.grkj.iscs.model.Constants.TICKET_STATUS_FINISHED
 import com.grkj.iscs.model.Constants.TICKET_STATUS_NOT_STARTED
 import com.grkj.iscs.model.Constants.TICKET_STATUS_PROCESSING
@@ -13,7 +13,7 @@ import com.grkj.iscs.model.Constants.TICKET_STATUS_READY_TO_LOCK
 import com.grkj.iscs.model.Constants.TICKET_STATUS_READY_TO_UNLOCK
 import com.grkj.iscs.model.Constants.TICKET_STATUS_UNLOCKED
 import com.grkj.iscs.model.vo.ticket.TicketPageRespVO
-import com.grkj.iscs.presenter.TicketListPresenter
+import com.grkj.iscs.view.presenter.TicketListPresenter
 import com.zhy.adapter.recyclerview.CommonAdapter
 import com.zhy.adapter.recyclerview.base.ViewHolder
 

app/src/main/java/com/grkj/iscs/view/iview/IAuthView.kt

@@ -0,0 +1,5 @@
+package com.grkj.iscs.view.iview
+
+import com.grkj.iscs.view.base.IView
+
+interface IAuthView : IView {}

app/src/main/java/com/grkj/iscs/iview/ICreateTicketView.kt → app/src/main/java/com/grkj/iscs/view/iview/ICreateTicketView.kt

@@ -1,6 +1,6 @@
-package com.grkj.iscs.iview
+package com.grkj.iscs.view.iview
 
-import com.grkj.iscs.base.IView
+import com.grkj.iscs.view.base.IView
 import com.grkj.iscs.model.vo.sop.SopPageRespVO
 
 interface ICreateTicketView : IView {

app/src/main/java/com/grkj/iscs/view/iview/ICustomHomeView.kt

@@ -0,0 +1,5 @@
+package com.grkj.iscs.view.iview
+
+import com.grkj.iscs.view.base.IView
+
+interface ICustomHomeView : IView {}

app/src/main/java/com/grkj/iscs/view/iview/IHomeView.kt

@@ -0,0 +1,6 @@
+package com.grkj.iscs.view.iview
+
+import com.grkj.iscs.view.base.IView
+
+interface IHomeView : IView {
+}

app/src/main/java/com/grkj/iscs/view/iview/IJobManagementView.kt

@@ -0,0 +1,6 @@
+package com.grkj.iscs.view.iview
+
+import com.grkj.iscs.view.base.IView
+
+interface IJobManagementView : IView {
+}

app/src/main/java/com/grkj/iscs/view/iview/ILoginView.kt

@@ -0,0 +1,5 @@
+package com.grkj.iscs.view.iview
+
+import com.grkj.iscs.view.base.IView
+
+interface ILoginView : IView {}

app/src/main/java/com/grkj/iscs/view/iview/IMaterialManagementView.kt

@@ -0,0 +1,6 @@
+package com.grkj.iscs.view.iview
+
+import com.grkj.iscs.view.base.IView
+
+interface IMaterialManagementView : IView {
+}

app/src/main/java/com/grkj/iscs/view/iview/IModbusView.kt

@@ -0,0 +1,5 @@
+package com.grkj.iscs.view.iview
+
+import com.grkj.iscs.view.base.IView
+
+interface IModbusView : IView

app/src/main/java/com/grkj/iscs/view/iview/ISopView.kt

@@ -0,0 +1,5 @@
+package com.grkj.iscs.view.iview
+
+import com.grkj.iscs.view.base.IView
+
+interface ISopView : IView {}

app/src/main/java/com/grkj/iscs/view/iview/ITicketDetailView.kt

@@ -0,0 +1,5 @@
+package com.grkj.iscs.view.iview
+
+import com.grkj.iscs.view.base.IView
+
+interface ITicketDetailView : IView {}

app/src/main/java/com/grkj/iscs/view/iview/ITicketListView.kt

@@ -0,0 +1,5 @@
+package com.grkj.iscs.view.iview
+
+import com.grkj.iscs.view.base.IView
+
+interface ITicketListView : IView {}

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

@@ -0,0 +1,6 @@
+package com.grkj.iscs.view.presenter
+
+import com.grkj.iscs.view.base.BasePresenter
+import com.grkj.iscs.view.iview.IAuthView
+
+class AuthPresenter : BasePresenter<IAuthView>() {}

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

@@ -1,8 +1,8 @@
-package com.grkj.iscs.presenter
+package com.grkj.iscs.view.presenter
 
 import com.grkj.iscs.R
-import com.grkj.iscs.base.BasePresenter
-import com.grkj.iscs.iview.ICreateTicketView
+import com.grkj.iscs.view.base.BasePresenter
+import com.grkj.iscs.view.iview.ICreateTicketView
 import com.grkj.iscs.model.Constants.USER_ROLE_COLOCKER
 import com.grkj.iscs.model.Constants.USER_ROLE_LOCKER
 import com.grkj.iscs.model.UrlConsts

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

@@ -1,8 +1,8 @@
-package com.grkj.iscs.presenter
+package com.grkj.iscs.view.presenter
 
 import com.grkj.iscs.R
-import com.grkj.iscs.base.BasePresenter
-import com.grkj.iscs.iview.ICustomHomeView
+import com.grkj.iscs.view.base.BasePresenter
+import com.grkj.iscs.view.iview.ICustomHomeView
 import com.grkj.iscs.util.Executor
 import com.grkj.iscs.util.NetApi
 import com.grkj.iscs.util.SPUtils

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

@@ -0,0 +1,7 @@
+package com.grkj.iscs.view.presenter
+
+import com.grkj.iscs.view.base.BasePresenter
+import com.grkj.iscs.view.iview.IHomeView
+
+class HomePresenter : BasePresenter<IHomeView>() {
+}

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

@@ -0,0 +1,7 @@
+package com.grkj.iscs.view.presenter
+
+import com.grkj.iscs.view.base.BasePresenter
+import com.grkj.iscs.view.iview.IJobManagementView
+
+class JobManagementPresenter : BasePresenter<IJobManagementView>() {
+}

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

@@ -1,12 +1,12 @@
-package com.grkj.iscs.presenter
+package com.grkj.iscs.view.presenter
 
 import android.content.Context
 import com.grkj.iscs.BusinessManager
 import com.grkj.iscs.R
-import com.grkj.iscs.base.BasePresenter
+import com.grkj.iscs.view.base.BasePresenter
 import com.grkj.iscs.extentions.removeLeadingZeros
 import com.grkj.iscs.extentions.toHexStrings
-import com.grkj.iscs.iview.ILoginView
+import com.grkj.iscs.view.iview.ILoginView
 import com.grkj.iscs.modbus.ModBusController
 import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_CARD
 import com.grkj.iscs.model.DeviceConst.DEVICE_TYPE_KEY

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

@@ -0,0 +1,7 @@
+package com.grkj.iscs.view.presenter
+
+import com.grkj.iscs.view.base.BasePresenter
+import com.grkj.iscs.view.iview.IMaterialManagementView
+
+class MaterialManagementPresenter : BasePresenter<IMaterialManagementView>() {
+}

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

@@ -0,0 +1,8 @@
+package com.grkj.iscs.view.presenter
+
+import com.grkj.iscs.view.base.BasePresenter
+import com.grkj.iscs.view.iview.IModbusView
+
+class ModBusPresenter: BasePresenter<IModbusView>() {
+
+}

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

@@ -0,0 +1,6 @@
+package com.grkj.iscs.view.presenter
+
+import com.grkj.iscs.view.base.BasePresenter
+import com.grkj.iscs.view.iview.ISopView
+
+class SopPresenter : BasePresenter<ISopView>() {}

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

@@ -1,12 +1,12 @@
-package com.grkj.iscs.presenter
+package com.grkj.iscs.view.presenter
 
 import com.grkj.iscs.BusinessManager
 import com.grkj.iscs.R
-import com.grkj.iscs.activity.TicketDetailActivity
-import com.grkj.iscs.base.BasePresenter
-import com.grkj.iscs.dialog.TipDialog
+import com.grkj.iscs.view.activity.TicketDetailActivity
+import com.grkj.iscs.view.base.BasePresenter
+import com.grkj.iscs.view.dialog.TipDialog
 import com.grkj.iscs.extentions.serialNo
-import com.grkj.iscs.iview.ITicketDetailView
+import com.grkj.iscs.view.iview.ITicketDetailView
 import com.grkj.iscs.modbus.ModBusController
 import com.grkj.iscs.model.Constants.JOB_STATUS_ACQUIRE_KEY
 import com.grkj.iscs.model.Constants.JOB_STATUS_ACQUIRE_LOCK

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

@@ -1,9 +1,9 @@
-package com.grkj.iscs.presenter
+package com.grkj.iscs.view.presenter
 
 import com.grkj.iscs.BusinessManager
 import com.grkj.iscs.R
-import com.grkj.iscs.base.BasePresenter
-import com.grkj.iscs.iview.ITicketListView
+import com.grkj.iscs.view.base.BasePresenter
+import com.grkj.iscs.view.iview.ITicketListView
 import com.grkj.iscs.modbus.ModBusController
 import com.grkj.iscs.model.vo.ticket.TicketPageRespVO
 import com.grkj.iscs.model.vo.ticket.TicketTypeRespVO

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

@@ -5,7 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activity.AuthActivity"
+    tools:context=".view.activity.AuthActivity"
     android:background="@color/black">
 
     <TextView

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.test.BleActivity">
+    tools:context=".view.activity.test.BleActivity">
 
     <com.scwang.smart.refresh.layout.SmartRefreshLayout
         android:id="@+id/srl"

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

@@ -5,7 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activity.CustomHomeActivity">
+    tools:context=".view.activity.CustomHomeActivity">
 
     <!--    <com.grkj.iscs.widget.TitleBar-->
     <!--        android:id="@+id/title_bar"-->

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

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/main_color"
-    tools:context=".activity.HomeActivity">
+    tools:context=".view.activity.HomeActivity">
 
     <RelativeLayout
         android:id="@+id/rl_menu"

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

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".activity.LoginActivity"
+    tools:context=".view.activity.LoginActivity"
     android:background="@color/common_bg_black_30"
     android:gravity="center">
 

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

@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:gravity="center"
-    tools:context=".activity.MainActivity">
+    tools:context=".view.activity.MainActivity">
 
     <LinearLayout
         android:layout_width="match_parent"

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.test.ModbusActivity">
+    tools:context=".view.activity.test.ModbusActivity">
 
 
     <LinearLayout

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

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

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

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

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.test.SopActivity">
+    tools:context=".view.activity.test.SopActivity">
 
     <com.grkj.iscs.widget.SelectableInput
         android:id="@+id/si_test"

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

@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal"
-    tools:context=".activity.TicketDetailActivity">
+    tools:context=".view.activity.TicketDetailActivity">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="320dp"

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".activity.TicketListActivity">
+    tools:context=".view.activity.TicketListActivity">
 
     <TextView
         android:id="@+id/tv_exit"

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.test.WebSocketActivity">
+    tools:context=".view.activity.test.WebSocketActivity">
 
     <com.grkj.iscs.widget.PageControl
         android:id="@+id/page"

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="@dimen/fragment_padding"
-    tools:context=".fragment.JobManagementFragment">
+    tools:context=".view.fragment.JobManagementFragment">
 
 
 </RelativeLayout>

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

@@ -3,12 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".fragment.MaterialManagementFragment">
-
-    <!-- TODO: Update blank fragment layout -->
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment" />
+    tools:context=".view.fragment.MaterialManagementFragment">
 
 </FrameLayout>

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

@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:gravity="center_horizontal"
-    tools:context=".fragment.TicketListFragment">
+    tools:context=".view.fragment.TicketListFragment">
 
     <TextView
         android:id="@+id/tv_fragment"