|
@@ -753,6 +753,7 @@ public class MainActivity extends BaseActivity {
|
|
|
if (BleManager.getInstance().isConnected(mBleDevice)) {
|
|
|
BleManager.getInstance().disconnect(mBleDevice);
|
|
|
}
|
|
|
+ BleManager.getInstance().clearCharacterCallback(mBleDevice);
|
|
|
}
|
|
|
}
|
|
|
@Override
|
|
@@ -786,7 +787,7 @@ public class MainActivity extends BaseActivity {
|
|
|
|
|
|
//开始蓝牙扫码器
|
|
|
private void startScan(String name) {
|
|
|
- Toast.makeText(MainActivity.this, "开始连接", Toast.LENGTH_SHORT).show();
|
|
|
+// Toast.makeText(MainActivity.this, "开始连接", Toast.LENGTH_SHORT).show();
|
|
|
BleManager.getInstance().scan(new BleScanCallback() {
|
|
|
@Override
|
|
|
public void onScanStarted(boolean success) {
|
|
@@ -807,7 +808,7 @@ public class MainActivity extends BaseActivity {
|
|
|
connect(bleDevice);
|
|
|
}
|
|
|
}else {
|
|
|
- Toast.makeText(MainActivity.this, "名字不匹配", Toast.LENGTH_SHORT).show();
|
|
|
+// Toast.makeText(MainActivity.this, "名字不匹配", Toast.LENGTH_SHORT).show();
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -820,7 +821,7 @@ public class MainActivity extends BaseActivity {
|
|
|
isScanSuccess = true;
|
|
|
}
|
|
|
}
|
|
|
- Toast.makeText(MainActivity.this, "扫描完成,是否成功="+isScanSuccess, Toast.LENGTH_SHORT).show();
|
|
|
+// Toast.makeText(MainActivity.this, "扫描完成,是否成功="+isScanSuccess, Toast.LENGTH_SHORT).show();
|
|
|
if (isScanSuccess){
|
|
|
mWebView.loadUrl("javascript:responseCode('1')");
|
|
|
}
|
|
@@ -838,14 +839,14 @@ public class MainActivity extends BaseActivity {
|
|
|
@Override
|
|
|
public void onConnectFail(BleDevice bleDevice, BleException exception) {
|
|
|
Log.e("-------->","------>连接失败");
|
|
|
- Toast.makeText(MainActivity.this, "连接失败", Toast.LENGTH_SHORT).show();
|
|
|
+// Toast.makeText(MainActivity.this, "连接失败", Toast.LENGTH_SHORT).show();
|
|
|
mWebView.loadUrl("javascript:responseCode('2')");
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public void onConnectSuccess(BleDevice bleDevice, BluetoothGatt gatt, int status) {
|
|
|
Log.e("-------->","------>连接成功");
|
|
|
- Toast.makeText(MainActivity.this, "连接成功", Toast.LENGTH_SHORT).show();
|
|
|
+// Toast.makeText(MainActivity.this, "连接成功", Toast.LENGTH_SHORT).show();
|
|
|
mBleDevice = bleDevice;
|
|
|
mWebView.loadUrl("javascript:responseCode('3')");
|
|
|
if (BleManager.getInstance().isConnected(bleDevice)) {
|
|
@@ -871,7 +872,7 @@ public class MainActivity extends BaseActivity {
|
|
|
runOnUiThread(new Runnable() {
|
|
|
@Override
|
|
|
public void run() {
|
|
|
- Toast.makeText(MainActivity.this, "打开通知成功", Toast.LENGTH_SHORT).show();
|
|
|
+// Toast.makeText(MainActivity.this, "打开通知成功", Toast.LENGTH_SHORT).show();
|
|
|
Log.e("-------->","-------->打开通知成功");
|
|
|
mWebView.loadUrl("javascript:responseCode('6')");
|
|
|
}
|
|
@@ -884,7 +885,7 @@ public class MainActivity extends BaseActivity {
|
|
|
runOnUiThread(new Runnable() {
|
|
|
@Override
|
|
|
public void run() {
|
|
|
- Toast.makeText(MainActivity.this, "连接通知失败", Toast.LENGTH_SHORT).show();
|
|
|
+// Toast.makeText(MainActivity.this, "连接通知失败", Toast.LENGTH_SHORT).show();
|
|
|
mWebView.loadUrl("javascript:responseCode('5')");
|
|
|
}
|
|
|
});
|
|
@@ -895,7 +896,7 @@ public class MainActivity extends BaseActivity {
|
|
|
runOnUiThread(new Runnable() {
|
|
|
@Override
|
|
|
public void run() {
|
|
|
- Toast.makeText(MainActivity.this, "接收数据="+(hexStringToGbk(HexUtil.formatHexString(characteristic.getValue(), false))), Toast.LENGTH_SHORT).show();
|
|
|
+// Toast.makeText(MainActivity.this, "接收数据="+(hexStringToGbk(HexUtil.formatHexString(characteristic.getValue(), false))), Toast.LENGTH_SHORT).show();
|
|
|
mWebView.loadUrl("javascript:responseData('"+(hexStringToGbk(HexUtil.formatHexString(characteristic.getValue(), false)))+"')");
|
|
|
Log.e("-------->","-------->接收数据data="+(hexStringToGbk(HexUtil.formatHexString(characteristic.getValue(), false))));
|
|
|
Log.e("-------->","-------->data="+(HexUtil.formatHexString(characteristic.getValue(), true)));
|