refactor silent codes

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d8c9ec8..e727f26 100644 (file)
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -185,7 +185,7 @@
             android:name=".utils.ProcessReceiver"
             android:exported="true">
             <intent-filter>
-                <action android:name="com.enqualcomm.support.DIALOG" />
+                <action android:name="com.ic.dialog.action.SHOW_DIALOG" />
                 <action android:name="com.enqualcomm.imessage.RESUME_ACTION" />
                 <action android:name="com.enqualcomm.support.ACTION_STEP_COUNT_ALARM" />
                 <action android:name="com.enqualcomm.imessage.SOS_ACTION" />

diff --git a/app/src/main/java/com/enqualcomm/support/Constants.java b/app/src/main/java/com/enqualcomm/support/Constants.java
index 67e9be4..c30cbe4 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/Constants.java
+++ b/app/src/main/java/com/enqualcomm/support/Constants.java
@@ -52,7 +52,7 @@ public interface Constants {
     Uri CONTACT_URI = Uri.parse("content://com.enqualcomm.support/contact");
 
 
-    String DIALOG_ACTION = "com.enqualcomm.support.DIALOG";
+    String DIALOG_ACTION = "com.ic.dialog.action.SHOW_DIALOG";
     String DIALOG_ACTION_WITH_IC_RESPONSE = "com.ic.dialog.action.DIALOG_RESPONSE";
 
     String TEMP_ALARM = "com.enqualcomm.support.TEMP_ALARM";

diff --git a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
index 27fcea2..c8322eb 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
@@ -241,6 +241,8 @@ public class SilentManager extends AbstractInvokeHandlerService {
         } else {
             isIdle = false;
         }
+        ICLogger.d("this.mRuntime.getBatteryLow() ==> " + this.mRuntime.getBatteryLow());
+        ICLogger.d("this.mInSilent ==> " + this.mInSilent);
         return isIdle && !this.mInSilent && !this.mRuntime.getBatteryLow();
     }
 

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 7331877..04f90c1 100644 (file)
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -22,6 +22,7 @@ import com.enqualcomm.support.bean.VoiceContent;
 import com.enqualcomm.support.service.AudioService;
 import com.enqualcomm.support.service.Deliver;
 import com.enqualcomm.support.service.HeartRateManager;
+import com.enqualcomm.support.service.SilentManager;
 import com.ic.protocols.protocolAPIHelper;
 import com.ic.view.webmsgresponse.WebMsgView;
 
@@ -283,7 +284,7 @@ public class ProcessReceiver extends BroadcastReceiver {
     }
 
     @Override
