Merge pull request #210 from YUKAI/release/3.0.0

Release/3.0.0
YUKAI · Jan 31, 2020 · f97cecb · f97cecb
2 parents 4b8eb32 + f84cb5d
commit f97cecb
Showing 39 changed files with 17 additions and 2,555 deletions.
diff --git a/bletia/.DS_Store b/bletia/.DS_Store
diff --git a/bletia/.gitignore b/bletia/.gitignore
diff --git a/bletia/build.gradle b/bletia/build.gradle
diff --git a/bletia/proguard-rules.pro b/bletia/proguard-rules.pro
diff --git a/bletia/src/androidTest/java/info/izumin/android/bletia/ActionQueueTest.java b/bletia/src/androidTest/java/info/izumin/android/bletia/ActionQueueTest.java
diff --git a/bletia/src/androidTest/java/info/izumin/android/bletia/ApplicationTest.java b/bletia/src/androidTest/java/info/izumin/android/bletia/ApplicationTest.java
diff --git a/bletia/src/androidTest/java/info/izumin/android/bletia/BletiaTest.java b/bletia/src/androidTest/java/info/izumin/android/bletia/BletiaTest.java
diff --git a/bletia/src/androidTest/java/info/izumin/android/bletia/BluetoothGattCallbackHandlerTest.java b/bletia/src/androidTest/java/info/izumin/android/bletia/BluetoothGattCallbackHandlerTest.java
diff --git a/bletia/src/main/AndroidManifest.xml b/bletia/src/main/AndroidManifest.xml
diff --git a/bletia/src/main/java/info/izumin/android/bletia/ActionMessageHandler.java b/bletia/src/main/java/info/izumin/android/bletia/ActionMessageHandler.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/ActionQueue.java b/bletia/src/main/java/info/izumin/android/bletia/ActionQueue.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/ActionQueueContainer.java b/bletia/src/main/java/info/izumin/android/bletia/ActionQueueContainer.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/BleErrorType.java b/bletia/src/main/java/info/izumin/android/bletia/BleErrorType.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/BleMessageThread.java b/bletia/src/main/java/info/izumin/android/bletia/BleMessageThread.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/BleState.java b/bletia/src/main/java/info/izumin/android/bletia/BleState.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/Bletia.java b/bletia/src/main/java/info/izumin/android/bletia/Bletia.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/BletiaErrorType.java b/bletia/src/main/java/info/izumin/android/bletia/BletiaErrorType.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/BletiaException.java b/bletia/src/main/java/info/izumin/android/bletia/BletiaException.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/BletiaListener.java b/bletia/src/main/java/info/izumin/android/bletia/BletiaListener.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/BluetoothGattCallbackHandler.java b/bletia/src/main/java/info/izumin/android/bletia/BluetoothGattCallbackHandler.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/EventEmitter.java b/bletia/src/main/java/info/izumin/android/bletia/EventEmitter.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/action/Action.java b/bletia/src/main/java/info/izumin/android/bletia/action/Action.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/action/CharacteristicAction.java b/bletia/src/main/java/info/izumin/android/bletia/action/CharacteristicAction.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/action/DescriptorAction.java b/bletia/src/main/java/info/izumin/android/bletia/action/DescriptorAction.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/action/EnableNotificationAction.java b/bletia/src/main/java/info/izumin/android/bletia/action/EnableNotificationAction.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/action/ReadCharacteristicAction.java b/bletia/src/main/java/info/izumin/android/bletia/action/ReadCharacteristicAction.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/action/ReadDescriptorAction.java b/bletia/src/main/java/info/izumin/android/bletia/action/ReadDescriptorAction.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/action/ReadRemoteRssiAction.java b/bletia/src/main/java/info/izumin/android/bletia/action/ReadRemoteRssiAction.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/action/WriteCharacteristicAction.java b/bletia/src/main/java/info/izumin/android/bletia/action/WriteCharacteristicAction.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/action/WriteDescriptorAction.java b/bletia/src/main/java/info/izumin/android/bletia/action/WriteDescriptorAction.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/helper/ConnectionHelper.java b/bletia/src/main/java/info/izumin/android/bletia/helper/ConnectionHelper.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/util/NotificationUtils.java b/bletia/src/main/java/info/izumin/android/bletia/util/NotificationUtils.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/wrapper/BluetoothDeviceWrapper.java b/bletia/src/main/java/info/izumin/android/bletia/wrapper/BluetoothDeviceWrapper.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/wrapper/BluetoothGattCallbackWrapper.java b/bletia/src/main/java/info/izumin/android/bletia/wrapper/BluetoothGattCallbackWrapper.java
diff --git a/bletia/src/main/java/info/izumin/android/bletia/wrapper/BluetoothGattWrapper.java b/bletia/src/main/java/info/izumin/android/bletia/wrapper/BluetoothGattWrapper.java
diff --git a/bletia/src/main/res/values/strings.xml b/bletia/src/main/res/values/strings.xml
diff --git a/konashi-android-sdk/build.gradle b/konashi-android-sdk/build.gradle
@@ -1,9 +1,9 @@
 apply plugin: 'com.android.library'
 apply plugin: 'groovyx.grooid.groovy-android'
 
