From: snickersun Date: Fri, 21 Aug 2020 12:22:17 +0000 (+0800) Subject: release V504 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=8dea63fbb6e6669d84bfdb8fe88a3d3f30c15584;p=protocol_srv.git release V504 protocol_beehome protocol_ic 两个协议 BP40 接收到服务器推送文本时，发送广播 action.ic.PushTxtToSMSDB 给Mms.apk 保存到SMS数据库中。 --- diff --git a/app/release/ICSer_V503_2008181921_release.apk b/app/release/ICSer_V504_2008212009_release.apk similarity index 78% rename from app/release/ICSer_V503_2008181921_release.apk rename to app/release/ICSer_V504_2008212009_release.apk index b087b885..cf14047c 100644 Binary files a/app/release/ICSer_V503_2008181921_release.apk and b/app/release/ICSer_V504_2008212009_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index c64cfe5d..e48e91c3 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":503,"versionName":"2008181921","enabled":true,"outputFile":"ICSer_V503_2008181921_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V503_2008181921_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":504,"versionName":"2008212009","enabled":true,"outputFile":"ICSer_V504_2008212009_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V504_2008212009_release.apk","properties":{}}] \ No newline at end of file diff --git a/app/src/main/java/com/enqualcomm/support/Constants.java b/app/src/main/java/com/enqualcomm/support/Constants.java index 0c9bd3ae..72efe0f9 100644 --- a/app/src/main/java/com/enqualcomm/support/Constants.java +++ b/app/src/main/java/com/enqualcomm/support/Constants.java @@ -317,6 +317,11 @@ public interface Constants { public static String PersistFotaServer2Url="persist.sys.ota.host2"; + //把服务器下发的文本消息作为短信消息存储在短信数据库中，mms.apk会接收此消息并保存到数据库 + //persist.sys.pushtxtAsSMS == false的时候mms.apk会忽略此消息，默认事true，所以要关闭要单独设置 + public static String ActionReceivePushTxt="action.ic.PushTxtToSMSDB"; + public static String ActionSrvPushTxt="action.ic.srvPushTxt"; + /** * PreferenceManager.getDefaultSharedPreferences(context) ， package name "com.enqualcomm.support" */ 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 9cb3d5a8..25572dfd 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java +++ b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java @@ -41,6 +41,8 @@ import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static com.enqualcomm.support.Constants.ACTION_ISCONNECTED; import static com.enqualcomm.support.Constants.ACTION_KEEPSIT_ALARM; import static com.enqualcomm.support.Constants.ACTION_SIT_ALARM; +import static com.enqualcomm.support.Constants.ActionReceivePushTxt; +import static com.enqualcomm.support.Constants.ActionSrvPushTxt; import static com.enqualcomm.support.Constants.DIALOG_ACTION; public class ContextProxy { @@ -327,9 +329,15 @@ public class ContextProxy { this.context.sendBroadcast(intent); } + public void saveMstToSMSDB(String msg){ + Intent intent = new Intent(); + intent.setAction(ActionReceivePushTxt); + intent.putExtra("txtMsg", msg); + intent.addFlags(FLAG_ACTIVITY_NEW_TASK); + this.context.sendBroadcast(intent); + } public void sendMsgBroadcast(String msg, int msgType) { sendMsgBroadcast(this.context,msg,msgType); - } private static void play_waning_notify(Context context){ AudioService.getInstance().play(context.getAssets(), "warning.mp3"); @@ -354,7 +362,7 @@ public class ContextProxy { e.printStackTrace(); } } - Intent intent = new Intent("action.ic.srvPushTxt"); + Intent intent = new Intent(ActionSrvPushTxt); intent.putExtra("msgType", msgType); //0 代表 server下发消息，1代表 SMS消息 intent.putExtra("txtMsg", msg); intent.addFlags(FLAG_ACTIVITY_NEW_TASK); @@ -379,7 +387,7 @@ public class ContextProxy { e.printStackTrace(); } } - Intent intent = new Intent("action.ic.srvPushTxt"); + Intent intent = new Intent(ActionSrvPushTxt); intent.putExtra("msgType", msgType); //0 代表 server下发消息，1代表 SMS消息,2代表有提示音的消息 intent.putExtra("txtMsg", msg); intent.addFlags(FLAG_ACTIVITY_NEW_TASK); @@ -406,7 +414,7 @@ public class ContextProxy { } } - Intent intent = new Intent("action.ic.srvPushTxt"); + Intent intent = new Intent(ActionSrvPushTxt); intent.putExtra("msgType", msgType); //0 代表 server下发消息，1代表 SMS消息,2代表有提示音的消息 intent.putExtra("txtMsg", msg); intent.addFlags(FLAG_ACTIVITY_NEW_TASK); diff --git a/app/src/main/java/com/ic/protocols/protocol_beehome.java b/app/src/main/java/com/ic/protocols/protocol_beehome.java index 5aa37f0a..a8ff2bb6 100644 --- a/app/src/main/java/com/ic/protocols/protocol_beehome.java +++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java @@ -1124,6 +1124,7 @@ public class protocol_beehome { connection.send(genStringMessage("AP40",msg)); ICLogger.i("received Txt Msg "+txtmsg); runtime.getContextProxy().sendMsgBroadcast(txtmsg,0); + runtime.getContextProxy().saveMstToSMSDB(txtmsg); }else{ ICLogger.i("BP40 format error!"); } diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java index cc15426c..b056e68f 100644 --- a/app/src/main/java/com/ic/protocols/protocol_ic.java +++ b/app/src/main/java/com/ic/protocols/protocol_ic.java @@ -1170,6 +1170,7 @@ public class protocol_ic { connection.send(genStringMessage("AP40",msg)); ICLogger.i("received Txt Msg "+txtmsg); runtime.getContextProxy().sendMsgBroadcast(txtmsg,0); + runtime.getContextProxy().saveMstToSMSDB(txtmsg); }else{ ICLogger.i("BP40 format error!"); } diff --git a/app/version_code.properties b/app/version_code.properties index b2601e6c..e9912a88 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Tue Aug 18 19:21:41 CST 2020 -VERSION_CODE=503 +#Fri Aug 21 20:09:36 CST 2020 +VERSION_CODE=504