-    public void onReceive(Context paramContext, Intent paramIntent) {
+    public void onReceive(Context context, Intent paramIntent) {
 
         boolean isSilence;
         Contact contact;
@@ -295,11 +296,11 @@ public class ProcessReceiver extends BroadcastReceiver {
 
         if (CoreService.getInstance() == null) {
             ICLogger.i("CoreService is null skip deal with this message! " + str);
-            paramContext.startService(new Intent(paramContext, CoreService.class));// protocol service
+            context.startService(new Intent(context, CoreService.class));// protocol service
             return;
         }
         if (RESUME_ACTION.equals(str)) {
-            SharePreferenceUtil.setPrefBoolean(paramContext, "key_is_resume", paramIntent.getBooleanExtra("is_resume", false));
+            SharePreferenceUtil.setPrefBoolean(context, "key_is_resume", paramIntent.getBooleanExtra("is_resume", false));
             return;
         } else if (ACTION_MESSAGE_SENT.equals(str)) {
 
@@ -346,7 +347,7 @@ public class ProcessReceiver extends BroadcastReceiver {
             }
         } else if (ACTION_SHUTDOWN.equals(str)) {
 
-            playshutdownsound(paramContext);
+            playshutdownsound(context);
 
             Util.shutdown();
             return;
@@ -366,7 +367,7 @@ public class ProcessReceiver extends BroadcastReceiver {
                 mHandler.post(new Runnable() {
                     @Override
                     public void run() {
-                        (new CameraUtil(paramContext)).getPicture(str1);
+                        (new CameraUtil(context)).getPicture(str1);
                     }
                 });
             } else {
@@ -399,47 +400,55 @@ public class ProcessReceiver extends BroadcastReceiver {
             }
             return;
         } else if (DIALOG_ACTION.equals(str)) {
+            //by TrillGates
+            //如果是上课禁用模式，那么就不会弹窗了
+            boolean idle = SilentManager.getInstance().isIdle(context);
+            ICLogger.d("idle ==> " + idle);
+            if (!idle) {
+                ICLogger.d("silent mode...no dialog..");
+                return;
+            }
             if (paramIntent.hasExtra("contact")) {
                 contact = (Contact) paramIntent.getParcelableExtra("contact");
-                SharePreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
-                isSilence = SharePreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
+                SharePreferenceUtil.getPrefBoolean(context, "key_is_resume", false);
+                isSilence = SharePreferenceUtil.getPrefBoolean(context, "KEY_ISSILENCE", false);
                 if (contact != null && !isSilence) {
-                    if (!DeviceInfoUtil.isTopActivity(paramContext)) {
-                        this.initMyDialog(paramContext, contact, 1, "", false);
+                    if (!DeviceInfoUtil.isTopActivity(context)) {
+                        this.initMyDialog(context, contact, 1, "", false);
                     }
                     //屏幕量了
-                    if (!Util.isScreenON(paramContext)) {
-                        this.screenOn(paramContext);
-                        VibrateUtil.getInstance(paramContext).vibrateOn(true);
-                        this.playNotificationVoice(paramContext);
+                    if (!Util.isScreenON(context)) {
+                        this.screenOn(context);
+                        VibrateUtil.getInstance(context).vibrateOn(true);
+                        this.playNotificationVoice(context);
                     }
                 }
             } else if (paramIntent.hasExtra("talkTextMsg")) {
                 contact = paramIntent.getParcelableExtra("talkTextMsg");
-                SharePreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
-                isSilence = SharePreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
+                SharePreferenceUtil.getPrefBoolean(context, "key_is_resume", false);
+                isSilence = SharePreferenceUtil.getPrefBoolean(context, "KEY_ISSILENCE", false);
                 if (contact != null && !isSilence) {
-                    if (!DeviceInfoUtil.isTopActivity(paramContext)) {
-                        this.initMyDialog(paramContext, contact, 1, "", false);
+                    if (!DeviceInfoUtil.isTopActivity(context)) {
+                        this.initMyDialog(context, contact, 1, "", false);
                     }
                     //屏幕量了
-                    if (!Util.isScreenON(paramContext)) {
-                        this.screenOn(paramContext);
-                        VibrateUtil.getInstance(paramContext).vibrateOn(true);
-                        this.playNotificationVoice(paramContext);
+                    if (!Util.isScreenON(context)) {
+                        this.screenOn(context);
+                        VibrateUtil.getInstance(context).vibrateOn(true);
+                        this.playNotificationVoice(context);
                     }
                 }
             } else if (paramIntent.hasExtra("sms")) {
                 String sms = paramIntent.getStringExtra("sms");
-                SharePreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
-                isSilence = SharePreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
+                SharePreferenceUtil.getPrefBoolean(context, "key_is_resume", false);
+                isSilence = SharePreferenceUtil.getPrefBoolean(context, "KEY_ISSILENCE", false);
                 if (sms != null && !isSilence) {
                     //if (!DeviceInfoUtil.isTopActivity(paramContext)) {
-                    this.initMyDialog(paramContext, null, 3, sms, false);
-                    this.playNotificationVoice(paramContext);
-                    VibrateUtil.getInstance(paramContext).vibrateOn(true);
+                    this.initMyDialog(context, null, 3, sms, false);
+                    this.playNotificationVoice(context);
+                    VibrateUtil.getInstance(context).vibrateOn(true);
                     //}
-                    this.screenOn(paramContext);
+                    this.screenOn(context);
                 }
             } else if (paramIntent.hasExtra("pushtxt")) {
                 String sms = paramIntent.getStringExtra("pushtxt");
@@ -447,44 +456,44 @@ public class ProcessReceiver extends BroadcastReceiver {
                 if (paramIntent.hasExtra("needreply")) {
                     needreply = paramIntent.getBooleanExtra("needreply", false);
                 }
-                SharePreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
-                isSilence = SharePreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
+                SharePreferenceUtil.getPrefBoolean(context, "key_is_resume", false);
+                isSilence = SharePreferenceUtil.getPrefBoolean(context, "KEY_ISSILENCE", false);
                 if (sms != null && !isSilence) {
-                    if (!DeviceInfoUtil.isTopActivity(paramContext)) {
-                        this.initMyDialog(paramContext, null, 4, sms, needreply);
-                        this.playNotificationVoice(paramContext);
-                        VibrateUtil.getInstance(paramContext).vibrateOn(true);
+                    if (!DeviceInfoUtil.isTopActivity(context)) {
+                        this.initMyDialog(context, null, 4, sms, needreply);
+                        this.playNotificationVoice(context);
+                        VibrateUtil.getInstance(context).vibrateOn(true);
                     }
 
-                    this.screenOn(paramContext);
+                    this.screenOn(context);
                 }
             } else if (paramIntent.hasExtra("findDev")) {
                 String finddevtxt = paramIntent.getStringExtra("findDev");
-                SharePreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
-                isSilence = SharePreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
+                SharePreferenceUtil.getPrefBoolean(context, "key_is_resume", false);
+                isSilence = SharePreferenceUtil.getPrefBoolean(context, "KEY_ISSILENCE", false);
                 if (finddevtxt != null && !isSilence) {
-                    this.initMyDialog(paramContext, null, 5, finddevtxt, false);
-                    this.playFindDevVoice(paramContext);
-                    VibrateUtil.getInstance(paramContext).vibrateOn(true);
-                    this.screenOn(paramContext);
+                    this.initMyDialog(context, null, 5, finddevtxt, false);
+                    this.playFindDevVoice(context);
+                    VibrateUtil.getInstance(context).vibrateOn(true);
+                    this.screenOn(context);
                 }
             } else if (paramIntent.hasExtra("takephoto")) {
                 String takephoto = paramIntent.getStringExtra("takephoto");
-                SharePreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
-                isSilence = SharePreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
+                SharePreferenceUtil.getPrefBoolean(context, "key_is_resume", false);
+                isSilence = SharePreferenceUtil.getPrefBoolean(context, "KEY_ISSILENCE", false);
                 if (takephoto != null && !isSilence) {
-                    this.initMyDialog(paramContext, null, 6, takephoto, false);
-                    this.playNotificationVoice(paramContext);
-                    VibrateUtil.getInstance(paramContext).vibrateOn(true);
+                    this.initMyDialog(context, null, 6, takephoto, false);
+                    this.playNotificationVoice(context);
+                    VibrateUtil.getInstance(context).vibrateOn(true);
 
-                    this.screenOn(paramContext);
+                    this.screenOn(context);
                 }
             }
 
         } else if (ACTION_SET_SIT_RANGE.equals(str)) {
             if (paramIntent.hasExtra(Constants.KEY_SIT_RANGE)) {
                 int sitrange = paramIntent.getIntExtra(Constants.KEY_SIT_RANGE, 0);
-                Config.setKeepSitRangeInMinutes(paramContext, sitrange);
+                Config.setKeepSitRangeInMinutes(context, sitrange);
                 ICLogger.i("set KeepSitRange int " + sitrange + " minutes!");
                 ICLogger.i("则重置 lastCheckSitTime 以及 lastSitCheckStepCount");
                 Runtime.lastSitCheckStepCount = CoreService.getInstance().getRuntime().getTotalStepCount();