diff --git a/FastBleLib/build/.transforms/2f4d96d8815bdfa87d85c8f08c4f3592/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/clj/fastble/BleManager.dex b/FastBleLib/build/.transforms/2f4d96d8815bdfa87d85c8f08c4f3592/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/clj/fastble/BleManager.dex index 658d608..e1a497e 100644 Binary files a/FastBleLib/build/.transforms/2f4d96d8815bdfa87d85c8f08c4f3592/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/clj/fastble/BleManager.dex and b/FastBleLib/build/.transforms/2f4d96d8815bdfa87d85c8f08c4f3592/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/clj/fastble/BleManager.dex differ diff --git a/FastBleLib/build/.transforms/3c80c0ecb176ee6895d12ab1dcd92718/results.bin b/FastBleLib/build/.transforms/3c80c0ecb176ee6895d12ab1dcd92718/results.bin deleted file mode 100644 index 0d259dd..0000000 --- a/FastBleLib/build/.transforms/3c80c0ecb176ee6895d12ab1dcd92718/results.bin +++ /dev/null @@ -1 +0,0 @@ -o/classes diff --git a/FastBleLib/build/.transforms/3c80c0ecb176ee6895d12ab1dcd92718/transformed/classes/classes_dex/classes.dex b/FastBleLib/build/.transforms/3c80c0ecb176ee6895d12ab1dcd92718/transformed/classes/classes_dex/classes.dex deleted file mode 100644 index 039160d..0000000 Binary files a/FastBleLib/build/.transforms/3c80c0ecb176ee6895d12ab1dcd92718/transformed/classes/classes_dex/classes.dex and /dev/null differ diff --git a/FastBleLib/build/.transforms/49adf8ea3a69f71ccfa8eaab736f5d82/transformed/classes/classes_dex/classes.dex b/FastBleLib/build/.transforms/49adf8ea3a69f71ccfa8eaab736f5d82/transformed/classes/classes_dex/classes.dex index fe27d16..81888a0 100644 Binary files a/FastBleLib/build/.transforms/49adf8ea3a69f71ccfa8eaab736f5d82/transformed/classes/classes_dex/classes.dex and b/FastBleLib/build/.transforms/49adf8ea3a69f71ccfa8eaab736f5d82/transformed/classes/classes_dex/classes.dex differ diff --git a/FastBleLib/build/.transforms/c826ccda5a6b4aaea2cfe5c0a041266f/results.bin b/FastBleLib/build/.transforms/c826ccda5a6b4aaea2cfe5c0a041266f/results.bin deleted file mode 100644 index 0d259dd..0000000 --- a/FastBleLib/build/.transforms/c826ccda5a6b4aaea2cfe5c0a041266f/results.bin +++ /dev/null @@ -1 +0,0 @@ -o/classes diff --git a/FastBleLib/build/.transforms/c826ccda5a6b4aaea2cfe5c0a041266f/transformed/classes/classes_dex/classes.dex b/FastBleLib/build/.transforms/c826ccda5a6b4aaea2cfe5c0a041266f/transformed/classes/classes_dex/classes.dex deleted file mode 100644 index 79983d5..0000000 Binary files a/FastBleLib/build/.transforms/c826ccda5a6b4aaea2cfe5c0a041266f/transformed/classes/classes_dex/classes.dex and /dev/null differ diff --git a/FastBleLib/build/intermediates/aapt_friendly_merged_manifests/release/processReleaseManifest/aapt/AndroidManifest.xml b/FastBleLib/build/intermediates/aapt_friendly_merged_manifests/release/processReleaseManifest/aapt/AndroidManifest.xml deleted file mode 100644 index e00e686..0000000 --- a/FastBleLib/build/intermediates/aapt_friendly_merged_manifests/release/processReleaseManifest/aapt/AndroidManifest.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/FastBleLib/build/intermediates/aapt_friendly_merged_manifests/release/processReleaseManifest/aapt/output-metadata.json b/FastBleLib/build/intermediates/aapt_friendly_merged_manifests/release/processReleaseManifest/aapt/output-metadata.json deleted file mode 100644 index fa42747..0000000 --- a/FastBleLib/build/intermediates/aapt_friendly_merged_manifests/release/processReleaseManifest/aapt/output-metadata.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 3, - "artifactType": { - "type": "AAPT_FRIENDLY_MERGED_MANIFESTS", - "kind": "Directory" - }, - "applicationId": "com.clj.fastble", - "variantName": "release", - "elements": [ - { - "type": "SINGLE", - "filters": [], - "attributes": [], - "outputFile": "AndroidManifest.xml" - } - ], - "elementType": "File" -} \ No newline at end of file diff --git a/FastBleLib/build/intermediates/aar_metadata/release/writeReleaseAarMetadata/aar-metadata.properties b/FastBleLib/build/intermediates/aar_metadata/release/writeReleaseAarMetadata/aar-metadata.properties deleted file mode 100644 index 1211b1e..0000000 --- a/FastBleLib/build/intermediates/aar_metadata/release/writeReleaseAarMetadata/aar-metadata.properties +++ /dev/null @@ -1,6 +0,0 @@ -aarFormatVersion=1.0 -aarMetadataVersion=1.0 -minCompileSdk=1 -minCompileSdkExtension=0 -minAndroidGradlePluginVersion=1.0.0 -coreLibraryDesugaringEnabled=false diff --git a/FastBleLib/build/intermediates/annotation_processor_list/release/javaPreCompileRelease/annotationProcessors.json b/FastBleLib/build/intermediates/annotation_processor_list/release/javaPreCompileRelease/annotationProcessors.json deleted file mode 100644 index 9e26dfe..0000000 --- a/FastBleLib/build/intermediates/annotation_processor_list/release/javaPreCompileRelease/annotationProcessors.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/FastBleLib/build/intermediates/compile_library_classes_jar/debug/bundleLibCompileToJarDebug/classes.jar b/FastBleLib/build/intermediates/compile_library_classes_jar/debug/bundleLibCompileToJarDebug/classes.jar index 1da2404..7c85c60 100644 Binary files a/FastBleLib/build/intermediates/compile_library_classes_jar/debug/bundleLibCompileToJarDebug/classes.jar and b/FastBleLib/build/intermediates/compile_library_classes_jar/debug/bundleLibCompileToJarDebug/classes.jar differ diff --git a/FastBleLib/build/intermediates/compile_library_classes_jar/release/bundleLibCompileToJarRelease/classes.jar b/FastBleLib/build/intermediates/compile_library_classes_jar/release/bundleLibCompileToJarRelease/classes.jar deleted file mode 100644 index 1da2404..0000000 Binary files a/FastBleLib/build/intermediates/compile_library_classes_jar/release/bundleLibCompileToJarRelease/classes.jar and /dev/null differ diff --git a/FastBleLib/build/intermediates/compile_r_class_jar/release/generateReleaseRFile/R.jar b/FastBleLib/build/intermediates/compile_r_class_jar/release/generateReleaseRFile/R.jar deleted file mode 100644 index 35c7129..0000000 Binary files a/FastBleLib/build/intermediates/compile_r_class_jar/release/generateReleaseRFile/R.jar and /dev/null differ diff --git a/FastBleLib/build/intermediates/compile_symbol_list/release/generateReleaseRFile/R.txt b/FastBleLib/build/intermediates/compile_symbol_list/release/generateReleaseRFile/R.txt deleted file mode 100644 index e69de29..0000000 diff --git a/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties index 0101f4d..901cfcb 100644 --- a/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties +++ b/FastBleLib/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties @@ -1 +1 @@ -#Tue Sep 30 10:14:20 CST 2025 +#Fri Oct 31 15:54:13 CST 2025 diff --git a/FastBleLib/build/intermediates/incremental/mergeReleaseAssets/merger.xml b/FastBleLib/build/intermediates/incremental/mergeReleaseAssets/merger.xml deleted file mode 100644 index db36b46..0000000 --- a/FastBleLib/build/intermediates/incremental/mergeReleaseAssets/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/FastBleLib/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml b/FastBleLib/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml deleted file mode 100644 index 55e1c9b..0000000 --- a/FastBleLib/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/FastBleLib/build/intermediates/incremental/mergeReleaseShaders/merger.xml b/FastBleLib/build/intermediates/incremental/mergeReleaseShaders/merger.xml deleted file mode 100644 index d51b877..0000000 --- a/FastBleLib/build/intermediates/incremental/mergeReleaseShaders/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/FastBleLib/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties b/FastBleLib/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties deleted file mode 100644 index e62b9bf..0000000 --- a/FastBleLib/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties +++ /dev/null @@ -1 +0,0 @@ -#Fri Oct 17 18:14:44 CST 2025 diff --git a/FastBleLib/build/intermediates/incremental/release/packageReleaseResources/merger.xml b/FastBleLib/build/intermediates/incremental/release/packageReleaseResources/merger.xml deleted file mode 100644 index 795eef3..0000000 --- a/FastBleLib/build/intermediates/incremental/release/packageReleaseResources/merger.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/FastBleLib/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/clj/fastble/BleManager.class b/FastBleLib/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/clj/fastble/BleManager.class index 9c16ab8..043a67e 100644 Binary files a/FastBleLib/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/clj/fastble/BleManager.class and b/FastBleLib/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/clj/fastble/BleManager.class differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/BleManager$BleManagerHolder.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/BleManager$BleManagerHolder.class deleted file mode 100644 index 95ac447..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/BleManager$BleManagerHolder.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/BleManager.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/BleManager.class deleted file mode 100644 index 9c16ab8..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/BleManager.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleBluetooth$1.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleBluetooth$1.class deleted file mode 100644 index d75fc73..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleBluetooth$1.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleBluetooth$LastState.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleBluetooth$LastState.class deleted file mode 100644 index 25df41c..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleBluetooth$LastState.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleBluetooth$MainHandler.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleBluetooth$MainHandler.class deleted file mode 100644 index 6601ed8..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleBluetooth$MainHandler.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleBluetooth.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleBluetooth.class deleted file mode 100644 index a4a991a..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleBluetooth.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleConnector$1.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleConnector$1.class deleted file mode 100644 index 3dd3925..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleConnector$1.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleConnector.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleConnector.class deleted file mode 100644 index b95be0a..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/BleConnector.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/MultipleBluetoothController$1.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/MultipleBluetoothController$1.class deleted file mode 100644 index 773a59d..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/MultipleBluetoothController$1.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/MultipleBluetoothController.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/MultipleBluetoothController.class deleted file mode 100644 index 9507406..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/MultipleBluetoothController.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/SplitWriter$1.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/SplitWriter$1.class deleted file mode 100644 index 21762b3..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/SplitWriter$1.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/SplitWriter$2.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/SplitWriter$2.class deleted file mode 100644 index 1ee6499..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/SplitWriter$2.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/SplitWriter.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/SplitWriter.class deleted file mode 100644 index a96ba5b..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/bluetooth/SplitWriter.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleBaseCallback.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleBaseCallback.class deleted file mode 100644 index 7d5c801..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleBaseCallback.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleGattCallback.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleGattCallback.class deleted file mode 100644 index 3430e03..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleGattCallback.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleIndicateCallback.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleIndicateCallback.class deleted file mode 100644 index 1a284d9..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleIndicateCallback.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleMtuChangedCallback.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleMtuChangedCallback.class deleted file mode 100644 index d25ef63..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleMtuChangedCallback.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleNotifyCallback.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleNotifyCallback.class deleted file mode 100644 index c3788ac..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleNotifyCallback.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleReadCallback.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleReadCallback.class deleted file mode 100644 index 7e867ec..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleReadCallback.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleRssiCallback.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleRssiCallback.class deleted file mode 100644 index e456b1a..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleRssiCallback.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleScanAndConnectCallback.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleScanAndConnectCallback.class deleted file mode 100644 index a0bde2e..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleScanAndConnectCallback.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleScanCallback.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleScanCallback.class deleted file mode 100644 index f1d6bd5..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleScanCallback.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleScanPresenterImp.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleScanPresenterImp.class deleted file mode 100644 index 169c27a..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleScanPresenterImp.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleWriteCallback.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleWriteCallback.class deleted file mode 100644 index ce9b5c4..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/callback/BleWriteCallback.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleConnectStateParameter.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleConnectStateParameter.class deleted file mode 100644 index 16fb2aa..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleConnectStateParameter.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleDevice$1.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleDevice$1.class deleted file mode 100644 index 8bc2acd..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleDevice$1.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleDevice.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleDevice.class deleted file mode 100644 index bb58e6d..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleDevice.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleMsg.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleMsg.class deleted file mode 100644 index 4aae379..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleMsg.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleScanState.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleScanState.class deleted file mode 100644 index 3f02e22..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleScanState.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleWriteState.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleWriteState.class deleted file mode 100644 index 46d6969..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/data/BleWriteState.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/exception/BleException.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/exception/BleException.class deleted file mode 100644 index 8194904..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/exception/BleException.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/exception/ConnectException.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/exception/ConnectException.class deleted file mode 100644 index 022b5e8..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/exception/ConnectException.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/exception/GattException.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/exception/GattException.class deleted file mode 100644 index 0d1a068..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/exception/GattException.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/exception/OtherException.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/exception/OtherException.class deleted file mode 100644 index 09f4849..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/exception/OtherException.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/exception/TimeoutException.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/exception/TimeoutException.class deleted file mode 100644 index ee2989f..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/exception/TimeoutException.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$1.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$1.class deleted file mode 100644 index b8b5cdb..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$1.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$2.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$2.class deleted file mode 100644 index 068b643..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$2.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$3.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$3.class deleted file mode 100644 index c9d1602..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$3.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$4.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$4.class deleted file mode 100644 index ec8c486..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$4.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$5.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$5.class deleted file mode 100644 index 69ea040..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$5.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$6.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$6.class deleted file mode 100644 index 7fdc812..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$6.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$ScanHandler.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$ScanHandler.class deleted file mode 100644 index 6596459..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter$ScanHandler.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter.class deleted file mode 100644 index e1bd61f..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanPresenter.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanRuleConfig$Builder.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanRuleConfig$Builder.class deleted file mode 100644 index b93ebc4..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanRuleConfig$Builder.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanRuleConfig.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanRuleConfig.class deleted file mode 100644 index 0c1232b..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanRuleConfig.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanner$1$1.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanner$1$1.class deleted file mode 100644 index 118cdbe..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanner$1$1.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanner$1.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanner$1.class deleted file mode 100644 index 5fa79ff..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanner$1.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanner$BleScannerHolder.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanner$BleScannerHolder.class deleted file mode 100644 index 50e2d94..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanner$BleScannerHolder.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanner.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanner.class deleted file mode 100644 index 4a53377..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/scan/BleScanner.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/utils/BleLog.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/utils/BleLog.class deleted file mode 100644 index f91fd0e..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/utils/BleLog.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/utils/BleLruHashMap.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/utils/BleLruHashMap.class deleted file mode 100644 index ffd8f3d..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/utils/BleLruHashMap.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/utils/HexUtil.class b/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/utils/HexUtil.class deleted file mode 100644 index 6cd82ab..0000000 Binary files a/FastBleLib/build/intermediates/javac/release/compileReleaseJavaWithJavac/classes/com/clj/fastble/utils/HexUtil.class and /dev/null differ diff --git a/FastBleLib/build/intermediates/local_only_symbol_list/release/parseReleaseLocalResources/R-def.txt b/FastBleLib/build/intermediates/local_only_symbol_list/release/parseReleaseLocalResources/R-def.txt deleted file mode 100644 index 78ac5b8..0000000 --- a/FastBleLib/build/intermediates/local_only_symbol_list/release/parseReleaseLocalResources/R-def.txt +++ /dev/null @@ -1,2 +0,0 @@ -R_DEF: Internal format may change without notice -local diff --git a/FastBleLib/build/intermediates/manifest_merge_blame_file/release/processReleaseManifest/manifest-merger-blame-release-report.txt b/FastBleLib/build/intermediates/manifest_merge_blame_file/release/processReleaseManifest/manifest-merger-blame-release-report.txt deleted file mode 100644 index 9530167..0000000 --- a/FastBleLib/build/intermediates/manifest_merge_blame_file/release/processReleaseManifest/manifest-merger-blame-release-report.txt +++ /dev/null @@ -1,20 +0,0 @@ -1 -2 -4 -5 -6 -7 -7-->E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:4:5-68 -7-->E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:4:22-65 -8 -8-->E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:5:5-74 -8-->E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:5:22-71 -9 -9-->E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:6:5-81 -9-->E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:6:22-78 -10 -10-->E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:7:5-79 -10-->E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:7:22-76 -11 -12 diff --git a/FastBleLib/build/intermediates/merged_manifest/release/processReleaseManifest/AndroidManifest.xml b/FastBleLib/build/intermediates/merged_manifest/release/processReleaseManifest/AndroidManifest.xml deleted file mode 100644 index e00e686..0000000 --- a/FastBleLib/build/intermediates/merged_manifest/release/processReleaseManifest/AndroidManifest.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/FastBleLib/build/intermediates/navigation_json/release/extractDeepLinksRelease/navigation.json b/FastBleLib/build/intermediates/navigation_json/release/extractDeepLinksRelease/navigation.json deleted file mode 100644 index 0637a08..0000000 --- a/FastBleLib/build/intermediates/navigation_json/release/extractDeepLinksRelease/navigation.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/FastBleLib/build/intermediates/nested_resources_validation_report/release/generateReleaseResources/nestedResourcesValidationReport.txt b/FastBleLib/build/intermediates/nested_resources_validation_report/release/generateReleaseResources/nestedResourcesValidationReport.txt deleted file mode 100644 index 08f4ebe..0000000 --- a/FastBleLib/build/intermediates/nested_resources_validation_report/release/generateReleaseResources/nestedResourcesValidationReport.txt +++ /dev/null @@ -1 +0,0 @@ -0 Warning/Error \ No newline at end of file diff --git a/FastBleLib/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/clj/fastble/BleManager.class b/FastBleLib/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/clj/fastble/BleManager.class index 9c16ab8..043a67e 100644 Binary files a/FastBleLib/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/clj/fastble/BleManager.class and b/FastBleLib/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/clj/fastble/BleManager.class differ diff --git a/FastBleLib/build/intermediates/runtime_library_classes_jar/debug/bundleLibRuntimeToJarDebug/classes.jar b/FastBleLib/build/intermediates/runtime_library_classes_jar/debug/bundleLibRuntimeToJarDebug/classes.jar index 2bdaa48..467299e 100644 Binary files a/FastBleLib/build/intermediates/runtime_library_classes_jar/debug/bundleLibRuntimeToJarDebug/classes.jar and b/FastBleLib/build/intermediates/runtime_library_classes_jar/debug/bundleLibRuntimeToJarDebug/classes.jar differ diff --git a/FastBleLib/build/intermediates/runtime_library_classes_jar/release/bundleLibRuntimeToJarRelease/classes.jar b/FastBleLib/build/intermediates/runtime_library_classes_jar/release/bundleLibRuntimeToJarRelease/classes.jar deleted file mode 100644 index 2bdaa48..0000000 Binary files a/FastBleLib/build/intermediates/runtime_library_classes_jar/release/bundleLibRuntimeToJarRelease/classes.jar and /dev/null differ diff --git a/FastBleLib/build/intermediates/symbol_list_with_package_name/release/generateReleaseRFile/package-aware-r.txt b/FastBleLib/build/intermediates/symbol_list_with_package_name/release/generateReleaseRFile/package-aware-r.txt deleted file mode 100644 index 48a4452..0000000 --- a/FastBleLib/build/intermediates/symbol_list_with_package_name/release/generateReleaseRFile/package-aware-r.txt +++ /dev/null @@ -1 +0,0 @@ -com.clj.fastble diff --git a/FastBleLib/build/outputs/logs/manifest-merger-release-report.txt b/FastBleLib/build/outputs/logs/manifest-merger-release-report.txt deleted file mode 100644 index 187eac0..0000000 --- a/FastBleLib/build/outputs/logs/manifest-merger-release-report.txt +++ /dev/null @@ -1,33 +0,0 @@ --- Merging decision tree log --- -manifest -ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12 -INJECTED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:1:1-9:12 - package - ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:2:5-30 - INJECTED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml - xmlns:android - ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:1:11-69 -uses-permission#android.permission.BLUETOOTH -ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:4:5-68 - android:name - ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:4:22-65 -uses-permission#android.permission.BLUETOOTH_ADMIN -ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:5:5-74 - android:name - ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:5:22-71 -uses-permission#android.permission.ACCESS_COARSE_LOCATION -ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:6:5-81 - android:name - ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:6:22-78 -uses-permission#android.permission.ACCESS_FINE_LOCATION -ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:7:5-79 - android:name - ADDED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml:7:22-76 -uses-sdk -INJECTED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml -INJECTED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml - android:targetSdkVersion - INJECTED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml - android:minSdkVersion - INJECTED from E:\AndroidProject\LatestSdkProject\Tracker\FastBleLib\src\main\AndroidManifest.xml diff --git a/FastBleLib/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/FastBleLib/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin index cd4b513..1edf5ae 100644 Binary files a/FastBleLib/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin and b/FastBleLib/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/FastBleLib/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin b/FastBleLib/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin deleted file mode 100644 index cd4b513..0000000 Binary files a/FastBleLib/build/tmp/compileReleaseJavaWithJavac/previous-compilation-data.bin and /dev/null differ diff --git a/FastBleLib/src/main/java/com/clj/fastble/BleManager.java b/FastBleLib/src/main/java/com/clj/fastble/BleManager.java index a961b8c..b5a37b8 100644 --- a/FastBleLib/src/main/java/com/clj/fastble/BleManager.java +++ b/FastBleLib/src/main/java/com/clj/fastble/BleManager.java @@ -74,13 +74,16 @@ public class BleManager { public void init(Application app) { if (context == null && app != null) { context = app; - if (isSupportBle()) { - bluetoothManager = - (BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE); - bluetoothAdapter = bluetoothManager.getAdapter(); - } else { - bluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); - } + bluetoothManager = + (BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE); + bluetoothAdapter = bluetoothManager.getAdapter(); + // if (isSupportBle()) { + // bluetoothManager = + // (BluetoothManager) context.getSystemService(Context.BLUETOOTH_SERVICE); + // bluetoothAdapter = bluetoothManager.getAdapter(); + // } else { + // bluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); + // } multipleBluetoothController = new MultipleBluetoothController(); bleScanRuleConfig = new BleScanRuleConfig(); } @@ -556,7 +559,7 @@ public class BleManager { * @param uuid_service * @param uuid_write * @param data - * @param split + * @param split 是否自动分包 * @param callback */ public void write(BleDevice bleDevice, String uuid_service, String uuid_write, byte[] data, diff --git a/app/build.gradle b/app/build.gradle index 64b5501..7131ced 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,9 +28,9 @@ android { applicationId "com.abbidot.tracker" minSdkVersion 23 targetSdkVersion 35 - versionCode 2021 -// versionName "2.0.21" - versionName "2.0.21-Beta1" + versionCode 2022 +// versionName "2.0.22" + versionName "2.0.22-Beta2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 487038a..8887a14 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -406,6 +406,7 @@ + ): BaseResponse /** * 添加矩形围栏 @@ -393,7 +394,7 @@ interface INetworkService { @Field("latitudeCenter") latitudeCenter: Double, @Field("longDistance") longDistance: Int, @Field("shortDistance") shortDistance: Int - ): BaseResponse + ): BaseResponse /** * 添加矩形围栏 @@ -426,7 +427,7 @@ interface INetworkService { @Field("latitudeCenter") latitudeCenter: Double, // @Field("longDistance") longDistance: Double, // @Field("shortDistance") shortDistance: Double - ): BaseResponse + ): BaseResponse /** * 更新圆形围栏 diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/HomeV2Activity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/HomeV2Activity.kt index 3b2751c..e2534d7 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/HomeV2Activity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/HomeV2Activity.kt @@ -349,6 +349,7 @@ class HomeV2Activity : BaseActivity(ActivityHomeV2Binding setSelectPetPos(mSelectPetPosition) //判断套餐有没有到期 packageUnavailableState() + //刚开始打开APP上传日志 getPet(false)?.apply { mLogBleReportViewModel.uploadLog(mContext, macID) } diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/AddAndEditFencesZoneBaseActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/AddAndEditFencesZoneBaseActivity.kt index 427cc7d..bef90c2 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/AddAndEditFencesZoneBaseActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/AddAndEditFencesZoneBaseActivity.kt @@ -297,8 +297,12 @@ open class AddAndEditFencesZoneBaseActivity : mFencesManageViewModel.mFencesAddLiveData.observe(this) { dealRequestResult(it, object : GetResultCallback { override fun onResult(any: Any) { - sendNotifyData() - successTips(R.string.txt_fence_saved) + it.getOrNull()?.apply { +// sendNotifyData() + mFencesBean.fenceId = fenceId + sendFenceData() + successTips(R.string.txt_fence_saved) + } } override fun onRequestError(exceptionCode: String?) { @@ -317,7 +321,10 @@ open class AddAndEditFencesZoneBaseActivity : dealRequestResult(it, object : GetResultCallback { override fun onResult(any: Any) { XEventBus.post(EventName.DeleteFences) - sendNotifyData() +// sendNotifyData() + //删除蓝牙标志 + mFencesBean.isOn = ConstantInt.Type2 + sendFenceData() showToast( R.string.txt_delete_success, isFinish = true, gravity = Gravity.CENTER ) @@ -327,7 +334,8 @@ open class AddAndEditFencesZoneBaseActivity : mFencesManageViewModel.mUpdateFenceLiveData.observe(this) { dealRequestResult(it, object : GetResultCallback { override fun onResult(any: Any) { - sendNotifyData() +// sendNotifyData() + sendFenceData() successTips(R.string.txt_fence_saved) } }) @@ -340,6 +348,15 @@ open class AddAndEditFencesZoneBaseActivity : } } + /** + * 发送围栏数据 + */ + private fun sendFenceData() { + mPetBean?.apply { + SRBleUtil.instance.isConnectBleSendFenceData(macID, mFencesBean) + } + } + /** * 修改成功提示 */ @@ -760,24 +777,18 @@ open class AddAndEditFencesZoneBaseActivity : when (mFencesBean.fenceShapeType) { ConstantInt.CircleShapeType -> { mFencesBean.radius = Utils.roundOffToInt(distances[0].toDouble()) -// val radiusStr = Util.metricConvertUnits( -// mContext, distances[0].toFloat(), ConstantInt.Type3, 2 -// ).toString() + mDistanceUnit - val radiusStr = mFencesBean.radius.toString() + mDistanceUnit + val r = Util.metricConvertUnits(distances[0].toFloat(), ConstantInt.Type3, 2) + val radiusStr = Utils.roundOffToInt(r.toDouble()).toString() + mDistanceUnit mViewBinding.fencesZoneCircleView.setShowDisDistance(radiusStr) } ConstantInt.RectangleShapeType -> { mFencesBean.longDistance = Utils.roundOffToInt(distances[0].toDouble()) mFencesBean.shortDistance = Utils.roundOffToInt(distances[1].toDouble()) -// val longStr = Util.metricConvertUnits( -// mContext, distances[0].toFloat(), ConstantInt.Type3, 2 -// ).toString() + mDistanceUnit -// val shortStr = Util.metricConvertUnits( -// mContext, distances[0].toFloat(), ConstantInt.Type3, 2 -// ).toString() + mDistanceUnit - val longStr = mFencesBean.longDistance.toString() + mDistanceUnit - val shortStr = mFencesBean.shortDistance.toString() + mDistanceUnit + val l = Util.metricConvertUnits(distances[0].toFloat(), ConstantInt.Type3, 2) + val s = Util.metricConvertUnits(distances[1].toFloat(), ConstantInt.Type3, 2) + val longStr = Utils.roundOffToInt(l.toDouble()).toString() + mDistanceUnit + val shortStr = Utils.roundOffToInt(s.toDouble()).toString() + mDistanceUnit mViewBinding.fencesZoneRectView.setShowDisDistance(longStr, shortStr) } diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/PreviewFencesZoneActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/PreviewFencesZoneActivity.kt index 552bcd3..c533697 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/PreviewFencesZoneActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/device/fences/PreviewFencesZoneActivity.kt @@ -22,6 +22,7 @@ import com.abbidot.tracker.databinding.ActivityPreviewFencesZoneBinding import com.abbidot.tracker.ui.common.map.PreviewFencesZoneCommon import com.abbidot.tracker.util.Util import com.abbidot.tracker.util.ViewUtil +import com.abbidot.tracker.util.bluetooth.SRBleUtil import com.abbidot.tracker.vm.FencesManageViewModel import com.abbidot.tracker.vm.FencesMapViewModel import com.daimajia.androidanimations.library.Techniques @@ -154,6 +155,7 @@ class PreviewFencesZoneActivity : mFencesManageViewModel.getFenceList( this@PreviewFencesZoneActivity, mCurrentDeviceId ) + sendFenceData() } } }) @@ -163,6 +165,9 @@ class PreviewFencesZoneActivity : dealRequestResult(it, object : GetResultCallback { override fun onResult(any: Any) { isCurrentActivityDelete = true + //删除蓝牙标志 + mCurrentFences?.isOn = ConstantInt.Type2 + sendFenceData() XEventBus.post(EventName.DeleteFences) showToast(R.string.txt_delete_success, true, gravity = Gravity.CENTER) } @@ -182,6 +187,18 @@ class PreviewFencesZoneActivity : } } + /** + * 发送围栏数据 + */ + private fun sendFenceData() { + mPetBean?.apply { + mCurrentFences?.apply { + SRBleUtil.instance.isConnectBleSendFenceData(macID, this) + } + } + } + + /** * 设置当前围栏的信息 */ diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/pet/PetHeightActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/pet/PetHeightActivity.kt index b59f228..13a6f22 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/pet/PetHeightActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/pet/PetHeightActivity.kt @@ -137,14 +137,14 @@ class PetHeightActivity : BaseActivity(ActivityPetHeig "${mViewBinding.npDialogPetHeightTens.value}.${mViewBinding.npDialogPetHeightUnit.value}" if (isFirstBind) { mPetBean?.apply { - height = Util.convertMetricUnits(value.toFloat(), ConstantInt.Type0) + height = Util.convertMetricUnits(value.toFloat(), ConstantInt.Type0,4) val intent = Intent(mContext, PetWeightActivity::class.java) intent.putExtra(ConstantString.Pet, this) intent.putExtra(ConstantString.isFirstBind, isFirstBind) startActivity(intent) } } else { -// val petHeight = Util.convertMetricUnits(mContext, value.toFloat(), ConstantInt.Type0) +// val petHeight = Util.convertMetricUnits(mContext, value.toFloat(), ConstantInt.Type0,4) val intent = Intent() intent.putExtra(ConstantString.PetHeight, value.toFloat()) setResult(ResultCode.ResultCode_2, intent) diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/pet/PetProfileActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/pet/PetProfileActivity.kt index 6cfcbf8..68f41e4 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/pet/PetProfileActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/pet/PetProfileActivity.kt @@ -424,13 +424,13 @@ class PetProfileActivity : //接收身高设置页面的值 it.data?.extras?.getFloat(ConstantString.PetHeight)?.apply { mViewBinding.ilPetProfileHeight.etInputContent.setText("$this") - mPetBean?.height = Util.convertMetricUnits(this, ConstantInt.Type0) + mPetBean?.height = Util.convertMetricUnits(this, ConstantInt.Type0,4) } } else if (it.resultCode == ResultCode.ResultCode_3) { //接收体重设置页面的值 it.data?.extras?.getFloat(ConstantString.PetWeight)?.apply { mViewBinding.ilPetProfileWeight.etInputContent.setText("$this") - mPetBean?.weight = Util.convertMetricUnits(this, ConstantInt.Type1) + mPetBean?.weight = Util.convertMetricUnits(this, ConstantInt.Type1,4) } } } @@ -502,7 +502,7 @@ class PetProfileActivity : if (any is String) { mViewBinding.ilPetProfileWeight.etInputContent.setText(any) weight = Util.convertMetricUnits( - any.toFloat(), ConstantInt.Type1 + any.toFloat(), ConstantInt.Type1,4 ) } } diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/pet/PetWeightActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/pet/PetWeightActivity.kt index a9de691..61e4203 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/pet/PetWeightActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/pet/PetWeightActivity.kt @@ -119,14 +119,14 @@ class PetWeightActivity : BaseActivity(ActivityPetWeig "${mViewBinding.npSetPetWeightTens.value}.${mViewBinding.npSetPetWeightUnit.value}" if (isFirstBind) { mPetBean?.apply { - weight = Util.convertMetricUnits(value.toFloat(), ConstantInt.Type1) + weight = Util.convertMetricUnits(value.toFloat(), ConstantInt.Type1,4) val intent = Intent(mContext, FirstPetProfileActivity::class.java) intent.putExtra(ConstantString.Pet, this) intent.putExtra(ConstantString.isFirstBind, isFirstBind) startActivity(intent) } } else { -// val petWeight = Util.convertMetricUnits(mContext, value.toFloat(), ConstantInt.Type1) +// val petWeight = Util.convertMetricUnits(mContext, value.toFloat(), ConstantInt.Type1,4) val intent = Intent() intent.putExtra(ConstantString.PetWeight, value.toFloat()) setResult(ResultCode.ResultCode_3, intent) diff --git a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SubscriptionHistoryActivity.kt b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SubscriptionHistoryActivity.kt index a14362c..222c846 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SubscriptionHistoryActivity.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/activity/subscribe/SubscriptionHistoryActivity.kt @@ -55,6 +55,10 @@ class SubscriptionHistoryActivity : dealRequestResult(it, object : GetResultCallback { override fun onResult(any: Any) { it.getOrNull()?.let { list -> + if (mSubscriptionsOrderList.size > 0) { + mHistoryAdapter.notifyItemRangeRemoved(0, mSubscriptionsOrderList.size) + mSubscriptionsOrderList.clear() + } for (l in list) { mSubscriptionsOrderList.add(l) if (l.annualCareType == ConstantInt.Type1) { diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt index 57add7a..e524c40 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/data/RouteV2Fragment.kt @@ -242,7 +242,7 @@ class RouteV2Fragment : BaseFragment(FragmentRouteV2Bind // getString(R.string.map_current_update_time), // DateUtils.getRelativeTimeSpanString(timeStamp * 1000) // ) - val timeString = Utils.formatTime(timeStamp * 1000, Utils.DATE_FORMAT_PATTERN_EN6) + val timeString = Utils.formatTime(timeStamp * 1000, Utils.DATE_FORMAT_PATTERN_EN10) //更新位置时间 dayTime = timeString diff --git a/app/src/main/java/com/abbidot/tracker/ui/fragment/subscribe/CreditCardPaymentFragment.kt b/app/src/main/java/com/abbidot/tracker/ui/fragment/subscribe/CreditCardPaymentFragment.kt index d33333e..1547c74 100644 --- a/app/src/main/java/com/abbidot/tracker/ui/fragment/subscribe/CreditCardPaymentFragment.kt +++ b/app/src/main/java/com/abbidot/tracker/ui/fragment/subscribe/CreditCardPaymentFragment.kt @@ -91,12 +91,9 @@ class CreditCardPaymentFragment : BaseFragment viewLifecycleOwner.lifecycleScope.launch(Dispatchers.IO) { val list = MyDatabase.creditCardDao().findAll(MyDatabase.CreditCardTableName) list?.let { - if (it.isNotEmpty()) mActivity!!.runOnUiThread { + mActivity?.runOnUiThread { val sortedByList = list.sortedByDescending { l -> l.isPrimary }.toMutableList() - //卡管理 不需要点击效果 - if (null != mPaymentMethodActivity.mOrderBean) { - setCheckAndPrimaryState(sortedByList) - } + setCheckAndPrimaryState(sortedByList) mCreditCardAdapter.setData(sortedByList, true) } } @@ -150,22 +147,30 @@ class CreditCardPaymentFragment : BaseFragment } private fun setCheckAndPrimaryState(list: MutableList) { - if (list.size == 0) return - var haveCheck = false - for (l in list) { - if (l.checked) { - haveCheck = true - break + if (list.size == 0) { + mViewBinding.apply { + tvCreditCardPaymentChoose.visibility = View.GONE + btnCreditCardPaymentAdd.visibility = View.GONE } + return } - if (!haveCheck) { - list[0].checked = true + //卡管理 不需要点击效果 + if (null == mPaymentMethodActivity.mOrderBean) { + mViewBinding.btnMakePaymentCreditCard.visibility = View.GONE + } else { + var haveCheck = false + for (l in list) { + if (l.checked) { + haveCheck = true + break + } + } + if (!haveCheck) { + list[0].checked = true + } + mViewBinding.btnMakePaymentCreditCard.visibility = View.VISIBLE } - mViewBinding.apply { - btnMakePaymentCreditCard.visibility = - if (null == mPaymentMethodActivity.mOrderBean) View.GONE - else View.VISIBLE tvCreditCardPaymentChoose.visibility = View.VISIBLE btnCreditCardPaymentAdd.visibility = View.VISIBLE } diff --git a/app/src/main/java/com/abbidot/tracker/util/bluetooth/SRBleCmdUtil.kt b/app/src/main/java/com/abbidot/tracker/util/bluetooth/SRBleCmdUtil.kt index cbaf77e..7c1832d 100644 --- a/app/src/main/java/com/abbidot/tracker/util/bluetooth/SRBleCmdUtil.kt +++ b/app/src/main/java/com/abbidot/tracker/util/bluetooth/SRBleCmdUtil.kt @@ -1,7 +1,9 @@ package com.abbidot.tracker.util.bluetooth import android.text.TextUtils +import com.abbidot.tracker.bean.FencesBean import com.abbidot.tracker.bean.WiFiZoneBean +import com.abbidot.tracker.constant.ConstantInt import java.util.TimeZone import kotlin.experimental.xor @@ -73,6 +75,17 @@ class SRBleCmdUtil private constructor() { return calcCrc8(data) } + /** + * 将十六进制字符串转换为字节数组 + */ + private fun hexStringToByteArray(hexString: String): ByteArray { + require(hexString.length % 2 == 0) { "十六进制字符串长度必须为偶数" } + return ByteArray(hexString.length / 2) { i -> + val startIndex = i * 2 + hexString.substring(startIndex, startIndex + 2).toInt(16).toByte() + } + } + /** * 长整型转换高低4个字节 */ @@ -294,5 +307,40 @@ class SRBleCmdUtil private constructor() { val byteArray = byteArrayOf(0x1A, writeAndRed.toByte(), status.toByte()) return getCrc8Cmd(byteArray) } + + /** + * 围栏设置 + */ + fun setFences(fencesBean: FencesBean): ByteArray { + var byteArray = byteArrayOf(0x13, CMD_WRITE.toByte()) + fencesBean.apply { + val fenceIdByteArray = hexStringToByteArray(fenceId.takeLast(8)) + byteArray = byteArray.plus(fenceIdByteArray) + byteArray = byteArray.plus( + byteArrayOf( + isOn.toByte(), fenceType.toByte(), fenceShapeType.toByte() + ) + ) + if (fenceShapeType == ConstantInt.Type1) { + byteArray = byteArray.plus(longTo4ByteArray((longitudeCenter * 1000000L).toLong())) + byteArray = byteArray.plus(longTo4ByteArray((latitudeCenter * 1000000L).toLong())) + byteArray = byteArray.plus(longTo4ByteArray((radius.toLong()))) + } else { + byteArray = byteArray.plus(longTo4ByteArray((longitudeA * 1000000L).toLong())) + byteArray = byteArray.plus(longTo4ByteArray((latitudeA * 1000000L).toLong())) + byteArray = byteArray.plus(longTo4ByteArray((longitudeB * 1000000L).toLong())) + } + byteArray = byteArray.plus(longTo4ByteArray((latitudeB * 1000000L).toLong())) + byteArray = byteArray.plus(longTo4ByteArray((longitudeC * 1000000L).toLong())) + byteArray = byteArray.plus(longTo4ByteArray((latitudeC * 1000000L).toLong())) + byteArray = byteArray.plus(longTo4ByteArray((longitudeD * 1000000L).toLong())) + byteArray = byteArray.plus(longTo4ByteArray((latitudeD * 1000000L).toLong())) + byteArray = byteArray.plus(longTo4ByteArray((longitudeE * 1000000L).toLong())) + byteArray = byteArray.plus(longTo4ByteArray((latitudeE * 1000000L).toLong())) + byteArray = byteArray.plus(longTo4ByteArray((longitudeF * 1000000L).toLong())) + byteArray = byteArray.plus(longTo4ByteArray((latitudeF * 1000000L).toLong())) + } + return getCrc8Cmd(byteArray) + } } diff --git a/app/src/main/java/com/abbidot/tracker/util/bluetooth/SRBleUtil.kt b/app/src/main/java/com/abbidot/tracker/util/bluetooth/SRBleUtil.kt index 1e119e6..522ca67 100644 --- a/app/src/main/java/com/abbidot/tracker/util/bluetooth/SRBleUtil.kt +++ b/app/src/main/java/com/abbidot/tracker/util/bluetooth/SRBleUtil.kt @@ -16,10 +16,12 @@ import com.abbidot.baselibrary.eventbus.XEventBus import com.abbidot.baselibrary.util.AppUtils import com.abbidot.baselibrary.util.LogUtil import com.abbidot.tracker.bean.BleTrackDeviceBean +import com.abbidot.tracker.bean.FencesBean import com.abbidot.tracker.bean.ReceiveDeviceData import com.abbidot.tracker.util.Util import com.clj.fastble.BleManager import com.clj.fastble.callback.BleGattCallback +import com.clj.fastble.callback.BleMtuChangedCallback import com.clj.fastble.callback.BleNotifyCallback import com.clj.fastble.callback.BleRssiCallback import com.clj.fastble.callback.BleWriteCallback @@ -27,7 +29,6 @@ import com.clj.fastble.data.BleDevice import com.clj.fastble.data.BleScanState import com.clj.fastble.exception.BleException import com.clj.fastble.utils.HexUtil -import com.hjq.toast.Toaster import java.util.UUID @@ -308,7 +309,7 @@ class SRBleUtil private constructor() { ) { LogUtil.d("send cmd:" + HexUtil.formatHexString(data, true)) BleManager.getInstance() - .write(bleDevice, uuidService, uuidWrite, data, object : BleWriteCallback() { + .write(bleDevice, uuidService, uuidWrite, data, false, object : BleWriteCallback() { override fun onWriteSuccess(current: Int, total: Int, justWrite: ByteArray?) { LogUtil.e( "writeData onWriteSuccess data:" + HexUtil.formatHexString(data, true) @@ -403,7 +404,7 @@ class SRBleUtil private constructor() { } /** - * 发送参数同步提醒消息 0x017 + * 发送参数同步提醒消息 0x17 */ fun isConnectBleSendNotifyData(mac: String) { if (TextUtils.isEmpty(mac)) { @@ -419,6 +420,25 @@ class SRBleUtil private constructor() { } } + /** + * 发送围栏设置 0x13 + */ + fun isConnectBleSendFenceData(mac: String, fencesBean: FencesBean) { + if (TextUtils.isEmpty(mac)) { + return + } + if (BleManager.getInstance().isConnected(mac)) { + val trackDeviceBean = getConnectMacDevice(mac) + trackDeviceBean?.let { + + writeData( + it.bleDevice, SRBleCmdUtil.instance.setFences(fencesBean) + ) + } + } + } + + /** *发送设备开启关闭led蓝牙指令 */ diff --git a/app/src/main/java/com/abbidot/tracker/vm/FencesManageViewModel.kt b/app/src/main/java/com/abbidot/tracker/vm/FencesManageViewModel.kt index 905d6e1..32fc8b6 100644 --- a/app/src/main/java/com/abbidot/tracker/vm/FencesManageViewModel.kt +++ b/app/src/main/java/com/abbidot/tracker/vm/FencesManageViewModel.kt @@ -19,7 +19,7 @@ import kotlinx.coroutines.launch */ class FencesManageViewModel : ViewModel() { - val mFencesAddLiveData = MutableLiveData>() + val mFencesAddLiveData = MutableLiveData>() val mDeleteFenceLiveData = MutableLiveData>() val mUpdateFenceLiveData = MutableLiveData>() val mFencesLiveData = MutableLiveData>() diff --git a/app/src/main/res/layout/fragment_credit_card_payment.xml b/app/src/main/res/layout/fragment_credit_card_payment.xml index 3c94c52..7444946 100644 --- a/app/src/main/res/layout/fragment_credit_card_payment.xml +++ b/app/src/main/res/layout/fragment_credit_card_payment.xml @@ -32,8 +32,8 @@ style="@style/my_match_RoundRect_Button_style" android:layout_alignParentBottom="true" android:layout_marginHorizontal="@dimen/dp_16" - android:visibility="gone" android:text="@string/txt_make_payment" + android:visibility="gone" app:qmui_radius="@dimen/dp_64" app:typeface="@string/roboto_bold_font" /> diff --git a/baselibrary/src/main/java/com/abbidot/baselibrary/util/Utils.kt b/baselibrary/src/main/java/com/abbidot/baselibrary/util/Utils.kt index 8eff28e..fc161ee 100644 --- a/baselibrary/src/main/java/com/abbidot/baselibrary/util/Utils.kt +++ b/baselibrary/src/main/java/com/abbidot/baselibrary/util/Utils.kt @@ -209,28 +209,20 @@ class Utils { /** * @param d 需要处理的数字 - * @param num 保留位数(只能是1或者2) + * @param num 保留位数 * @return 保留num位小数后的字符串 */ fun formatDecimal(d: Double, num: Int = 2): String { - return if (num == 2) { - String.format(Locale("en", "US"), "%.2f", d) - } else { - String.format(Locale("en", "US"), "%.1f", d) - } + return String.format(Locale("en", "US"), "%.${num}f", d) } /** * @param f 需要处理的数字 - * @param num 保留位数(只能是1或者2) + * @param num 保留位数 * @return 保留num位小数后的字符串 */ fun formatDecimal(f: Float, num: Int): String { - return if (num == 2) { - String.format(Locale("en", "US"), "%.2f", f) - } else { - String.format(Locale("en", "US"), "%.1f", f) - } + return String.format(Locale("en", "US"), "%.${num}f", f) } /**