From: snickersun <scy@incartech.cn>
Date: Mon, 15 Jun 2020 13:17:31 +0000 (+0800)
Subject: release 422
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=43543011eee94596bf67e188c41657af09f55352;p=protocol_srv.git

release 422
修复 L05 发送voice package
---

diff --git a/app/release/ICSer_V421_2006031908_release.apk b/app/release/ICSer_V421_2006031908_release.apk
deleted file mode 100644
index 707267dc..00000000
Binary files a/app/release/ICSer_V421_2006031908_release.apk and /dev/null differ
diff --git a/app/release/ICSer_V422_2006152116_release.apk b/app/release/ICSer_V422_2006152116_release.apk
new file mode 100644
index 00000000..135a69c5
Binary files /dev/null and b/app/release/ICSer_V422_2006152116_release.apk differ
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 01f39bf2..f07da65c 100644
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -388,6 +388,8 @@ public static void sendLocationMSG( String Msg){
                 intent.putExtra(Constants.KEY_MESSAGE_FROM,"广播消息");
                 intent.putExtra(Constants.KEY_MESSAGE_URL,paramStringMessage.isFromCache());
 
+             //   playVoice(context,paramStringMessage.isFromCache());
+
             }else {
                 //显示提示窗口
                 intent.setAction(DIALOG_ACTION);
@@ -403,7 +405,14 @@ public static void sendLocationMSG( String Msg){
 
     return false;
   }
-  
+
+  private AudioService mAudioService;
+  private void playVoice(Context paramContext,String voicefile) {
+    if (this.mAudioService == null)
+      this.mAudioService = new AudioService();
+    this.mAudioService.play(voicefile);
+  }
+
   public static void releaseOneWakeLock() {
     if (ReceiveWakeLock == null) {
       ICLogger.i("ReceiveWakeLock 没有加锁");
diff --git a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
index 0c898706..dbd99ff8 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -235,6 +235,7 @@ public class ProcessReceiver extends BroadcastReceiver {
       String msgFrom=paramIntent.getStringExtra(KEY_MESSAGE_FROM);
       String msgUrl=paramIntent.getStringExtra(KEY_MESSAGE_URL);
     ICLogger.i("receive msg to send type="+msgType+", msg from = "+msgFrom+", msgUrl"+msgUrl);
+    if (msgFrom==null) msgFrom="123";
       if (msgType.equals("voice"))
       {
         //创建voiceConent并添加到数据
diff --git a/app/version_code.properties b/app/version_code.properties
index c67cb1a2..3d738310 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Jun 03 19:08:31 CST 2020
-VERSION_CODE=421
+#Mon Jun 15 21:16:00 CST 2020
+VERSION_CODE=422