来电关闭未读的消息窗口

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 ac609ce..bec77bb 100644 (file)
--- 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;\r
 import java.util.Iterator;\r
 \r
+import static android.telephony.TelephonyManager.ACTION_PHONE_STATE_CHANGED;\r
 import static android.telephony.TelephonyManager.CALL_STATE_OFFHOOK;\r
 import static android.telephony.TelephonyManager.CALL_STATE_RINGING;\r
 import static com.enqualcomm.support.Constants.ACTION_CARE_ALARM;\r
+import static com.enqualcomm.support.Constants.ACTION_CLOSE_UNREAD_MSG;\r
 import static com.enqualcomm.support.Constants.ACTION_HEATR_RATE_START;\r
 import static com.enqualcomm.support.Constants.SERVICE_CLS_NAME;\r
 import static com.enqualcomm.support.Constants.SERVICE_PKG_NAME;\r
@@ -82,23 +84,26 @@ public class SilentManager extends AbstractInvokeHandlerService {
     return mSilentManger;\r
   }\r
   private PhoneStateListener phoneStateListener = new PhoneStateListener() {\r
-    public void onCallStateChanged(int var1, String var2) {\r
-      super.onCallStateChanged(var1, var2);\r
-      switch(var1) {\r
-        case 0:\r
-          SilentManager.this.isCalling = false;\r
+    public void onCallStateChanged(int state, String incomingNumber) {\r
+      super.onCallStateChanged(state, incomingNumber);\r
+\r
+      ICLogger.i("onCallStateChanged state "+state+", incomingNumber "+incomingNumber);\r
+      switch(state) {\r
+        case 0: //挂电话\r
+          isCalling = false;\r
 //          if (SilentManager.this.haveHandSilence) {\r
 //            SilentManager.this.handSilence(SilentManager.this.mContext, SilentManager.this.mValue_isSilence);\r
 //          }\r
+\r
           break;\r
-        case 1:\r
-          SilentManager.this.isCalling = true;\r
-//          Intent var3 = new Intent();\r
-//          var3.setAction("com.enqualcomm.support.CloseUnreadMsg");\r
-//          SilentManager.this.mContext.sendBroadcast(var3);\r
+        case 1: //来电\r
+          isCalling = true;\r
+          Intent var3 = new Intent();\r
+          var3.setAction(ACTION_CLOSE_UNREAD_MSG);\r
+          mContext.sendBroadcast(var3);\r
           break;\r
-        case 2:\r
-          SilentManager.this.isCalling = true;\r
+        case 2://接电话\r
+          isCalling = true;\r
       }\r
 \r
     }\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 7244a0f..a1873f9 100644 (file)
--- 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;\r
 import static android.os.PowerManager.ACQUIRE_CAUSES_WAKEUP;\r
 import static android.os.PowerManager.SCREEN_DIM_WAKE_LOCK;\r
+import static com.enqualcomm.support.Constants.ACTION_CLOSE_UNREAD_MSG;\r
 import static com.enqualcomm.support.Constants.ACTION_HEATR_RATE_START;\r
 import static com.enqualcomm.support.Constants.ACTION_REMOTE_CAMERA;\r
 import static com.enqualcomm.support.Constants.ACTION_SEND_EMEGENCY_LOCATION_START;\r
@@ -235,7 +236,7 @@ public class ProcessReceiver extends BroadcastReceiver {
             this.screenOn(paramContext);\r
           }\r
         }\r
-      } else if (!"com.enqualcomm.support.CloseUnreadMsg".equals(paramIntent.getAction()) && !"android.intent.action.BATTERY_LOW".equals(paramIntent.getAction())) {\r
+      } else if (!ACTION_CLOSE_UNREAD_MSG.equals(paramIntent.getAction()) && !"android.intent.action.BATTERY_LOW".equals(paramIntent.getAction())) {\r
         if ("com.enqualcomm.support.ACTION_MISSED_CALL_GET".equals(str)) {\r
           contact = (Contact)paramIntent.getParcelableExtra("contact");\r
           contact.extra = paramIntent.getStringExtra("date");\r
@@ -247,6 +248,11 @@ public class ProcessReceiver extends BroadcastReceiver {
             this.screenOn(paramContext);\r
           }\r
         }\r
+        //如果来电了，还有未读的消息，干脆关掉，防止影响接电话。\r
+        if (mCustomDialog != null && mCustomDialog.isShowing()) {\r
+          mCustomDialog.dismiss();\r
+        }\r
+\r
       } else {\r
         if (mCustomDialog != null && mCustomDialog.isShowing()) {\r
           mCustomDialog.dismiss();\r

diff --git a/app/version_code.properties b/app/version_code.properties
index ede9f36..2b8a5a3 100644 (file)
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Sat Apr 11 18:28:43 CST 2020\r
-VERSION_CODE=400\r
+#Mon Apr 13 16:03:41 CST 2020\r
+VERSION_CODE=402\r