[dev]

Author: JYXie233

android/src/main/java/com/pauldemarco/flutterblue/FlutterBluePlugin.java

@@ -226,9 +226,14 @@ public void onMethodCall(MethodCall call, Result result) {
                 String deviceId = (String)call.arguments;
                 BluetoothGatt gattServer = mGattServers.remove(deviceId);
                 if(gattServer != null) {
-                    gattServer.disconnect();
-                    gattServer.close();
-                    gattServer = null;
+                    try {
+                        gattServer.disconnect();
+                        gattServer.close();
+                        gattServer = null;
+                    }catch (Exception e){
+                        log(LogLevel.ERROR, e.getMessage());
+                    }
+
                 }
                 result.success(null);
                 break;
@@ -559,14 +564,17 @@ public void onReceive(Context context, Intent intent) {
                 if (BluetoothAdapter.ACTION_STATE_CHANGED.equals(action)) {
                     final int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE,
                             BluetoothAdapter.ERROR);
+
                     switch (state) {
                         case BluetoothAdapter.STATE_OFF:
+                            log(LogLevel.DEBUG, "[手机蓝牙状态] status: 关闭" );
                             sink.success(Protos.BluetoothState.newBuilder().setState(Protos.BluetoothState.State.OFF).build().toByteArray());
                             break;
                         case BluetoothAdapter.STATE_TURNING_OFF:
                             sink.success(Protos.BluetoothState.newBuilder().setState(Protos.BluetoothState.State.TURNING_OFF).build().toByteArray());
                             break;
                         case BluetoothAdapter.STATE_ON:
+                            log(LogLevel.DEBUG, "[手机蓝牙状态] status: 打开" );
                             sink.success(Protos.BluetoothState.newBuilder().setState(Protos.BluetoothState.State.ON).build().toByteArray());
                             break;
                         case BluetoothAdapter.STATE_TURNING_ON:
@@ -705,9 +713,6 @@ public void onConnectionStateChange(BluetoothGatt gatt, int status, int newState
             if(newState == BluetoothProfile.STATE_DISCONNECTED) {
                 if(!mGattServers.containsKey(gatt.getDevice().getAddress())) {
                     gatt.close();
-                }else{
-                    mGattServers.remove(gatt.getDevice().getAddress());
-                    gatt.close();
                 }
             }
             invokeMethodUIThread("DeviceState", ProtoMaker.from(gatt.getDevice(), newState).toByteArray());