From: snickersun <scy@incartech.cn>
Date: Thu, 15 Oct 2020 13:07:26 +0000 (+0800)
Subject: release V660
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=11d28f89a2cf89acb28a66257ac28a08fe846d33;p=protocol_srv.git

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 d90e8dc5..46c2467e 100644
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 3647a2c7..90d083cd 100644
--- 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 41b2194a..2ef3f78b 100644
--- 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 {
 
 
 
-        (new Thread(new Runnable() {
-          public void run() {
 
-            if (runtime !=null) {
-              //更新lbs信息
-              CellInfoUtil.getCellInfo(runtime.getContextProxy().getTelephonyManager(),runtime);
-
-              if (runtime.bleInfo.btMacList.size() > 0) {
-                //有蓝牙搜索要求则 先进行蓝牙扫描
-                startSOSLocation=true;//启动SOS定位，为了快速响应，只要wifi定位即可。
-                forceLocation=1;
-                if (needLocationForBT())
-                  btHelper.scanBLE();
-              } else {
-                try{
-                  Thread.sleep(1000);
-                }catch (Exception e){}
-                StringMessage waningmsg=protocolAPIHelper.getWarningMSG(runtime);
-                DeliverMessage(waningmsg);
-              }
-            }
-
-          }
-        })).start();
 
 
-//      mhandler.sendEmptyMessage(msgWhat_StartSOSLocationProcess);
+      mhandler.sendEmptyMessage(msgWhat_StartSOSLocationProcess);
 
   }
 
@@ -465,15 +442,37 @@ public class LocationClient {
                 btHelper.scanBLE();
             }
           }else if (msg.what == msgWhat_StartSOSLocationProcess){
-            startSOSLocation=true;//启动SOS定位，为了快速响应，只要wifi定位即可。
-            forceLocation=1;
-            if (runtime.bleInfo.btMacList.size() > 0) {
-              //有蓝牙搜索要求则 先进行蓝牙扫描
-              if (needLocationForBT())
-                btHelper.scanBLE();
-            } else {
-              startLocationProcess(ICLocation.NORMAL_MOD);
+
+
+            if (runtime !=null) {
+              //更新lbs信息
+              CellInfoUtil.getCellInfo(runtime.getContextProxy().getTelephonyManager(),runtime);
+
+              if (runtime.bleInfo.btMacList.size() > 0) {
+                //有蓝牙搜索要求则 先进行蓝牙扫描
+                startSOSLocation=true;//启动SOS定位，为了快速响应，只要wifi定位即可。
+                forceLocation=1;
+                if (needLocationForBT())
+                  btHelper.scanBLE();
+              } else {
+                try{
+                  Thread.sleep(1000);
+                }catch (Exception e){}
+                StringMessage waningmsg=protocolAPIHelper.getWarningMSG(runtime);
+                DeliverMessage(waningmsg);
+              }
             }
+
+//
+//            startSOSLocation=true;//启动SOS定位，为了快速响应，只要wifi定位即可。
+//            forceLocation=1;
+//            if (runtime.bleInfo.btMacList.size() > 0) {
+//              //有蓝牙搜索要求则 先进行蓝牙扫描
+//              if (needLocationForBT())
+//                btHelper.scanBLE();
+//            } else {
+//              startLocationProcess(ICLocation.NORMAL_MOD);
+//            }
           }
         }
   };
diff --git a/app/version_code.properties b/app/version_code.properties
index f1ccb936..85837ea3 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Oct 15 19:57:42 CST 2020
-VERSION_CODE=659
+#Thu Oct 15 20:53:54 CST 2020
+VERSION_CODE=660