移除所有物资柜相关内容和适配

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

@@ -3,7 +3,6 @@ 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

@@ -20,7 +20,6 @@ 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.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
@@ -47,8 +46,7 @@ class HomeActivity : BaseMvpActivity<IHomeView, HomePresenter, ActivityHomeBindi
         if (userInfo != null && (userInfo as UserInfoRespVO).roles != null) {
             if (userInfo.roles?.any { it == USER_ROLE_DRAWER || it == USER_ROLE_LOCKER || it == USER_ROLE_COLOCKER || it == USER_ROLE_GUARD } == true) {
                 mMenuList.addAll(mutableListOf(
-                    Menu(getString(R.string.job_management), R.mipmap.job_management, JobManagementFragment()),
-                    Menu(getString(R.string.material_management), R.mipmap.material_management, MaterialManagementFragment())
+                    Menu(getString(R.string.job_management), R.mipmap.job_management, JobManagementFragment())
                 ))
             }
             if (userInfo.roles?.any { it == USER_ROLE_ADMHDWTESTER } == true) {

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

@@ -6,7 +6,6 @@ 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.view.base.BaseMvpActivity
 import com.grkj.iscs.view.dialog.LoginDialog
@@ -18,33 +17,29 @@ import com.zhy.adapter.recyclerview.base.ViewHolder
 class LoginActivity : BaseMvpActivity<ILoginView, LoginPresenter, ActivityLoginBinding>() {
 
     private var cardLoginDialog: LoginDialog? = null
-    private var mLoginTypeList = mutableListOf<LoginType>()
 
     override val viewBinding: ActivityLoginBinding
         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)
 
-        mLoginTypeList.add(LoginType(getString(R.string.login_face), R.mipmap.login_face, 0))
-        if (Constants.DEVICE_TYPE != 2) {
-            mLoginTypeList.add(LoginType(getString(R.string.login_fingerprint), R.mipmap.login_fingerprint, 1))
-        }
-        mLoginTypeList.add(LoginType(getString(R.string.login_card), R.mipmap.login_card, 2))
-        mLoginTypeList.add(LoginType(getString(R.string.login_account), R.mipmap.login_account, 3))
+        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)
+        )
 
         mBinding?.rvType?.adapter =
