From: snickersun <scy@incartech.cn>
Date: Fri, 10 Apr 2020 03:35:39 +0000 (+0800)
Subject: release V397
X-Git-Url: http://git.snicker.com.cn/sitemap.xml?a=commitdiff_plain;h=1a9e7a6d9fdfe98b6901d6b1d75b8f68da1a594b;p=icsupport.git

release V397
LocationClient的定时更严格，采用硬件定时器解决。
---

diff --git a/app/release/ICSer_V396_2004082225_release.apk b/app/release/ICSer_V396_2004082225_release.apk
deleted file mode 100644
index 43ee67e9..00000000
Binary files a/app/release/ICSer_V396_2004082225_release.apk and /dev/null differ
diff --git a/app/release/ICSer_V397_2004101116_release.apk b/app/release/ICSer_V397_2004101116_release.apk
new file mode 100644
index 00000000..f32c78c8
Binary files /dev/null and b/app/release/ICSer_V397_2004101116_release.apk differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3d033892..c77b132b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -142,7 +142,9 @@
                 <action android:name="com.enqualcomm.support.CloseUnreadMsg" />
                 <action android:name="android.intent.action.BATTERY_LOW" />
                 <action android:name="com.enqualcomm.support.ACTION_MISSED_CALL_GET" />
-
+                <action android:name="com.enqualcomm.support.ACTION_CHECK_SERVER_RESPONSE" />
+                <action android:name="com.enqualcomm.support.ACTION_RETRY_SERVER_CONNECT" />
+                <action android:name="com.enqualcomm.support.ACTION_CHECK_LOCATION_RESULT" />
                 <!-- <action android:name="com.eqc.heartrate.action.SILENT_START" /> -->
             </intent-filter>
         </receiver>
