1.设置波特率等参数固定

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.dlc.eboard"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 12
-        versionName "1.1.2-alpha-kuangda"
+        versionCode 11
+        versionName "1.1.3-alpha-kuangda"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 

app/release/output-metadata.json

@@ -1,18 +1,37 @@
 {
-  "version": 2,
+  "version": 3,
   "artifactType": {
     "type": "APK",
     "kind": "Directory"
   },
   "applicationId": "com.dlc.eboard",
-  "variantName": "processReleaseResources",
+  "variantName": "release",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
+      "attributes": [],
       "versionCode": 11,
-      "versionName": "1.1.1-alpha-kuangda",
-      "outputFile": "Eboard_release_v11_1.1.1-alpha-kuangda_202407171137release.apk"
+      "versionName": "1.1.3-alpha-kuangda",
+      "outputFile": "Eboard_release_v11_1.1.3-alpha-kuangda_202503260930release.apk"
     }
-  ]
+  ],
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/Eboard_release_v11_1.1.3-alpha-kuangda_202503260930release.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/Eboard_release_v11_1.1.3-alpha-kuangda_202503260930release.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 21
 }

app/src/main/java/com/dlc/eboard/serial/SerialPortManager.kt

@@ -3,7 +3,6 @@ package com.dlc.eboard.serial
 import android.content.Context
 import android.os.Handler
 import android.os.Looper
-import com.dlc.eboard.sp.PortDevicesSp
 import com.rc.core.log.RcLog
 import eyecool_serialport_api.SerialPort
 import java.io.File
@@ -44,12 +43,11 @@ class SerialPortManager(private val listener: OnSerialListener? = null) {
 
     fun connect(context: Context) {
         try {
-            val device = PortDevicesSp.loadConfig(context)
-            mSerialPort = SerialPort(File(device.path), device.baudRate, 0)
+            mSerialPort = SerialPort(File("/dev/ttyS3"), 9600, 0)
             mInputStream = mSerialPort?.inputStream
             mOutputStream = mSerialPort?.outputStream
-            listener?.onConnected(true, "path:${device.path}, baudRate:${device.baudRate} connected.")
-            RcLog.info("==============串口${device.path}  ${device.baudRate}")
+            listener?.onConnected(true, "path:${"/dev/ttyS3"}, baudRate:${9600} connected.")
+            RcLog.info("==============串口${"/dev/ttyS3"}  ${9600}")
             mReadThread = ReadThread(mInputStream) { buffer, size ->
                 onDataReceived(buffer, size)
             }

app/src/main/java/com/dlc/eboard/sp/PortDevicesSp.kt

@@ -1,62 +0,0 @@
-package com.dlc.eboard.sp
-
-import android.content.Context
-import com.dlc.eboard.serial.SerialPortManager
-import java.lang.Exception
-
-/**
- * info
- *
- * @author ReiChin_
- */
-object PortDevicesSp {
-
-    private const val SP_NAME = "port_devices_sp"
-    private const val KEY_PATH = "_path"
-    private const val KEY_BAUD_RATE = "_baud_rate"
-
-    fun saveConfig(
-        context: Context,
-        config: PortDevicesConfig,
-        type: PortDevicesType = PortDevicesType.SCAN
-    ) {
-        saveConfig(context, config.path, config.baudRate, type)
-    }
-
-    fun saveConfig(
-        context: Context,
-        path: String,
-        baudRate: Int,
-        type: PortDevicesType = PortDevicesType.SCAN
-    ) {
-        val sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE)
-        sp.edit()
-            .putString("${type.name}${KEY_PATH}", path)
-            .putInt("${type.name}${KEY_BAUD_RATE}", baudRate)
-            .apply()
-    }
-
-    fun loadConfig(
-        context: Context,
-        type: PortDevicesType = PortDevicesType.SCAN,
-        defPath: String = SerialPortManager.PATH,
-        defBaudRate: Int = SerialPortManager.BAUD_RATE
-    ): PortDevicesConfig {
-        return try {
-            val sp = context.getSharedPreferences(SP_NAME, Context.MODE_PRIVATE)
-            val path = sp.getString("${type.name}${KEY_PATH}", defPath)!!
-            val baudRate = sp.getInt("${type.name}${KEY_BAUD_RATE}", defBaudRate)
-            PortDevicesConfig(path = path, baudRate = baudRate)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            PortDevicesConfig(path = defPath, baudRate = defBaudRate)
-        }
-    }
-
-}
-
-data class PortDevicesConfig(val path: String, val baudRate: Int)
-
-enum class PortDevicesType {
-    SCAN
-}

app/src/main/java/com/dlc/eboard/ui/HomeActivity.kt

@@ -266,7 +266,6 @@ class HomeActivity :
         })
         RcLog.info("==================LabApp.sLabConfig?.authType:" + LabApp.sLabConfig?.authType)
         // 身份验证
