|
@@ -321,7 +321,7 @@ public class MainActivity extends BaseActivity {
|
|
|
findViewById(R.id.close_scan).setOnClickListener(new View.OnClickListener(){
|
|
|
@Override
|
|
|
public void onClick(View v) {
|
|
|
- closeScan();
|
|
|
+ toCloseScan();
|
|
|
// startActivity(new Intent(MainActivity.this, CaremaActivity.class));
|
|
|
}
|
|
|
});
|
|
@@ -395,7 +395,7 @@ public class MainActivity extends BaseActivity {
|
|
|
@JavascriptInterface
|
|
|
public void closeScan() {
|
|
|
Log.e(TAG, "closeScan");
|
|
|
- closeScan();
|
|
|
+ toCloseScan();
|
|
|
}
|
|
|
|
|
|
@JavascriptInterface
|
|
@@ -920,7 +920,7 @@ public class MainActivity extends BaseActivity {
|
|
|
//关闭蓝牙扫码器
|
|
|
BleDevice mBleDevice;
|
|
|
BluetoothGattCharacteristic mCharacteristic;
|
|
|
- private void closeScan(){
|
|
|
+ private void toCloseScan(){
|
|
|
if (mBleDevice!=null){
|
|
|
if (BleManager.getInstance().isConnected(mBleDevice)) {
|
|
|
BleManager.getInstance().disconnect(mBleDevice);
|