release V660

解决蓝牙扫描在thread里面会失败的问题。

diff --git a/app/release/ICSer_V659_2010151957_release.apk b/app/release/ICSer_V660_2010152053_release.apk
similarity index 78%
rename from app/release/ICSer_V659_2010151957_release.apk
rename to app/release/ICSer_V660_2010152053_release.apk
index d90e8dc..46c2467 100644 (file)
Binary files a/app/release/ICSer_V659_2010151957_release.apk and b/app/release/ICSer_V660_2010152053_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index 3647a2c..90d083c 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":659,"versionName":"2010151957","enabled":true,"outputFile":"ICSer_V659_2010151957_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V659_2010151957_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":660,"versionName":"2010152053","enabled":true,"outputFile":"ICSer_V660_2010152053_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V660_2010152053_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index 41b2194..2ef3f78 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -323,33 +323,10 @@ public class LocationClient {
 \r
 \r
 \r
-        (new Thread(new Runnable() {\r
-          public void run() {\r
 \r
-            if (runtime !=null) {\r
-              //更新lbs信息\r
-              CellInfoUtil.getCellInfo(runtime.getContextProxy().getTelephonyManager(),runtime);\r
-\r
-              if (runtime.bleInfo.btMacList.size() > 0) {\r
-                //有蓝牙搜索要求则 先进行蓝牙扫描\r
-                startSOSLocation=true;//启动SOS定位，为了快速响应，只要wifi定位即可。\r
-                forceLocation=1;\r
-                if (needLocationForBT())\r
-                  btHelper.scanBLE();\r
-              } else {\r
-                try{\r
-                  Thread.sleep(1000);\r
-                }catch (Exception e){}\r
-                StringMessage waningmsg=protocolAPIHelper.getWarningMSG(runtime);\r
-                DeliverMessage(waningmsg);\r
-              }\r
-            }\r
-\r
-          }\r
-        })).start();\r
 \r
 \r
-//      mhandler.sendEmptyMessage(msgWhat_StartSOSLocationProcess);\r
+      mhandler.sendEmptyMessage(msgWhat_StartSOSLocationProcess);\r
 \r
   }\r
 \r
@@ -465,15 +442,37 @@ public class LocationClient {
                 btHelper.scanBLE();\r
             }\r
           }else if (msg.what == msgWhat_StartSOSLocationProcess){\r
-            startSOSLocation=true;//启动SOS定位，为了快速响应，只要wifi定位即可。\r
-            forceLocation=1;\r
-            if (runtime.bleInfo.btMacList.size() > 0) {\r
-              //有蓝牙搜索要求则 先进行蓝牙扫描\r
-              if (needLocationForBT())\r
-                btHelper.scanBLE();\r
-            } else {\r
-              startLocationProcess(ICLocation.NORMAL_MOD);\r
+\r
+\r
+            if (runtime !=null) {\r
+              //更新lbs信息\r
+              CellInfoUtil.getCellInfo(runtime.getContextProxy().getTelephonyManager(),runtime);\r
+\r
+              if (runtime.bleInfo.btMacList.size() > 0) {\r
+                //有蓝牙搜索要求则 先进行蓝牙扫描\r
+                startSOSLocation=true;//启动SOS定位，为了快速响应，只要wifi定位即可。\r
+                forceLocation=1;\r
+                if (needLocationForBT())\r
+                  btHelper.scanBLE();\r
+              } else {\r
+                try{\r
+                  Thread.sleep(1000);\r
+                }catch (Exception e){}\r
+                StringMessage waningmsg=protocolAPIHelper.getWarningMSG(runtime);\r
+                DeliverMessage(waningmsg);\r
+              }\r
             }\r
+\r
+//\r
+//            startSOSLocation=true;//启动SOS定位，为了快速响应，只要wifi定位即可。\r
+//            forceLocation=1;\r
+//            if (runtime.bleInfo.btMacList.size() > 0) {\r
+//              //有蓝牙搜索要求则 先进行蓝牙扫描\r
+//              if (needLocationForBT())\r
+//                btHelper.scanBLE();\r
+//            } else {\r
+//              startLocationProcess(ICLocation.NORMAL_MOD);\r
+//            }\r
           }\r
         }\r
   };\r

diff --git a/app/version_code.properties b/app/version_code.properties
index f1ccb93..85837ea 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Oct 15 19:57:42 CST 2020\r
-VERSION_CODE=659\r
+#Thu Oct 15 20:53:54 CST 2020\r
+VERSION_CODE=660\r