1.Fix bugs and update sample

Ficat · Ficat · commit 7a4c88875036 · 2025-07-03T16:32:15.000+08:00
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ allprojects {
 }
 
 dependencies {
-    implementation 'com.github.Ficat:EasyBle:v3.1.1'
+    implementation 'com.github.Ficat:EasyBle:v3.1.2'
 }
 ```
 
diff --git a/doc/README_CN.md b/doc/README_CN.md
@@ -11,7 +11,7 @@ allprojects {
 
 
 dependencies {
-    implementation 'com.github.Ficat:EasyBle:v3.1.1'
+    implementation 'com.github.Ficat:EasyBle:v3.1.2'
 }
 ```
 
diff --git a/easyble/src/main/java/com/ficat/easyble/gatt/BleGattCommunicator.java b/easyble/src/main/java/com/ficat/easyble/gatt/BleGattCommunicator.java
@@ -156,7 +156,7 @@ public void run() {
                         mGatt.close();
                     }
                     mConnState = DISCONNECTED;
-                    mConnectCallback.onConnectionFailed(BleErrorCodes.CONNECTION_TIMEOUT, mDevice);
+                    callback.onConnectionFailed(BleErrorCodes.CONNECTION_TIMEOUT, mDevice);
                     clearAndResetAll();
                 }
             });
