release V671

1、QatjaService 遇到Exception ECONNABORTED 跳过 继续读取
2、Runtime getFZDLBSmulti...  getfzdWiFi... 修改默认没有情况下的格式问题
3、CellinfoUtil 没有读取到mccmnc时隔5秒重试

diff --git a/app/release/ICSer_V667_2010211806_release.apk b/app/release/ICSer_V671_2010221304_release.apk
similarity index 78%
rename from app/release/ICSer_V667_2010211806_release.apk
rename to app/release/ICSer_V671_2010221304_release.apk
index ad991a6..1d382f6 100644 (file)
Binary files a/app/release/ICSer_V667_2010211806_release.apk and b/app/release/ICSer_V671_2010221304_release.apk differ

diff --git a/app/release/output.json b/app/release/output.json
index f7b50fe..e7b64fc 100644 (file)
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":667,"versionName":"2010211806","enabled":true,"outputFile":"ICSer_V667_2010211806_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V667_2010211806_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":671,"versionName":"2010221304","enabled":true,"outputFile":"ICSer_V671_2010221304_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V671_2010221304_release.apk","properties":{}}]
\ No newline at end of file

diff --git a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
index ea06474..31d4622 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
@@ -771,9 +771,7 @@ public class Runtime {
     wifiInfo=info;\r
   }\r
 \r
-  public String getWifiInfo(){\r
-    return wifiInfo;\r
-  }\r
+  public String getWifiInfo(){   return wifiInfo;  }\r
 \r
   public Runtime() {\r
     if (gpsp == null) gpsp = new ICLocation();\r
@@ -927,6 +925,9 @@ public class Runtime {
     return gpsStr;\r
   }\r
     public String getFZDLBSMultiStationData(){\r
+        if(mFZDLBSMultiStationData.trim().isEmpty()){\r
+            mFZDLBSMultiStationData="0";\r
+        }\r
         return mFZDLBSMultiStationData;\r
     }\r
 \r
@@ -963,6 +964,9 @@ public class Runtime {
 //        460: MCC 国家码\r
 //        0: MNC运营商代码\r
 //        9520|3671|10: LAC|CID|dbm表示一组基站信息，后面数量需和基站组数地应  10：dbm为信号强度多基站信号强度建议从高到低排列后上传，信号强度转正数：150 – abs(dbm)\r
+      if(mLBSMultiStationData.trim().isEmpty()){\r
+          mLBSMultiStationData="0,0,0,";\r
+      }\r
      return mLBSMultiStationData;\r
   }\r
 \r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java b/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java
index fd1915c..bace32c 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java
@@ -27,6 +27,7 @@ import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;\r
 import com.enqualcomm.support.Config;\r
 import com.enqualcomm.support.GSensorListener;\r
+import com.enqualcomm.support.adapter.LBSHelper;\r
 import com.enqualcomm.support.bean.Runtime;\r
 import com.sprd.internal.telephony.SprdCallManager;\r
 \r
@@ -170,6 +171,14 @@ public class CellInfoUtil {
     } else {\r
       mccmnc = telephonyManager.getNetworkOperator();\r
     }\r
+\r
+    if(mccmnc==null|| (mccmnc!=null && mccmnc.trim().isEmpty()))\r
+    {\r
+      ICLogger.i("LBS retry get MCCMNC");\r
+      telephonyManager=((TelephonyManager) runtime.getContextProxy().context.getSystemService(Context.TELEPHONY_SERVICE));\r
+      Util.mSleep(5000);\r
+      mccmnc=telephonyManager.getSimOperator();\r
+    }\r
     ICLogger.i("LBS mccmnc "+mccmnc);\r
 \r
     if (mccmnc != null && mccmnc.length() > 3) {\r

diff --git a/app/src/main/java/se/wetcat/qatja/android/QatjaService.java b/app/src/main/java/se/wetcat/qatja/android/QatjaService.java
index 7e80713..2c3822d 100644 (file)
--- a/app/src/main/java/se/wetcat/qatja/android/QatjaService.java
+++ b/app/src/main/java/se/wetcat/qatja/android/QatjaService.java
@@ -1187,9 +1187,9 @@ public class QatjaService extends Service {
         } catch (IOException e) {
           if (DEBUG)
             ICLogger.e("disconnected (this is fine, expected almost)", e);
-
-          connectionLost();
-
+          if(!e.getCause().getMessage().contains("ECONNABORTED")) {
+            connectionLost();
+          }
           break;
         }
       }

diff --git a/app/version_code.properties b/app/version_code.properties
index 1ab72dd..ca21088 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Oct 21 18:06:30 CST 2020\r
-VERSION_CODE=667\r
+#Thu Oct 22 13:04:43 CST 2020\r
+VERSION_CODE=671\r