From 92e336c9b197193a6fd19bf3bdd232739195b7a2 Mon Sep 17 00:00:00 2001
From: snickersun <snickersun@qq.com>
Date: Thu, 20 Feb 2020 00:29:08 +0800
Subject: [PATCH] =?utf8?q?1=E3=80=81Deliver.java=E4=B8=AD=E5=8F=91?=
 =?utf8?q?=E9=80=81Location=20message=E6=97=B6=E6=B2=A1=E6=B3=95=E9=80=81?=
 =?utf8?q?=E4=B8=80=E4=B8=AAdelay=205=E7=A7=92=E9=92=9F=E3=80=82=202?=
 =?utf8?q?=E3=80=81KeepAlive.java=20=E4=B8=ADAP00=E4=B8=8EAP03=E4=B9=8B?=
 =?utf8?q?=E9=97=B4=E6=B7=BB=E5=8A=A0=20delay=205=E7=A7=92=E9=92=9F?=
 =?utf8?q?=E3=80=82=203=E3=80=81AlarmWakeup.java=20=E5=90=AF=E5=8A=A8?=
 =?utf8?q?=E6=97=B6=E7=9A=84=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9=E4=B8=BAH?=
 =?utf8?q?eartBeatAlarm=204=E3=80=81NettyConnection.java=20=E4=BF=AE?=
 =?utf8?q?=E6=94=B9Log=E6=B6=88=E6=81=AF=E3=80=82=205=E3=80=81LocationClie?=
 =?utf8?q?nt.java=E6=B7=BB=E5=8A=A0SkipMoveCheck=E6=8E=A5=E5=8F=A3?=
 =?utf8?q?=EF=BC=8C=E5=B9=B6=E5=9C=A8ICSmsManager.java=E4=B8=AD=E6=B7=BB?=
 =?utf8?q?=E5=8A=A0=E5=AF=B9=E5=BA=94SMSCMD=20#skipmovecheck#=3Dcurrent=20?=
 =?utf8?q?#skipmovecheck#=3Dtrue=20#skipmovecheck#=3Dfalse=206=E3=80=81Cor?=
 =?utf8?q?eService.java=20=E4=BF=9D=E8=AF=81=E6=AF=8F=E6=AC=A1=E4=BA=AE?=
 =?utf8?q?=E5=B1=8F=E7=9A=84=E6=97=B6=E5=80=99=E9=83=BD=E5=8F=91=E4=B8=80?=
 =?utf8?q?=E6=AC=A1=E5=BF=83=E8=B7=B3=EF=BC=8C=E4=BF=9D=E8=AF=81=E8=AE=A1?=
 =?utf8?q?=E6=AD=A5=E7=AD=89=E6=95=B0=E6=8D=AE=E5=BF=AB=E9=80=9F=E6=9B=B4?=
 =?utf8?q?=E6=96=B0=EF=BC=8C=E6=8F=90=E9=AB=98=E4=BD=93=E9=AA=8C=E3=80=82?=
 =?utf8?q?=20=20=20=20=E7=BD=91=E7=BB=9C=E9=87=8D=E8=AF=95=E7=9A=84?=
 =?utf8?q?=E9=97=B4=E9=9A=94=E4=BB=8E5=E7=A7=92=E6=94=B9=E4=B8=BA20?=
 =?utf8?q?=E7=A7=92=20=20=20=20=E5=8E=BB=E6=8E=89Action=5FAlarm=E5=8F=AA?=
 =?utf8?q?=E4=BF=9D=E7=95=99=20Location=5FAlarm=EF=BC=8C=E9=99=8D=E4=BD=8E?=
 =?utf8?q?=E5=8A=9F=E8=80=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 app/app.iml                                   |   4 +-
 .../com/enqualcomm/support/CoreService.java   | 149 ++++++++++--------
 .../com/enqualcomm/support/ICSmsManager.java  |  17 ++
 .../enqualcomm/support/LocationClient.java    |  11 +-
 .../enqualcomm/support/service/Deliver.java   |  66 +++++---
 .../enqualcomm/support/service/KeepAlive.java |  27 +++-
 .../enqualcomm/support/utils/AlarmWakeUp.java |   9 +-
 .../support/utils/NettyConnection.java        |   4 +-
 8 files changed, 188 insertions(+), 99 deletions(-)