@@ -177,11 +177,12 @@ void disconnect() {
                 refreshDeviceCache();
                 mGatt.close();
                 mConnState = DISCONNECTED;
+                BleConnectCallback callback = mConnectCallback;
                 mHandler.post(new Runnable() {
                     @Override
                     public void run() {
-                        if (mConnectCallback != null) {
-                            mConnectCallback.onConnectionFailed(BleErrorCodes.CONNECTION_CANCELED, mDevice);
+                        if (callback != null) {
+                            callback.onConnectionFailed(BleErrorCodes.CONNECTION_CANCELED, mDevice);
                         }
                     }
                 });
diff --git a/sample/src/main/java/com/ficat/sample/OperateActivity.java b/sample/src/main/java/com/ficat/sample/OperateActivity.java
@@ -226,12 +226,17 @@ public void onClick(View v) {
                 BleManager.getInstance().read(device, curService.getUuid(), curCharacteristic.getUuid(), readCallback);
                 break;
             case R.id.tv_write:
-                String str = etWrite.getText().toString();
+                String str = etWrite.getText().toString().trim();
                 if (TextUtils.isEmpty(str)) {
                     Toast.makeText(this, getResources().getString(R.string.tips_write_operation),
                             Toast.LENGTH_SHORT).show();
                     return;
                 }
+                if (str.length() % 2 != 0) {
+                    Toast.makeText(this, getResources().getString(R.string.tips_write_operation_length_err),
+                            Toast.LENGTH_SHORT).show();
+                    return;
+                }
                 BleManager.getInstance().write(device, curService.getUuid(), curCharacteristic.getUuid(),
                         ByteUtils.hexStr2Bytes(str), writeCallback);
                 break;
diff --git a/sample/src/main/res/layout/activity_operate.xml b/sample/src/main/res/layout/activity_operate.xml
@@ -199,6 +199,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1"
+                android:imeOptions="actionDone"
+                android:maxLines="1"
+                android:digits="0123456789ABCDEFabcdef"
+                android:singleLine="true"
                 android:gravity="center"
                 android:hint="@string/tips_write_operate_input"
                 android:paddingEnd="10dp"
diff --git a/sample/src/main/res/values-en-rGB/strings.xml b/sample/src/main/res/values-en-rGB/strings.xml
@@ -38,6 +38,7 @@
     <string name="tips_connection_canceled">connection canceled</string>
     <string name="tips_connection_disconnected">connection has disconnected</string>
     <string name="tips_write_operation">please enter a hex string</string>
+    <string name="tips_write_operation_length_err">hex string length is not a multiple of 2</string>
     <string name="tips_not_support_ble">This device not support BLE</string>
     <string name="tips_user_reject_permissions">User rejected bluetooth permissions</string>
     <string name="tips_bluetooth_on">Bluetooth turned on</string>
diff --git a/sample/src/main/res/values-en-rUS/strings.xml b/sample/src/main/res/values-en-rUS/strings.xml
@@ -38,6 +38,7 @@
     <string name="tips_connection_canceled">connection canceled</string>
     <string name="tips_connection_disconnected">connection has disconnected</string>
     <string name="tips_write_operation">please enter a hex string</string>
+    <string name="tips_write_operation_length_err">hex string length is not a multiple of 2</string>
     <string name="tips_not_support_ble">This device not support BLE</string>
     <string name="tips_user_reject_permissions">User rejected bluetooth permissions</string>
     <string name="tips_bluetooth_on">Bluetooth turned on</string>
diff --git a/sample/src/main/res/values-zh-rCN/strings.xml b/sample/src/main/res/values-zh-rCN/strings.xml
@@ -38,6 +38,7 @@
     <string name="tips_connection_canceled">连接已取消</string>
     <string name="tips_connection_disconnected">连接已断开</string>
     <string name="tips_write_operation">请输入十六进制字符串命令</string>
+    <string name="tips_write_operation_length_err">字符串个数非2的倍数</string>
     <string name="tips_not_support_ble">该设备不支持BLE</string>
     <string name="tips_user_reject_permissions">用户已拒绝蓝牙权限</string>
     <string name="tips_bluetooth_on">蓝牙已打开</string>
diff --git a/sample/src/main/res/values/strings.xml b/sample/src/main/res/values/strings.xml
@@ -38,6 +38,7 @@
     <string name="tips_connection_canceled">connection canceled</string>
     <string name="tips_connection_disconnected">connection has disconnected</string>
     <string name="tips_write_operation">please input a hex string</string>
+    <string name="tips_write_operation_length_err">hex string length is not a multiple of 2</string>
     <string name="tips_not_support_ble">This device not support BLE</string>
     <string name="tips_user_reject_permissions">User rejected bluetooth permissions</string>
     <string name="tips_bluetooth_on">Bluetooth turned on</string>

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ allprojects {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencies {`
`16`		`- implementation 'com.github.Ficat:EasyBle:v3.1.1'`
	`16`	`+ implementation 'com.github.Ficat:EasyBle:v3.1.2'`
`17`	`17`	`}`
`18`	`18`	```
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ allprojects {`
`11`	`11`
`12`	`12`
`13`	`13`	`dependencies {`
`14`		`- implementation 'com.github.Ficat:EasyBle:v3.1.1'`
	`14`	`+ implementation 'com.github.Ficat:EasyBle:v3.1.2'`
`15`	`15`	`}`
`16`	`16`	```
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public void run() {`
`156`	`156`	`mGatt.close();`
`157`	`157`	`}`
`158`	`158`	`mConnState = DISCONNECTED;`
`159`		`- mConnectCallback.onConnectionFailed(BleErrorCodes.CONNECTION_TIMEOUT, mDevice);`
	`159`	`+ callback.onConnectionFailed(BleErrorCodes.CONNECTION_TIMEOUT, mDevice);`
`160`	`160`	`clearAndResetAll();`
`161`	`161`	`}`
`162`	`162`	`});`
`@@ -177,11 +177,12 @@ void disconnect() {`
`177`	`177`	`refreshDeviceCache();`
`178`	`178`	`mGatt.close();`
`179`	`179`	`mConnState = DISCONNECTED;`
	`180`	`+ BleConnectCallback callback = mConnectCallback;`
`180`	`181`	`mHandler.post(new Runnable() {`
`181`	`182`	`@Override`
`182`	`183`	`public void run() {`
`183`		`- if (mConnectCallback != null) {`
`184`		`- mConnectCallback.onConnectionFailed(BleErrorCodes.CONNECTION_CANCELED, mDevice);`
	`184`	`+ if (callback != null) {`
	`185`	`+ callback.onConnectionFailed(BleErrorCodes.CONNECTION_CANCELED, mDevice);`
`185`	`186`	`}`
`186`	`187`	`}`
`187`	`188`	`});`