-
         viewBinding.accessVerify.setOnClickListener(FastClickDelegate {
             RcLog.info("==================LabApp.sLabConfig?.authType:" + LabApp.sLabConfig?.authType)
             val authType = LabApp.sLabConfig?.authType ?: return@FastClickDelegate

app/src/main/java/com/dlc/eboard/ui/risk/RiskActivity.kt

@@ -7,6 +7,7 @@ import android.widget.TextView
 import androidx.recyclerview.widget.LinearLayoutManager
 import cn.bingoogolapple.qrcode.core.BGAQRCodeUtil
 import cn.bingoogolapple.qrcode.zxing.QRCodeEncoder
+import com.blankj.utilcode.util.LogUtils
 import com.bumptech.glide.Glide
 import com.chad.library.adapter.base.BaseQuickAdapter
 import com.chad.library.adapter.base.viewholder.BaseViewHolder
@@ -110,7 +111,7 @@ open class RiskActivity :
                 html.append("<HTML><HEAD><LINK href=\"simple_table.css\" type=\"text/css\" rel=\"stylesheet\"/></HEAD><body>")
                 html.append(EscapeUnescape.unescape(data.content))
                 html.append("</body></HTML>")
-
+                LogUtils.d(html)
                 viewBinding.webView.loadDataWithBaseURL(
                     "file:///android_asset/",
                     html.toString(),
@@ -164,7 +165,7 @@ open class RiskActivity :
  * 危险源列表
  */
 private class RiskAdapter :
-    BaseQuickAdapter<LabHazardVo, BaseViewHolder>(R.layout.item_risk){
+    BaseQuickAdapter<LabHazardVo, BaseViewHolder>(R.layout.item_risk) {
 
     var selectedItemId: String? = null
 

app/src/main/java/com/dlc/eboard/ui/rule/SafetyRegulationDetailActivity.kt

@@ -1,8 +1,10 @@
 package com.dlc.eboard.ui.rule
 
 import android.os.Bundle
+import android.util.Log
 import cn.bingoogolapple.qrcode.core.BGAQRCodeUtil
 import cn.bingoogolapple.qrcode.zxing.QRCodeEncoder
+import com.blankj.utilcode.util.LogUtils
 import com.bumptech.glide.Glide
 import com.dlc.eboard.R
 import com.dlc.eboard.databinding.ActivitySafetyRegulationDetailBinding
@@ -92,12 +94,18 @@ class SafetyRegulationDetailActivity :
 
                 override fun onSuccess() {
                     dismissLoading()
-                    viewBinding.pdfview.fromFile(pdfFile)
-                        .defaultPage(1)
-                        .showMinimap(false)
-                        .swipeVertical(true)
-                        .enableSwipe(true)
-                        .load()
+                    try {
+                        viewBinding.pdfview.fromFile(pdfFile)
+                            .defaultPage(1)
+                            .showMinimap(false)
+                            .swipeVertical(true)
+                            .enableSwipe(true)
+                            .load()
+                    } catch (e: Exception) {
+                        LogUtils.e(Log.getStackTraceString(e))
+                        showToast("PDF文件无法播放,可能已损坏,请重新上传后重试!")
+                    }
+
                 }
 
                 override fun onFailed(errMsg: String?) {

app/src/main/java/com/dlc/eboard/ui/settings/ScanSettingsActivity.kt

@@ -4,7 +4,6 @@ import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import com.dlc.eboard.R
 import com.dlc.eboard.databinding.ActivitySettingsScanBinding
-import com.dlc.eboard.sp.PortDevicesSp
 import com.rc.core.ui.activity.RcBaseActivity
 import eyecool_serialport_api.SerialPortFinder
 
@@ -45,11 +44,6 @@ class ScanSettingsActivity :
 
         // 确定
         viewBinding.confirm.setOnClickListener {
-            PortDevicesSp.saveConfig(
-                context = this,
-                path = viewBinding.path.text.toString(),
-                baudRate = viewBinding.baudRate.text.toString().toInt()
-            )
             viewBinding.confirm.postDelayed({
                 setResult(RESULT_OK)
                 finish()
@@ -58,9 +52,8 @@ class ScanSettingsActivity :
     }
 
     override fun initData() {
-        val device = PortDevicesSp.loadConfig(this)
-        viewBinding.path.text = device.path
-        viewBinding.baudRate.text = device.baudRate.toString()
+        viewBinding.path.text = "/dev/ttyS3"
+        viewBinding.baudRate.text = "9600"
     }
 
 }

app/src/main/java/com/dlc/eboard/ui/settings/SettingsActivity.kt

@@ -12,7 +12,6 @@ import com.dlc.eboard.common.Constants
 import com.dlc.eboard.databinding.ActivitySettingsBinding
 import com.dlc.eboard.sp.EnvConfig
 import com.dlc.eboard.sp.EnvSp
-import com.dlc.eboard.sp.PortDevicesSp
 import com.dlc.eboard.ui.SplashActivity
 import com.dlc.eboard.ui.auth.FourChoiceAuthActivity
 import com.dlc.eboard.utils.SharedPreferencesUtil
@@ -179,9 +178,8 @@ class SettingsActivity : RcBaseActivity<ActivitySettingsBinding>() {
     }
 
     private fun loadScanConfig() {
-        val device = PortDevicesSp.loadConfig(this)
         viewBinding.scan.text =
-            String.format(Locale.US, "path %s, baud rate %d", device.path, device.baudRate)
+            String.format(Locale.US, "path %s, baud rate %d", "/dev/ttyS3", "9600")
     }
 
     // static + 弱引用  防止内存泄露

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

@@ -48,7 +48,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="18dp"
                     android:layout_marginTop="8dp"
-                    android:text="党员自建小组"
+                    android:text="党员自管小组"
                     android:textColor="#FF0B85F8"
                     android:textSize="14sp" />