From: snickersun <scy@incartech.cn>
Date: Fri, 2 Apr 2021 10:14:34 +0000 (+0800)
Subject: release 773
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=3e5635fecb7778b823fa40441f1e404a017275a1;p=protocol_srv.git

release 773
修复无法强制阅读sms的问题
L02默认使用协议提示短信消息
---

diff --git a/app/release/ICSer_V772_2103311126_release.apk b/app/release/ICSer_V773_2104021759_release.apk
similarity index 78%
rename from app/release/ICSer_V772_2103311126_release.apk
rename to app/release/ICSer_V773_2104021759_release.apk
index 3b05ffdc..aa3598a7 100644
Binary files a/app/release/ICSer_V772_2103311126_release.apk and b/app/release/ICSer_V773_2104021759_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 5a1ab0b1..b7f13cbe 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":772,"versionName":"2103311126","enabled":true,"outputFile":"ICSer_V772_2103311126_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V772_2103311126_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":773,"versionName":"2104021759","enabled":true,"outputFile":"ICSer_V773_2104021759_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V773_2104021759_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 043da9d8..a050f5c2 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -570,6 +570,7 @@ public class Config {
             C5_noBroadCastActionStrip = true;
         } else if (custom_name.equals("L02")) {
             noPushTxtReadReply = false;//即爱需要阅读反馈
+            noBroadCastPushTxtNotify = true;
         } else {
             noBroadCastPushTxtNotify = true;
         }
diff --git a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
index a94d9fbf..2f9da84f 100644
--- a/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
+++ b/app/src/main/java/com/enqualcomm/support/ICSmsManager.java
@@ -38,6 +38,7 @@ import com.enqualcomm.support.utils.TemperatureUtil;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
 import com.enqualcomm.support.utils.VibrateUtil;
+import com.enqualcomm.support.utils.WakeLockUtil;
 import com.ic.protocols.protocolAPIHelper;
 import com.ic.view.msg.MsgMustReadDialog;
 
@@ -101,8 +102,6 @@ public class ICSmsManager extends BroadcastReceiver {
             long currenttime = System.currentTimeMillis();
 //            if (currenttime - ICSmsManager.preTimeMillis > 30000L) {
             ICSmsManager.preTimeMillis = currenttime;
-//                (new Thread(new Runnable() {
-//                    public void run() {
             SystemClock.sleep(3000L);
             if (intent == null || intent.getAction() == null) return;
 
@@ -119,14 +118,29 @@ public class ICSmsManager extends BroadcastReceiver {
                 message += sms.getDisplayMessageBody();
             }
             ICLogger.i("收到" + from + "短信：" + message);
-//                         Toast.makeText(context, "收到" + from + "短信：" + message, Toast.LENGTH_LONG).show();
+            //判断是否要弹窗，强制读取
+            String forceReadMsg = Util.getSystemProperties("persist.sys.forcereadmsg");
+            ICLogger.d("forceReadMsg == > " + forceReadMsg);
             if (handleSMS_CMD(from, message) == false) {
+
                 //说明不是sms命令，提示短信接收。
-                ContextProxy.sendMsgBroadcast(context, message, 1);
+                if (!TextUtils.isEmpty(forceReadMsg)) {
+
+                    WakeLockUtil.ScreenOnWakeLockTemperary(context);
+                    ContextProxy.play_waning_notify(context);
+                    VibrateUtil.getInstance(context).VibrateOnOnce(true);
+                    Util.mSleep(2000);
+
+                    MsgMustReadDialog instance = MsgMustReadDialog.getInstance();
+                    instance.showMsgDialog();
+                    List<String> list = new ArrayList<>();
+                    list.add(message);
+                    instance.addData(list);
+                } else {
+                    //说明不是sms命令，提示短信接收。
+                    ContextProxy.sendMsgBroadcast(context, message, 1);
+                }
             }
-//                    }
-//                })).start();
-//            }
         }
 
     }
@@ -181,6 +195,11 @@ public class ICSmsManager extends BroadcastReceiver {
                                     if (!handleSMS_CMD(from, smsmessage)) {
                                         //说明不是sms命令，提示短信接收。
                                         if (!TextUtils.isEmpty(forceReadMsg)) {
+                                            WakeLockUtil.ScreenOnWakeLockTemperary(mContext);
+                                            ContextProxy.play_waning_notify(mContext);
+                                            VibrateUtil.getInstance(mContext).VibrateOnOnce(true);
+                                            Util.mSleep(2000);
+
                                             MsgMustReadDialog instance = MsgMustReadDialog.getInstance();
                                             instance.showMsgDialog();
                                             List<String> list = new ArrayList<>();
diff --git a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
index e9451647..190fe0ee 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
@@ -377,7 +377,7 @@ public class ContextProxy {
         sendMsgBroadcast(this.context, msg, msgType);
     }
 
-    private static void play_waning_notify(Context context) {
+    public static void play_waning_notify(Context context) {
         AudioService.getInstance().play(context.getAssets(), "warning.mp3");
     }
 
diff --git a/app/version_code.properties b/app/version_code.properties
index 6d30eac8..51ebd3f3 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Mar 31 11:26:30 CST 2021
-VERSION_CODE=772
+#Fri Apr 02 17:59:55 CST 2021
+VERSION_CODE=773