修改了指令查询的路基:
authorTrillGates <WilliamTrillGates@gmail.com>
Thu, 17 Mar 2022 09:33:32 +0000 (17:33 +0800)
committerTrillGates <WilliamTrillGates@gmail.com>
Thu, 17 Mar 2022 09:33:32 +0000 (17:33 +0800)
1.  FLAG=0 and ( TOPIC='AL' or TOPIC='AP10' )
2.  FLAG=0 and ( TOPIC='AP01' or TOPIC='UD' )
3.  FLAG=0 and ( TOPIC='APH1' or TOPIC='UD2' )
4.  FLAG=0

app/src/main/java/com/enqualcomm/support/service/Deliver.java
app/src/main/java/com/enqualcomm/support/utils/DBHelper.java

index 6de8b96..6477008 100644 (file)
@@ -81,17 +81,20 @@ public class Deliver extends AbstractConnectionService {
      * 检查消息的状态,如果没有发送成功,则重发,不超过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;
-        }
+        mSendMSGHandler.post(() -> {
+            //由子线程去完成
+            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) {
index 5c63d35..f966a53 100644 (file)
@@ -1233,13 +1233,33 @@ public class DBHelper {
                 cmdrecords.close();
             } else { //没有警报,就查询 UD 消息发送 //当前数据优先于 UD2数据
                 cmdrecords.close();
-                where = new StringBuilder("FLAG=0 and TOPIC='UD' ");
+                where = new StringBuilder("FLAG=0 and ( TOPIC='AP01' or TOPIC='UD' ) ");
                 cmdrecords = pcr.query(table, null, where.toString(), null, null);
                 ICLogger.i("Query2 cmdRecords " + where);
                 msg = null;
-                if (cmdrecords != null) {
-                    score = 0;
-                    if (cmdrecords.getCount() > 0) {
+                if (cmdrecords != null && cmdrecords.getCount() > 0) {
+                    if (cmdrecords.moveToFirst()) {
+                        String topic = cmdrecords.getString(cmdrecords.getColumnIndex("TOPIC"));
+                        String cmd = cmdrecords.getString(cmdrecords.getColumnIndex("CMD"));
+                        String date = cmdrecords.getString(cmdrecords.getColumnIndex("DATE"));
+                        String time = cmdrecords.getString(cmdrecords.getColumnIndex("TIME"));
+                        int flag = cmdrecords.getInt(cmdrecords.getColumnIndex("FLAG"));
+                        int index = cmdrecords.getInt(cmdrecords.getColumnIndex("_id"));
+                        msg = new StringMessage(new String[]{topic});
+                        msg.refresh(cmd);
+                        msg.setDate(date, time);
+                        msg.setSentFlag(flag);
+                        msg.setIndex(index);
+                        ICLogger.i("get cmd Record not sent  _id " + index + " " + date + time + " topic " + topic + " cmd " + cmd);
+                    }
+                    cmdrecords.close();
+                } else {
+                    cmdrecords.close();
+                    where = new StringBuilder("FLAG=0 and ( TOPIC='APH1' or TOPIC='UD2' )");
+                    cmdrecords = pcr.query(table, null, where.toString(), null, null);
+                    ICLogger.i("Query3 cmdRecords " + where);
+                    msg = null;
+                    if (cmdrecords != null && cmdrecords.getCount() > 0) {
                         if (cmdrecords.moveToFirst()) {
                             String topic = cmdrecords.getString(cmdrecords.getColumnIndex("TOPIC"));
                             String cmd = cmdrecords.getString(cmdrecords.getColumnIndex("CMD"));
@@ -1255,30 +1275,26 @@ public class DBHelper {
                             ICLogger.i("get cmd Record not sent  _id " + index + " " + date + time + " topic " + topic + " cmd " + cmd);
                         }
                         cmdrecords.close();
-
-                    } else {  //最后轮到 除了 AL,AP10,UD 以外的其他缓存数据
+                    } else {
                         cmdrecords.close();
                         where = new StringBuilder("FLAG=0");
                         cmdrecords = pcr.query(table, null, where.toString(), null, null);
-                        ICLogger.i("Query3 cmdRecords " + where);
+                        ICLogger.i("Query4 cmdRecords " + where);
                         msg = null;
-                        if (cmdrecords != null) {
-                            score = 0;
-                            if (cmdrecords.getCount() > 0) {
-                                if (cmdrecords.moveToFirst()) {
-                                    String topic = cmdrecords.getString(cmdrecords.getColumnIndex("TOPIC"));
-                                    String cmd = cmdrecords.getString(cmdrecords.getColumnIndex("CMD"));
-                                    String date = cmdrecords.getString(cmdrecords.getColumnIndex("DATE"));
-                                    String time = cmdrecords.getString(cmdrecords.getColumnIndex("TIME"));
-                                    int flag = cmdrecords.getInt(cmdrecords.getColumnIndex("FLAG"));
-                                    int index = cmdrecords.getInt(cmdrecords.getColumnIndex("_id"));
-                                    msg = new StringMessage(new String[]{topic});
-                                    msg.refresh(cmd);
-                                    msg.setDate(date, time);
-                                    msg.setSentFlag(flag);
-                                    msg.setIndex(index);
-                                    ICLogger.i("get cmd Record not sent  _id " + index + " " + date + time + " topic " + topic + " cmd " + cmd);
-                                }
+                        if (cmdrecords != null && cmdrecords.getCount() > 0) {
+                            if (cmdrecords.moveToFirst()) {
+                                String topic = cmdrecords.getString(cmdrecords.getColumnIndex("TOPIC"));
+                                String cmd = cmdrecords.getString(cmdrecords.getColumnIndex("CMD"));
+                                String date = cmdrecords.getString(cmdrecords.getColumnIndex("DATE"));
+                                String time = cmdrecords.getString(cmdrecords.getColumnIndex("TIME"));
+                                int flag = cmdrecords.getInt(cmdrecords.getColumnIndex("FLAG"));
+                                int index = cmdrecords.getInt(cmdrecords.getColumnIndex("_id"));
+                                msg = new StringMessage(new String[]{topic});
+                                msg.refresh(cmd);
+                                msg.setDate(date, time);
+                                msg.setSentFlag(flag);
+                                msg.setIndex(index);
+                                ICLogger.i("get cmd Record not sent  _id " + index + " " + date + time + " topic " + topic + " cmd " + cmd);
                             }
                             cmdrecords.close();
                         }