diff --git a/app/app.iml b/app/app.iml
index e9dfcaaf..19e98f4e 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -19,7 +19,7 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
         <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
@@ -126,5 +126,7 @@
     <orderEntry type="module" module-name="dNSCache" />
     <orderEntry type="module" module-name="dNSCache" />
     <orderEntry type="module" module-name="dNSCache" />
+    <orderEntry type="module" module-name="dNSCache" />
+    <orderEntry type="module" module-name="dNSCache" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 095c1c16..2c35f7bc 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -110,6 +110,7 @@ public class CoreService extends Service {
 
     public static final int interval = 60000;
 
+    public static boolean needLocateInAfterHeartBeat=false;
     private static int is_allowed_in_sleep_mode = 1;
 
     private static boolean is_in_sleep_mode = false;
@@ -291,7 +292,7 @@ public class CoreService extends Service {
                 Logger.i(var3.toString());
                 if (CoreService.is_in_sleep_mode) {
 
-                    /*屏幕亮起时，如果在sleep模式，则唤醒各个进程*/
+                    /*屏幕亮起时，如果在sleep模式(夜晚的那个睡眠模式，非系统休眠，暂时没实现，还不会跑到这里)，则唤醒各个进程*/
                     CoreService.is_in_sleep_mode = false;
                     CoreService.is_allowed_in_sleep_mode = 0;
                     if (CoreService.this.mKeepAlive != null) {
@@ -301,14 +302,23 @@ public class CoreService extends Service {
                     CoreService.this.wakeUpFromSleep();
                 }
 
+
+                //为了保证唤醒时各个状态及时更新到服务器，发送一个同步心跳包，这样用户体验更好
+                Observable.timer(500L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {
+                    public void call(Long param1Long) {
+                        connection.send(protocolAPIHelper.genStringMessage("heart",protocolAPIHelper.AP03(runtime)));
+                    }
+                });
+
+
                 if (CoreService.is_wifi_network_ok) {
                     CoreService.is_wifi_network_ok = false;
                     /*屏幕亮起时，如果wifi用户设置是开启的，则开启wifi*/
-                    Util.turnOnWifiForConnect(CoreService.this.runtime.getContextProxy().context, CoreService.this.runtime);
+                    Util.turnOnWifiForConnect(runtime.getContextProxy().context, runtime);
                 }
-            } else if ("android.intent.action.SCREEN_OFF".equals(param1Intent.getAction()) && Util.isWifiIsOpen(CoreService.this.runtime.getContextProxy().context, CoreService.this.runtime)) {
+            } else if ("android.intent.action.SCREEN_OFF".equals(param1Intent.getAction()) && Util.isWifiIsOpen(runtime.getContextProxy().context,runtime)) {
                 CoreService.is_wifi_network_ok = true;
-                Util.turnOffWifiForSleep(CoreService.this.runtime.getContextProxy().context, CoreService.this.runtime);
+                Util.turnOffWifiForSleep(runtime.getContextProxy().context, runtime);
             }
         }
     };
@@ -402,8 +412,13 @@ public class CoreService extends Service {
     }
     private void wakeUpFromSleep() {
         this.startAlarmCount = 0;
-        alarmCycle = 1;
-        setAlarm(alarmCycle);
+//        alarmCycle = 1;
+//        setAlarm(alarmCycle);
+//        runtime.getLocationInstance().setLocation_cycle(1);
+
+        //每次唤醒都强制设置一次定位alarm和定位一次。
+        setLocationAlarm(runtime.getLocationInstance().getWorkingMod());
+
         this.runtime.getContextProxy().sendBroadcast(ACTION_EQC_ALARM, this.runtime);
         this.connection.open();
         checkconnection();
@@ -481,7 +496,9 @@ public class CoreService extends Service {
 
         this.connectionServiceChain.processAttach(this.connection, this.runtime);
         this.invokeHandlerServiceChain.processAttach(this.connection, this.runtime);
-        setAlarm(alarmCycle);
+//        setAlarm(alarmCycle);
+
+
         if (Config.LOG_TOFILE)  FileOutputUtil.fileOutput(runtime.getCacheDir(), "alarmCycle", "设置闹钟服务  alarmCycle");
         this.locationClient = new LocationClient(this.connection, this.runtime);
         this.connection.open();
@@ -557,7 +574,9 @@ public class CoreService extends Service {
         //获取天气时间
         setWeatherAlarm();
 
+
         //获取定位时间
+        needLocateInAfterHeartBeat=true;
         setLocationAlarm(runtime.getLocationInstance().getWorkingMod());
 
         //备份DB数据到sd cache目录，为调试方便
@@ -576,18 +595,21 @@ public class CoreService extends Service {
             stringBuilder.append(" paramInt2=");
             stringBuilder.append(paramInt2);
             Logger.i(stringBuilder.toString());
-            if (ACTION_ALARM.equals(paramIntent.getAction())) {
-                if (cmcm_call_eiot_into_powersave_mode() == 1) {
-                    Logger.i("2 into powersave return");
-                    return Service.START_NOT_STICKY;
-                }
+//            if (ACTION_ALARM.equals(paramIntent.getAction())) {
+            if (ACTION_LOCATION_ALARM.equals(paramIntent.getAction())){
 
-                //wakeup后1分钟唤醒一次，5分钟后，心跳改为从配置信息读取的值，默认为3分钟
-                if (this.startAlarmCount < 5 && alarmCycle == 1) {
-                    this.startAlarmCount++;
-                } else {
-                    alarmCycle = Config.getAlarmCycle(this);
-                }
+
+//                    if (cmcm_call_eiot_into_powersave_mode() == 1) {
+//                        Logger.i("2 into powersave return");
+//                        return Service.START_NOT_STICKY;
+//                    }
+
+//                //wakeup后1分钟唤醒一次，5分钟后，心跳改为从配置信息读取的值，默认为3分钟
+//                if (this.startAlarmCount < 5 && alarmCycle == 1) {
+//                    this.startAlarmCount++;
+//                } else {
+//                    alarmCycle = Config.getAlarmCycle(this);
+//                }
                 AlarmWakeUp.setAlarmWakeUpTime();
                 boolean screenon = ((PowerManager)getSystemService(POWER_SERVICE)).isScreenOn();
                 if (!screenon) {
@@ -598,19 +620,29 @@ public class CoreService extends Service {
                     is_wifi_network_ok = true; //如果wifi开启的，则记录wifi状态为开启，以后屏幕开启时，再根据此变量决定是否打开wifi
                     Util.turnOffWifiForSleep((this.runtime.getContextProxy()).context, this.runtime);
                 }
-                setAlarm(alarmCycle);
-                if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(runtime.getCacheDir(), "alarmCycle", "ALARM alarmCycle");
+//                setAlarm(alarmCycle);
+//                if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(runtime.getCacheDir(), "alarmCycle", "ALARM alarmCycle");
 
                 //发送心跳间隔广播给其他应用
                 this.runtime.getContextProxy().sendBroadcast(ACTION_EQC_ALARM, this.runtime);
-                this.locationClient.onAlarm(getWakeLock(alarmCycle));
+                this.locationClient.onAlarm(getWakeLock(1));
                 this.connectionServiceChain.processAlarmClock(this.connection, this.runtime);
                 this.invokeHandlerServiceChain.processAlarmClock(this.connection, this.runtime);
-                if (SystemClock.elapsedRealtime() - this.mWeatherTime > 60000L && this.mHaveSetWeatherAlarm) {
-                    setWeatherAlarm();
-                    this.mHaveSetWeatherAlarm = false;
-                    return Service.START_NOT_STICKY;
-                }
+//                if (SystemClock.elapsedRealtime() - this.mWeatherTime > 60000L && this.mHaveSetWeatherAlarm) {
+//                    setWeatherAlarm();
+//                    this.mHaveSetWeatherAlarm = false;
+//                    return Service.START_NOT_STICKY;
+//                }
+
+
+                //收到定时定位消息
+                setLocationAlarm(runtime.getLocationInstance().getWorkingMod());
+                StringBuilder stringBuilder1 = new StringBuilder();
+                stringBuilder1.append("LOCATION_ALARM  work mod=");
+                stringBuilder1.append(runtime.getLocationInstance().getWorkingMod());
+                if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(runtime.getCacheDir(), "alarmCycle", stringBuilder1.toString());
+                this.locationClient.triggerLocationProcess();
+
             } else {
                 StringBuilder stringBuilder1;
                 if (Constants.SLEEP_ALARM.equals(paramIntent.getAction())) {
@@ -642,8 +674,7 @@ public class CoreService extends Service {
                         is_allowed_in_sleep_mode = 1;
                         setWakeAlarm();
                         return Service.START_STICKY;
-                    }
-                    if (HEART_ALARM.equals(paramIntent.getAction())) {
+                    }else if (HEART_ALARM.equals(paramIntent.getAction())) {
                         if (this.mKeepAlive != null) {
                             this.mKeepAlive.onHeartAlarm(this.connection, this.runtime);
                             setHeartAlarm();
@@ -651,39 +682,29 @@ public class CoreService extends Service {
                             return Service.START_STICKY;
                         }
                     } else {
-                        if (WEATHER_ALARM.equals(paramIntent.getAction())) {
-//                            this.mSendPairMessage.resetDownLoadConfig();
-//                            this.mSendPairMessage.startDownLoad(this.runtime, false);
-                            return Service.START_STICKY;
-                        }else if (ACTION_ALARM_ADD_DATAPOINTS.equals(paramIntent.getAction())) {
-                            setUpLocationDataAlarm(28800000L);
-                            if (this.upLoadDataPoints != null) {
-                                this.upLoadDataPoints.uploadCurrentLocation();
-                                return Service.START_STICKY;
-                            }
-                            Logger.i("upLoadDataPoints=null");
-                            return Service.START_STICKY;
-                        }else if (Constants.STWORKMODE_ALARM.equals(paramIntent.getAction())) {
-                            if (this.startAlarmCount >= 5) {
-                                alarmCycle = paramIntent.getIntExtra("location_cycle", 3);
-                                setAlarm(alarmCycle);
-                            }
-                            stringBuilder1 = new StringBuilder();
-                            stringBuilder1.append("STWORKMODE_ALARM  alarmCycle=");
-                            stringBuilder1.append(alarmCycle);
-                            if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(runtime.getCacheDir(), "alarmCycle", stringBuilder1.toString());
-                            return Service.START_STICKY;
-                        }else if (ACTION_LOCATION_ALARM.equals(paramIntent.getAction())){
-                            //收到定时定位消息
-                            setLocationAlarm(runtime.getLocationInstance().getWorkingMod());
-                            stringBuilder1 = new StringBuilder();
-                            stringBuilder1.append("LOCATION_ALARM  work mod=");
-                            stringBuilder1.append(runtime.getLocationInstance().getWorkingMod());
-                            if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(runtime.getCacheDir(), "alarmCycle", stringBuilder1.toString());
-                            this.locationClient.triggerLocationProcess();
-                            return Service.START_STICKY;
-
-                        }else {
+//                        if (WEATHER_ALARM.equals(paramIntent.getAction())) {
+////                            this.mSendPairMessage.resetDownLoadConfig();
+////                            this.mSendPairMessage.startDownLoad(this.runtime, false);
+//                            return Service.START_STICKY;
+//                        }else if (ACTION_ALARM_ADD_DATAPOINTS.equals(paramIntent.getAction())) {
+//                            setUpLocationDataAlarm(28800000L);
+//                            if (this.upLoadDataPoints != null) {
+//                                this.upLoadDataPoints.uploadCurrentLocation();
+//                                return Service.START_STICKY;
+//                            }
+//                            Logger.i("upLoadDataPoints=null");
+//                            return Service.START_STICKY;
+//                        }else if (Constants.STWORKMODE_ALARM.equals(paramIntent.getAction())) {
+//                            if (this.startAlarmCount >= 5) {
+//                                alarmCycle = paramIntent.getIntExtra("location_cycle", 3);
+//                                setAlarm(alarmCycle);
+//                            }
+//                            stringBuilder1 = new StringBuilder();
+//                            stringBuilder1.append("STWORKMODE_ALARM  alarmCycle=");
+//                            stringBuilder1.append(alarmCycle);
+//                            if (Config.LOG_TOFILE) FileOutputUtil.fileOutput(runtime.getCacheDir(), "alarmCycle", stringBuilder1.toString());
+//                            return Service.START_STICKY;
+//                        }else {
                             if (ACTION_HEATR_RATE_START.equals(paramIntent.getAction())) {
 
                                 //此处消息从timer来
@@ -695,7 +716,7 @@ public class CoreService extends Service {
                                 setLocationAlarm(runtime.getLocationInstance().getWorkingMod());//同时重置alarm并触发定位
                             }
                             this.invokeHandlerServiceChain.processUserRequest(paramIntent, this.connection, this.runtime);
-                        }
+//                        }
                     }
                 }
             }
@@ -727,7 +748,7 @@ public class CoreService extends Service {
     }
     //每一分钟设置一次
     public void setAlarm(int paramInt) {
-        AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context,paramInt,ACTION_ALARM);
+//        AlarmHelper.setRealTimeAlarm(runtime.getContextProxy().context,paramInt,ACTION_ALARM);
     }
 
     public void setHeartRateDetectAlarm(int heartRateDetectAlarmCycle){
@@ -858,7 +879,7 @@ public class CoreService extends Service {
                     public void run() {
                         ReConnectToServer();
                     }
-                }, 0, 5000); //每5秒重试一次
+                }, 0, 20000); //每20秒重试一次
             }
         }
     }
diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index e63d8914..10fbfd3b 100644
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -277,6 +277,23 @@ public class ICSmsManager {
                     sendSMS(phonenumber, "setlocation format error!");
                 }
 
+            }else if (sms.startsWith("#skipmovecheck#=")){
+                String tmp[]=sms.split("=");
+                if (tmp.length==2) {
+                    if (tmp[1].equals("current")) {
+                        sendSMS(phonenumber, "SkipMoveCheck "+LocationClient.getSkipMoveCheck()+"!");
+                    }else if (tmp[1].equals("true")) {
+                        LocationClient.setSkipMoveCheck(true);
+                        sendSMS(phonenumber, "set SkipMoveCheck "+LocationClient.getSkipMoveCheck()+" success!");
+                    }else if (tmp[1].equals("false")) {
+                        LocationClient.setSkipMoveCheck(false);
+                        sendSMS(phonenumber, "set SkipMoveCheck "+LocationClient.getSkipMoveCheck()+" success!");
+                    }else{
+                        sendSMS(phonenumber, "skipmovecheck format error!");
+                    }
+                }else{
+                    sendSMS(phonenumber, "skipmovecheck format error!");
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index 1c1a4103..612d9a85 100644
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -423,8 +423,13 @@ public void updateCellInfo() {
   }
 
 
-
-
+  private static boolean skipMoveCheck=false;
+  public static void setSkipMoveCheck(boolean _skipMoveCheck){
+    skipMoveCheck=_skipMoveCheck;
+  }
+  public static boolean getSkipMoveCheck(){
+      return skipMoveCheck;
+  }
   public void startLocationProcess(int mod){
 
     updateStepCount();//update StepCount,保证每次定位前，计步数据是最新的。防止丢数据。
@@ -435,7 +440,7 @@ public void updateCellInfo() {
     }
 
     // 不强制定位 且 WorkingMod 不是紧急模式，且 没有移动过
-    if ( ( forceLocation != 1 ) &&  ( mod != ICLocation.REALTIME_MOD )&&  ( mod != ICLocation.EMERGNECY_MOD ) && (mod != ICLocation.CUSTOM_MOD) && ( runtime.getLastStepCount() == runtime.getTotalStepCount())  ){
+    if ( ( forceLocation != 1 ) &&  ( mod != ICLocation.REALTIME_MOD )&&  ( mod != ICLocation.EMERGNECY_MOD ) && (mod != ICLocation.CUSTOM_MOD) &&  (runtime.getLastStepCount() == runtime.getTotalStepCount()) && (skipMoveCheck ==false  )){
       Logger.i("No Move ,skip location!");
       return ;
     }
diff --git a/app/src/main/java/com/enqualcomm/support/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
index a41bcab5..2853dff7 100644
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -103,20 +103,15 @@ public class Deliver extends AbstractConnectionService {
 
   private boolean wifiEnabled;
 
-
+  public static Runnable delaySendMSG;
+//  public static boolean sendingMsg=false;
   private static Handler mSendMSGHandler=new Handler(new Handler.Callback() {
     @Override
     public boolean handleMessage(Message message) {
 
       switch (message.what){
         case 1:
-
-          new Thread(new Runnable() {
-            @Override
-            public void run() {
-              sendThread();
-            }
-          }).start();
+          mSendMSGHandler.post(delaySendMSG);
           break;
         default:
           break;
@@ -125,8 +120,30 @@ public class Deliver extends AbstractConnectionService {
     }
   });
 
-  static  {
-  
+  static {
+    delaySendMSG = new Runnable() {
+      @Override
+      public void run() {
+//        if (sendingMsg==true)
+//        {
+//          Logger.i("Sending MSG in Thread, skip this send Command.");
+//          return;
+//        }
+//        sendingMsg=true;
+//        while (getAndSendMsgFromQueue()==true) {
+//          try {
+//            Thread.sleep(5000);
+//          } catch (InterruptedException e) {
+//            e.printStackTrace();
+//          }
+//        }
+        if (getAndSendMsgFromQueue()==true){
+          mSendMSGHandler.postDelayed(delaySendMSG,5000);
+        }
+//        sendingMsg=false;
+//        Logger.i("exit delaySendMSG!");
+      }
+    };
   }
   public Deliver(NettyConnection paramNettyConnection, Runtime paramRuntime) {
     connection = paramNettyConnection;
@@ -156,46 +173,51 @@ public class Deliver extends AbstractConnectionService {
     mSendMSGHandler.sendEmptyMessage(1);
   }
 
-  public static void sendThread(){
+  public static boolean getAndSendMsgFromQueue(){
+    boolean ret=false;
     if (mRuntime.getUseQueue()) {
       Logger.i("queue locked "+mLock.isLocked());
-      if(mLock.isLocked()) return;
+      if(mLock.isLocked()) return false;
       mLock.lock();
       try
       {
         String str;
         //如果没有数据从缓存中尝试读取
-        if (queue.isEmpty())
-          loadMessage2Queue();
+//        if (queue.isEmpty())
+//          loadMessage2Queue();
         if (!queue.isEmpty()) {
           StringBuilder stringBuilder = new StringBuilder();
           if (checkNetwork()) {
             StringMessage stringMessage = queue.poll();
-            while (stringMessage != null) {
+            if (stringMessage != null) {
               String cmd = stringMessage.isFromCache();
               stringBuilder.append(cmd);
               stringBuilder.append("\n");
               if (checkNetwork()) {
                 connection.sendMsg(cmd);
-                stringMessage = queue.poll();
+//                stringMessage = queue.poll();
+                ret=true;
               } else {
                 //已经拿到的缓存，如果刚巧没有网络，就原路放回去
                 ServiceUtil.offerQueue(stringMessage,true);
-                break;
+                ret=false;
               }
+            }else{
+             stringBuilder.append("no message!\n");
             }
           }
           str = stringBuilder.toString();
         } else {
-          str = null;
+          str = "no message!\n";
         }
-        Logger.i("send cached cmd: \n"+str);
+        Logger.i("send cached cmd : \n"+str);
+        Logger.i("\n"+queue.size()+" left in Queue!");
       }finally {
         if(mLock!=null && mLock.isLocked())
           mLock.unlock();
       }
-
     }
+    return ret;
   }
   private static void loadMessage2Queue() {
     byte b = 0;
@@ -248,8 +270,8 @@ public class Deliver extends AbstractConnectionService {
 public static void sendLocationMSG( String Msg){
 
     if(mRuntime.getUseQueue()){
-        ServiceUtil.offerQueue(protocolAPIHelper.genStringMessage("queue",Msg));
-        triggerSendThread();
+      ServiceUtil.offerQueue(protocolAPIHelper.genStringMessage("queue",Msg));
+      triggerSendThread();
     }else {
       if (connection.isServerConnected() && KeepAlive.isConnected) {
         Logger.i(" first send " + Msg);
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 844d3a46..b09dcd65 100644
--- a/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
+++ b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
@@ -9,6 +9,7 @@ import android.util.Log;
 
 import com.eiot.watch_lib.LauncherCtrl;
 import com.enqualcomm.support.CoreService;
+import com.enqualcomm.support.LocationClient;
 import com.enqualcomm.support.adapter.protocolAPIHelper;
 import com.enqualcomm.support.bean.StringMessage;
 import com.enqualcomm.support.service.base.AbstractConnectionService;
@@ -146,6 +147,8 @@ public class KeepAlive extends AbstractConnectionService {
     stringBuilder.append(",set KeepAlive isConnected = false");
     Logger.i(stringBuilder.toString());
     LauncherCtrl.getInstance(this.mContext).setStatusBarIcon("server_connected", STATUS_BAR_STATE_SERVER_CONNECTED_OFF);
+//网络断开后，重连成功后发送一个定位
+//    CoreService.needLocateInAfterHeartBeat=true;
     return false;
   }
   
@@ -161,10 +164,20 @@ public class KeepAlive extends AbstractConnectionService {
 //    if (!connectionError) {
     connectionError = false;
 
+
     //发送登录包
-    connection.send(protocolAPIHelper.genStringMessage("AP00",protocolAPIHelper.AP00(paramRuntime)));
-    //发送心跳包
-    connection.send(protocolAPIHelper.genStringMessage("heart",protocolAPIHelper.AP03(paramRuntime)));
+    Observable.timer(500L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {
+      public void call(Long param1Long) {
+        connection.send(protocolAPIHelper.genStringMessage("AP00",protocolAPIHelper.AP00(paramRuntime)));
+
+      }
+    });
+     //发送心跳包
+    Observable.timer(5500L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {
+      public void call(Long param1Long) {
+        connection.send(protocolAPIHelper.genStringMessage("heart",protocolAPIHelper.AP03(paramRuntime)));
+      }
+    });
 
     isConnected = true;
     this.firstReConnected = true;
@@ -185,7 +198,7 @@ public class KeepAlive extends AbstractConnectionService {
 //    UpdateHeartBeatTimeout();
 //    if (this.reCycleTimes == 0 && this.currentReConnectInterval != 11){
 //    paramNettyConnection.send(protocolAPIHelper.genStringMessage("AP00",protocolAPIHelper.AP00(paramRuntime)));
-    paramNettyConnection.send(protocolAPIHelper.genStringMessage("heart",protocolAPIHelper.AP03(paramRuntime)));
+      paramNettyConnection.send(protocolAPIHelper.genStringMessage("heart",protocolAPIHelper.AP03(paramRuntime)));
 
     //    }
 
@@ -204,6 +217,12 @@ public class KeepAlive extends AbstractConnectionService {
 //      Deliver.triggerSendThread(); //链接上就尝试清除 buffer中的数据
       CoreService.getInstance().stopConnectionRetryTimer();
 
+      if (CoreService.needLocateInAfterHeartBeat==true){
+        //第一次启动或者系统Close后重连的时候，重置LocationCycle
+        CoreService.needLocateInAfterHeartBeat=false;
+        LocationClient.setForceLocation(1);
+        CoreService.getInstance().setLocationAlarm(paramRuntime.getLocationInstance().getWorkingMod());
+      }
     }
     return false;
   }
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 56d82a77..0b0a321f 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java
@@ -7,6 +7,7 @@ import android.os.SystemClock;
 import android.util.Log;
 
 import com.enqualcomm.support.Config;
+import com.enqualcomm.support.Constants;
 import com.enqualcomm.support.bean.Contact;
 import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.CoreService;
@@ -16,10 +17,12 @@ public class AlarmWakeUp {
   
   public static void isNeedWakeUpAlarm(Runtime runtime) {
     long l = SystemClock.elapsedRealtime();
-    int i = Config.getAlarmCycle(runtime.getContextProxy().context);
-    if (l - lastAlarmTime > ((i + 1) * 60 * 1000)) {
+//    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");
-      Intent intent = (new Intent(CoreService.ACTION_ALARM)).setComponent(componentName);
+//      Intent intent = (new Intent(CoreService.ACTION_ALARM)).setComponent(componentName);
+      Intent intent = (new Intent(Constants.ACTION_LOCATION_ALARM)).setComponent(componentName);
       (runtime.getContextProxy()).context.startService(intent);
 
       StringBuilder stringBuilder = new StringBuilder();
diff --git a/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
index af5d14c4..fbad60d7 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
@@ -56,7 +56,7 @@ public class NettyConnection implements Connection {
                         switch (type){
                             case BP00:
                                 API.handleBP00(cmd);
-                                Logger.i("服务器收到心跳AP00");
+                                Logger.i("服务器收到登录包AP00");
                                 DeliverCMDMessageToSystem("BP00",cmd);//通知下面线程状态变化
                                 break;
                             case BP01:
@@ -65,7 +65,7 @@ public class NettyConnection implements Connection {
                                 break;
                             case BP03:
                                 API.handleBP03(cmd);
-                                Logger.i("服务器收到心跳AP03");
+                                Logger.i("服务器收到心跳包AP03");
                                 DeliverCMDMessageToSystem("BP03",cmd);//通知下面线程状态变化
                                 break;
 
-- 
2.17.1