-def versionMajor = 2
-def versionMinor = 1
-def versionPatch = 3
+def versionMajor = 3
+def versionMinor = 0
+def versionPatch = 0
 def versionBuild = 0
 
 def sdkVersionCode = versionMajor * 1000 + versionMinor * 100 + versionPatch * 10 + versionBuild
@@ -43,7 +43,7 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile project(":bletia")
+    compile 'info.izumin.android:bletia:1.3.5'
 
     androidTestCompile 'com.android.support.test:runner:0.3'
     androidTestCompile 'com.android.support.test:rules:0.3'

diff --git a/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java b/konashi-android-sdk/src/main/java/com/uxxu/konashi/lib/CallbackHandler.java
@@ -112,8 +112,18 @@ public Promise<BluetoothGattCharacteristic, BletiaException, Void> pipeDone(Blue
             @Override
             public void onDone(BluetoothGattCharacteristic bluetoothGattCharacteristic) {
                 BluetoothGattCharacteristic spiCharacteristic = service.getCharacteristic(KonashiUUID.SPI_NOTIFICATION_UUID);
-                if(spiCharacteristic != null) bletia.execute(new KonashiEnableNotificationAction(spiCharacteristic, true));
-                mEmitter.emitConnect(mManager);
+                if(spiCharacteristic != null) {
+                    bletia.execute(new KonashiEnableNotificationAction(spiCharacteristic, true))
+                        .done(new DoneCallback<BluetoothGattCharacteristic>() {
+                            @Override
+                            public void onDone(BluetoothGattCharacteristic characteristic) {
+                                mEmitter.emitConnect(mManager);
+                            }
+                        });
+                } else {
+                    mEmitter.emitConnect(mManager);
+                }
+
             }
         }).fail(new FailCallback<BletiaException>() {
             @Override

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':konashi-android-sdk', ':bletia', ':samples:test_all_functions', ':samples:aio-sample', ':samples:pwm-sample', ':samples:pio-sample', ':samples:uart-sample', ':samples:i2c-sample', ':samples:spi-sample'
+include ':konashi-android-sdk', ':samples:test_all_functions', ':samples:aio-sample', ':samples:pwm-sample', ':samples:pio-sample', ':samples:uart-sample', ':samples:i2c-sample', ':samples:spi-sample'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include ':konashi-android-sdk', ':bletia', ':samples:test_all_functions', ':samples:aio-sample', ':samples:pwm-sample', ':samples:pio-sample', ':samples:uart-sample', ':samples:i2c-sample', ':samples:spi-sample'
		include ':konashi-android-sdk', ':samples:test_all_functions', ':samples:aio-sample', ':samples:pwm-sample', ':samples:pio-sample', ':samples:uart-sample', ':samples:i2c-sample', ':samples:spi-sample'