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 (file)
index 707267d..0000000
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 (file)
index 0000000..135a69c
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 01f39bf..f07da65 100644 (file)
--- 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,"广播消息");\r
                 intent.putExtra(Constants.KEY_MESSAGE_URL,paramStringMessage.isFromCache());\r
 \r
+             //   playVoice(context,paramStringMessage.isFromCache());\r
+\r
             }else {\r
                 //显示提示窗口\r
                 intent.setAction(DIALOG_ACTION);\r
@@ -403,7 +405,14 @@ public static void sendLocationMSG( String Msg){
 \r
     return false;\r
   }\r
-  \r
+\r
+  private AudioService mAudioService;\r
+  private void playVoice(Context paramContext,String voicefile) {\r
+    if (this.mAudioService == null)\r
+      this.mAudioService = new AudioService();\r
+    this.mAudioService.play(voicefile);\r
+  }\r
+\r
   public static void releaseOneWakeLock() {\r
     if (ReceiveWakeLock == null) {\r
       ICLogger.i("ReceiveWakeLock 没有加锁");\r

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 0c89870..dbd99ff 100644 (file)
--- 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);\r
       String msgUrl=paramIntent.getStringExtra(KEY_MESSAGE_URL);\r
     ICLogger.i("receive msg to send type="+msgType+", msg from = "+msgFrom+", msgUrl"+msgUrl);\r
+    if (msgFrom==null) msgFrom="123";\r
       if (msgType.equals("voice"))\r
       {\r
         //创建voiceConent并添加到数据\r

diff --git a/app/version_code.properties b/app/version_code.properties
index c67cb1a..3d73831 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Jun 03 19:08:31 CST 2020\r
-VERSION_CODE=421\r
+#Mon Jun 15 21:16:00 CST 2020\r
+VERSION_CODE=422\r