From 4c6f5510f545f27ab7a5b76fbc40278f118ffe6b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 25 三月 2026 16:52:04 +0800
Subject: [PATCH] 2026年03月25日16:51:49
---
app/src/main/java/com/hdl/photovoltaic/utils/BleWifiConfiguratorUtils.java | 143 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 121 insertions(+), 22 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/BleWifiConfiguratorUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/BleWifiConfiguratorUtils.java
index 3b9e8a4..f8b302d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/BleWifiConfiguratorUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/BleWifiConfiguratorUtils.java
@@ -327,6 +327,7 @@
bluetoothGatt.disconnect(); // 鍏堟柇寮�杩炴帴
bluetoothGatt.close();
bluetoothGatt = null;
+ Log.d(TAG, "Connecting to 鍏堟柇寮�鏃ц摑鐗欒繛鎺�");
}
BluetoothDevice device = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(deviceAddress);
// 鑷姩杩炴帴 = false锛岄伩鍏嶇郴缁熺紦瀛樿繛鎺�
@@ -369,9 +370,15 @@
gatt.discoverServices();
} else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
isConnected = false;
+// if (bluetoothGatt != null) {
+// bluetoothGatt.close();
+// bluetoothGatt = null;
+// }
if (connectListener != null) {
callbackHandler.post(() -> connectListener.onDisconnected());
}
+
+ Log.d(TAG, "Connected to GATT server, onDisconnected");
}//
}
@@ -387,6 +394,9 @@
}
characteristic = targetService.getCharacteristic(charUuid);
notifyCharacteristic = targetService.getCharacteristic(notifyCharUuid);
+ boolean mtuRequestResult = gatt.requestMtu(512); // 榛樿璁剧疆璇锋眰鏈�澶� MTU锛屾湁璁惧鍙兘涓嶆敮鎸�
+ Log.d(TAG, "requestMtu(512) 缁撴灉锛�" + mtuRequestResult);
+
if (characteristic == null) {
Log.e(TAG, "Required characteristics not found");
notifyConnectionFailed("Characteristics not found");
@@ -419,7 +429,7 @@
}
return;
}
-
+ Log.d(TAG, "onCharacteristicWrite: 鍐欏叆鎴愬姛鍥炲");
if (characteristic.getUuid().equals(charUuid)) {
//鍐欏叆鎴愬姛
if (writeListener != null) {
@@ -431,8 +441,12 @@
@Override
public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) {
+ Log.d(TAG, "onCharacteristicChanged: " + characteristic.getUuid());
+
+ //鏀跺埌钃濈墮鍥炲鐨勬暟
if (characteristic.getUuid().equals(notifyCharUuid) && writeListener != null) {
byte[] value = characteristic.getValue();
+// Log.d(TAG, "鎵撳嵃鍗佸叚杩涘埗: " + bytesToHexString(value));
String response = new String(value, StandardCharsets.UTF_8);
callbackHandler.post(() -> writeListener.onDeviceResponse(response));
}
@@ -440,16 +454,46 @@
@Override
public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
+ Log.d(TAG, "onDescriptorWrite: status=" + status +
+ ", descriptor=" + descriptor.getUuid());
// 閫氱煡鎻忚堪绗﹀啓鍏ュ畬鎴愶紝鍙互蹇界暐
-// if (status == BluetoothGatt.GATT_SUCCESS) {
-// Log.d(TAG, "閫氱煡寮�鍚垚鍔燂紝鍙互鎺ユ敹璁惧鍝嶅簲浜�");
-// } else {
-// Log.e(TAG, "閫氱煡寮�鍚け璐ワ細" + status);
-// if (writeListener != null) {
-// callbackHandler.post(() -> writeListener.onWriteFailed(status));
-// }
-// }
+ if (status == BluetoothGatt.GATT_SUCCESS) {
+ Log.d(TAG, "閫氱煡寮�鍚垚鍔燂紝鍙互鎺ユ敹璁惧鍝嶅簲浜�");
+ } else {
+ Log.e(TAG, "閫氱煡寮�鍚け璐ワ細" + status);
+ if (writeListener != null) {
+ callbackHandler.post(() -> writeListener.onWriteFailed(status));
+ }
+ }
}
+
+ @Override
+ public void onMtuChanged(BluetoothGatt gatt, int mtu, int status) {
+ //todo 鍚庨潰鍏肩敤mtc鍒嗗寘鐨勶紝鐩墠榛樿璁剧疆512瀛楄妭
+ if (status == BluetoothGatt.GATT_SUCCESS) {
+// currentMtu = mtu;
+ Log.d(TAG, "鉁� MTU 鍗忓晢鎴愬姛锛氬綋鍓� MTU = " + mtu + " 瀛楄妭");
+ Log.d(TAG, " 鏈夋晥鏁版嵁闀垮害 = " + (mtu - 5) + " 瀛楄妭");
+
+// // MTU 璁剧疆鎴愬姛鍚庯紝鏍囪杩炴帴鎴愬姛
+// isConnected = true;
+// if (connectListener != null) {
+// callbackHandler.post(() -> {
+// Log.d(TAG, "閫氱煡杩炴帴鎴愬姛鍥炶皟");
+// connectListener.onConnected();
+// });
+// }
+ } else {
+// Log.w(TAG, "鈿狅笍 MTU 鍗忓晢澶辫触锛宻tatus: " + status + "锛屼娇鐢ㄩ粯璁� MTU=23");
+//// currentMtu = 23;
+// // 鍗充娇 MTU 澶辫触锛屼篃璁や负杩炴帴鎴愬姛锛堜娇鐢ㄩ粯璁� MTU锛�
+// isConnected = true;
+// if (connectListener != null) {
+// callbackHandler.post(() -> connectListener.onConnected());
+// }
+ }
+ }
+
};
@@ -462,19 +506,38 @@
// 绗� 1 姝ワ細鍦ㄥ崗璁爤灞傞潰寮�鍚�氱煡
boolean enabled = bluetoothGatt.setCharacteristicNotification(characteristic, true);
if (enabled) {
- // 绗� 2 姝ワ細鑾峰彇瀹㈡埛绔壒寰侀厤缃弿杩扮 (CCCD)
- // 鈫� 00002902 鏄爣鍑嗙殑 CCCD 鎻忚堪绗� UUID
- BluetoothGattDescriptor descriptor = characteristic.getDescriptor(
- UUID.fromString("00002902-0000-1000-8000-00805f9b34fb"));
- if (descriptor != null) {
- // 绗� 3 姝ワ細璁剧疆鎻忚堪绗︾殑鍊间负 ENABLE_NOTIFICATION_VALUE锛�
- // 鈫� 杩欎釜鍊兼槸 byte[]{0x01, 0x00}锛屽憡璇夎澶囩"鎴戣璁㈤槄閫氱煡"
- descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
- // 绗� 4 姝ワ細鍐欏叆鎻忚堪绗﹀埌璁惧
- //鈫� 鍙湁鍐欏叆鎴愬姛鍚庯紝鍛婅瘔璁惧绔紝璁惧鎵嶄細寮�濮嬪彂閫侀�氱煡锛�
- bluetoothGatt.writeDescriptor(descriptor);
- Log.e(TAG, "writeDescriptor success");
- }
+ // 鏍规嵁 Android 鐗堟湰鍜岃澶囧巶鍟嗗姩鎬佽皟鏁村欢杩�
+ int delayMs = calculateNotificationDelay();
+ callbackHandler.postDelayed(() -> {
+
+ // 绗� 2 姝ワ細鑾峰彇瀹㈡埛绔壒寰侀厤缃弿杩扮 (CCCD)
+ // 鈫� 00002902 鏄爣鍑嗙殑 CCCD 鎻忚堪绗� UUID
+ BluetoothGattDescriptor descriptor = characteristic.getDescriptor(
+ UUID.fromString("00002902-0000-1000-8000-00805f9b34fb"));
+ if (descriptor != null) {
+// // 绗� 3 姝ワ細璁剧疆鎻忚堪绗︾殑鍊�
+// // 鍏堟鏌ョ壒寰佸睘鎬э紝鍐冲畾浣跨敤 NOTIFY 杩樻槸 INDICATE
+ int charProp = characteristic.getProperties();
+ if ((charProp & BluetoothGattCharacteristic.PROPERTY_NOTIFY) > 0) {
+ descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
+ Log.d(TAG, "浣跨敤 NOTIFICATION 妯″紡");
+ } else if ((charProp & BluetoothGattCharacteristic.PROPERTY_INDICATE) > 0) {
+ descriptor.setValue(BluetoothGattDescriptor.ENABLE_INDICATION_VALUE);
+ Log.d(TAG, "浣跨敤 INDICATION 妯″紡");
+ } else {
+ Log.e(TAG, "璇ョ壒寰佷笉鏀寔閫氱煡/鎸囩ず");
+ return;
+ }
+ // 绗� 3 姝ワ細璁剧疆鎻忚堪绗︾殑鍊间负 ENABLE_NOTIFICATION_VALUE锛�
+ // 鈫� 杩欎釜鍊兼槸 byte[]{0x01, 0x00}锛屽憡璇夎澶囩"鎴戣璁㈤槄閫氱煡"
+// descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
+ // 绗� 4 姝ワ細鍐欏叆鎻忚堪绗﹀埌璁惧
+ //鈫� 鍙湁鍐欏叆鎴愬姛鍚庯紝鍛婅瘔璁惧绔紝璁惧鎵嶄細寮�濮嬪彂閫侀�氱煡锛�
+ bluetoothGatt.writeDescriptor(descriptor);
+
+ Log.d(TAG, "writeDescriptor success");
+ }
+ }, delayMs);
}
}
@@ -495,6 +558,7 @@
*/
@RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
public void writeCredentials(String data, WriteListener listener) {
+ Log.d(TAG, "writeCredentials :鍑嗗鍐欏叆");
this.writeListener = listener;
if (!isConnected || characteristic == null) {
if (listener != null) {
@@ -508,6 +572,8 @@
@RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
private void writeCharacteristic(BluetoothGattCharacteristic characteristic, String value) {
+
+ Log.d(TAG, "writeCharacteristic :寮�濮嬪啓鍏�");
if (!this.getMissingPermissions().isEmpty()) {
callbackHandler.post(() -> this.writeListener.onWriteFailed(-2)); // 娌℃湁鏉冮檺
return;
@@ -515,6 +581,39 @@
characteristic.setValue(value.getBytes(StandardCharsets.UTF_8));
characteristic.setWriteType(BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT);
bluetoothGatt.writeCharacteristic(characteristic);
+ Log.d(TAG, "writeCharacteristic :寮�濮嬪畬鎴�");
+ }
+
+
+
+ /**
+ * 鏍规嵁 Android 鐗堟湰鍜岃澶囧巶鍟嗚绠楀欢杩熸椂闂�
+ * Android 10/11 涓嶉渶瑕佸欢杩� 鍘熷洜锛氱郴缁熷鐞嗗揩锛屾棤涓ユ牸妫�鏌�
+ * Android 12 闇�瑕�100-200ms寤惰繜 鍘熷洜锛氱郴缁熼渶瑕佹椂闂村噯澶� BLE 鍗忚鏍�
+ * Android 13 闇�瑕�50-100ms寤惰繜 鍘熷洜锛氫紭鍖栧悗閫熷害绋嶅揩
+ * Android 14 闇�瑕�50ms寤惰繜 鍘熷洜锛氳繘涓�姝ヤ紭鍖�
+ */
+ private int calculateNotificationDelay() {
+ int sdkVersion = Build.VERSION.SDK_INT;
+
+ // Android 12 (SDK 31) 闇�瑕佹渶闀垮欢杩�
+ if (sdkVersion == Build.VERSION_CODES.S) {
+ // 灏忕背/绾㈢背璁惧鍙兘闇�瑕佹洿闀垮欢杩�
+ if ("Xiaomi".equals(Build.MANUFACTURER)) {
+ Log.d(TAG, "妫�娴嬪埌灏忕背璁惧锛屽鍔犲欢杩熷埌 200ms");
+ return 200;
+ }
+ // 鍏朵粬 Android 12 璁惧
+ return 100;
+ }
+
+ // Android 13+ 浼樺寲鍚庡欢杩熷彲浠ョ煭涓�浜�
+ if (sdkVersion >= Build.VERSION_CODES.TIRAMISU) {
+ return 50;
+ }
+
+ // Android 11 鍙婁互涓嬩笉闇�瑕佸欢杩�
+ return 0;
}
// ==================== 宸ュ叿鏂规硶 ====================
--
Gitblit v1.8.0