修改了定时5秒检查消息发送状态为alarm.
authorTrillGates <WilliamTrillGates@gmail.com>
Tue, 15 Mar 2022 11:54:12 +0000 (19:54 +0800)
committerTrillGates <WilliamTrillGates@gmail.com>
Tue, 15 Mar 2022 11:54:12 +0000 (19:54 +0800)
app/src/main/java/com/enqualcomm/support/Constants.java
app/src/main/java/com/enqualcomm/support/CoreService.java
app/src/main/java/com/enqualcomm/support/service/Deliver.java
app/src/main/java/com/ic/protocols/protocol_beehome.java

index 6b8dc6a..894bd03 100644 (file)
@@ -42,6 +42,10 @@ public interface Constants {
     String ACTION_EQC_ALARM = "com.enqualcomm.support.ACTION_EQC_ALARM";
 
     String ACTION_LOCATION_ALARM = "com.enqualcomm.support.ACTION_LOCATION_ALARM";
+    //add by TrillGates
+    //这个action是用于检查消息发送状态的
+    //如果只用handler检查的话,休眠就发不了了.
+    String ACTION_MSG_STATE_CHECK_ALARM = "com.ic.ACTION_MSG_STATE_CHECK_ALARM";
 
     String ACTION_EXIT_MONITOR_MODE = "com.enqualcomm.support.MONITOR_EXIT";
 
index 3ab20be..d8a4ca1 100644 (file)
@@ -92,6 +92,7 @@ import static com.enqualcomm.support.Constants.ACTION_EQC_ALARM;
 import static com.enqualcomm.support.Constants.ACTION_HEATR_RATE_START;
 import static com.enqualcomm.support.Constants.ACTION_LOCAL_SOS_ACTION;
 import static com.enqualcomm.support.Constants.ACTION_LOCATION_ALARM;
+import static com.enqualcomm.support.Constants.ACTION_MSG_STATE_CHECK_ALARM;
 import static com.enqualcomm.support.Constants.ACTION_QUERY_WEATHER;
 import static com.enqualcomm.support.Constants.ACTION_SEND_EMEGENCY_LOCATION_START;
 import static com.enqualcomm.support.Constants.ACTION_SEND_EMEGENCY_LOCATION_STOP;
@@ -1136,6 +1137,9 @@ public class CoreService extends Service {
                 if (Config.LOG_TOFILE)
                     ICLogger.logToFile("alarmCycle", "HEART_ALARM alarmCycle  ");
                 return Service.START_STICKY;
+            } else if (ACTION_MSG_STATE_CHECK_ALARM.equals(paramIntent.getAction())) {
+                ICLogger.d("收到检查定位的alarm...");
+                Deliver.checkMsgState();
             } else if (ACTION_LOCATION_ALARM.equals(paramIntent.getAction())) {
                 ICLogger.d("收到定位闹钟...");
                 //如果设置项是关的,那么就return掉,如果设置项开了,直接去设置闹钟
index d79a8d4..8887f80 100644 (file)
@@ -24,6 +24,7 @@ import com.enqualcomm.support.provider.FZDDatabaseHelper;
 import com.enqualcomm.support.provider.FZDMessageProvider;
 import com.enqualcomm.support.service.base.AbstractConnectionService;
 import com.enqualcomm.support.utils.AESCipher;
+import com.enqualcomm.support.utils.AlarmHelper;
 import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.NettyConnection;
 import com.enqualcomm.support.utils.SharePreferenceUtil;
@@ -38,6 +39,8 @@ import com.ic.protocols.protocolAPIHelper;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.locks.ReentrantLock;
 
+import static com.enqualcomm.support.Constants.ACTION_LOCATION_ALARM;
+import static com.enqualcomm.support.Constants.ACTION_MSG_STATE_CHECK_ALARM;
 import static com.enqualcomm.support.Constants.DIALOG_ACTION;
 import static com.enqualcomm.support.Constants.FROM_SERVER;
 import static com.enqualcomm.support.bean.Contact.CATEGORY_GROUP;
@@ -65,7 +68,6 @@ public class Deliver extends AbstractConnectionService {
 
     private static boolean wifiEnabled;
 
-    public static Runnable delaySendMSG;
 
     private static final Handler mSendMSGHandler;
 
@@ -73,19 +75,23 @@ public class Deliver extends AbstractConnectionService {
         HandlerThread handlerThread = new HandlerThread("ic:deliver-handlerThread");
         handlerThread.start();
         mSendMSGHandler = new Handler(handlerThread.getLooper());
-        delaySendMSG = new Runnable() {
-            @Override
-            public void run() {
-                sendloopruning = true;
-                if (getAndSendMsgFromQueue()) {
-                    //数据发送成功,则5秒后进行下一轮发送(while 循环用sleep会很占资源造成死锁
-                    mSendMSGHandler.postDelayed(this, 5000L);
-                } else {
-                    //没有数据可以发送,则退出sendLoop
-                    sendloopruning = false;
-                }
-            }
-        };
+    }
+
+    /**
+     * 检查消息的状态,如果没有发送成功,则重发,不超过6次.
+     */
+    public static void checkMsgState() {
+        sendloopruning = true;
+        boolean andSendMsgFromQueue = getAndSendMsgFromQueue();
+        ICLogger.d("andSendMsgFromQueue ==> " + andSendMsgFromQueue);
+        if (andSendMsgFromQueue) {
+            //数据发送成功,则5秒后进行下一轮发送(while 循环用sleep会很占资源造成死锁
+            //通过alarm发送一个定时检查发送的.
+            AlarmHelper.setRealTimeAlarmInSeconds(mRuntime.getContextProxy().context, 5, ACTION_MSG_STATE_CHECK_ALARM);
+        } else {
+            //没有数据可以发送,则退出sendLoop
+            sendloopruning = false;
+        }
     }
 
     public Deliver(Connection paramNettyConnection, Runtime paramRuntime) {
@@ -124,7 +130,8 @@ public class Deliver extends AbstractConnectionService {
     public static void triggerSendThread() {
         if (!sendloopruning) {
             ICLogger.i("triggerSendThread !");
-            mSendMSGHandler.post(delaySendMSG);
+            //调用检查消息的
+            checkMsgState();
         } else {
             ICLogger.i("triggerSendThread running skip !");
         }
index 23b912b..de51647 100644 (file)
@@ -13,6 +13,7 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.support.v4.app.ActivityCompat;
 import android.text.TextUtils;
+import android.widget.Toast;
 
 import com.enqualcomm.support.Config;
 import com.enqualcomm.support.Constants;
@@ -1049,6 +1050,7 @@ public class protocol_beehome {
             if (!phNum1.isEmpty()) {
                 contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos1", phNum1));
             }
+            Toast.makeText(mContext, "", Toast.LENGTH_SHORT).show();
             if (!phNum2.isEmpty()) {
                 contactArray.add(new Contact(Contact.CATEGORY_SOS, "sos2", phNum2));
             }