diff --git a/apk/BLE-v3.3.1.apk b/apk/BLE-v3.3.1.apk new file mode 100644 index 0000000..a879d32 Binary files /dev/null and b/apk/BLE-v3.3.1.apk differ diff --git a/java-sample/build.gradle b/java-sample/build.gradle index 7a9358f..351c41f 100644 --- a/java-sample/build.gradle +++ b/java-sample/build.gradle @@ -51,7 +51,7 @@ dependencies { implementation project(':core') // implementation 'com.github.aicareles:Android-BLE:3.3.1' implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'cn.com.superLei:aop-arms:1.0.4' +// implementation 'cn.com.superLei:aop-arms:1.0.4' implementation 'androidx.recyclerview:recyclerview:1.3.1' implementation 'com.google.android.material:material:1.10.0' implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" diff --git a/java-sample/release/BLE-v3.3.0.apk b/java-sample/release/BLE-v3.3.0.apk deleted file mode 100644 index 5dc56e2..0000000 Binary files a/java-sample/release/BLE-v3.3.0.apk and /dev/null differ diff --git a/java-sample/release/output-metadata.json b/java-sample/release/output-metadata.json index d8bcbaa..88668c9 100644 --- a/java-sample/release/output-metadata.json +++ b/java-sample/release/output-metadata.json @@ -11,9 +11,9 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 330, - "versionName": "3.3.0", - "outputFile": "BLE-v3.3.0.apk" + "versionCode": 331, + "versionName": "3.3.1", + "outputFile": "BLE-v3.3.1.apk" } ], "elementType": "File" diff --git a/java-sample/src/main/java/com/example/admin/mybledemo/MyApplication.java b/java-sample/src/main/java/com/example/admin/mybledemo/MyApplication.java index d4e432d..012688b 100644 --- a/java-sample/src/main/java/com/example/admin/mybledemo/MyApplication.java +++ b/java-sample/src/main/java/com/example/admin/mybledemo/MyApplication.java @@ -11,7 +11,6 @@ import cn.com.heaton.blelibrary.ble.model.BleDevice; import cn.com.heaton.blelibrary.ble.model.BleFactory; import cn.com.heaton.blelibrary.ble.utils.UuidUtils; -import cn.com.superLei.aoparms.AopArms; /** @@ -47,7 +46,6 @@ public class MyApplication extends Application { public void onCreate() { super.onCreate(); mApplication = this; - AopArms.init(this); initBle(); } diff --git a/java-sample/src/main/java/com/example/admin/mybledemo/Test.java b/java-sample/src/main/java/com/example/admin/mybledemo/Test.java index 6c75114..cc9b72a 100644 --- a/java-sample/src/main/java/com/example/admin/mybledemo/Test.java +++ b/java-sample/src/main/java/com/example/admin/mybledemo/Test.java @@ -28,8 +28,6 @@ import cn.com.heaton.blelibrary.ble.queue.RequestTask; import cn.com.heaton.blelibrary.ble.utils.ByteUtils; import cn.com.heaton.blelibrary.ble.utils.CrcUtils; -import cn.com.superLei.aoparms.annotation.Permission; -import cn.com.superLei.aoparms.annotation.Retry; public class Test extends AppCompatActivity { private static final String TAG = "Test"; @@ -38,7 +36,6 @@ public class Test extends AppCompatActivity { /** * 发送数据 */ - @Retry(count = 3, delay = 100, asyn = true) private void sendData() { byte[] data = new byte[20]; data[0] = 0x01; @@ -67,7 +64,6 @@ public void onWriteFailed(BleDevice device, int failedCode) { * * @param device 设备对象 */ - @Retry(count = 3, delay = 100, asyn = true) public boolean read(BleDevice device) { return ble.read(device, new BleReadCallback() { @Override diff --git a/java-sample/src/main/java/com/example/admin/mybledemo/Utils.java b/java-sample/src/main/java/com/example/admin/mybledemo/Utils.java index e746568..4297ccc 100644 --- a/java-sample/src/main/java/com/example/admin/mybledemo/Utils.java +++ b/java-sample/src/main/java/com/example/admin/mybledemo/Utils.java @@ -22,7 +22,6 @@ import java.util.List; import cn.com.heaton.blelibrary.ble.utils.UuidUtils; -import cn.com.superLei.aoparms.annotation.Async; public class Utils { @@ -100,7 +99,6 @@ private static String getPackageName(Context context) { /** * 拷贝OTA升级文件到SD卡 */ - @Async public static void copyOtaFile(final Context context, final String path) { //判断是否存在ota文件 if (SPUtils.get(context, Constant.SP.OTA_FILE_EXIST, false))return;