diff --git a/app/build.gradle b/app/build.gradle
index ed281be..a3e3c2c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,9 +14,9 @@ android {
minSdk 26
targetSdk 35
// 指定应用内部版本号
- versionCode 27
+ versionCode 30
// 指定展示给用户的版本号
- versionName "1.1.27"
+ versionName "1.1.30"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/app/src/main/assets/web/asset-manifest.json b/app/src/main/assets/web/asset-manifest.json
index acac809..a4360cf 100644
--- a/app/src/main/assets/web/asset-manifest.json
+++ b/app/src/main/assets/web/asset-manifest.json
@@ -1,7 +1,7 @@
{
"files": {
- "main.css": "/static/css/main.85138b91.css",
- "main.js": "/static/js/main.deeffa60.js",
+ "main.css": "/static/css/main.1950d39d.css",
+ "main.js": "/static/js/main.7cfdbd68.js",
"static/js/453.e7f11a48.chunk.js": "/static/js/453.e7f11a48.chunk.js",
"static/media/icon_leftR.svg": "/static/media/icon_leftR.76cd3e03bb846b0bacb0a84808f24c36.svg",
"static/media/icon_tab3_u.svg": "/static/media/icon_tab3_u.6d18cbd7c4dc6a54f745fdfcc7716050.svg",
@@ -26,12 +26,12 @@
"static/media/icon_bluetooth.svg": "/static/media/icon_bluetooth.a48021d03233ba0570bf3960cddf6a65.svg",
"static/media/power.svg": "/static/media/power.544f6ce9a5b3e930a515cf130f9f9551.svg",
"static/media/icon_check_s_u.svg": "/static/media/icon_check_s_u.2c5e20bec088338dc1cb2161b5cba37d.svg",
- "main.85138b91.css.map": "/static/css/main.85138b91.css.map",
- "main.deeffa60.js.map": "/static/js/main.deeffa60.js.map",
+ "main.1950d39d.css.map": "/static/css/main.1950d39d.css.map",
+ "main.7cfdbd68.js.map": "/static/js/main.7cfdbd68.js.map",
"453.e7f11a48.chunk.js.map": "/static/js/453.e7f11a48.chunk.js.map"
},
"entrypoints": [
- "static/css/main.85138b91.css",
- "static/js/main.deeffa60.js"
+ "static/css/main.1950d39d.css",
+ "static/js/main.7cfdbd68.js"
]
}
\ No newline at end of file
diff --git a/app/src/main/assets/web/index.html b/app/src/main/assets/web/index.html
index 82630c3..85a5e94 100644
--- a/app/src/main/assets/web/index.html
+++ b/app/src/main/assets/web/index.html
@@ -1 +1 @@
-廓形仪
\ No newline at end of file
+廓形仪
\ No newline at end of file
diff --git a/app/src/main/java/com/iflytop/profilometer/api/ble/BleApi.java b/app/src/main/java/com/iflytop/profilometer/api/ble/BleApi.java
index 7b09b98..eacb8ad 100644
--- a/app/src/main/java/com/iflytop/profilometer/api/ble/BleApi.java
+++ b/app/src/main/java/com/iflytop/profilometer/api/ble/BleApi.java
@@ -28,10 +28,7 @@ public class BleApi {
*/
public String start() {
try {
- BluetoothGatt bluetoothGatt = BleManager.getInstance().getBluetoothGatt();
- if (bluetoothGatt == null) {
- BleManager.getInstance().startScan();
- }
+ BleManager.getInstance().startScan();
BleWebsocketManager.getInstance().startWsPush();
return Result.success();
} catch (Exception e) {
diff --git a/app/src/main/java/com/iflytop/profilometer/api/ws/BleWebsocketManager.java b/app/src/main/java/com/iflytop/profilometer/api/ws/BleWebsocketManager.java
index d5a68d3..7ba46d2 100644
--- a/app/src/main/java/com/iflytop/profilometer/api/ws/BleWebsocketManager.java
+++ b/app/src/main/java/com/iflytop/profilometer/api/ws/BleWebsocketManager.java
@@ -3,7 +3,6 @@ package com.iflytop.profilometer.api.ws;
import android.annotation.SuppressLint;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothGatt;
-import android.util.Log;
import com.iflytop.profilometer.core.bluetooth.BleManager;
import com.iflytop.profilometer.core.websocket.WebSocketManager;
@@ -56,17 +55,16 @@ public class BleWebsocketManager {
bleMap.put("name", gattDevice.getName());
bleMap.put("linked", true);
bleList.add(bleMap);
- }else{
- for (BluetoothDevice bluetoothDevice : scannedDevices) {
- String mac = bluetoothDevice.getAddress();
- boolean exists = bleList.stream() .anyMatch(map -> mac.equals(map.get("mac")));
- if(! exists){
- Map bleMap = new HashMap<>();
- bleMap.put("mac", mac);
- bleMap.put("name", bluetoothDevice.getName() == null ? "未命名" : bluetoothDevice.getName());
- bleMap.put("linked", false);
- bleList.add(bleMap);
- }
+ }
+ for (BluetoothDevice bluetoothDevice : scannedDevices) {
+ String mac = bluetoothDevice.getAddress();
+ boolean exists = bleList.stream().anyMatch(map -> mac.equals(map.get("mac")));
+ if (!exists) {
+ Map bleMap = new HashMap<>();
+ bleMap.put("mac", mac);
+ bleMap.put("name", bluetoothDevice.getName() == null ? "未命名" : bluetoothDevice.getName());
+ bleMap.put("linked", false);
+ bleList.add(bleMap);
}
}
bleList.sort(Comparator.comparing(map -> (String) map.get("mac")));