release V650

解决蓝牙扫描互斥问题。防止重复扫描造成状态错误。

diff --git a/app/release/ICSer_V647_2010132120_release.apk b/app/release/ICSer_V650_2010141931_release.apk
similarity index 78%
rename from app/release/ICSer_V647_2010132120_release.apk
rename to app/release/ICSer_V650_2010141931_release.apk
index 6f04334..140eb82 100644 (file)
Binary files a/app/release/ICSer_V647_2010132120_release.apk and b/app/release/ICSer_V650_2010141931_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index f1c222d..aad1151 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":647,"versionName":"2010132120","enabled":true,"outputFile":"ICSer_V647_2010132120_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V647_2010132120_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":650,"versionName":"2010141931","enabled":true,"outputFile":"ICSer_V650_2010141931_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V650_2010141931_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/adapter/BTHelper.java b/app/src/main/java/com/enqualcomm/support/adapter/BTHelper.java
index 931ee11..61e9078 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/adapter/BTHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/adapter/BTHelper.java
@@ -24,6 +24,7 @@ public class BTHelper {
     private BTScanCallback mCallback=null;\r
     private static BTHelper mBThelper=null;\r
 \r
+    private static boolean btscanning=false;\r
     private boolean enabledBeforScan=false;\r
     BTHelper(){\r
 \r
@@ -31,7 +32,9 @@ public class BTHelper {
 \r
     //enableBT\r
     public void enableBT() {\r
-        ICLogger.i( "BT enableBT()");\r
+        ICLogger.i("BT enableBT()");\r
+\r
+\r
         if (!mBtAdapter.isEnabled()) {\r
 //            Intent enableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);\r
 //            mContext.startActivity(enableIntent);\r
@@ -45,11 +48,13 @@ public class BTHelper {
             //此处无法执行说没权限\r
 //            mBtAdapter.enableNoAutoConnect();\r
         }\r
+\r
     }\r
 \r
     //disableBT\r
     public void disableBT(){\r
         ICLogger.i( "BT disableBT()");\r
+        btscanning=false;\r
         if (mBtAdapter.isEnabled()) {\r
             mBtAdapter.disable();\r
 //            Intent enableIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);\r
@@ -158,70 +163,65 @@ public class BTHelper {
     public void scanBLE() {\r
         ICLogger.i( "BT doDiscovery()");\r
 \r
-\r
-        enabledBeforScan=mBtAdapter.isEnabled();\r
-\r
-        enableBT();\r
-\r
-\r
-        // If we're already discovering, stop it\r
-\r
+        if(btscanning==false) {\r
+            btscanning=true;\r
+            enabledBeforScan = mBtAdapter.isEnabled();\r
+            enableBT();\r
+            // If we're already discovering, stop it\r
 //        ICLogger.i(" mBtAdapter.isDiscovering() "+mBtAdapter.isDiscovering());\r
 //        if (mBtAdapter.isDiscovering()) {\r
 //            mBtAdapter.cancelDiscovery();\r
 //        }\r
 \r
 //        mBtAdapter.setDiscoverableTimeout(3);\r
-        mPairedDevicesArray.clear();\r
-        mNewDevicesArray.clear();\r
-        // Request discover from BluetoothAdapter\r
-\r
+            mPairedDevicesArray.clear();\r
+            mNewDevicesArray.clear();\r
+            // Request discover from BluetoothAdapter\r
 \r
 \r
 //        mBtAdapter.startDiscovery();\r
 \r
 \r
+            mBtAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_NONE, Config.bleScanTimeout);\r
+            LeScanCallback lecallback = new LeScanCallback() {\r
 \r
-\r
-\r
-        mBtAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_NONE, Config.bleScanTimeout);\r
-        LeScanCallback lecallback=new LeScanCallback(){\r
-\r
-            @Override\r
-            public void onLeScan(BluetoothDevice bluetoothDevice, int rssi, byte[] scanRecode) {\r
+                @Override\r
+                public void onLeScan(BluetoothDevice bluetoothDevice, int rssi, byte[] scanRecode) {\r
 //                ICLogger.i( "BT onLeScan "+bluetoothDevice.getName()+" "+bluetoothDevice.getAddress()+" rssi "+rssi);\r
 //                ICLogger.logToFile("LBS","BT onLeScan "+bluetoothDevice.getName()+" "+bluetoothDevice.getAddress()+" rssi "+rssi );\r
-                boolean found=false;\r
-                for (String dev: mNewDevicesArray){\r
-                   if (dev.contains(bluetoothDevice.getAddress())) {\r
-                       found = true;\r
-                       break;\r
-                   }\r
+                    boolean found = false;\r
+                    for (String dev : mNewDevicesArray) {\r
+                        if (dev.contains(bluetoothDevice.getAddress())) {\r
+                            found = true;\r
+                            break;\r
+                        }\r
+                    }\r
+                    if (!found)\r
+                        mNewDevicesArray.add(bluetoothDevice.getAddress() + "," + rssi);\r
                 }\r
-                if(!found)\r
-                    mNewDevicesArray.add(bluetoothDevice.getAddress()+","+rssi);\r
-            }\r
-        };\r
+            };\r
 \r
-        ICLogger.i("BT startLeScan");\r
-        mBtAdapter.startLeScan(lecallback);\r
+            ICLogger.i("BT startLeScan");\r
+            mBtAdapter.startLeScan(lecallback);\r
 \r
 \r
-        new Handler().postDelayed(new Runnable() {\r
-            @Override\r
-            public void run() {\r
-                ICLogger.i("BT stopLeScan");\r
-                mBtAdapter.stopLeScan(lecallback);\r
+            new Handler().postDelayed(new Runnable() {\r
+                @Override\r
+                public void run() {\r
+                    ICLogger.i("BT stopLeScan");\r
+                    mBtAdapter.stopLeScan(lecallback);\r
 \r
-                //开始扫描前是关闭的，就关闭它\r
+                    //开始扫描前是关闭的，就关闭它\r
 //                if(!enabledBeforScan)\r
                     disableBT();\r
 \r
-                if (mCallback!=null)\r
-                    mCallback.OnScanFinished(mPairedDevicesArray,mNewDevicesArray);\r
-            }\r
-        },5000);\r
-\r
+                    if (mCallback != null)\r
+                        mCallback.OnScanFinished(mPairedDevicesArray, mNewDevicesArray);\r
+                }\r
+            }, 5000);\r
+        }else{\r
+            ICLogger.i("BT Scanning skip Scan!");\r
+        }\r
 \r
     }\r
 \r

diff --git a/app/version_code.properties b/app/version_code.properties
index a9c96af..8d1cbe1 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Tue Oct 13 21:20:34 CST 2020\r
-VERSION_CODE=647\r
+#Wed Oct 14 19:31:29 CST 2020\r
+VERSION_CODE=650\r