删除冗余代码

app/src/main/AndroidManifest.xml

@@ -63,14 +63,11 @@
             android:name=".presentation.PresentationActivity"
             android:exported="false" />
         <activity
-            android:name=".view.activity.test.SopActivity"
+            android:name=".view.activity.test.WidgetTestActivity"
             android:exported="false" />
         <activity
             android:name=".view.activity.CustomHomeActivity"
             android:exported="false" />
-        <activity
-            android:name=".view.activity.AuthActivity"
-            android:exported="false" />
         <activity
             android:name=".view.activity.test.RfidActivity"
             android:exported="false" />

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

@@ -1,20 +0,0 @@
-package com.grkj.iscs.view.activity
-
-import com.grkj.iscs.view.base.BaseMvpActivity
-import com.grkj.iscs.databinding.ActivityAuthBinding
-import com.grkj.iscs.view.iview.IAuthView
-import com.grkj.iscs.view.presenter.AuthPresenter
-
-class AuthActivity : BaseMvpActivity<IAuthView, AuthPresenter, ActivityAuthBinding>() {
-
-    override fun initView() {
-
-    }
-
-    override fun initPresenter(): AuthPresenter {
-        return AuthPresenter()
-    }
-
-    override val viewBinding: ActivityAuthBinding
-        get() = ActivityAuthBinding.inflate(layoutInflater)
-}

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

@@ -9,7 +9,7 @@ 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.WidgetTestActivity
 import com.grkj.iscs.view.activity.test.WebSocketActivity
 
 class MainActivity : BaseActivity<ActivityMainBinding>() {
@@ -34,16 +34,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
             startActivity(Intent(this, RfidActivity::class.java))
         }
 
-        mBinding?.auth?.setOnClickListener {
-            startActivity(Intent(this, AuthActivity::class.java))
-        }
-
         mBinding?.home?.setOnClickListener {
             startActivity(Intent(this, HomeActivity::class.java))
         }
 
         mBinding?.sop?.setOnClickListener {
-            startActivity(Intent(this, SopActivity::class.java))
+            startActivity(Intent(this, WidgetTestActivity::class.java))
         }
 
         mBinding?.presentation?.setOnClickListener {

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

@@ -1,16 +1,14 @@
 package com.grkj.iscs.view.activity.test
 
-import com.grkj.iscs.view.base.BaseMvpActivity
-import com.grkj.iscs.databinding.ActivitySopBinding
-import com.grkj.iscs.view.iview.ISopView
-import com.grkj.iscs.view.presenter.SopPresenter
+import com.grkj.iscs.databinding.ActivityWidgetTestBinding
 import com.grkj.iscs.util.ToastUtils
+import com.grkj.iscs.view.base.BaseActivity
 import com.grkj.iscs.view.widget.SelectableInput
 
-class SopActivity : BaseMvpActivity<ISopView, SopPresenter, ActivitySopBinding>() {
+class WidgetTestActivity : BaseActivity<ActivityWidgetTestBinding>() {
 
-    override val viewBinding: ActivitySopBinding
-        get() = ActivitySopBinding.inflate(layoutInflater)
+    override val viewBinding: ActivityWidgetTestBinding
+        get() = ActivityWidgetTestBinding.inflate(layoutInflater)
 
     override fun initView() {
         mBinding?.siTest?.mOptionList = mutableListOf("1", "2", "3")
@@ -20,8 +18,4 @@ class SopActivity : BaseMvpActivity<ISopView, SopPresenter, ActivitySopBinding>(
             }
         })
     }
-
-    override fun initPresenter(): SopPresenter {
-        return SopPresenter()
-    }
 }

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

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

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

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

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

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

@@ -1,6 +0,0 @@
-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/res/layout/activity_auth.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/main"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".view.activity.AuthActivity"
-    android:background="@color/black">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/enter_system"
-        android:textColor="@color/white"
-        android:textSize="@dimen/common_text_size"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -54,16 +54,6 @@
             android:textSize="10sp"
             android:layout_margin="5dp"/>
 
-        <Button
-            android:id="@+id/auth"
-            android:layout_width="80dp"
-            android:layout_height="50dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="Auth Page"
-            android:textSize="10sp"
-            android:layout_margin="5dp"/>
-
         <Button
             android:id="@+id/home"
             android:layout_width="80dp"

app/src/main/res/layout/activity_sop.xml → app/src/main/res/layout/activity_widget_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.activity.test.SopActivity">
+    tools:context=".view.activity.test.WidgetTestActivity">
 
     <com.grkj.iscs.view.widget.SelectableInput
         android:id="@+id/si_test"