From: snickersun <scy@incartech.cn>
Date: Mon, 13 Apr 2020 08:04:37 +0000 (+0800)
Subject: 来电关闭未读的消息窗口
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=a9df05582f05405a37dfda7216cc3a81bbbb61a0;p=icsupport.git

来电关闭未读的消息窗口
---

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 ac609ce1..bec77bbf 100644
--- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
@@ -36,9 +36,11 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Iterator;
 
+import static android.telephony.TelephonyManager.ACTION_PHONE_STATE_CHANGED;
 import static android.telephony.TelephonyManager.CALL_STATE_OFFHOOK;
 import static android.telephony.TelephonyManager.CALL_STATE_RINGING;
 import static com.enqualcomm.support.Constants.ACTION_CARE_ALARM;
+import static com.enqualcomm.support.Constants.ACTION_CLOSE_UNREAD_MSG;
 import static com.enqualcomm.support.Constants.ACTION_HEATR_RATE_START;
 import static com.enqualcomm.support.Constants.SERVICE_CLS_NAME;
 import static com.enqualcomm.support.Constants.SERVICE_PKG_NAME;
@@ -82,23 +84,26 @@ public class SilentManager extends AbstractInvokeHandlerService {
     return mSilentManger;
   }
   private PhoneStateListener phoneStateListener = new PhoneStateListener() {
-    public void onCallStateChanged(int var1, String var2) {
-      super.onCallStateChanged(var1, var2);
-      switch(var1) {
-        case 0:
-          SilentManager.this.isCalling = false;
+    public void onCallStateChanged(int state, String incomingNumber) {
+      super.onCallStateChanged(state, incomingNumber);
+
+      ICLogger.i("onCallStateChanged state "+state+", incomingNumber "+incomingNumber);
+      switch(state) {
+        case 0: //挂电话
+          isCalling = false;
 //          if (SilentManager.this.haveHandSilence) {
 //            SilentManager.this.handSilence(SilentManager.this.mContext, SilentManager.this.mValue_isSilence);
 //          }
+
           break;
-        case 1:
-          SilentManager.this.isCalling = true;
-//          Intent var3 = new Intent();
-//          var3.setAction("com.enqualcomm.support.CloseUnreadMsg");
-//          SilentManager.this.mContext.sendBroadcast(var3);
+        case 1: //来电
+          isCalling = true;
+          Intent var3 = new Intent();
+          var3.setAction(ACTION_CLOSE_UNREAD_MSG);
+          mContext.sendBroadcast(var3);
           break;
-        case 2:
-          SilentManager.this.isCalling = true;
+        case 2://接电话
+          isCalling = true;
       }
 
     }
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 7244a0f0..a1873f9f 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -39,6 +39,7 @@ import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.media.RingtoneManager.TYPE_NOTIFICATION;
 import static android.os.PowerManager.ACQUIRE_CAUSES_WAKEUP;
 import static android.os.PowerManager.SCREEN_DIM_WAKE_LOCK;
+import static com.enqualcomm.support.Constants.ACTION_CLOSE_UNREAD_MSG;
 import static com.enqualcomm.support.Constants.ACTION_HEATR_RATE_START;
 import static com.enqualcomm.support.Constants.ACTION_REMOTE_CAMERA;
 import static com.enqualcomm.support.Constants.ACTION_SEND_EMEGENCY_LOCATION_START;
@@ -235,7 +236,7 @@ public class ProcessReceiver extends BroadcastReceiver {
             this.screenOn(paramContext);
           }
         }
-      } else if (!"com.enqualcomm.support.CloseUnreadMsg".equals(paramIntent.getAction()) && !"android.intent.action.BATTERY_LOW".equals(paramIntent.getAction())) {
+      } else if (!ACTION_CLOSE_UNREAD_MSG.equals(paramIntent.getAction()) && !"android.intent.action.BATTERY_LOW".equals(paramIntent.getAction())) {
         if ("com.enqualcomm.support.ACTION_MISSED_CALL_GET".equals(str)) {
           contact = (Contact)paramIntent.getParcelableExtra("contact");
           contact.extra = paramIntent.getStringExtra("date");
@@ -247,6 +248,11 @@ public class ProcessReceiver extends BroadcastReceiver {
             this.screenOn(paramContext);
           }
         }
+        //如果来电了，还有未读的消息，干脆关掉，防止影响接电话。
+        if (mCustomDialog != null && mCustomDialog.isShowing()) {
+          mCustomDialog.dismiss();
+        }
+
       } else {
         if (mCustomDialog != null && mCustomDialog.isShowing()) {
           mCustomDialog.dismiss();
diff --git a/app/version_code.properties b/app/version_code.properties
index ede9f36f..2b8a5a36 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Apr 11 18:28:43 CST 2020
-VERSION_CODE=400
+#Mon Apr 13 16:03:41 CST 2020
+VERSION_CODE=402