修复收到两个数据的问题

lib_common/src/main/AndroidManifest.xml

@@ -7,7 +7,7 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
-    <application>
+    <application android:requestLegacyExternalStorage="true">
 
         <!-- 屏幕适配基准DP -->
         <meta-data

lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/constant/MMKVName.kt

@@ -19,8 +19,8 @@ abstract class MMKVName {
             get() = "MANAGER_ID"//后台管理id
         val LANGUAGE_TYPE: String
             get() = "LANGUAGE_TYPE"//语言类型
-        val MDB: String
-            get() = "MDB"//支付通讯协议
+        val ICT: String
+            get() = "ICT"//支付通讯协议
         val CHANGE: String
             get() = "CHANGE"//找零功能
         val CONTACT_NAME: String

lib_common/src/main/java/com/quyunshuo/androidbaseframemvvm/common/util/XLogUtil.kt

@@ -1,6 +1,7 @@
 package com.quyunshuo.androidbaseframemvvm.common.util
 
 import android.os.Environment
+import android.util.Log
 import com.elvishew.xlog.LogConfiguration
 import com.elvishew.xlog.LogLevel
 import com.elvishew.xlog.XLog
@@ -32,9 +33,8 @@ object XLogUtil {
         val androidPrinter =
             AndroidPrinter(true)
 
-        val logFolder =
-            Environment.getExternalStorageDirectory().path.toString() + "/android_gif"
-
+        val logFolder ="/storage/emulated/0/logdata/"
+//            Environment.getExternalStorageDirectory().path.toString() + "/logdata"
         val filePrinter = FilePrinter.Builder(logFolder)
             .fileNameGenerator(DateFileNameGenerator())//日志文件名格式
             .backupStrategy(FileSizeBackupStrategy((500 * 1024 * 1024).toLong()))//单个日志文件的大小默认:FileSizeBackupStrategy(1024 * 1024) 500MB

module_home/src/main/java/com/quyunshuo/module/home/service/GlobalService.kt

@@ -124,7 +124,7 @@ class GlobalService :LifecycleService() {
     private fun initPayIctMdb() {
         CoroutineScope(Dispatchers.IO).launch {
             //MDB ICT
-            val payAgreement = SpUtils.getInt(MMKVName.MDB, 0)
+            val payAgreement = SpUtils.getInt(MMKVName.ICT, 0)
 
             XLogUtil.d("initPayIctMdb ："+ PayAgreementUtil.MDB_ICT[payAgreement!!])
             val createStrategy = PaySendDataFactory.createStrategy(PayAgreementUtil.MDB_ICT[payAgreement!!])

module_pay/src/main/java/com/module/pay/common/OtherEnum.kt

@@ -16,7 +16,7 @@ import com.quyunshuo.androidbaseframemvvm.common.util.AmountMoney
  * mmkvName：保存key
  */
 enum class OtherEnum(var nameId:Int, var nameS:String, var category:String, var default:Any, var type:Int, var mmkvName: String) {
-    AGREEMENT(R.string.agreement,"通讯协议","串口设置", PayAgreementUtil.MDB_ICT, 3,MMKVName.MDB),//ArrayList<String>(listOf("MDB","ICT","WMDB"))
+    AGREEMENT(R.string.agreement,"通讯协议","串口设置", PayAgreementUtil.MDB_ICT, 3,MMKVName.ICT),//ArrayList<String>(listOf("MDB","ICT","WMDB"))
     CHANGE(R.string.change,"找零功能","找零设置",false, 1,MMKVName.CHANGE),
     SHOPPING_TROLLEY(R.string.shopping_trolley,"购物车","购物车设置",true, 1,MMKVName.SHOPPING_TROLLEY),
     PROMOTION_CODE(R.string.promotion_code,"优惠码","功能开启",false, 1,MMKVName.PROMOTION_CODE),

module_pay/src/main/java/com/module/pay/common/PayAgreementUtil.kt

@@ -4,6 +4,6 @@ import com.module.pay.strategy.StrategyType
 
 object PayAgreementUtil {
     val MDB_ICT: ArrayList<StrategyType> = ArrayList<StrategyType>(listOf(
-        StrategyType.MDB,StrategyType.ICT
+        StrategyType.ICT ,StrategyType.MDB
     ))
 }

module_pay/src/main/java/com/module/pay/strategy/StrategyType.kt

@@ -1,5 +1,5 @@
 package com.module.pay.strategy
 
 enum class StrategyType {
-    MDB, ICT
+    ICT,MDB
 }

serialport-api/src/main/java/com/hboxs/serialport/sbc/VboxSerialPortReadThread.java

@@ -96,11 +96,12 @@ public class VboxSerialPortReadThread extends Thread {
             if (commandFrame == null) {
                 return;
             }
-            Log.d("backinifo","长度："+size+","+commandFrame.getCmd());
+//            Log.d("backinifo","长度："+size+","+commandFrame.getCmd());
+            XLogUtil.INSTANCE.d("长度："+size+","+commandFrame.getCmd());
             vboxSerialPortSendQueue.setReceived();//收到数据了，要停止了。
             synchronized (receiveBuffer) {
                 // 将新数据追加到缓冲区
-                receiveBuffer.write(received, 0, received.length);
+                receiveBuffer.write(received, 0, size);
                 // 尝试解析缓冲区
                 processBuffer();
             }
@@ -141,8 +142,8 @@ public class VboxSerialPortReadThread extends Thread {
         // 示例1：将字节数组转为十六进制字符串
         String hexStr =ByteUtil.ByteArrToHex(packet, 0, packet.length);
         EventBus.getDefault().post(new VBoxMessage(commandFrame.getCmd(), hexStr));
-        Log.d(TAG,"长度 收到的命令：3 "+ commandFrame.getCmd()+"收到有效数据包: " + hexStr);
-
+//        Log.d(TAG,"长度 收到的命令：3 "+ commandFrame.getCmd()+"收到有效数据包: " + hexStr);
+        XLogUtil.INSTANCE.d("长度 收到的命令：3 "+ commandFrame.getCmd()+"收到有效数据包: " + hexStr);
     }
 
     // 查找起始符位置

serialport-api/src/main/java/com/hboxs/serialport/sbc/VboxSerialPortSendQueue.java

@@ -9,6 +9,7 @@ import android.util.Log;
 
 import com.hboxs.serialport.sbc.frame.VboxCommandFrame;
 import com.hboxs.serialport.sbc.frame.VboxOrder;
+import com.quyunshuo.androidbaseframemvvm.common.util.XLogUtil;
 
 import java.util.LinkedList;
 
@@ -118,7 +119,8 @@ public class VboxSerialPortSendQueue {
                 isSendSuccess = false;
                 synchronized (VboxSerialPortSendQueue.class) {
                     sendOrderMessage(sMessageListRead.getFirst());
-                    Log.d(TAG, "长度 startReadListThread: "+currentFrame.getCmd());
+//                    Log.d(TAG, "长度 startReadListThread: "+currentFrame.getCmd());
+                    XLogUtil.INSTANCE.d("长度 startReadListThread: "+currentFrame.getCmd());
                 }
             }
 //                Thread.sleep(300);