fix bug

dingjikerbo · Apr 19, 2017 · 5ac2fc5 · 5ac2fc5
1 parent a2639e7
commit 5ac2fc5
Show file tree

Hide file tree

Showing 54 changed files with 20 additions and 1,139 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.inuker.bluetooth"
-        minSdkVersion 18
+        minSdkVersion 21
         targetSdkVersion 21
         versionCode 1
         versionName "1.0"
@@ -29,6 +29,6 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:appcompat-v7:23.1.0'
     compile 'com.android.support:design:23.1.0'
-//    compile 'com.inuker.bluetooth:library:1.3.8'
+    //    compile 'com.inuker.bluetooth:library:1.3.8'
     compile project(path: ':library')
 }
diff --git a/app/src/main/java/com/inuker/bluetooth/DeviceDetailActivity.java b/app/src/main/java/com/inuker/bluetooth/DeviceDetailActivity.java
@@ -17,6 +17,9 @@
 import com.inuker.bluetooth.library.search.SearchResult;
 import com.inuker.bluetooth.library.utils.BluetoothLog;
 import com.inuker.bluetooth.library.utils.BluetoothUtils;
+import com.xiaomi.smarthome.mibtservice.library.channel.Channel;
+import com.xiaomi.smarthome.mibtservice.library.channel.ChannelCallback;
+
 import static com.inuker.bluetooth.library.Constants.*;
 
 import java.util.UUID;
@@ -119,12 +122,23 @@ public void onResponse(int code, BleGattProfile profile) {
                 if (code == REQUEST_SUCCESS) {
                     mAdapter.setGattProfile(profile);
                 }
-
-                SecureConnector.processStep1(mDevice);
             }
         });
     }
 
+    private class MyChannel extends Channel {
+
+        @Override
+        public void write(byte[] bytes, ChannelCallback channelCallback) {
+
+        }
+
+        @Override
+        public void onRecv(byte[] bytes) {
+
+        }
+    }
+
     private void connectDeviceIfNeeded() {
         if (!mConnected) {
             connectDevice();

diff --git a/library/src/main/java/com/inuker/bluetooth/library/BluetoothClientImpl.java b/library/src/main/java/com/inuker/bluetooth/library/BluetoothClientImpl.java
@@ -91,9 +91,9 @@ public class BluetoothClientImpl implements IBluetoothClient, ProxyInterceptor,
 
     private Context mContext;
 
-    private IBluetoothService mBluetoothService;
+    private volatile IBluetoothService mBluetoothService;
 
-    private static IBluetoothClient sInstance;
+    private volatile static IBluetoothClient sInstance;
 
     private CountDownLatch mCountDownLatch;
 

diff --git a/settings.gradle b/settings.gradle
@@ -1,5 +1 @@
-<<<<<<< Updated upstream
-include ':app', ':library', ':wave', ':test', ':testgattserver', ':testj'
-=======
 include ':app', ':library'
->>>>>>> Stashed changes
diff --git a/test/.gitignore b/test/.gitignore
diff --git a/test/build.gradle b/test/build.gradle
diff --git a/test/src/main/java/com/example/MyClass.java b/test/src/main/java/com/example/MyClass.java
diff --git a/testgattserver/.gitignore b/testgattserver/.gitignore
diff --git a/testgattserver/build.gradle b/testgattserver/build.gradle
diff --git a/testgattserver/proguard-rules.pro b/testgattserver/proguard-rules.pro
diff --git a/testgattserver/src/androidTest/java/com/inuker/testgattserver/ExampleInstrumentedTest.java b/testgattserver/src/androidTest/java/com/inuker/testgattserver/ExampleInstrumentedTest.java
diff --git a/testgattserver/src/main/AndroidManifest.xml b/testgattserver/src/main/AndroidManifest.xml