From: snickersun <scy@incartech.cn>
Date: Sat, 20 Mar 2021 02:27:15 +0000 (+0800)
Subject: release 767
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=a00b4a50e0cb1a1eaac4f5e8507071775fd407c1;p=protocol_srv.git

release 767
protocol fzd  UD 发送优先级提高到UD2 之前
---

diff --git a/app/release/ICSer_V765_2103191651_release.apk b/app/release/ICSer_V767_2103201024_release.apk
similarity index 78%
rename from app/release/ICSer_V765_2103191651_release.apk
rename to app/release/ICSer_V767_2103201024_release.apk
index 99870756..46b40a7c 100644
Binary files a/app/release/ICSer_V765_2103191651_release.apk and b/app/release/ICSer_V767_2103201024_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 8a3994be..a559e1af 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":766,"versionName":"2103192133","enabled":true,"outputFile":"ICSer_V766_2103192133_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V766_2103192133_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":767,"versionName":"2103201024","enabled":true,"outputFile":"ICSer_V767_2103201024_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V767_2103201024_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
index 4bc1272d..5d34eaac 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
@@ -1108,7 +1108,7 @@ public class DBHelper {
         ContentResolver pcr = this.cr;
         Uri table = ICContentProvider.PROTOCOL_CMD_RECORDS_URI;
         StringBuilder where = new StringBuilder();
-        where.append("FLAG=0 and ( TOPIC == 'AL' or TOPIC == 'AP10' ) ");
+        where.append("FLAG=0 and ( TOPIC='AL' or TOPIC='AP10' ) ");
         ICLogger.i("Query1 cmdRecords "+where);
         Cursor cmdrecords = pcr.query(table, null, where.toString(), null, null);
         StringMessage msg = null;
@@ -1132,8 +1132,9 @@ public class DBHelper {
 
                 }
                 cmdrecords.close();
-            }else{ //没有警报，就查询其他消息发送
-                where  = new StringBuilder("FLAG=0");
+            }else{ //没有警报，就查询 UD 消息发送 //当前数据优先于 UD2数据
+                cmdrecords.close();
+                where  = new StringBuilder("FLAG=0 and TOPIC='UD' ");
                 cmdrecords = pcr.query(table, null, where.toString(), null, null);
                 ICLogger.i("Query2 cmdRecords "+where);
                 msg = null;
@@ -1154,34 +1155,36 @@ public class DBHelper {
                             msg.setIndex(index);
                             ICLogger.i("get cmd Record not sent  _id " + index + " " + date + time + " topic " + topic + " cmd " + cmd);
                         }
-                    }
-                    cmdrecords.close();
-                }
-            }
-        }else{
-            where  = new StringBuilder("FLAG=0");
-            cmdrecords = pcr.query(table, null, where.toString(), null, null);
-            ICLogger.i("Query3 cmdRecords "+where);
-            msg = null;
-            if (cmdrecords != null) {
-                int 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);
+                        cmdrecords.close();
+
+                    }else{  //最后轮到 除了 AL,AP10,UD 以外的其他缓存数据
+                        cmdrecords.close();
+                        where  = new StringBuilder("FLAG=0");
+                        cmdrecords = pcr.query(table, null, where.toString(), null, null);
+                        ICLogger.i("Query3 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);
+                                }
+                            }
+                            cmdrecords.close();
+                        }
                     }
                 }
-                cmdrecords.close();
             }
         }
 
diff --git a/app/version_code.properties b/app/version_code.properties
index 9901c072..c0933e14 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Fri Mar 19 21:33:38 CST 2021
-VERSION_CODE=766
+#Sat Mar 20 10:24:20 CST 2021
+VERSION_CODE=767