Merge pull request #56 from EspressifApp/dev

update

Author: XuXiangJun

README.md

@@ -16,7 +16,7 @@ This is a demo app to control the ESP device which run [BluFi](https://github.co
    ```
 - And add a dependency code to your app module's `build.gradle` file.
   ```
-  implementation 'com.github.EspressifApp:lib-blufi-android:2.3.7'
+  implementation 'com.github.EspressifApp:lib-blufi-android:2.4.1'
   ```
 
 ## ESPRSSIF MIT License

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.espressif.espblufi"
         minSdk 21
         targetSdk 34
-        versionCode 30
-        versionName "1.6.4"
+        versionCode 31
+        versionName "1.6.5"
     }
 
     buildTypes {
@@ -33,8 +33,9 @@ dependencies {
 
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+    implementation 'androidx.gridlayout:gridlayout:1.1.0'
     implementation 'androidx.preference:preference:1.2.1'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
     implementation 'io.reactivex.rxjava3:rxjava:3.1.4'
     implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'

app/src/main/java/com/espressif/espblufi/constants/BlufiConstants.java

@@ -8,8 +8,8 @@ public final class BlufiConstants {
     public static final String KEY_CONFIGURE_PARAM = "configure_param";
 
     public static final int MIN_MTU_LENGTH = 23;
-    public static final int MAX_MTU_LENGTH = 517;
-    public static final int DEFAULT_MTU_LENGTH = 512;
+    public static final int MAX_MTU_LENGTH = 300;
+    public static final int DEFAULT_MTU_LENGTH = 270;
 
     public static final long GATT_WRITE_TIMEOUT = 10000L;
 }

app/src/main/java/com/espressif/espblufi/ui/MainActivity.java

@@ -184,8 +184,12 @@ private void scan() {
         mScanStartTime = SystemClock.elapsedRealtime();
 
         mLog.d("Start scan ble");
-        scanner.startScan(null, new ScanSettings.Builder().setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY).build(),
-                mScanCallback);
+        ScanSettings.Builder scanSettingsBuilder = new ScanSettings.Builder()
+                .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            scanSettingsBuilder.setLegacy(false);
+        }
+        scanner.startScan(null, scanSettingsBuilder.build(), mScanCallback);
         mUpdateFuture = mThreadPool.submit(() -> {
             while (!Thread.currentThread().isInterrupted()) {
                 try {

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.9.0'
+        classpath 'com.android.tools.build:gradle:8.10.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

lib-blufi/build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'com.android.library'
 }
 
-def libVersion = "2.4.0"
+def libVersion = "2.4.1"
 
 android {
     compileSdk 34

lib-blufi/log/changelog_en.md

@@ -1,6 +1,12 @@
 # Change Log
 [中文](changelog_zh.md)
 
+### 2.4.1
+- Fix publishing to JitPack
+
+## 2.4.0
+- Fix: DH secret key which leading zero bits
+
 ## 2.3.7
 - Add gatt write timeout interface in `BlufiClient`
   ```java
@@ -20,4 +26,4 @@
 - Update `targetSdkVersion` to 31
 
 ## 2.3.4
-- Publish the lib on jitpack
+- Publish the lib on jitpack

lib-blufi/log/changelog_zh.md

@@ -1,6 +1,12 @@
 # 修改记录
 [English](changelog_en.md)
 
+### 2.4.1
+- 修复发布库至 JitPack
+
+## 2.4.0
+- 修复 DH secret 的生成
+
 ## 2.3.7
 - `BlufiClient` 新增 gatt 写超时接口
   ```java
@@ -20,4 +26,4 @@
 - `targetSdkVersion` 更新至 31
 
 ## 2.3.4
-- 在 jitpack 上发布库
+- 在 jitpack 上发布库

log/updatelog-en.md

@@ -2,6 +2,11 @@
 
 # Update Log
 
+## 1.6.5
+- Update `targetSdk` to 34
+- Android 8.0 or late support scanning BLE 5.0
+- Update blufi lib to 2.4.1
+
 ## 1.6.3
 - Set gatt write timeout as 5 seconds.
 - Update blufi lib to `2.3.7`

log/updatelog-zh-rCN.md

@@ -2,6 +2,11 @@
 
 # 更新日志
 
+## 1.6.5
+- 更新 `targetSdk` 为 34
+- Android 8.0 以上系统支持扫描 BLE 5.0
+- 更新 blufi 库至 2.4.1
+
 ## 1.6.3
 - 设置 gatt 写超时为 5 秒
 - 更新 blufi 库版本为 `2.3.7`