-            object : CommonAdapter<LoginType>(this, R.layout.item_rv_login, mLoginTypeList) {
-                override fun convert(holder: ViewHolder, data: LoginType, position: Int) {
-                    holder.setText(R.id.tv_name, data.name)
-                    holder.getView<ImageView>(R.id.iv_icon).setImageResource(data.icon)
+            object : CommonAdapter<Pair<String, Int>>(this, R.layout.item_rv_login, pairList) {
+                override fun convert(holder: ViewHolder, pair: Pair<String, Int>, position: Int) {
+                    holder.setText(R.id.tv_name, pair.first)
+                    holder.getView<ImageView>(R.id.iv_icon).setImageResource(pair.second)
                     holder.setOnClickListener(R.id.root) {
-                        showLoginDialog(data.type)
+                        showLoginDialog(position)
                     }
                 }
             }
@@ -95,6 +90,4 @@ class LoginActivity : BaseMvpActivity<ILoginView, LoginPresenter, ActivityLoginB
     override fun initPresenter(): LoginPresenter {
         return LoginPresenter()
     }
-
-    private data class LoginType(val name: String, val icon: Int, val type: Int)
 }

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

@@ -11,9 +11,6 @@ import com.grkj.iscs.extentions.toHexStrings
 import com.grkj.iscs.model.vo.card.CardInfoRespVO
 import com.grkj.iscs.model.vo.user.UserInfoRespVO
 import com.grkj.iscs.util.Executor
-import com.grkj.iscs.util.NetApi
-import com.grkj.iscs.util.SPUtils
-import com.grkj.iscs.util.ToastUtils
 import com.grkj.iscs.view.base.BaseDialog
 import com.grkj.iscs.view.presenter.LoginPresenter
 

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

@@ -1,24 +0,0 @@
-package com.grkj.iscs.view.fragment.material
-
-import com.grkj.iscs.databinding.FragmentMaterialFetchReturnBinding
-import com.grkj.iscs.view.base.BaseMvpFragment
-import com.grkj.iscs.view.iview.IMaterialFetchReturnView
-import com.grkj.iscs.view.presenter.MaterialFetchReturnPresenter
-
-/**
- * 物资管理 - 物资取还
- */
-class MaterialFetchReturnFragment :
-    BaseMvpFragment<IMaterialFetchReturnView, MaterialFetchReturnPresenter, FragmentMaterialFetchReturnBinding>() {
-
-    override val viewBinding: FragmentMaterialFetchReturnBinding
-        get() = FragmentMaterialFetchReturnBinding.inflate(layoutInflater)
-
-    override fun initView() {
-
-    }
-
-    override fun initPresenter(): MaterialFetchReturnPresenter {
-        return MaterialFetchReturnPresenter()
-    }
-}

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

@@ -1,23 +0,0 @@
-package com.grkj.iscs.view.fragment.material
-
-import com.grkj.iscs.databinding.FragmentMaterialHomeBinding
-import com.grkj.iscs.view.base.BaseMvpFragment
-import com.grkj.iscs.view.iview.IMaterialHomeView
-import com.grkj.iscs.view.presenter.MaterialHomePresenter
-
-/**
- * 物资管理 - 首页
- */
-class MaterialHomeFragment : BaseMvpFragment<IMaterialHomeView, MaterialHomePresenter, FragmentMaterialHomeBinding>() {
-
-    override val viewBinding: FragmentMaterialHomeBinding
-        get() = FragmentMaterialHomeBinding.inflate(layoutInflater)
-
-    override fun initView() {
-
-    }
-
-    override fun initPresenter(): MaterialHomePresenter {
-        return MaterialHomePresenter()
-    }
-}

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

@@ -1,24 +0,0 @@
-package com.grkj.iscs.view.fragment.material
-
-import com.grkj.iscs.databinding.FragmentMaterialInspectionBinding
-import com.grkj.iscs.view.base.BaseMvpFragment
-import com.grkj.iscs.view.iview.IMaterialInspectionView
-import com.grkj.iscs.view.presenter.MaterialInspectionPresenter
-
-/**
- * 物资管理 - 物资检查
- */
-class MaterialInspectionFragment :
-    BaseMvpFragment<IMaterialInspectionView, MaterialInspectionPresenter, FragmentMaterialInspectionBinding>() {
-
-    override val viewBinding: FragmentMaterialInspectionBinding
-        get() = FragmentMaterialInspectionBinding.inflate(layoutInflater)
-
-    override fun initView() {
-
-    }
-
-    override fun initPresenter(): MaterialInspectionPresenter {
-        return MaterialInspectionPresenter()
-    }
-}

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

@@ -1,24 +0,0 @@
-package com.grkj.iscs.view.fragment.material
-
-import com.grkj.iscs.databinding.FragmentMaterialInstructionBinding
-import com.grkj.iscs.view.base.BaseMvpFragment
-import com.grkj.iscs.view.iview.IMaterialInstructionView
-import com.grkj.iscs.view.presenter.MaterialInstructionPresenter
-
-/**
- * 物资管理 - 物资使用说明
- */
-class MaterialInstructionFragment :
-    BaseMvpFragment<IMaterialInstructionView, MaterialInstructionPresenter, FragmentMaterialInstructionBinding>() {
-
-    override val viewBinding: FragmentMaterialInstructionBinding
-        get() = FragmentMaterialInstructionBinding.inflate(layoutInflater)
-
-    override fun initView() {
-
-    }
-
-    override fun initPresenter(): MaterialInstructionPresenter {
-        return MaterialInstructionPresenter()
-    }
-}

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

@@ -1,24 +0,0 @@
-package com.grkj.iscs.view.fragment.material
-
-import com.grkj.iscs.view.base.BaseMvpFragment
-import com.grkj.iscs.databinding.FragmentMaterialManagementBinding
-import com.grkj.iscs.view.iview.IMaterialManagementView
-import com.grkj.iscs.view.presenter.MaterialManagementPresenter
-
-/**
- * 物资管理页
- */
-class MaterialManagementFragment :
-    BaseMvpFragment<IMaterialManagementView, MaterialManagementPresenter, FragmentMaterialManagementBinding>() {
-
-    override val viewBinding: FragmentMaterialManagementBinding
-        get() = FragmentMaterialManagementBinding.inflate(layoutInflater)
-
-    override fun initView() {
-
-    }
-
-    override fun initPresenter(): MaterialManagementPresenter {
-        return MaterialManagementPresenter()
-    }
-}

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

@@ -1,24 +0,0 @@
-package com.grkj.iscs.view.fragment.material
-
-import com.grkj.iscs.databinding.FragmentMaterialReplacementBinding
-import com.grkj.iscs.view.base.BaseMvpFragment
-import com.grkj.iscs.view.iview.IMaterialReplacementView
-import com.grkj.iscs.view.presenter.MaterialReplacementPresenter
-
-/**
- * 物资管理 - 物资更换
- */
-class MaterialReplacementFragment :
-    BaseMvpFragment<IMaterialReplacementView, MaterialReplacementPresenter, FragmentMaterialReplacementBinding>() {
-
-    override val viewBinding: FragmentMaterialReplacementBinding
-        get() = FragmentMaterialReplacementBinding.inflate(layoutInflater)
-
-    override fun initView() {
-
-    }
-
-    override fun initPresenter(): MaterialReplacementPresenter {
-        return MaterialReplacementPresenter()
-    }
-}

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

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

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

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

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

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

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

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

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

@@ -1,6 +0,0 @@
-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/IMaterialReplacementView.kt

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +0,0 @@
-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/MaterialReplacementPresenter.kt

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

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

@@ -16,7 +16,6 @@
         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_material_fetch_return.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".view.fragment.material.MaterialFetchReturnFragment">
-
-</FrameLayout>

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".view.fragment.material.MaterialHomeFragment">
-
-</FrameLayout>

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".view.fragment.material.MaterialInspectionFragment">
-
-</FrameLayout>

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".view.fragment.material.MaterialInstructionFragment">
-
-</FrameLayout>

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".view.fragment.material.MaterialManagementFragment">
-
-</FrameLayout>

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".view.fragment.material.MaterialReplacementFragment">
-    
-</FrameLayout>

build.gradle

@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.application) apply false
     alias(libs.plugins.jetbrains.kotlin.android) apply false
 }