release V453

 为文本接收 不弹出窗口时添加亮屏及接收提示。
 把所有音频播放都放到AudioService中

diff --git a/app/app.iml b/app/app.iml
index ebbc230..586ced2 100644 (file)
--- a/app/app.iml
+++ b/app/app.iml
@@ -129,6 +129,7 @@
     <orderEntry type="module" module-name="dNSCache"/>\r
     <orderEntry type="module" module-name="dNSCache"/>\r
     <orderEntry type="module" module-name="dNSCache"/>\r
+    <orderEntry type="module" module-name="dNSCache"/>\r
     <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK"/>\r
   </component>\r
 </module>\r

diff --git a/app/release/ICSer_V452_2007161657_release.apk b/app/release/ICSer_V453_2007171308_release.apk
similarity index 79%
rename from app/release/ICSer_V452_2007161657_release.apk
rename to app/release/ICSer_V453_2007171308_release.apk
index 091d0a2..aa389a8 100644 (file)
Binary files a/app/release/ICSer_V452_2007161657_release.apk and b/app/release/ICSer_V453_2007171308_release.apk differ

diff --git a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
index 698eb83..9f4a5bb 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/AntiMonitorService.java
@@ -40,7 +40,6 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
     private static int ant_status_event_reported=0; // 0 表示无消息， 1表示有消息需要发送， 大于1表示timeout时间内又有新消息，可以忽略不计\r
     private static long anti_event_receivedTime=0;\r
     private static int last_send_antoff_event=-1;\r
-    private AudioService mAudioService=null;\r
     private Handler  mHandler=null;\r
      PowerManager.WakeLock mWakeLock = null;\r
     public AntiMonitorService(){\r
@@ -57,8 +56,7 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
                         }\r
 \r
                     }else if (msg.what == 200){\r
-                        if( mAudioService!=null)\r
-                            mAudioService.stop();\r
+                        AudioService.getInstance().stop();\r
                     }\r
                 }\r
             };\r
@@ -71,10 +69,7 @@ public class AntiMonitorService extends AbstractInvokeHandlerService {
     }\r
     private void play_notify(){\r
 \r
-        if (this.mAudioService == null)\r
-            this.mAudioService = new AudioService();\r
-\r
-        this.mAudioService.play(mContext.getAssets(), "antioff.mp3");\r
+        AudioService.getInstance().play(mContext.getAssets(), "antioff.mp3");\r
         if(mHandler!=null)\r
             mHandler.sendEmptyMessageDelayed(200,5000);\r
 \r

diff --git a/app/src/main/java/com/enqualcomm/support/service/AudioService.java b/app/src/main/java/com/enqualcomm/support/service/AudioService.java
index ccc26d3..0d372ff 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/AudioService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/AudioService.java
@@ -9,9 +9,15 @@ import com.enqualcomm.support.utils.ICLogger;
 \r
 public class AudioService implements MediaPlayer.OnErrorListener, MediaPlayer.OnCompletionListener {\r
   private MediaPlayer mMediaPlayer;\r
-  \r
+\r
+  private static AudioService mAudioService=null;\r
   public AudioService() { initMediaPlayer(); }\r
-  \r
+\r
+  public static AudioService getInstance(){\r
+    if (mAudioService==null)\r
+      mAudioService=new AudioService();\r
+    return mAudioService;\r
+  }\r
   private void initMediaPlayer() {\r
     release();\r
     this.mMediaPlayer = new MediaPlayer();\r

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 bb61747..b945024 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -425,11 +425,9 @@ public static void sendLocationMSG( String Msg){
     return false;\r
   }\r
 \r
-  private AudioService mAudioService;\r
+\r
   private void playVoice(Context paramContext,String voicefile) {\r
-    if (this.mAudioService == null)\r
-      this.mAudioService = new AudioService();\r
-    this.mAudioService.play(voicefile);\r
+    AudioService.getInstance().play(voicefile);\r
   }\r
 \r
   public static void releaseOneWakeLock() {\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java b/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java
index c34f93d..51046c2 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java
@@ -142,16 +142,11 @@ public class BatteryUtil {
         }\r
       }\r
     };\r
-  private AudioService mAudioService=null;\r
   private Handler mHandler=null;\r
   PowerManager.WakeLock mWakeLock = null;\r
 \r
   private void play_waning_notify(Context context){\r
-\r
-    if (this.mAudioService == null)\r
-      this.mAudioService = new AudioService();\r
-\r
-    this.mAudioService.play(context.getAssets(), "warning.mp3");\r
+    AudioService.getInstance().play(context.getAssets(), "warning.mp3");\r
   }\r
   private void send_batterylow_event_broadcast(Context context,int batlow){\r
 \r
@@ -178,8 +173,7 @@ public class BatteryUtil {
               mWakeLock.release();\r
             }\r
           }else if (msg.what == 200){\r
-            if( mAudioService!=null)\r
-              mAudioService.stop();\r
+            AudioService.getInstance().stop();\r
           }\r
         }\r
       };\r

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 c05eba5..92824b3 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
@@ -24,6 +24,7 @@ import com.enqualcomm.support.bean.NoticeContent;
 import com.enqualcomm.support.bean.Silent;\r
 import com.enqualcomm.support.bean.Runtime;\r
 import com.enqualcomm.support.bean.VoiceContent;\r
