调整目录结构

app/src/main/java/com/grkj/iscs/modbus/ModBusManager.kt

@@ -9,7 +9,7 @@ import com.grkj.iscs.util.Executor
 import com.grkj.iscs.util.SPUtils
 import com.grkj.iscs.util.jvmSeconds
 import com.grkj.iscs.util.log.LogUtil
-import com.grkj.iscs.view.fragment.iscs.DockTestFragment
+import com.grkj.iscs.view.fragment.DockTestFragment
 import java.util.concurrent.LinkedBlockingQueue
 
 /**

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

@@ -18,10 +18,10 @@ import com.grkj.iscs.model.vo.user.UserInfoRespVO
 import com.grkj.iscs.view.adapter.MenuAdapter
 import com.grkj.iscs.view.base.BaseFragment
 import com.grkj.iscs.view.base.BaseMvpActivity
-import com.grkj.iscs.view.fragment.iscs.DockTestFragment
-import com.grkj.iscs.view.fragment.iscs.JobManagementFragment
-import com.grkj.iscs.view.fragment.iscs.SettingFragment
-import com.grkj.iscs.view.fragment.iscs.SystemSettingFragment
+import com.grkj.iscs.view.fragment.DockTestFragment
+import com.grkj.iscs.view.fragment.JobManagementFragment
+import com.grkj.iscs.view.fragment.SettingFragment
+import com.grkj.iscs.view.fragment.SystemSettingFragment
 import com.grkj.iscs.view.iview.IHomeView
 import com.grkj.iscs.view.presenter.HomePresenter
 import com.zhy.adapter.recyclerview.CommonAdapter

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

@@ -5,7 +5,7 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import com.grkj.iscs.view.base.BaseActivity
 import com.grkj.iscs.databinding.ActivityTicketListBinding
-import com.grkj.iscs.view.fragment.iscs.TicketListFragment
+import com.grkj.iscs.view.fragment.TicketListFragment
 
 class TicketListActivity : BaseActivity<ActivityTicketListBinding>() {
 

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

@@ -1,4 +1,4 @@
-package com.grkj.iscs.view.fragment.iscs
+package com.grkj.iscs.view.fragment
 
 import android.view.View
 import com.google.gson.Gson

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

@@ -1,4 +1,4 @@
-package com.grkj.iscs.view.fragment.iscs
+package com.grkj.iscs.view.fragment
 
 import com.grkj.iscs.databinding.FragmentJobExecutionBinding
 import com.grkj.iscs.model.bo.PageChangeBO

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

@@ -1,4 +1,4 @@
-package com.grkj.iscs.view.fragment.iscs
+package com.grkj.iscs.view.fragment
 
 import android.widget.ImageView
 import com.grkj.iscs.R

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

@@ -1,4 +1,4 @@
-package com.grkj.iscs.view.fragment.iscs
+package com.grkj.iscs.view.fragment
 
 import android.view.View
 import android.widget.ImageView

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

@@ -1,4 +1,4 @@
-package com.grkj.iscs.view.fragment.iscs
+package com.grkj.iscs.view.fragment
 
 import android.content.Intent
 import com.grkj.iscs.databinding.FragmentSettingBinding

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

@@ -1,4 +1,4 @@
-package com.grkj.iscs.view.fragment.iscs
+package com.grkj.iscs.view.fragment
 
 import android.view.View
 import android.widget.ImageView

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

@@ -1,4 +1,4 @@
-package com.grkj.iscs.view.fragment.iscs
+package com.grkj.iscs.view.fragment
 
 import android.view.LayoutInflater
 import android.view.View

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

@@ -1,4 +1,4 @@
-package com.grkj.iscs.view.fragment.iscs
+package com.grkj.iscs.view.fragment
 
 import android.widget.ImageView
 import android.widget.LinearLayout

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

@@ -1,4 +1,4 @@
-package com.grkj.iscs.view.fragment.iscs
+package com.grkj.iscs.view.fragment
 
 import android.content.Intent
 import com.grkj.iscs.R

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

@@ -1,4 +1,4 @@
-package com.grkj.iscs.view.fragment.iscs
+package com.grkj.iscs.view.fragment
 
 import android.view.View
 import android.widget.ImageView

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

@@ -1,4 +1,4 @@
-package com.grkj.iscs.view.fragment.iscs
+package com.grkj.iscs.view.fragment
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory

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

@@ -15,8 +15,8 @@ import com.grkj.iscs.util.CommonUtils
 import com.grkj.iscs.util.SPUtils
 import com.grkj.iscs.util.ToastUtils
 import com.grkj.iscs.view.base.BasePresenter
-import com.grkj.iscs.view.fragment.iscs.DockTestFragment
-import com.grkj.iscs.view.fragment.iscs.SystemSettingFragment.DockItem
+import com.grkj.iscs.view.fragment.DockTestFragment
+import com.grkj.iscs.view.fragment.SystemSettingFragment.DockItem
 import com.grkj.iscs.view.iview.ISystemSettingView
 import java.io.File
 import kotlin.system.exitProcess

app/src/main/java/com/grkj/iscs/view/widget/CustomMarkLayer.kt

@@ -9,7 +9,7 @@ import android.graphics.Paint
 import android.util.Pair
 import android.view.MotionEvent
 import com.grkj.iscs.R
-import com.grkj.iscs.view.fragment.iscs.WorkshopFragment.CustomPoint
+import com.grkj.iscs.view.fragment.WorkshopFragment.CustomPoint
 import com.onlylemi.mapview.library.MapView
 import com.onlylemi.mapview.library.layer.MapBaseLayer
 import com.onlylemi.mapview.library.utils.MapMath

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".view.fragment.iscs.DockTestFragment">
+    tools:context=".view.fragment.DockTestFragment">
 
     <com.grkj.iscs.view.widget.CommonBtn
         android:id="@+id/cb_close"

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

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".view.fragment.iscs.JobExecutionFragment">
+    tools:context=".view.fragment.JobExecutionFragment">
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/vp"

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".view.fragment.iscs.JobManagementFragment">
+    tools:context=".view.fragment.JobManagementFragment">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_tab"

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".view.fragment.iscs.JobProgressFragment">
+    tools:context=".view.fragment.JobProgressFragment">
 
     <com.grkj.iscs.view.widget.CommonBtn
         android:id="@+id/cb_back"

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".view.fragment.iscs.SettingFragment">
+    tools:context=".view.fragment.SettingFragment">
 
     <com.grkj.iscs.view.widget.CommonBtn
         android:id="@+id/cb_logout"

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".view.fragment.iscs.StepFragment">
+    tools:context=".view.fragment.StepFragment">
 
     <com.grkj.iscs.view.widget.CommonBtn
         android:id="@+id/cb_back"

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

@@ -7,7 +7,7 @@
     android:background="@drawable/item_rv_technology_sop_bg_normal"
     android:orientation="horizontal"
     android:padding="@dimen/common_spacing_small"
-    tools:context=".view.fragment.iscs.SystemSettingFragment">
+    tools:context=".view.fragment.SystemSettingFragment">
 
     <!-- 主板设置 -->
     <LinearLayout

app/src/main/res/layout/fragment_technology_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=".view.fragment.iscs.TechnologySopFragment">
+    tools:context=".view.fragment.TechnologySopFragment">
 
     <com.grkj.iscs.view.widget.CommonBtn
         android:id="@+id/cb_start"

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=".view.fragment.iscs.TicketListFragment">
+    tools:context=".view.fragment.TicketListFragment">
 
     <TextView
         android:id="@+id/tv_fragment"

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".view.fragment.iscs.WorkerFragment">
+    tools:context=".view.fragment.WorkerFragment">
 
     <com.grkj.iscs.view.widget.CommonBtn
         android:id="@+id/cb_cancel"

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".view.fragment.iscs.WorkshopFragment">
+    tools:context=".view.fragment.WorkshopFragment">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_statistics"