From 564c440ed059f8273fe77383712e25734d588286 Mon Sep 17 00:00:00 2001 From: snickersun Date: Wed, 3 Jun 2020 09:55:53 +0800 Subject: [PATCH] =?utf8?q?=E6=B7=BB=E5=8A=A0=20persist.sys.doBroadcastMSG?= =?utf8?q?=E5=8F=98=E9=87=8F=EF=BC=8C=20true=E5=8F=91=E9=80=81=E5=B9=BF?= =?utf8?q?=E6=92=AD=EF=BC=8C=E8=80=8C=E4=B8=8D=E5=BC=B9=E5=87=BA=E6=8F=90?= =?utf8?q?=E7=A4=BA=E7=AA=97=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit public static final String ACTION_MESSAGE_RECEIVED = "com.ic.action.message_received"; public static final String KEY_MESSAGE_TYPE = "msgType"; // 分为 voice ,pic ,和 text public static final String KEY_MESSAGE_URL = "msgUrl"; // 消息为 voice和 pic 此纪录为 路径， text消息则直接是消息内容。 utf-8 格式String public static final String KEY_MESSAGE_FROM = "msgFrom"; // 消息来源（发送者名称），预留，暂时不用。 --- app/app.iml | 229 +++++++++--------- .../java/com/enqualcomm/support/Config.java | 10 + .../com/enqualcomm/support/Constants.java | 5 + .../com/enqualcomm/support/CoreService.java | 2 + .../enqualcomm/support/service/Deliver.java | 20 +- .../com/ic/protocols/protocol_beehome.java | 2 +- .../java/com/ic/protocols/protocol_jiai.java | 2 +- 7 files changed, 150 insertions(+), 120 deletions(-) diff --git a/app/app.iml b/app/app.iml index 6bdfc5af..d430e477 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,132 +1,131 @@ - - + - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ 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 f47ece5b..d5b6ef5a 100644 --- a/app/src/main/java/com/enqualcomm/support/Config.java +++ b/app/src/main/java/com/enqualcomm/support/Config.java @@ -340,6 +340,16 @@ public class Config { return ret; } + public static boolean do_broadCast_message_no_indication=false; + + public static void LoadMessageConfigs(){ + String tmp=Util.getSystemProperties("persist.sys.doBroadcastMSG"); + boolean ret=false; + if (tmp.equals("true")) + ret=true; + + do_broadCast_message_no_indication = ret; + } public static boolean isUsingCustomServer=false; public static void setCustomServer(Context context,boolean isusingCutomerServer,String serverip,int serverport) { diff --git a/app/src/main/java/com/enqualcomm/support/Constants.java b/app/src/main/java/com/enqualcomm/support/Constants.java index 45740288..84482119 100644 --- a/app/src/main/java/com/enqualcomm/support/Constants.java +++ b/app/src/main/java/com/enqualcomm/support/Constants.java @@ -285,5 +285,10 @@ public interface Constants { public static final String ACTION_CHECK_LOCATION_RESULT = "com.enqualcomm.support.ACTION_CHECK_LOCATION_RESULT"; + public static final String ACTION_MESSAGE_RECEIVED = "com.ic.action.message_received"; + public static final String KEY_MESSAGE_TYPE = "msgType"; // 分为 voice ,pic ,和 text + public static final String KEY_MESSAGE_URL = "msgUrl"; // 消息为 voice和 pic 此纪录为 路径， text消息则直接是消息内容。 utf-8 格式String + public static final String KEY_MESSAGE_FROM = "msgFrom"; // 消息来源（发送者名称），预留，暂时不用。 + } diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index 59c4cf70..f778fde5 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -516,6 +516,8 @@ public class CoreService extends Service { Config.loadCustomServerAddr(this); Config.loadServerSettings(runtime); + Config.LoadMessageConfigs(); + this.connectionServiceChain.processAttach(this.connection, this.runtime); this.invokeHandlerServiceChain.processAttach(this.connection, this.runtime); diff --git a/app/src/main/java/com/enqualcomm/support/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java index 8a6bbdef..01f39bf2 100644 --- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java +++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java @@ -16,6 +16,7 @@ import android.os.PowerManager; import android.os.SystemClock; import com.enqualcomm.support.Config; +import com.enqualcomm.support.Constants; import com.enqualcomm.support.CoreService; import com.enqualcomm.support.R; import com.ic.protocols.protocolAPIHelper; @@ -376,10 +377,23 @@ public static void sendLocationMSG( String Msg){ int i = mRuntime.getContextProxy().getTelephonyManager().getCallState(); if (!mRuntime.getBatteryLow() && 1 != i && 2 != i) { Intent intent = new Intent(); - intent.setAction(DIALOG_ACTION); - intent.putExtra("contact", (Parcelable) param2Contact); - context.sendBroadcast(intent); + if (Config.do_broadCast_message_no_indication) + { + + //广播 voice消息 + intent = new Intent(); + intent.setAction(Constants.ACTION_MESSAGE_RECEIVED); + intent.putExtra(Constants.KEY_MESSAGE_TYPE,"voice"); + intent.putExtra(Constants.KEY_MESSAGE_FROM,"广播消息"); + intent.putExtra(Constants.KEY_MESSAGE_URL,paramStringMessage.isFromCache()); + + }else { + //显示提示窗口 + intent.setAction(DIALOG_ACTION); + intent.putExtra("contact", (Parcelable) param2Contact); + } + context.sendBroadcast(intent); } } }); 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 ca22e756..a58c6777 100644 --- a/app/src/main/java/com/ic/protocols/protocol_beehome.java +++ b/app/src/main/java/com/ic/protocols/protocol_beehome.java @@ -1332,7 +1332,7 @@ public class protocol_beehome { // runtime.getContextProxy().sendBroadcast(ACTION_IMESSAGE, runtime); - connection.DeliverCMDMessageToSystem("NewVoice", "");//通知下面线程状态变化 + connection.DeliverCMDMessageToSystem("NewVoice", amrFilepath);//通知下面线程状态变化 } }else{ diff --git a/app/src/main/java/com/ic/protocols/protocol_jiai.java b/app/src/main/java/com/ic/protocols/protocol_jiai.java index 4b110421..824f693d 100644 --- a/app/src/main/java/com/ic/protocols/protocol_jiai.java +++ b/app/src/main/java/com/ic/protocols/protocol_jiai.java @@ -1287,7 +1287,7 @@ public class protocol_jiai { // runtime.getContextProxy().sendBroadcast(ACTION_IMESSAGE, runtime); - connection.DeliverCMDMessageToSystem("NewVoice", "");//通知下面线程状态变化 + connection.DeliverCMDMessageToSystem("NewVoice", amrFilepath);//通知下面线程状态变化 } }else{ -- 2.17.1