From: snickersun <scy@incartech.cn>
Date: Wed, 26 Aug 2020 13:25:41 +0000 (+0800)
Subject: 1、优化音量调大过程，只有通话开始时才会进行音量调整
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.js?a=commitdiff_plain;h=dcbf6c46268f8c607c60a714ff7d9fe2b2122741;p=protocol_srv.git

1、优化音量调大过程，只有通话开始时才会进行音量调整
2、在 AndroidManifest.xml 中添加 mqtt service 定义
---

diff --git a/app/app.iml b/app/app.iml
index 2ccae5de..77c19ca9 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -18,8 +18,8 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false"/>
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml"/>
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res"/>
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug"/>
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value=""/>
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug"/>
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res;file://$MODULE_DIR$/src/test/res;file://$MODULE_DIR$/src/androidTestDebug/res;file://$MODULE_DIR$/src/testDebug/res;file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug;file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug"/>
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets"/>
       </configuration>
     </facet>
@@ -101,15 +101,15 @@
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner:0.5@aar" level="project"/>
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish:0.5@aar" level="project"/>
     <orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource:2.2.2@aar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\android-logging-log4j-1.0.3.jar:unspecified@jar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\ftp4j-1.7.2.jar:unspecified@jar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\log4j-1.2.17.jar:unspecified@jar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\okio-2.4.3.jar:unspecified@jar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\mail.jar:unspecified@jar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\activation.jar:unspecified@jar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\additionnal.jar:unspecified@jar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\frameworks-full-debug.jar:unspecified@jar" level="project"/>
-    <orderEntry type="library" name="Gradle: __local_aars__:D.\workspace\icsupport\app\libs\telephony_common-full-debug.jar:unspecified@jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/android-logging-log4j-1.0.3.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/ftp4j-1.7.2.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/log4j-1.2.17.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/okio-2.4.3.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/mail.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/activation.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/additionnal.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/frameworks-full-debug.jar" level="project"/>
+    <orderEntry type="library" name="Gradle: ./app/libs/telephony_common-full-debug.jar" level="project"/>
     <orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project"/>
     <orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.1.0@jar" level="project"/>
     <orderEntry type="library" name="Gradle: io.reactivex:rxjava:1.1.0@jar" level="project"/>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 05c4691c..757f37d9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -109,7 +109,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
+        <service android:name="se.wetcat.qatja.android.QatjaService"> <!-- MQTT协议通讯服务 -->
+            <intent-filter>
+                <action android:name="com.ic.mqtt.startsrv" />
+            </intent-filter>
+        </service>
         <service android:name=".CoreService"> <!-- 协议通讯服务 -->
             <intent-filter>
                 <action android:name="com.enqualcomm.support.startsrv" />
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 a5d5dd51..4bb6997f 100644
--- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
@@ -13,6 +13,7 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
 import android.telephony.PhoneStateListener;
+import android.telephony.PreciseCallState;
 import android.telephony.TelephonyManager;
 
 import com.enqualcomm.support.Config;
@@ -85,6 +86,16 @@ public class SilentManager extends AbstractInvokeHandlerService {
   private int mTodayWeek;
   private boolean mValue_isSilence;
 
+  public static final int PRECISE_CALL_STATE_NOT_VALID = -1;
+  public static final int PRECISE_CALL_STATE_IDLE = 0;  //空闲
+  public static final int PRECISE_CALL_STATE_ACTIVE = 1; //正在通话
+  public static final int PRECISE_CALL_STATE_HOLDING = 2; //通话挂起
+  public static final int PRECISE_CALL_STATE_DIALING = 3; //拨号开始
+  public static final int PRECISE_CALL_STATE_ALERTING = 4; //正在呼出
+  public static final int PRECISE_CALL_STATE_INCOMING = 5; //对方来电
+  public static final int PRECISE_CALL_STATE_WAITING = 6; //第三方来电等待
+  public static final int PRECISE_CALL_STATE_DISCONNECTED = 7; //挂断完成
+  public static final int PRECISE_CALL_STATE_DISCONNECTING = 8; //正在挂断
 
   private static SilentManager mSilentManger=null;
 
@@ -96,13 +107,11 @@ public class SilentManager extends AbstractInvokeHandlerService {
   private PhoneStateListener phoneStateListener = new PhoneStateListener() {
     public void onCallStateChanged(int state, String incomingNumber) {
       super.onCallStateChanged(state, incomingNumber);
-        if (ICAudioManager.needMute == false){
-          if (Config.custom_branch_name.equals("AK"))
-            ICAudioManager.setVoiceCallMaxVolumn(mContext); //设置最大音量
-        }
-        ICLogger.i("========onCallStateChanged state "+state+", incomingNumber "+incomingNumber);
+
+      ICLogger.i("========onCallStateChanged state "+state+", incomingNumber "+incomingNumber);
       switch(state) {
-        case 0: //挂电话
+        case PRECISE_CALL_STATE_DISCONNECTING: //挂电话
+        case PRECISE_CALL_STATE_DISCONNECTED: //挂电话
           isCalling = false;
 //          if (SilentManager.this.haveHandSilence) {
 //            SilentManager.this.handSilence(SilentManager.this.mContext, SilentManager.this.mValue_isSilence);
@@ -118,15 +127,17 @@ public class SilentManager extends AbstractInvokeHandlerService {
             });
 
           }
-          ICLogger.i("========Ring!");
+          ICLogger.i("========Hung up!");
           break;
-        case 1: //来电
+        case PRECISE_CALL_STATE_INCOMING: //来电
+        case PRECISE_CALL_STATE_ALERTING:
+        case PRECISE_CALL_STATE_DIALING:
           isCalling = true;
           Intent var3 = new Intent();
           var3.setAction(ACTION_CLOSE_UNREAD_MSG);
           mContext.sendBroadcast(var3);
 
-          ICLogger.i("========Hung up!");
+          ICLogger.i("========Ring!");
           if(ICAudioManager.needMute==true)
           {
             ICAudioManager.setVolumnMute(mContext);
@@ -138,8 +149,15 @@ public class SilentManager extends AbstractInvokeHandlerService {
 
           }
           break;
-        case 2://接电话
-        case 8://接电话
+        case PRECISE_CALL_STATE_ACTIVE://接电话
+        {
+          if (ICAudioManager.needMute == false){
+            if (Config.custom_branch_name.equals("AK"))
+              ICAudioManager.setVoiceCallMaxVolumn(mContext); //设置最大音量
+          }
+        }
+        case PRECISE_CALL_STATE_HOLDING://接电话
+        case PRECISE_CALL_STATE_WAITING:
           isCalling = true;
           ICLogger.i("========Answer Call !");
           if(ICAudioManager.needMute==true)