项目工程目录结构调整；登录页调整以兼容物资柜

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.DockTestFragment
+import com.grkj.iscs.view.fragment.iscs.DockTestFragment
 import java.util.concurrent.LinkedBlockingQueue
 
 /**

app/src/main/java/com/grkj/iscs/model/Constants.kt

@@ -3,6 +3,7 @@ package com.grkj.iscs.model
 import com.grkj.iscs.R
 
 object Constants {
+    // TODO 根据要求配置
     const val DEVICE_TYPE = 1 // 1.机柜 2.物料柜 3.手提柜 4.混合柜
     const val DEVICE_TYPE_NORMAL = "Android_Normal"     // 机柜
     const val DEVICE_TYPE_MATERIAL = "Android_Material" // 物资柜

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

@@ -18,11 +18,11 @@ 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.DockTestFragment
-import com.grkj.iscs.view.fragment.JobManagementFragment
-import com.grkj.iscs.view.fragment.MaterialManagementFragment
-import com.grkj.iscs.view.fragment.SettingFragment
-import com.grkj.iscs.view.fragment.SystemSettingFragment
+import com.grkj.iscs.view.fragment.iscs.DockTestFragment
+import com.grkj.iscs.view.fragment.iscs.JobManagementFragment
+import com.grkj.iscs.view.fragment.material.MaterialManagementFragment
+import com.grkj.iscs.view.fragment.iscs.SettingFragment
+import com.grkj.iscs.view.fragment.iscs.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/LoginActivity.kt

@@ -7,6 +7,7 @@ import com.grkj.iscs.BusinessManager
 import com.grkj.iscs.R
 import com.grkj.iscs.databinding.ActivityLoginBinding
 import com.grkj.iscs.modbus.ModBusController
+import com.grkj.iscs.model.Constants
 import com.grkj.iscs.util.AppUtils
 import com.grkj.iscs.util.Executor
 import com.grkj.iscs.view.base.BaseMvpActivity
@@ -24,15 +25,20 @@ class LoginActivity : BaseMvpActivity<ILoginView, LoginPresenter, ActivityLoginB
         get() = ActivityLoginBinding.inflate(layoutInflater)
 
     override fun initView() {
+        if (Constants.DEVICE_TYPE == 2) {
+            mBinding?.tvTitle?.text = getString(R.string.material_management_system)
+        }
         mBinding?.tvVersion?.text = "v${AppUtils.getPkgVerName(this)}"
 
         mBinding?.main?.setBackgroundResource(R.mipmap.login_bg)
         val pairList = mutableListOf(
             Pair(getString(R.string.login_face), R.mipmap.login_face),
-            Pair(getString(R.string.login_fingerprint), R.mipmap.login_fingerprint),
             Pair(getString(R.string.login_card), R.mipmap.login_card),
             Pair(getString(R.string.login_account), R.mipmap.login_account)
         )
+        if (Constants.DEVICE_TYPE != 2) {
+            pairList.add(Pair(getString(R.string.login_fingerprint), R.mipmap.login_fingerprint))
+        }
 
         mBinding?.rvType?.adapter =
             object : CommonAdapter<Pair<String, Int>>(this, R.layout.item_rv_login, pairList) {
@@ -54,7 +60,7 @@ class LoginActivity : BaseMvpActivity<ILoginView, LoginPresenter, ActivityLoginB
     }
 
     /**
-     * @param loginType 0:人脸 1:指纹 2:工卡 3:账号
+     * @param loginType 0:人脸 1:工卡 2:账号 3:指纹
      */
     private fun showLoginDialog(loginType: Int) {
         cardLoginDialog ?: run {

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.TicketListFragment
+import com.grkj.iscs.view.fragment.iscs.TicketListFragment
 
 class TicketListActivity : BaseActivity<ActivityTicketListBinding>() {
 

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

@@ -48,11 +48,11 @@ class LoginDialog(val presenter: LoginPresenter?, val ctx: Context, private var
     /**
      * 根据类型显示弹框
      *
-     * @param loginType 0:人脸 1:指纹 2:工卡 3:账号
+     * @param loginType 0:人脸 1:工卡 2:账号 3:指纹
      */
     fun showByType(loginType: Int) {
         mLoginType = loginType
-        if (loginType == 3) {
+        if (loginType == 2) {
             mBinding?.llAccountContainer?.visibility = View.VISIBLE
             mBinding?.llEasyContainer?.visibility = View.GONE
         } else {

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.grkj.iscs.view.fragment
+package com.grkj.iscs.view.fragment.iscs
 
 import android.view.View
 import android.widget.ImageView
@@ -65,6 +65,7 @@ class JobProgressFragment(val goBack: () -> Unit) :
             }
 
         mBinding?.cbAction?.setOnClickListener {
+            println("haha : $mStep")
             if (mStep == 4) {
                 presenter?.handleLockProcess(mPageChangeBO?.ticketId!!)
             } else if (mStep == 7) {

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

@@ -1,8 +1,7 @@
-package com.grkj.iscs.view.fragment
+package com.grkj.iscs.view.fragment.iscs
 
 import android.content.Intent
 import com.grkj.iscs.databinding.FragmentSettingBinding
-import com.grkj.iscs.util.ActivityUtils
 import com.grkj.iscs.util.NetApi
 import com.grkj.iscs.view.activity.LoginActivity
 import com.grkj.iscs.view.base.BaseFragment

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.grkj.iscs.view.fragment
+package com.grkj.iscs.view.fragment.iscs
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
@@ -41,7 +41,8 @@ class WorkshopFragment(val changePage: (PageChangeBO) -> Unit) :
             JobStatistics(Constants.SOP_PRE_MAINTENANCE, 0),
             JobStatistics(Constants.SOP_CHANGE_SHIFTS, 0),
             JobStatistics(Constants.SOP_CLEAN, 0),
-            JobStatistics(Constants.SOP_SWITCH_PRODUCT, 0))
+            JobStatistics(Constants.SOP_SWITCH_PRODUCT, 0)
+        )
         
         mBinding?.rvStatistics?.adapter = object : CommonAdapter<JobStatistics>(requireActivity(), R.layout.item_rv_job_management, jobStatisticList) {
             override fun convert(holder: ViewHolder, statistic: JobStatistics, position: Int) {

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

@@ -1,4 +1,4 @@
-package com.grkj.iscs.view.fragment
+package com.grkj.iscs.view.fragment.material
 
 import com.grkj.iscs.view.base.BaseMvpFragment
 import com.grkj.iscs.databinding.FragmentMaterialManagementBinding

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

@@ -6,7 +6,6 @@ import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.grkj.iscs.BusinessManager
 import com.grkj.iscs.R
-import com.grkj.iscs.modbus.ModBusController
 import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_COLLECT
 import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_ELEC_LOCK_BOARD
 import com.grkj.iscs.model.DeviceConst.DOCK_TYPE_KEY
@@ -16,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.DockTestFragment
-import com.grkj.iscs.view.fragment.SystemSettingFragment.DockItem
+import com.grkj.iscs.view.fragment.iscs.DockTestFragment
+import com.grkj.iscs.view.fragment.iscs.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.WorkshopFragment.CustomPoint
+import com.grkj.iscs.view.fragment.iscs.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/activity_login.xml

@@ -16,6 +16,7 @@
         android:orientation="horizontal" />
 
     <TextView
+        android:id="@+id/tv_title"
         style="@style/CommonTextView"
         android:layout_above="@id/rv_type"
         android:layout_centerHorizontal="true"

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.DockTestFragment">
+    tools:context=".view.fragment.iscs.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.JobExecutionFragment">
+    tools:context=".view.fragment.iscs.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.JobManagementFragment">
+    tools:context=".view.fragment.iscs.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.JobProgressFragment">
+    tools:context=".view.fragment.iscs.JobProgressFragment">
 
     <com.grkj.iscs.view.widget.CommonBtn
         android:id="@+id/cb_back"

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

@@ -3,6 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".view.fragment.MaterialManagementFragment">
+    tools:context=".view.fragment.material.MaterialManagementFragment">
 
 </FrameLayout>

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.SettingFragment">
+    tools:context=".view.fragment.iscs.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.StepFragment">
+    tools:context=".view.fragment.iscs.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.SystemSettingFragment">
+    tools:context=".view.fragment.iscs.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.TechnologySopFragment">
+    tools:context=".view.fragment.iscs.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.TicketListFragment">
+    tools:context=".view.fragment.iscs.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.WorkerFragment">
+    tools:context=".view.fragment.iscs.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.WorkshopFragment">
+    tools:context=".view.fragment.iscs.WorkshopFragment">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rv_statistics"

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

@@ -203,4 +203,7 @@
     <string name="save_config">保存配置</string>
     <string name="system_setting_tip">保存配置后App将自动重启，配置将在重启后生效</string>
     <string name="no_board_responses">没有主板响应</string>
+
+    <!-- 物资柜 -->
+    <string name="material_management_system">物资管理系统</string>
 </resources>