删除冗余代码；调整目录结构

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

@@ -13,14 +13,14 @@ import android.util.Log
 import com.clj.fastble.BleManager
 import com.clj.fastble.data.BleDevice
 import com.clj.fastble.exception.BleException
-import com.grkj.iscs.CustomBleGattCallback
-import com.grkj.iscs.CustomBleIndicateCallback
-import com.grkj.iscs.CustomBleScanCallback
-import com.grkj.iscs.CustomBleWriteCallback
+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.R
 import com.grkj.iscs.base.BaseBindingActivity
 import com.grkj.iscs.databinding.ActivityBleBinding
-import com.grkj.iscs.model.BleBean
+import com.grkj.iscs.ble.BleBean
 import com.grkj.iscs.model.Constants.PERMISSION_REQUEST_CODE
 import com.grkj.iscs.ble.BleConst.INDICATE_UUID
 import com.grkj.iscs.ble.BleConst.SERVICE_UUID

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

@@ -2,7 +2,9 @@ package com.grkj.iscs.activity
 
 import com.grkj.iscs.base.BaseMvpActivity
 import com.grkj.iscs.databinding.ActivityModbusBinding
+import com.grkj.iscs.iview.IModbusView
 import com.grkj.iscs.modbus.ModBusController
+import com.grkj.iscs.presenter.ModBusPresenter
 
 class ModbusActivity : BaseMvpActivity<IModbusView, ModBusPresenter, ActivityModbusBinding>() {
 

app/src/main/java/com/grkj/iscs/activity/ScreenAdaptActivity.kt

@@ -1,20 +0,0 @@
-package com.grkj.iscs.activity
-
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import com.grkj.iscs.databinding.ActivityScreenAdaptBinding
-
-class ScreenAdaptActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val binding = ActivityScreenAdaptBinding.inflate(layoutInflater)
-
-        setContentView(binding.root)
-        var i = 0
-
-        binding.tvTest.setOnClickListener {
-            binding.tvTest.text = "点击了$i"
-            i++
-        }
-    }
-}

app/src/main/java/com/grkj/iscs/activity/WebActivity.kt

@@ -1,57 +0,0 @@
-package com.grkj.iscs.activity
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.KeyEvent
-import android.view.View
-import android.webkit.WebViewClient
-import androidx.appcompat.app.AppCompatActivity
-import com.grkj.iscs.databinding.ActivityWebBinding
-
-
-class WebActivity : AppCompatActivity() {
-
-    private var mBinding: ActivityWebBinding? = null
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        mBinding = ActivityWebBinding.inflate(layoutInflater)
-        setContentView(mBinding!!.root)
-
-        createWebView()
-    }
-
-    @SuppressLint("SetJavaScriptEnabled")
-    private fun createWebView() {
-        // 创建 WebView 实例并通过 id 绑定我们刚在布局中创建的 WebView 标签
-        // 这里的 R.id.webview 就是 activity_main.xml 中的 WebView 标签的 id
-
-
-        // 设置 WebView 允许执行 JavaScript 脚本
-        mBinding!!.webView.settings.javaScriptEnabled = true
-
-        // 确保跳转到另一个网页时仍然在当前 WebView 中显示
-        // 而不是调用浏览器打开
-        mBinding!!.webView.webViewClient = WebViewClient()
-
-        // 加载指定网页
-//        val url = "https://yaie.hihakid.com/homePage"
-        val url = "www.ithome.com"
-        mBinding!!.webView.loadUrl(url)
-
-        mBinding!!.webView.setOnKeyListener(View.OnKeyListener { v, keyCode, event ->
-            if (keyCode == KeyEvent.KEYCODE_BACK && mBinding!!.webView.canGoBack()) {
-                mBinding!!.webView.goBack()
-                return@OnKeyListener true
-            }
-            false
-        })
-    }
-
-    override fun onBackPressed() {
-        if (mBinding!!.webView.canGoBack()) {
-            mBinding!!.webView.goBack()
-        } else {
-            super.onBackPressed()
-        }
-    }
-}

app/src/main/java/com/grkj/iscs/model/BleBean.kt → app/src/main/java/com/grkj/iscs/ble/BleBean.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs.model
+package com.grkj.iscs.ble
 
 import com.clj.fastble.data.BleDevice
 import java.io.File

app/src/main/java/com/grkj/iscs/ble/BleCmdManager.kt

@@ -7,7 +7,6 @@ import com.grkj.iscs.extentions.crc16
 import com.grkj.iscs.extentions.startsWith
 import com.grkj.iscs.extentions.toByteArray
 import com.grkj.iscs.extentions.toHexStrings
-import com.grkj.iscs.model.BleBean
 import com.grkj.iscs.ble.BleConst.REQ_CURRENT_STATUS
 import com.grkj.iscs.ble.BleConst.REQ_GET_TOKEN
 import com.grkj.iscs.ble.BleConst.REQ_GET_VERSION

app/src/main/java/com/grkj/iscs/ble/BleUtil.kt

@@ -14,7 +14,6 @@ import com.grkj.iscs.CustomBleGattCallback
 import com.grkj.iscs.CustomBleIndicateCallback
 import com.grkj.iscs.CustomBleScanCallback
 import com.grkj.iscs.CustomBleWriteCallback
-import com.grkj.iscs.model.BleBean
 import com.grkj.iscs.model.Constants.BLE_LOCAL_NAME
 import com.grkj.iscs.ble.BleConst.INDICATE_UUID
 import com.grkj.iscs.ble.BleConst.MTU

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

@@ -1,4 +1,4 @@
-package com.grkj.iscs.activity
+package com.grkj.iscs.iview
 
 import com.grkj.iscs.base.IView
 

app/src/main/java/com/grkj/iscs/RealResponse.kt → app/src/main/java/com/grkj/iscs/model/RealResponse.kt

@@ -1,3 +1,3 @@
-package com.grkj.iscs
+package com.grkj.iscs.model
 
 data class RealResponse(val code: Int, val msg: String, val data: Any?)

app/src/main/java/com/grkj/iscs/Token.kt → app/src/main/java/com/grkj/iscs/model/Token.kt

@@ -1,4 +1,4 @@
-package com.grkj.iscs
+package com.grkj.iscs.model
 
 import android.content.Context
 import android.content.SharedPreferences

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

@@ -1,6 +1,7 @@
-package com.grkj.iscs.activity
+package com.grkj.iscs.presenter
 
 import com.grkj.iscs.base.BasePresenter
+import com.grkj.iscs.iview.IModbusView
 import com.grkj.iscs.modbus.ModBusController
 
 class ModBusPresenter: BasePresenter<IModbusView>() {

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

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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=".activity.ScreenAdaptActivity">
-
-    <ImageView
-        android:layout_width="180dp"
-        android:layout_height="640dp"
-        android:background="#123456"/>
-
-    <TextView
-        android:id="@+id/tv_test"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:text="Hello World!"
-        android:textSize="50sp"/>
-
-</RelativeLayout>

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

@@ -1,15 +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=".activity.WebActivity">
-
-    <WebView
-        android:id="@+id/webView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
-
-</androidx.constraintlayout.widget.ConstraintLayout>