diff --git a/app/src/main/java/com/enqualcomm/support/Constants.java b/app/src/main/java/com/enqualcomm/support/Constants.java
index 42cb2af8..e7c131fb 100644
--- a/app/src/main/java/com/enqualcomm/support/Constants.java
+++ b/app/src/main/java/com/enqualcomm/support/Constants.java
@@ -272,5 +272,12 @@ public interface Constants {
   public static final String contact = "contact";
   
   public static final String wechat_contact = "content";
+
+
+  public static final String ACTION_CHECK_SERVER_RESPONSE = "com.enqualcomm.support.ACTION_CHECK_SERVER_RESPONSE";
+  public static final String ACTION_RETRY_SERVER_CONNECT = "com.enqualcomm.support.ACTION_RETRY_SERVER_CONNECT";
+  public static final String ACTION_CHECK_LOCATION_RESULT = "com.enqualcomm.support.ACTION_CHECK_LOCATION_RESULT";
+
+
 }
 
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index f7ccdf62..213626a3 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -684,7 +684,13 @@ public class CoreService extends Service {
                 if (Config.LOG_TOFILE) ICLogger.logToFile("alarmCycle", stringBuilder1.toString());
 //                this.locationClient.triggerLocationProcess();
 
-            } else if (Constants.SLEEP_ALARM.equals(paramIntent.getAction())) {
+            }else if (Constants.ACTION_CHECK_SERVER_RESPONSE.equals(paramIntent.getAction())) {
+                //暂时还使用 ScheduledThreadPoolExecutor ， 时间要求不是那么的严格
+            }else if (Constants.ACTION_RETRY_SERVER_CONNECT.equals(paramIntent.getAction())) {
+                //暂时还使用 ScheduledThreadPoolExecutor ， 时间要求不是那么的严格
+            }else if (Constants.ACTION_CHECK_LOCATION_RESULT.equals(paramIntent.getAction())) {
+                locationClient.waitAndSendLocation();
+            }else if (Constants.SLEEP_ALARM.equals(paramIntent.getAction())) {
                 StringBuilder stringBuilder1;
                 ICLogger.i("SLEEP_ALARM");
                 is_allowed_in_sleep_mode = 1;
@@ -947,7 +953,16 @@ public class CoreService extends Service {
 
     public void stopConnectionRetryTimer(){
         if (mTimer_retry_connect !=null){
-            mTimer_retry_connect.shutdown();
+            mTimer_retry_connect.shutdownNow();
+//            while(!mTimer_retry_connect.isTerminated())
+//            {
+//                ICLogger.i("Wait for thread pool terminated");
+//                try {
+//                    Thread.sleep(500);
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+//            }
             mTimer_retry_connect.purge();
             mTimer_retry_connect = null;
         }
diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index 9e55428c..6b23714e 100644
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -46,6 +46,7 @@ import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 
 import static android.location.LocationManager.GPS_PROVIDER;
+import static com.enqualcomm.support.Constants.ACTION_CHECK_LOCATION_RESULT;
 import static com.enqualcomm.support.Constants.HEART_ALARM;
 
 public class LocationClient {
@@ -104,7 +105,7 @@ public class LocationClient {
 
   private LBSHelper mLbsHelper;
 
-  private ScheduledThreadPoolExecutor mTimer=null;
+//  private ScheduledThreadPoolExecutor mTimer=null;
   
   private int mPedometer2;
   
@@ -266,17 +267,28 @@ public class LocationClient {
       checktimes=0;
       timeout=false;
       startCheckTime= System.currentTimeMillis();
+      needCheckAgain=true;
       //延时2秒执行发送“读取定位”消息
-      if (mTimer==null) mTimer=new ScheduledThreadPoolExecutor(2);
-      mTimer.scheduleAtFixedRate(new Runnable() {
-        @Override
-        public void run() {
-          waitAndSendLocation();
-          //mhandler.sendEmptyMessage(msgWhat_WaitAndSendLocation);
-        }
-      }, 1000L, 1000L,TimeUnit.MILLISECONDS);
-//    AlarmManager alarmManager=(AlarmManager)runtime.getContextProxy().context.getSystemService(Context.ALARM_SERVICE);
-//    AlarmHelper.setAlarm(alarmManager,0,1,);
+//      if (mTimer==null) {
+//        mTimer = new ScheduledThreadPoolExecutor(1);
+//      }
+
+      ICLogger.i("startCheckResult " );
+
+//      mTimer.scheduleAtFixedRate(new Runnable() {
+//        @Override
+//        public void run() {
+//          try {
+//            waitAndSendLocation();
+//          }catch (Exception e){
+//            e.printStackTrace();
+//          }
+//          //mhandler.sendEmptyMessage(msgWhat_WaitAndSendLocation);
+//        }
+//      }, 1000L, 1000L,TimeUnit.MILLISECONDS);
+
+    AlarmHelper.setRealTimeAlarmInSeconds(runtime.getContextProxy().context,1,ACTION_CHECK_LOCATION_RESULT);
+
   }
 
 
@@ -305,6 +317,7 @@ public class LocationClient {
 
   boolean wifi_ok=false,gps_ok=false,lbs_ok=false,gps_nosignal=false;
 
+  private static boolean needCheckAgain=false;
   public void waitAndSendLocation(){
 
         long timeCost=0L;
@@ -447,17 +460,47 @@ public class LocationClient {
             break;
         }
 
+        if(needCheckAgain)
+          AlarmHelper.setRealTimeAlarmInSeconds(runtime.getContextProxy().context,1,ACTION_CHECK_LOCATION_RESULT);
   }
 
   public void stopCheckLocationResult(){
     ICLogger.i("stopCheckLocationResult!");
-    if (mTimer!=null){
-      mTimer.shutdown();
-      mTimer.purge();
-      mTimer=null;
-    }
+//    if (mTimer!=null){
+//      mTimer.shutdownNow();
+//      Runnable tmp= mTimer.getQueue().poll();
+//      while (tmp!=null){
+//        mTimer.remove(tmp);
+//      }
+//      mTimer.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
+//      mTimer.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
+//      mTimer.setRemoveOnCancelPolicy(true);
+//      ICLogger.i("Wait for thread pool getContinueExistingPeriodicTasksAfterShutdownPolicy " +mTimer.getContinueExistingPeriodicTasksAfterShutdownPolicy()+
+//              "\ngetExecuteExistingDelayedTasksAfterShutdownPolicy "+mTimer.getExecuteExistingDelayedTasksAfterShutdownPolicy()+
+//              "\ngetRemoveOnCancelPolicy "+mTimer.getRemoveOnCancelPolicy());
+//      while(!mTimer.isTerminated())
+//      {
+//      StringBuilder sb=new StringBuilder();
+//        if (mTimer.isTerminated()) sb.append("+");
+//        if (mTimer.isShutdown()) sb.append("*");
+//        if (mTimer.isTerminating()) sb.append("-");
+//        ICLogger.i(sb.toString());
+//
+//        try {
+//          Thread.sleep(500);
+//        } catch (InterruptedException e) {
+//          e.printStackTrace();
+//        }
+//      }
+//      mTimer.purge();
+//      mTimer=null;
+//    }
+
+    needCheckAgain=false;
     isLocating = false;
     startCheckTime=0L;
+
+//    ICLogger.i(" stopCheckLocationResult Done ");
   }
 
 //  public void EqcAlgorithmInterfaceMethod3() {
@@ -616,7 +659,7 @@ public void updateCellInfo() {
     @Override
     public void onReceive(Context context, Intent intent) {
       String action = intent.getAction();
-      if (ACTION_GPSCMD.equals(action)) {
+      if (ACTION_GPSCMD.equals(action)) { //此消息来自工厂测试工具，测试GPS时会发送。
         String status = intent.getStringExtra("status");
         if( status.equals("needReopen")){
           runtime.setFactoryTestingStat(true);
diff --git a/app/src/main/java/com/enqualcomm/support/MainActivity.java b/app/src/main/java/com/enqualcomm/support/MainActivity.java
index b61ec786..e2786413 100644
--- a/app/src/main/java/com/enqualcomm/support/MainActivity.java
+++ b/app/src/main/java/com/enqualcomm/support/MainActivity.java
@@ -129,7 +129,16 @@ public class MainActivity extends AppCompatActivity {
     protected void onPause() {
         super.onPause();
         if (timer!=null) {
-            timer.shutdown();
+            timer.shutdownNow();
+//            while(!timer.isTerminated())
+//            {
+//                ICLogger.i("Wait for thread pool terminated");
+//                try {
+//                    Thread.sleep(500);
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+//            }
             timer.purge();
             timer = null;
         }
diff --git a/app/src/main/java/com/enqualcomm/support/adapter/protocolAPIHelper.java b/app/src/main/java/com/enqualcomm/support/adapter/protocolAPIHelper.java
index 2bde14da..b3842f41 100644
--- a/app/src/main/java/com/enqualcomm/support/adapter/protocolAPIHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/adapter/protocolAPIHelper.java
@@ -381,6 +381,39 @@ public class protocolAPIHelper {
 
 
 
+    /*LBS+WiFi混合定位*/
+    public static String AP02(Runtime ds) {
+        //示例数据：IWAP02,
+        // zh_cn,
+        // 0,
+        // 7,
+        // 460,0,
+        // 9520|3671|13,9520|3672|12,9520|3673|11,9520|3674|10,9520|3675|9,9520|3676|8,9520|3677|7,
+        // 4,
+        // 1|D8-24-BD-79-FA-1F|59&2|3C-46-D8-6D-CE-01|81&3|0C-4C-39-1A-7C-65|69&4|70-A8-E3-5D-D7-C0|65#
+//        IW标识符
+//        AP02:命令字
+//        zh_cn: 语言标志
+//        0:回复标识，为0时不回复地址，为 1 时，服务器回复地址信息
+//        7: 表示共有7组基站
+//        460: MCC 国家码
+//        0: MNC运营商代码
+//        9520|3671|10: LAC|CID|dbm表示一组基站信息，后面数量需和基站组数地应  10：dbm为信号强度多基站信号强度建议从高到低排列后上传，信号强度转正数：150 – abs(dbm)
+//        4: 表示WIFI组数,
+//                1|D8-24-BD-79-FA-1F|59: ssid|mac地址|信号强度，信号强度转正数：150 – abs(信号强度)
+        return new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP02)).append(TimeUtil.getShortDate())
+                .append(ds.getGPSData()).append(TimeUtil.getShortTime()).append(ds.getGPSHeading()).append(String.format("%03d",abs(ds.getSignalStrength())))
+                .append(ds.getGPSLocationStarNums()).append(ds.getBattery()).append("0")
+                .append(ds.getProtection()).append(ds.getWorkModeStr()).append(CMDSPLIT)
+                .append(ds.getLBSData()).append(CMDSPLIT).append(ds.getWifiInfo()).append(CMDEND).toString();
+    }
+
+    //处理 定位 BP01
+    public void handleBP02(String cmd){
+        log("BP02定位接收成功");
+    }
+
+
 
     public static String APXL(String id){
 //设备响应：	IWAPXL,080835#
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 43a8dfcd..c6d820b9 100644
--- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
@@ -35,7 +35,7 @@ public class Runtime {
   
   public String cellidByAt;
   
-  public String cellinfo;
+  private String cellinfo;
   
   private String cid = "";
   
diff --git a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
index b3a18817..2e1387f9 100644
--- a/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -227,7 +227,9 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
       ICJniUtils.enablePPG();
       getPPGWakeLock();
 
-      timerPPG = new ScheduledThreadPoolExecutor(2);
+
+      if (timerPPG==null)
+          timerPPG = new ScheduledThreadPoolExecutor(2);
       timerPPG.scheduleAtFixedRate(new Runnable() {
         @Override
         public void run() {
@@ -241,7 +243,7 @@ public class HeartRateManager extends AbstractInvokeHandlerService {
   public void stopPPG(){
     if( isTimerStarted )
     {
-      timerPPG.shutdown();
+      timerPPG.shutdownNow();
       timerPPG.purge();
       isTimerStarted=false;
     }
diff --git a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
index e44d1761..5e5984cc 100644
--- a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
+++ b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
@@ -76,7 +76,7 @@ public class KeepAlive extends AbstractConnectionService {
     if (SimSignalUtil.checkNet(mRuntime.getContextProxy().context) ) {
       stopResponseCheckTimer();
       if (scheduled == null) {
-        scheduled = new ScheduledThreadPoolExecutor(2);
+        scheduled = new ScheduledThreadPoolExecutor(10);
       }
       //开始检测重新计数
       hearBeatResendCount=0;
@@ -94,7 +94,6 @@ public class KeepAlive extends AbstractConnectionService {
 
     if (SimSignalUtil.checkNet(mRuntime.getContextProxy().context) ) {
 
-
       //如果收到服务器响应BP03，则停止重试，否则 继续发送AP03 心跳包，且继续检查响应
       if (this.is_heartBeat_send_success ) {
         ICLogger.i("checkSrvResponse 成功，停止检测！");
@@ -127,10 +126,35 @@ public class KeepAlive extends AbstractConnectionService {
 
   public void stopResponseCheckTimer(){
     if (scheduled !=null){
-      scheduled.shutdown();
+      scheduled.shutdownNow();
+//      Runnable tmp= scheduled.getQueue().poll();
+//      while (tmp!=null){
+//        scheduled.remove(tmp);
+//      }
+      scheduled.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
+      scheduled.setExecuteExistingDelayedTasksAfterShutdownPolicy(false);
+      scheduled.setRemoveOnCancelPolicy(true);
+      ICLogger.i("Wait for thread pool getContinueExistingPeriodicTasksAfterShutdownPolicy " +scheduled.getContinueExistingPeriodicTasksAfterShutdownPolicy()+
+              "\ngetExecuteExistingDelayedTasksAfterShutdownPolicy "+scheduled.getExecuteExistingDelayedTasksAfterShutdownPolicy()+
+              "\ngetRemoveOnCancelPolicy "+scheduled.getRemoveOnCancelPolicy());
+//      while(!scheduled.isTerminated())
+//      {
+//        StringBuilder sb=new StringBuilder();
+//        if (scheduled.isTerminated()) sb.append("+");
+//        if (scheduled.isShutdown()) sb.append("*");
+//        if (scheduled.isTerminating()) sb.append("-");
+//        ICLogger.i(sb.toString());
+//        try {
+//          Thread.sleep(500);
+//        } catch (InterruptedException e) {
+//          e.printStackTrace();
+//        }
+//      }
       scheduled.purge();
       scheduled = null;
     }
+
+    ICLogger.i(" stopResponseCheckTimer Done ");
   }
 
 
diff --git a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
index fe70d794..ac609ce1 100644
--- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
@@ -40,6 +40,8 @@ import static android.telephony.TelephonyManager.CALL_STATE_OFFHOOK;
 import static android.telephony.TelephonyManager.CALL_STATE_RINGING;
 import static com.enqualcomm.support.Constants.ACTION_CARE_ALARM;
 import static com.enqualcomm.support.Constants.ACTION_HEATR_RATE_START;
+import static com.enqualcomm.support.Constants.SERVICE_CLS_NAME;
+import static com.enqualcomm.support.Constants.SERVICE_PKG_NAME;
 
 public class SilentManager extends AbstractInvokeHandlerService {
   private static final long ONE_WEEK = 604800000L;
@@ -278,7 +280,7 @@ public class SilentManager extends AbstractInvokeHandlerService {
       var3.setAction("com.enqualcomm.support.ACTION_ISSILENCE2IMESSAGE");
       var3.putExtra("KEY_ISSILENCE", var2);
       var1.sendBroadcast(var3);
-      ComponentName var4 = new ComponentName("com.enqualcomm.support", "com.enqualcomm.support.CoreService");
+      ComponentName var4 = new ComponentName(SERVICE_PKG_NAME, SERVICE_CLS_NAME);
       Intent var5 = (new Intent("com.enqualcomm.support.ACTION_VIDEO_END_CALL")).setComponent(var4);
       this.mRuntime.getContextProxy().context.startService(var5);
     }
diff --git a/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java b/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java
index 7a1fca78..da1dcf78 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java
@@ -82,14 +82,6 @@ public class AlarmHelper {
     PendingIntent pendingIntent = PendingIntent.getService(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
     alarmManager.cancel(pendingIntent);
     long l = SystemClock.elapsedRealtime();
-    StringBuilder stringBuilder = new StringBuilder();
-    stringBuilder.append("SDK_INT=");
-    stringBuilder.append(Build.VERSION.SDK_INT);
-    stringBuilder.append(",m=,");
-    stringBuilder.append(23);
-    stringBuilder.append(",kitkat=");
-    stringBuilder.append(19);
-    ICLogger.i(stringBuilder.toString());
     if (Build.VERSION.SDK_INT >= 19) {
       alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, l + (minutes * 60 * 1000), pendingIntent);
       return;
@@ -104,14 +96,6 @@ public class AlarmHelper {
     PendingIntent pendingIntent = PendingIntent.getService(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
     alarmManager.cancel(pendingIntent);
     long l = SystemClock.elapsedRealtime();
-    StringBuilder stringBuilder = new StringBuilder();
-    stringBuilder.append("SDK_INT=");
-    stringBuilder.append(Build.VERSION.SDK_INT);
-    stringBuilder.append(",m=,");
-    stringBuilder.append(23);
-    stringBuilder.append(",kitkat=");
-    stringBuilder.append(19);
-    ICLogger.i(stringBuilder.toString());
     if (Build.VERSION.SDK_INT >= 19) {
       alarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP, l + (seconds  * 1000), pendingIntent);
       return;
diff --git a/app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java b/app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java
index 0a5f6ab0..da199c49 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java
@@ -12,6 +12,9 @@ import com.enqualcomm.support.bean.Contact;
 import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.CoreService;
 
+import static com.enqualcomm.support.Constants.SERVICE_CLS_NAME;
+import static com.enqualcomm.support.Constants.SERVICE_PKG_NAME;
+
 public class AlarmWakeUp {
   private static long lastAlarmTime;
   
@@ -20,7 +23,7 @@ public class AlarmWakeUp {
 //    int i = Config.getAlarmCycle(runtime.getContextProxy().context);
     int i = Config.getLocationCycle(runtime.getContextProxy().context);
     if (l - lastAlarmTime > ((i + 1) * 60 * 1000)) { //达到cycle时间则唤醒CoreService并发送定位消息
-      ComponentName componentName = new ComponentName("com.enqualcomm.support", "com.enqualcomm.support.CoreService");
+      ComponentName componentName = new ComponentName(SERVICE_PKG_NAME, SERVICE_CLS_NAME);
 //      Intent intent = (new Intent(CoreService.ACTION_ALARM)).setComponent(componentName);
       Intent intent = (new Intent(Constants.ACTION_LOCATION_ALARM)).setComponent(componentName);
       (runtime.getContextProxy()).context.startService(intent);
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 35f95718..67e6513c 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java
@@ -95,19 +95,20 @@ public class CellInfoUtil {
                   int j = Integer.parseInt(arrayOfString1[1]);
                   int k = Integer.parseInt(arrayOfString1[2]);
                   CellInfoUtil.BSSS = Integer.parseInt(arrayOfString1[5]);
-//                EqcAlgorithmNative.native_EqcAlgorithmMethod4(3, j, CellInfoUtil.BSSS, CellInfoUtil.MCC, CellInfoUtil.MNC, i, k);
+
                   CellInfoUtil.releaseWakeLock(mWakeLock);
                 } else {
-                  String[] arrayOfString = mCellInfo.split("\\+")[0].split("@");
-                  CellInfoUtil.MCC = Integer.parseInt(arrayOfString[0]);
-                  CellInfoUtil.MNC = Integer.parseInt(arrayOfString[1]);
-                  CellInfoUtil.LAC = Integer.parseInt(arrayOfString[2]);
-                  CellInfoUtil.CELL_ID = Integer.parseInt(arrayOfString[3]);
-                  CellInfoUtil.BSSS = Integer.parseInt(arrayOfString[4]);
-//                CellInfoUtil.access$002(2);
-                  CellInfoUtil.IS2SECOND = 2;
-//                EqcAlgorithmNative.native_EqcAlgorithmMethod4(0, 0, CellInfoUtil.BSSS, CellInfoUtil.MCC, CellInfoUtil.MNC, CellInfoUtil.LAC, CellInfoUtil.CELL_ID);
-                  mRuntime.cellinfo = mCellInfo;
+
+                  String[] stationlist = mCellInfo.split("\\+");
+                  if (stationlist.length>0 ) {
+                    String[] arrayOfString = stationlist[0].split("@");
+                    CellInfoUtil.MCC = Integer.parseInt(arrayOfString[0]);
+                    CellInfoUtil.MNC = Integer.parseInt(arrayOfString[1]);
+                    CellInfoUtil.LAC = Integer.parseInt(arrayOfString[2]);
+                    CellInfoUtil.CELL_ID = Integer.parseInt(arrayOfString[3]);
+                    CellInfoUtil.BSSS = Integer.parseInt(arrayOfString[4]);
+                    CellInfoUtil.IS2SECOND = 2;
+                  }
                 }
                 if (Config.LOG_TOFILE)ICLogger.logToFile("LBS", mCellInfo);
                 CellInfoUtil.releaseWakeLock(mWakeLock);
@@ -133,9 +134,11 @@ public class CellInfoUtil {
                 stringBuilder.append(CellInfoUtil.CELL_ID);
                 stringBuilder.append("@");
                 stringBuilder.append(CellInfoUtil.BSSS);
-                runtime.cellinfo = stringBuilder.toString();
+
+                runtime.setCurrentCellInfo(stringBuilder.toString());
+
 //              EqcAlgorithmNative.native_EqcAlgorithmMethod4(1, 0, CellInfoUtil.BSSS, CellInfoUtil.MCC, CellInfoUtil.MNC, CellInfoUtil.LAC, CellInfoUtil.CELL_ID);
-                if (Config.LOG_TOFILE) ICLogger.logToFile("LBS", mRuntime.cellinfo);
+                if (Config.LOG_TOFILE) ICLogger.logToFile("LBS", mRuntime.getCurrentCellInfo());
 
                 CellInfoUtil.releaseWakeLock(mWakeLock);
                 ICLogger.i(" setCurrentAttachCellInfo " + mCellInfo);
diff --git a/app/version_code.properties b/app/version_code.properties
index c7b2868a..69d4d431 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Apr 08 22:25:32 CST 2020
-VERSION_CODE=396
+#Fri Apr 10 11:16:37 CST 2020
+VERSION_CODE=397