+import com.enqualcomm.support.service.AudioService;\r
 \r
 import java.lang.reflect.Method;\r
 import java.util.ArrayList;\r
@@ -327,36 +328,63 @@ public class ContextProxy {
     sendMsgBroadcast(this.context,msg,msgType);\r
 \r
   }\r
-\r
+  private static void play_waning_notify(Context context){\r
+    AudioService.getInstance().play(context.getAssets(), "warning.mp3");\r
+  }\r
   public static void sendMsgBroadcast(Context _context,String msg, int msgType) {\r
-    Intent intent = new Intent("action.ic.srvPushTxt");\r
-    intent.putExtra("msgType", 0); //0 代表 server下发消息，1代表 SMS消息\r
-    intent.putExtra("txtMsg", msg);\r
-    _context.sendBroadcast(intent);\r
 \r
     if (msgType==0){\r
-      Observable.timer(500L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {\r
+      Observable.timer(50L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {\r
         public void call(Long param1Long) {\r
           if(Config.noPushTxtNotifyDialog==false) {\r
             Intent intent = new Intent();\r
             intent.setAction(DIALOG_ACTION);\r
             intent.putExtra("pushtxt", msg);\r
             _context.sendBroadcast(intent);\r
+          }else{\r
+            WakeLockUtil.ScreenOnWakeLockTemperary(_context);\r
+            play_waning_notify(_context);\r
+            try {\r
+              Thread.sleep(2000);\r
+            } catch (InterruptedException e) {\r
+              e.printStackTrace();\r
+            }\r
           }\r
+          Intent intent = new Intent("action.ic.srvPushTxt");\r
+          intent.putExtra("msgType", 0); //0 代表 server下发消息，1代表 SMS消息\r
+          intent.putExtra("txtMsg", msg);\r
+          _context.sendBroadcast(intent);\r
         }\r
       });\r
     }else{\r
-      Observable.timer(500L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {\r
+      Observable.timer(50L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {\r
         public void call(Long param1Long) {\r
           if(Config.noSMSNotifyDialog==false) {\r
             Intent intent = new Intent();\r
             intent.setAction(DIALOG_ACTION);\r
             intent.putExtra("sms", msg);\r
             _context.sendBroadcast(intent);\r
+          }else{\r
+            WakeLockUtil.ScreenOnWakeLockTemperary(_context);\r
+            play_waning_notify(_context);\r
+            try {\r
+              Thread.sleep(2000);\r
+            } catch (InterruptedException e) {\r
+              e.printStackTrace();\r
+            }\r
           }\r
+\r
+          Intent intent = new Intent("action.ic.srvPushTxt");\r
+          intent.putExtra("msgType", 0); //0 代表 server下发消息，1代表 SMS消息\r
+          intent.putExtra("txtMsg", msg);\r
+          _context.sendBroadcast(intent);\r
         }\r
        });\r
     }\r
+\r
+\r
+\r
+\r
   }\r
   public void sendStheartRateBroadcast(String paramString, int paramInt) {\r
     Intent intent = new Intent();\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 133df78..97d675d 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -74,8 +74,6 @@ public class ProcessReceiver extends BroadcastReceiver {
   \r
   private static CustomDialog mCustomDialog;\r
   \r
-  private AudioService mAudioService;\r
-  \r
   private CustomNotification mCustomNotification;\r
 \r
   private CustomDialog.Builder mDialog;\r
@@ -217,28 +215,21 @@ public class ProcessReceiver extends BroadcastReceiver {
   }\r
   private void playFindDevVoice(Context context){\r
 \r
-    if (this.mAudioService == null)\r
-      this.mAudioService = new AudioService();\r
-\r
-    this.mAudioService.play(context.getAssets(), "Campus_Life.ogg");\r
+    AudioService.getInstance().play(context.getAssets(), "Campus_Life.ogg");\r
 \r
   }\r
   private void stopmediaplayer(){\r
-    if (this.mAudioService != null)\r
-      this.mAudioService.stop();\r
+   AudioService.getInstance().stop();\r
   }\r
   private void playNotificationVoice(Context paramContext) {\r
-    if (this.mAudioService == null)\r
-      this.mAudioService = new AudioService(); \r
-    this.mAudioService.play(paramContext.getAssets(), "ring_msg.mp3");\r
+    AudioService.getInstance().play(paramContext.getAssets(), "ring_msg.mp3");\r
   }\r
 \r
   private void playshutdownsound(Context paramContext) {\r
-    if (this.mAudioService == null)\r
-      this.mAudioService = new AudioService();\r
-    this.mAudioService.play(paramContext.getAssets(), "shutdownsound.mp3");\r
+    AudioService.getInstance().play(paramContext.getAssets(), "shutdownsound.mp3");\r
   }\r
 \r
+\r
   private void screenOn(Context paramContext) {\r
     final PowerManager.WakeLock wakelock = ((PowerManager)paramContext.getSystemService(Context.POWER_SERVICE)).newWakeLock(ACQUIRE_CAUSES_WAKEUP| SCREEN_DIM_WAKE_LOCK, ProcessReceiver.class.getSimpleName());\r
     wakelock.acquire();\r

diff --git a/app/src/main/java/com/enqualcomm/support/utils/WakeLockUtil.java b/app/src/main/java/com/enqualcomm/support/utils/WakeLockUtil.java
index 374b227..2095c3d 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/WakeLockUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/WakeLockUtil.java
@@ -1,17 +1,37 @@
 package com.enqualcomm.support.utils;\r
 \r
 import android.content.Context;\r
+import android.os.Handler;\r
+import android.os.Message;\r
 import android.os.PowerManager;\r
 \r
+import com.enqualcomm.support.service.AudioService;\r
+\r
 import java.util.Objects;\r
+import java.util.concurrent.TimeUnit;\r
+\r
+import rx.Observable;\r
+import rx.functions.Action1;\r
+\r
+import static android.os.PowerManager.ACQUIRE_CAUSES_WAKEUP;\r
+import static android.os.PowerManager.SCREEN_DIM_WAKE_LOCK;\r
 \r
 \r
 public class WakeLockUtil {\r
+\r
   public static PowerManager.WakeLock getScreenOnWakeLock(Context context, String tag) {\r
     PowerManager.WakeLock wakeLock = ((PowerManager)(context.getSystemService(Context.POWER_SERVICE))).newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK, tag);\r
 //    wakeLock.acquire(900000L);\r
     wakeLock.acquire();\r
     return wakeLock;\r
   }\r
+  public static void ScreenOnWakeLockTemperary(Context context) {\r
+    final PowerManager.WakeLock wakelock = ((PowerManager)context.getSystemService(Context.POWER_SERVICE)).newWakeLock(ACQUIRE_CAUSES_WAKEUP| SCREEN_DIM_WAKE_LOCK, WakeLockUtil.class.getSimpleName());\r
+    wakelock.acquire();\r
+    Observable.timer(5000L, TimeUnit.MILLISECONDS).subscribe(new Action1<Long>() {\r
+      public void call(Long param1Long) { wakelock.release(); }\r
+    });\r
+  }\r
+\r
 }\r
 \r

diff --git a/app/version_code.properties b/app/version_code.properties
index 5bfb822..490f599 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Jul 16 16:57:07 CST 2020\r
-VERSION_CODE=452\r
+#Fri Jul 17 13:08:38 CST 2020\r
+VERSION_CODE=453\r