JaycePC 1 ヶ月 前
コミット
226e027402

+ 1 - 1
app/build.gradle

@@ -13,7 +13,7 @@ android {
         //noinspection ExpiredTargetSdkVersion,OldTargetApi
         targetSdk 28
         versionCode 1
-        versionName "1.1"
+        versionName "1.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled = true

+ 0 - 5
app/src/main/java/xn/hxp/ui/MainActivity.kt

@@ -24,10 +24,6 @@ import com.blankj.utilcode.util.SPUtils
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.request.RequestOptions
-import com.clj.fastble.BleManager
-import com.clj.fastble.callback.BleScanCallback
-import com.clj.fastble.data.BleDevice
-import com.clj.fastble.scan.BleScanRuleConfig
 import com.kongzue.dialogx.dialogs.PopTip
 import com.lztek.toolkit.Lztek
 import com.rc.core.ui.activity.BaseActivity
@@ -64,7 +60,6 @@ import xn.hxp.utils.bluetooth.BleTool
 import xn.hxp.weidith.CustomDialog
 import java.net.ConnectException
 import java.net.SocketTimeoutException
-import java.util.UUID
 
 //首页 -  登录or 未登录
 public class MainActivity : BaseActivity() {

+ 1 - 1
app/src/main/java/xn/hxp/ui/SettingActivity.java

@@ -106,7 +106,7 @@ public class SettingActivity extends BaseActivity {
                 return;
             }
             SPUtils.getInstance().put("cameraSelector", binding.backRB.isChecked() ? 1 : 0);
-            SharedPreferencesHelper.INSTANCE.saveUrlBase(this, new SettingsBean(httpUriETText.toString(), httpUriETText.toString(), httpUriETText.toString(), binding.backRB.isChecked() ? "1" : "0", oldPasswordETText.toString()));
+            SharedPreferencesHelper.INSTANCE.saveUrlBase(this, new SettingsBean(httpUriETText.toString(), httpUriETText.toString(), httpUriETText.toString(), binding.frontRB.isChecked() ? "0" : "1", oldPasswordETText.toString()));
             WaitDialog.show("稍后重启App");
             binding.backRB.postDelayed(() -> AppUtils.relaunchApp(true), 1500);
         } catch (Exception e) {

+ 15 - 1
app/src/main/java/xn/hxp/ui/plan/add/AddActivity.java

@@ -18,6 +18,8 @@ import com.blankj.utilcode.util.GsonUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.TimeUtils;
 import com.bumptech.glide.Glide;
+import com.clj.fastble.BleManager;
+import com.clj.fastble.data.BleDevice;
 import com.kongzue.dialogx.dialogs.PopTip;
 import com.rc.core.ui.activity.BaseActivity;
 import com.rc.httpcore.HttpConfig;
@@ -31,6 +33,7 @@ import com.rc.httpcore.client.HttpTool;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Locale;
@@ -146,7 +149,7 @@ public class AddActivity extends BaseActivity {
 
     @Override
     protected void onInit() {
-// 化学品搜索
+        // 化学品搜索
         binding.chemicalSearchBT.setOnClickListener(v -> {
             Editable chemicalSearchETText = binding.chemicalSearchET.getText();
             if (null == chemicalSearchETText || TextUtils.isEmpty(chemicalSearchETText)) {
@@ -336,6 +339,17 @@ public class AddActivity extends BaseActivity {
             binding.belongET.setText(userName + "-" + account);
             binding.belongET.setTag(belongingPerson.getUserId());
         }
+
+        List<String> msclist = new ArrayList<>();
+        List<BleDevice> bleDeviceList = BleManager.getInstance().getAllConnectedDevice();
+        LogUtils.d(bleDeviceList);
+        if (null != bleDeviceList) {
+            for (int i = 0; i < bleDeviceList.size(); i++) {
+                BleDevice bleDevice = bleDeviceList.get(i);
+                msclist.add(bleDevice.getMac());
+            }
+        }
+        LogUtils.d(msclist);
     }
 
     @Override

+ 15 - 2
app/src/main/java/xn/hxp/utils/bluetooth/BleTool.java

@@ -31,6 +31,7 @@ public enum BleTool {
     private BleNotifyCallback bleNotifyCallback;
 
     private String weight = "";
+    private long lastWeightTime = 0;
 
     public interface BleCallback {
         void onSuccess();
@@ -140,9 +141,20 @@ public enum BleTool {
                                                                         if (null != bleCallback) {
                                                                             if (split.length > 0) {
                                                                                 String line = split[0].trim();
-                                                                                if (!weight.equals(line)) {
+                                                                                if (!weight.equals(line) || (System.currentTimeMillis() - lastWeightTime > 3000)) {
+                                                                                    lastWeightTime = System.currentTimeMillis();
                                                                                     weight = line;
-                                                                                    bleCallback.onChanged(weight);
+                                                                                    LogUtils.d("蓝牙", "处理前的蓝牙数据", data, split);
+                                                                                    if (weight.startsWith("=")) {
+                                                                                        try {
+                                                                                            String wD = new StringBuilder(weight.replace("=", "")).reverse().toString();
+                                                                                            bleCallback.onChanged(wD);
+                                                                                        } catch (Exception e) {
+                                                                                            LogUtils.e(e.getMessage());
+                                                                                        }
+                                                                                    } else {
+                                                                                        bleCallback.onChanged(weight);
+                                                                                    }
                                                                                 }
                                                                             }
                                                                         }
@@ -215,4 +227,5 @@ public enum BleTool {
             LogUtils.e(Log.getStackTraceString(e));
         }
     }
+
 }

+ 9 - 2
app/src/main/java/xn/hxp/weidith/ble/BluetoothWeighDialog.java

@@ -9,9 +9,11 @@ import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.Toast;
 
 import androidx.appcompat.app.AppCompatDialog;
 
+import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.ThreadUtils;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
@@ -83,8 +85,13 @@ public class BluetoothWeighDialog extends AppCompatDialog {
 
             @Override
             public void onChanged(String weight) {
-                hxpChemicalVo.setWeigh(Double.parseDouble(weight));
-                binding.weighTV.setText(weight + "g");
+                try {
+                    double w = Double.parseDouble(weight);
+                    hxpChemicalVo.setWeigh(w);
+                    binding.weighTV.setText(weight + "g");
+                } catch (Exception e) {
+                    ThreadUtils.runOnUiThread(() -> Toast.makeText(ActivityUtils.getTopActivity(), "蓝牙称值异常! " + weight, Toast.LENGTH_SHORT).show());
+                }
                 if (binding.weightRL.getVisibility() != View.VISIBLE) {
                     binding.weightRL.setVisibility(View.VISIBLE);
                 }

+ 1 - 1
app/src/main/res/layout/activity_setting.xml

@@ -201,12 +201,12 @@
                             android:id="@+id/front_RB"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
-                            android:checked="true"
                             android:paddingHorizontal="10dp"
                             android:text="前置相机" />
 
                         <RadioButton
                             android:id="@+id/back_RB"
+                            android:checked="true"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
                             android:paddingHorizontal="10dp"

+ 12 - 12
serialport/.cxx/Debug/6e5q1f5t/arm64-v8a/configure_fingerprint.bin

@@ -2,28 +2,28 @@ C/C++ Structured Logb
 `
 ^D:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	 …þŠÔ2 —’¼‘Ò2_
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	̦ŸÖÕ2 —’¼‘Ò2_
 ]
-[D:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\android_gradle_build.json	 …þŠÔ2˜
+[D:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\android_gradle_build.json	̦ŸÖÕ2˜
  œ’¼‘Ò2d
 b
-`D:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\android_gradle_build_mini.json	 …þŠÔ2”	 ¼’¼‘Ò2Q
+`D:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\android_gradle_build_mini.json	̦ŸÖÕ2”	 ¼’¼‘Ò2Q
 O
-MD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\build.ninja	 …þŠÔ2މ 쑼‘Ò2U
+MD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\build.ninja	̦ŸÖÕ2މ 쑼‘Ò2U
 S
-QD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\build.ninja.txt	 …þŠÔ2Z
+QD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\build.ninja.txt	̦ŸÖÕ2Z
 X
-VD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\build_file_index.txt	 …þŠÔ2
? ¿’¼‘Ò2[
+VD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\build_file_index.txt	̦ŸÖÕ2
? ¿’¼‘Ò2[
 Y
-WD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\compile_commands.json	 …þŠÔ2¸ 둼‘Ò2_
+WD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\compile_commands.json	̦ŸÖÕ2¸ 둼‘Ò2_
 ]
-[D:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\compile_commands.json.bin	 …þŠÔ2	… 둼‘Ò2e
+[D:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\compile_commands.json.bin	̦ŸÖÕ2	… 둼‘Ò2e
 c
-aD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\metadata_generation_command.txt	 …þŠÔ2
+aD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\metadata_generation_command.txt	ͦŸÖÕ2
 ž ¾’¼‘Ò2X
 V
-TD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\prefab_config.json	 …þŠÔ2
( ¾’¼‘Ò2]
+TD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\prefab_config.json	ͦŸÖÕ2
( ¾’¼‘Ò2]
 [
-YD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\symbol_folder_index.txt	 …þŠÔ2
X ¾’¼‘Ò2C
+YD:\work\HuaXuePin\xn_hxp\serialport\.cxx\Debug\6e5q1f5t\arm64-v8a\symbol_folder_index.txt	ͦŸÖÕ2
X ¾’¼‘Ò2C
 A
-?D:\work\HuaXuePin\xn_hxp\serialport\src\main\cpp\CMakeLists.txt	 …þŠÔ2
Ó ÈÒðê©2
+?D:\work\HuaXuePin\xn_hxp\serialport\src\main\cpp\CMakeLists.txt	ͦŸÖÕ2
Ó ÈÒðê©2

+ 12 - 12
serialport/.cxx/RelWithDebInfo/5y6y3m58/arm64-v8a/configure_fingerprint.bin

@@ -2,28 +2,28 @@ C/C++ Structured Logk
 i
 gD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	øî—ŒÔ2 ô±ôèÓ2h
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	ÝŽÔÜÕ2 ô±ôèÓ2h
 f
-dD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\android_gradle_build.json	øî—ŒÔ2Ç
+dD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\android_gradle_build.json	ÝŽÔÜÕ2Ç
  ‚²ôèÓ2m
 k
-iD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\android_gradle_build_mini.json	øî—ŒÔ2Á	 À²ôèÓ2Z
+iD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\android_gradle_build_mini.json	ÝŽÔÜÕ2Á	 À²ôèÓ2Z
 X
-VD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\build.ninja	øî—ŒÔ2Û‰ À±ôèÓ2^
+VD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\build.ninja	ÝŽÔÜÕ2Û‰ À±ôèÓ2^
 \
-ZD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\build.ninja.txt	øî—ŒÔ2c
+ZD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\build.ninja.txt	ÝŽÔÜÕ2c
 a
-_D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\build_file_index.txt	øî—ŒÔ2
? DzôèÓ2d
+_D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\build_file_index.txt	ÝŽÔÜÕ2
? DzôèÓ2d
 b
-`D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\compile_commands.json	øî—ŒÔ2º À±ôèÓ2h
+`D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\compile_commands.json	ÝŽÔÜÕ2º À±ôèÓ2h
 f
-dD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\compile_commands.json.bin	øî—ŒÔ2	� À±ôèÓ2n
+dD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\compile_commands.json.bin	ÝŽÔÜÕ2	� À±ôèÓ2n
 l
-jD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\metadata_generation_command.txt	øî—ŒÔ2
+jD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\metadata_generation_command.txt	ÝŽÔÜÕ2
 Â ƲôèÓ2a
 _
-]D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\prefab_config.json	øî—ŒÔ2
( ƲôèÓ2f
+]D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\prefab_config.json	ÝŽÔÜÕ2
( ƲôèÓ2f
 d
-bD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\symbol_folder_index.txt	øî—ŒÔ2
a DzôèÓ2C
+bD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\arm64-v8a\symbol_folder_index.txt	ÝŽÔÜÕ2
a DzôèÓ2C
 A
-?D:\work\HuaXuePin\xn_hxp\serialport\src\main\cpp\CMakeLists.txt	øî—ŒÔ2
Ó ÈÒðê©2
+?D:\work\HuaXuePin\xn_hxp\serialport\src\main\cpp\CMakeLists.txt	ÝŽÔÜÕ2
Ó ÈÒðê©2

+ 12 - 12
serialport/.cxx/RelWithDebInfo/5y6y3m58/armeabi-v7a/configure_fingerprint.bin

@@ -2,28 +2,28 @@ C/C++ Structured Logm
 k
 iD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	³ï—ŒÔ2 •ÛôèÓ2j
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	ì�ÔÜÕ2 •ÛôèÓ2j
 h
-fD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\android_gradle_build.json	³ï—ŒÔ2Ó
+fD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\android_gradle_build.json	ì�ÔÜÕ2Ó
  –ÛôèÓ2o
 m
-kD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\android_gradle_build_mini.json	³ï—ŒÔ2Í	 ›ÛôèÓ2\
+kD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\android_gradle_build_mini.json	ì�ÔÜÕ2Í	 ›ÛôèÓ2\
 Z
-XD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\build.ninja	³ï—ŒÔ2›Š úÚôèÓ2`
+XD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\build.ninja	ì�ÔÜÕ2›Š úÚôèÓ2`
 ^
-\D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\build.ninja.txt	³ï—ŒÔ2e
+\D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\build.ninja.txt	ì�ÔÜÕ2e
 c
-aD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\build_file_index.txt	³ï—ŒÔ2
? œÛôèÓ2f
+aD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\build_file_index.txt	ì�ÔÜÕ2
? œÛôèÓ2f
 d
-bD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\compile_commands.json	³ï—ŒÔ2Õ úÚôèÓ2j
+bD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\compile_commands.json	ì�ÔÜÕ2Õ úÚôèÓ2j
 h
-fD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\compile_commands.json.bin	³ï—ŒÔ2	¹ úÚôèÓ2p
+fD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\compile_commands.json.bin	ì�ÔÜÕ2	¹ úÚôèÓ2p
 n
-lD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\metadata_generation_command.txt	³ï—ŒÔ2
+lD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\metadata_generation_command.txt	í�ÔÜÕ2
 Ì ›ÛôèÓ2c
 a
-_D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\prefab_config.json	³ï—ŒÔ2
( ›ÛôèÓ2h
+_D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\prefab_config.json	í�ÔÜÕ2
( ›ÛôèÓ2h
 f
-dD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\symbol_folder_index.txt	³ï—ŒÔ2
c œÛôèÓ2C
+dD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\armeabi-v7a\symbol_folder_index.txt	í�ÔÜÕ2
c œÛôèÓ2C
 A
-?D:\work\HuaXuePin\xn_hxp\serialport\src\main\cpp\CMakeLists.txt	³ï—ŒÔ2
Ó ÈÒðê©2
+?D:\work\HuaXuePin\xn_hxp\serialport\src\main\cpp\CMakeLists.txt	í�ÔÜÕ2
Ó ÈÒðê©2

+ 12 - 12
serialport/.cxx/RelWithDebInfo/5y6y3m58/x86/configure_fingerprint.bin

@@ -2,28 +2,28 @@ C/C++ Structured Loge
 c
 aD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	ùï—ŒÔ2 –ú²‘Ò2b
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	Ä�ÔÜÕ2 –ú²‘Ò2b
 `
-^D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\android_gradle_build.json	ùï—ŒÔ2£
+^D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\android_gradle_build.json	Ä�ÔÜÕ2£
  šú²‘Ò2g
 e
-cD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\android_gradle_build_mini.json	ùï—ŒÔ2�	 ·ú²‘Ò2T
+cD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\android_gradle_build_mini.json	Ä�ÔÜÕ2�	 ·ú²‘Ò2T
 R
-PD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\build.ninja	ùï—ŒÔ2¢‰ ëù²‘Ò2X
+PD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\build.ninja	Ä�ÔÜÕ2¢‰ ëù²‘Ò2X
 V
-TD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\build.ninja.txt	ùï—ŒÔ2]
+TD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\build.ninja.txt	Ä�ÔÜÕ2]
 [
-YD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\build_file_index.txt	ùï—ŒÔ2
? »ú²‘Ò2^
+YD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\build_file_index.txt	Ä�ÔÜÕ2
? »ú²‘Ò2^
 \
-ZD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\compile_commands.json	úï—ŒÔ2± êù²‘Ò2b
+ZD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\compile_commands.json	Ä�ÔÜÕ2± êù²‘Ò2b
 `
-^D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\compile_commands.json.bin	úï—ŒÔ2	‡ êù²‘Ò2h
+^D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\compile_commands.json.bin	Ä�ÔÜÕ2	‡ êù²‘Ò2h
 f
-dD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\metadata_generation_command.txt	úï—ŒÔ2
+dD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\metadata_generation_command.txt	Ä�ÔÜÕ2
 ¤ ºú²‘Ò2[
 Y
-WD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\prefab_config.json	úï—ŒÔ2
( ºú²‘Ò2`
+WD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\prefab_config.json	Ä�ÔÜÕ2
( ºú²‘Ò2`
 ^
-\D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\symbol_folder_index.txt	úï—ŒÔ2
[ ºú²‘Ò2C
+\D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86\symbol_folder_index.txt	Ä�ÔÜÕ2
[ ºú²‘Ò2C
 A
-?D:\work\HuaXuePin\xn_hxp\serialport\src\main\cpp\CMakeLists.txt	úï—ŒÔ2
Ó ÈÒðê©2
+?D:\work\HuaXuePin\xn_hxp\serialport\src\main\cpp\CMakeLists.txt	Ä�ÔÜÕ2
Ó ÈÒðê©2

+ 12 - 12
serialport/.cxx/RelWithDebInfo/5y6y3m58/x86_64/configure_fingerprint.bin

@@ -2,28 +2,28 @@ C/C++ Structured Logh
 f
 dD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\additional_project_files.txtC
 A
-?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	Çð—ŒÔ2 Æ„õèÓ2e
+?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint	€‘ÔÜÕ2 Æ„õèÓ2e
 c
-aD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\android_gradle_build.json	Çð—ŒÔ2µ
+aD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\android_gradle_build.json	�‘ÔÜÕ2µ
  Ç„õèÓ2j
 h
-fD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\android_gradle_build_mini.json	Çð—ŒÔ2¯	 Ì„õèÓ2W
+fD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\android_gradle_build_mini.json	�‘ÔÜÕ2¯	 Ì„õèÓ2W
 U
-SD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\build.ninja	Çð—ŒÔ2¿‰ œ„õèÓ2[
+SD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\build.ninja	�‘ÔÜÕ2¿‰ œ„õèÓ2[
 Y
-WD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\build.ninja.txt	Çð—ŒÔ2`
+WD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\build.ninja.txt	�‘ÔÜÕ2`
 ^
-\D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\build_file_index.txt	Çð—ŒÔ2
? Ï„õèÓ2a
+\D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\build_file_index.txt	�‘ÔÜÕ2
? Ï„õèÓ2a
 _
-]D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\compile_commands.json	Çð—ŒÔ2¶ ›„õèÓ2e
+]D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\compile_commands.json	�‘ÔÜÕ2¶ ›„õèÓ2e
 c
-aD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\compile_commands.json.bin	Çð—ŒÔ2	Œ ›„õèÓ2k
+aD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\compile_commands.json.bin	�‘ÔÜÕ2	Œ ›„õèÓ2k
 i
-gD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\metadata_generation_command.txt	Çð—ŒÔ2
+gD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\metadata_generation_command.txt	�‘ÔÜÕ2
 ³ Ì„õèÓ2^
 \
-ZD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\prefab_config.json	Çð—ŒÔ2
( Í„õèÓ2c
+ZD:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\prefab_config.json	�‘ÔÜÕ2
( Í„õèÓ2c
 a
-_D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\symbol_folder_index.txt	Çð—ŒÔ2
^ ΄õèÓ2C
+_D:\work\HuaXuePin\xn_hxp\serialport\.cxx\RelWithDebInfo\5y6y3m58\x86_64\symbol_folder_index.txt	�‘ÔÜÕ2
^ ΄õèÓ2C
 A
-?D:\work\HuaXuePin\xn_hxp\serialport\src\main\cpp\CMakeLists.txt	Çð—ŒÔ2
Ó ÈÒðê©2
+?D:\work\HuaXuePin\xn_hxp\serialport\src\main\cpp\CMakeLists.txt	�‘ÔÜÕ2
Ó ÈÒðê©2