From: TrillGates <williamtrillgates@gmail.com>
Date: Tue, 8 Jun 2021 03:55:31 +0000 (+0800)
Subject: add absolute silent.
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=8a36bf884fff11d2d5876ac90e2f8269dc2ebdf1;p=protocol_srv.git

add absolute silent.
---

diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index c52ca944..00d3542b 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -8,7 +8,7 @@ import com.enqualcomm.support.bean.ICLocation;
 import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.utils.ICAudioManager;
 import com.enqualcomm.support.utils.ICLogger;
-import com.enqualcomm.support.utils.SharPreferenceUtil;
+import com.enqualcomm.support.utils.SharePreferenceUtil;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
 import com.enqualcomm.support.utils.VibrateUtil;
@@ -195,43 +195,43 @@ public class Config {
     }
 
     public static void setDurationOfVibration(Context context, int cycle) {
-        SharPreferenceUtil.setPrefInt(context, KEYDurationOfVibration, cycle);
+        SharePreferenceUtil.setPrefInt(context, KEYDurationOfVibration, cycle);
     }
 
     public static int getDurationOfVibration(Context context) {
-        return SharPreferenceUtil.getPrefInt(context, KEYDurationOfVibration, 1);
+        return SharePreferenceUtil.getPrefInt(context, KEYDurationOfVibration, 1);
     }
 
     public static void setMasterVolume(Context context, int cycle) {
-        SharPreferenceUtil.setPrefInt(context, KeyMasterVolume, cycle);
+        SharePreferenceUtil.setPrefInt(context, KeyMasterVolume, cycle);
     }
 
     public static int getMasterVolume(Context context) {
-        return SharPreferenceUtil.getPrefInt(context, KeyMasterVolume, 15);
+        return SharePreferenceUtil.getPrefInt(context, KeyMasterVolume, 15);
     }
 
     public static void setBleScanCycle(Context context, int cycle) {
-        SharPreferenceUtil.setPrefInt(context, KeyBleScanCycle, cycle);
+        SharePreferenceUtil.setPrefInt(context, KeyBleScanCycle, cycle);
     }
 
     public static int getBleScanCycle(Context context) {
-        return SharPreferenceUtil.getPrefInt(context, KeyBleScanCycle, 0);
+        return SharePreferenceUtil.getPrefInt(context, KeyBleScanCycle, 0);
     }
 
     public static String getLastUnReadMessage(Context context) {
-        return SharPreferenceUtil.getPrefString(context, KeyLastUnReadMessage, "");
+        return SharePreferenceUtil.getPrefString(context, KeyLastUnReadMessage, "");
     }
 
     public static void setLastUnReadMessage(Context context, String smsPWD) {
-        SharPreferenceUtil.setPrefString(context, KeyLastUnReadMessage, smsPWD);
+        SharePreferenceUtil.setPrefString(context, KeyLastUnReadMessage, smsPWD);
     }
 
     public static String getSMSPwd(Context context) {
-        return SharPreferenceUtil.getPrefString(context, KeySMSPassword, DefaultSMSPassword);
+        return SharePreferenceUtil.getPrefString(context, KeySMSPassword, DefaultSMSPassword);
     }
 
     public static void setSMSPwd(Context context, String smsPWD) {
-        SharPreferenceUtil.setPrefString(context, KeySMSPassword, smsPWD);
+        SharePreferenceUtil.setPrefString(context, KeySMSPassword, smsPWD);
     }
 
     public static boolean getIsL03tracker() {
@@ -240,77 +240,77 @@ public class Config {
     }
 
     public static String getWiFiSSID(Context context) {
-        return SharPreferenceUtil.getPrefString(context, KeyWiFiSSID, DefaultWiFiSSID);
+        return SharePreferenceUtil.getPrefString(context, KeyWiFiSSID, DefaultWiFiSSID);
     }
 
     public static void setWiFiSSID(Context context, String ssid) {
-        SharPreferenceUtil.setPrefString(context, KeyWiFiSSID, ssid);
+        SharePreferenceUtil.setPrefString(context, KeyWiFiSSID, ssid);
     }
 
     public static String getWiFiPasswd(Context context) {
-        return SharPreferenceUtil.getPrefString(context, KeyWiFiPasswd, DefaultWiFiPWD);
+        return SharePreferenceUtil.getPrefString(context, KeyWiFiPasswd, DefaultWiFiPWD);
     }
 
     public static void setWiFiPasswd(Context context, String pwd) {
-        SharPreferenceUtil.setPrefString(context, KeyWiFiPasswd, pwd);
+        SharePreferenceUtil.setPrefString(context, KeyWiFiPasswd, pwd);
     }
 
     public static String getWiFiEncryptType(Context context) {
-        return SharPreferenceUtil.getPrefString(context, KeyWiFiEncyptType, DefaultWiFiEncryptType);
+        return SharePreferenceUtil.getPrefString(context, KeyWiFiEncyptType, DefaultWiFiEncryptType);
     }
 
     public static void setWiFiEncryptType(Context context, String type) {
-        SharPreferenceUtil.setPrefString(context, KeyWiFiEncyptType, type);
+        SharePreferenceUtil.setPrefString(context, KeyWiFiEncyptType, type);
     }
 
     public static String getFotaServerUrl(Context context) {
-        return SharPreferenceUtil.getPrefString(context, KeyFotaServerUrl, "");
+        return SharePreferenceUtil.getPrefString(context, KeyFotaServerUrl, "");
     }
 
     public static void setFotaServerUrl(Context context, String url) {
-        SharPreferenceUtil.setPrefString(context, KeyFotaServerUrl, url);
+        SharePreferenceUtil.setPrefString(context, KeyFotaServerUrl, url);
     }
 
     public static String getFtpUser(Context context) {
-        return SharPreferenceUtil.getPrefString(context, KeyLogFtpUser, DefaultLogFtpUser);
+        return SharePreferenceUtil.getPrefString(context, KeyLogFtpUser, DefaultLogFtpUser);
     }
 
     public static void setFtpUser(Context context, String user) {
-        SharPreferenceUtil.setPrefString(context, KeyLogFtpUser, user);
+        SharePreferenceUtil.setPrefString(context, KeyLogFtpUser, user);
     }
 
     public static String getFtpServer(Context context) {
-        return SharPreferenceUtil.getPrefString(context, KeyLogFtpServer, DefaultLogFtpServer);
+        return SharePreferenceUtil.getPrefString(context, KeyLogFtpServer, DefaultLogFtpServer);
     }
 
     public static void setFtpServer(Context context, String host) {
-        SharPreferenceUtil.setPrefString(context, KeyLogFtpServer, host);
+        SharePreferenceUtil.setPrefString(context, KeyLogFtpServer, host);
     }
 
     public static String getFtpPWD(Context context) {
-        return SharPreferenceUtil.getPrefString(context, KeyLogFtpPWD, DefaultLogFtpPWD);
+        return SharePreferenceUtil.getPrefString(context, KeyLogFtpPWD, DefaultLogFtpPWD);
     }
 
     public static void setFtpPWD(Context context, String PWD) {
-        SharPreferenceUtil.setPrefString(context, KeyLogFtpPWD, PWD);
+        SharePreferenceUtil.setPrefString(context, KeyLogFtpPWD, PWD);
     }
 
     public static void setAlarmCycle(Context context, int cycle) {
-        SharPreferenceUtil.setPrefInt(context, KeyAlarmCycle, cycle);
+        SharePreferenceUtil.setPrefInt(context, KeyAlarmCycle, cycle);
     }
 
     //默认3分钟，刚刚wakeup的时候1分钟
     public static int getAlarmCycle(Context context) {
-        return SharPreferenceUtil.getPrefInt(context, KeyAlarmCycle, 3);
+        return SharePreferenceUtil.getPrefInt(context, KeyAlarmCycle, 3);
     }
 
     public static void setProtocolServerPort(Context context, int serverPort) {
 //    SharPreferenceUtil.setPrefString(context,KeyProtocolServerIP,serverIP);
-        SharPreferenceUtil.setPrefInt(context, KeyProtocolServerPort, serverPort);
+        SharePreferenceUtil.setPrefInt(context, KeyProtocolServerPort, serverPort);
     }
 
     public static void setProtocolServerHost(Context context, String host) {
-        SharPreferenceUtil.setPrefString(context, KeyProtocolServerHOST, host);
+        SharePreferenceUtil.setPrefString(context, KeyProtocolServerHOST, host);
     }
     //public static String getProtocolServerIP(Context context){
     //   return SharPreferenceUtil.getPrefString(context,KeyProtocolServerIP,"118.178.155.223");
@@ -350,66 +350,66 @@ public class Config {
 
     public static String getProtocolServerHost(Context context) {
         String host;
-        host = SharPreferenceUtil.getPrefString(context, KeyProtocolServerHOST, protocolAPIHelper.getDefaultServerIP());
+        host = SharePreferenceUtil.getPrefString(context, KeyProtocolServerHOST, protocolAPIHelper.getDefaultServerIP());
         return host;
     }
 
 
     public static int getProtocolServerPort(Context context) {
         int port;
-        port = SharPreferenceUtil.getPrefInt(context, KeyProtocolServerPort, protocolAPIHelper.getDefaultServerPort());
+        port = SharePreferenceUtil.getPrefInt(context, KeyProtocolServerPort, protocolAPIHelper.getDefaultServerPort());
         return port;
     }
 
     public static void setConfigInitFlag(Context context, int flag) {
-        SharPreferenceUtil.setPrefInt(context, "ConfigInitFlag", flag);
+        SharePreferenceUtil.setPrefInt(context, "ConfigInitFlag", flag);
     }
 
     public static int getConfigInitFlag(Context context) {
-        return SharPreferenceUtil.getPrefInt(context, "ConfigInitFlag", 0);
+        return SharePreferenceUtil.getPrefInt(context, "ConfigInitFlag", 0);
     }
 
     public static void setHttpLogServerUrl(Context context, String serverurl) {
-        SharPreferenceUtil.setPrefString(context, KeyLogServerUrl, serverurl);
+        SharePreferenceUtil.setPrefString(context, KeyLogServerUrl, serverurl);
     }
 
     public static String getHttpLogServerUrl(Context context) {
-        return SharPreferenceUtil.getPrefString(context, KeyLogServerUrl, DefaultHttpLogServerUrl);
+        return SharePreferenceUtil.getPrefString(context, KeyLogServerUrl, DefaultHttpLogServerUrl);
     }
 
     public static void setPPGTestCycle(Context context, int cycle_ninutes) {
-        SharPreferenceUtil.setPrefInt(context, KeyPpgTestCycle, cycle_ninutes);
+        SharePreferenceUtil.setPrefInt(context, KeyPpgTestCycle, cycle_ninutes);
     }
 
     public static int getPPGTestCycle(Context context) {
-        return SharPreferenceUtil.getPrefInt(context, KeyPpgTestCycle, 0);
+        return SharePreferenceUtil.getPrefInt(context, KeyPpgTestCycle, 0);
     }
 
 
     public static int getHeartBeatCycle(Context context) {
-        return SharPreferenceUtil.getPrefInt(context, KeyHeartBeatCycle, 5);
+        return SharePreferenceUtil.getPrefInt(context, KeyHeartBeatCycle, 5);
     }
 
     public static void setHeartBeatCycle(Context context, int cycle) {
-        SharPreferenceUtil.setPrefInt(context, KeyHeartBeatCycle, cycle);
+        SharePreferenceUtil.setPrefInt(context, KeyHeartBeatCycle, cycle);
     }
 
     public static void setLocationCycle(Context context, int cycle_second) {
-        SharPreferenceUtil.setPrefInt(context, KeyLocationCycle, cycle_second);
+        SharePreferenceUtil.setPrefInt(context, KeyLocationCycle, cycle_second);
     }
 
     public static int getLocationCycle(Context context) {
-        return SharPreferenceUtil.getPrefInt(context, KeyLocationCycle, 900);
+        return SharePreferenceUtil.getPrefInt(context, KeyLocationCycle, 900);
     }
 
     public static void setLocationMode(Context context, int mode) {
         ICLogger.i("setLocationMode " + mode);
-        SharPreferenceUtil.setPrefInt(context, KeyLocationMode, mode);
+        SharePreferenceUtil.setPrefInt(context, KeyLocationMode, mode);
     }
 
 
     public static int getLocationMode(Context context) {
-        return SharPreferenceUtil.getPrefInt(context, KeyLocationMode, ICLocation.NORMAL_MOD);
+        return SharePreferenceUtil.getPrefInt(context, KeyLocationMode, ICLocation.NORMAL_MOD);
     }
 
     private static final String KeyBootUpDate = "bootupdate";
@@ -417,7 +417,7 @@ public class Config {
     public static boolean logBootDate(Context context) {
         //如果时间和最后一次时间不同，则重置，否则启动次数+1
         if (isFirstBootToday(context)) {
-            SharPreferenceUtil.setPrefString(context, KeyBootUpDate, TimeUtil.getSystemTime4());
+            SharePreferenceUtil.setPrefString(context, KeyBootUpDate, TimeUtil.getSystemTime4());
             return true;
         } else {
             return false;
@@ -425,7 +425,7 @@ public class Config {
     }
 
     private static String getLastBootupDate(Context context) {
-        return SharPreferenceUtil.getPrefString(context, KeyBootUpDate, "");
+        return SharePreferenceUtil.getPrefString(context, KeyBootUpDate, "");
     }
 
     private static boolean isFirstBootToday(Context context) {
@@ -495,11 +495,11 @@ public class Config {
     }
 
     public static void loadTemperatureSettings(Runtime runtime) {
-        runtime.temp_test_Cycle_Seconds = SharPreferenceUtil.getPrefInt(runtime.getContextProxy().context, KeyTempTestCycle, 60 * 60);
+        runtime.temp_test_Cycle_Seconds = SharePreferenceUtil.getPrefInt(runtime.getContextProxy().context, KeyTempTestCycle, 60 * 60);
     }
 
     public static void setTemperatureTestCycle(Runtime runtime, int cycle_seconds) {
-        SharPreferenceUtil.setPrefInt(runtime.getContextProxy().context, KeyTempTestCycle, cycle_seconds);
+        SharePreferenceUtil.setPrefInt(runtime.getContextProxy().context, KeyTempTestCycle, cycle_seconds);
         loadTemperatureSettings(runtime);
     }
 
@@ -602,38 +602,38 @@ public class Config {
 
 
     public static void setPPGAdjust(Context context, int adjust) {
-        SharPreferenceUtil.setPrefInt(context, KeyPPGadust, adjust);
+        SharePreferenceUtil.setPrefInt(context, KeyPPGadust, adjust);
     }
 
 
     public static int getPPGAdjust(Context context) {
-        return SharPreferenceUtil.getPrefInt(context, KeyPPGadust, 0);
+        return SharePreferenceUtil.getPrefInt(context, KeyPPGadust, 0);
     }
 
     public static void setBPHAdjust(Context context, int adjust) {
-        SharPreferenceUtil.setPrefInt(context, KeyBPHadust, adjust);
+        SharePreferenceUtil.setPrefInt(context, KeyBPHadust, adjust);
     }
 
 
     public static int getBPHAdjust(Context context) {
-        return SharPreferenceUtil.getPrefInt(context, KeyBPHadust, 0);
+        return SharePreferenceUtil.getPrefInt(context, KeyBPHadust, 0);
     }
 
 
     public static int getBPLAdjust(Context context) {
-        return SharPreferenceUtil.getPrefInt(context, KeyBPLadust, 0);
+        return SharePreferenceUtil.getPrefInt(context, KeyBPLadust, 0);
     }
 
     public static void setBPLAdjust(Context context, int adjust) {
-        SharPreferenceUtil.setPrefInt(context, KeyBPLadust, adjust);
+        SharePreferenceUtil.setPrefInt(context, KeyBPLadust, adjust);
     }
 
     public static void setSPo2Adjust(Context context, int adjust) {
-        SharPreferenceUtil.setPrefInt(context, KeySPo2adust, adjust);
+        SharePreferenceUtil.setPrefInt(context, KeySPo2adust, adjust);
     }
 
     public static int getSPo2Adjust(Context context) {
-        return SharPreferenceUtil.getPrefInt(context, KeySPo2adust, 0);
+        return SharePreferenceUtil.getPrefInt(context, KeySPo2adust, 0);
     }
 
     public static void loadPPG_BPH_BPL_SPO2_adjustvalue(Context context, Runtime runtime) {
@@ -692,19 +692,19 @@ public class Config {
     }
 
     public static void setNeedCutOff(Context context, boolean enAnti) {
-        SharPreferenceUtil.setPrefBoolean(context, "NeedCutOff", enAnti);
+        SharePreferenceUtil.setPrefBoolean(context, "NeedCutOff", enAnti);
     }
 
     public static boolean getNeedCutOff(Context context) {
-        return SharPreferenceUtil.getPrefBoolean(context, "NeedCutOff", false);
+        return SharePreferenceUtil.getPrefBoolean(context, "NeedCutOff", false);
     }
 
     public static void setNeedAntiOff(Context context, boolean enAnti) {
-        SharPreferenceUtil.setPrefBoolean(context, "NeedAntiOff", enAnti);
+        SharePreferenceUtil.setPrefBoolean(context, "NeedAntiOff", enAnti);
     }
 
     public static boolean getNeedAntiOff(Context context) {
-        return SharPreferenceUtil.getPrefBoolean(context, "NeedAntiOff", false);
+        return SharePreferenceUtil.getPrefBoolean(context, "NeedAntiOff", false);
     }
 
     public static boolean enableSleep = false;
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 95c83cd2..650b4b52 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -55,7 +55,7 @@ import com.enqualcomm.support.utils.FileOutputUtil;
 import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.LedUtil;
 import com.enqualcomm.support.utils.NettyConnection;
-import com.enqualcomm.support.utils.SharPreferenceUtil;
+import com.enqualcomm.support.utils.SharePreferenceUtil;
 import com.enqualcomm.support.utils.SimSignalUtil;
 import com.enqualcomm.support.utils.TemperatureUtil;
 import com.enqualcomm.support.utils.TimeUtil;
@@ -437,7 +437,7 @@ public class CoreService extends Service {
 
                 int newVolume = intent.getIntExtra("android.media.EXTRA_VOLUME_STREAM_VALUE", 0);
                 int oldVolume = intent.getIntExtra("android.media.EXTRA_PREV_VOLUME_STREAM_VALUE", 0);
-                boolean isSilence = SharPreferenceUtil.getPrefBoolean(context, "KEY_ISSILENCE", false);
+                boolean isSilence = SharePreferenceUtil.getPrefBoolean(context, "KEY_ISSILENCE", false);
                 if (newVolume != oldVolume && !isSilence) {
                     ICLogger.i("Volume changed old " + oldVolume + " new " + newVolume);
                     Config.setMasterVolume(context, newVolume);
@@ -486,16 +486,16 @@ public class CoreService extends Service {
     private void resetStepCount() {
         if (ICJniUtils.isPedometerEnabled() == 0) ICJniUtils.enablePedometer();
         ICJniUtils.resetStepCount();
-        SharPreferenceUtil.setPrefInt(this, KEY_STEP_COUNT, 0);
-        SharPreferenceUtil.setPrefInt(this, KEY_SAVE_STEP_COUNT, 0);
+        SharePreferenceUtil.setPrefInt(this, KEY_STEP_COUNT, 0);
+        SharePreferenceUtil.setPrefInt(this, KEY_SAVE_STEP_COUNT, 0);
         ICLogger.i("Reset StepCount , " + ICJniUtils.getStepCount());
         this.runtime.setSaveStepCount(0);
         this.runtime.setTotalStepCount(0);
     }
 
     private void loadStepCount() {
-        int i = SharPreferenceUtil.getPrefInt(this, KEY_STEP_COUNT, 0);
-        int j = SharPreferenceUtil.getPrefInt(this, KEY_SAVE_STEP_COUNT, 0);
+        int i = SharePreferenceUtil.getPrefInt(this, KEY_STEP_COUNT, 0);
+        int j = SharePreferenceUtil.getPrefInt(this, KEY_SAVE_STEP_COUNT, 0);
         if (ICJniUtils.isPedometerEnabled() == 0) ICJniUtils.enablePedometer();
         //ICJniUtils.recoverStepCount();
         if (ICJniUtils.getStepCount() > i) {
@@ -510,8 +510,8 @@ public class CoreService extends Service {
     public void saveStepCount() {
         int i = runtime.getTotalStepCount();
         int j = runtime.getSaveStepCount();
-        SharPreferenceUtil.setPrefInt(this, KEY_STEP_COUNT, i);
-        SharPreferenceUtil.setPrefInt(this, KEY_SAVE_STEP_COUNT, j);
+        SharePreferenceUtil.setPrefInt(this, KEY_STEP_COUNT, i);
+        SharePreferenceUtil.setPrefInt(this, KEY_SAVE_STEP_COUNT, j);
         //ICJniUtils.saveStepCount();
     }
 
diff --git a/app/src/main/java/com/enqualcomm/support/MainActivity.java b/app/src/main/java/com/enqualcomm/support/MainActivity.java
index ec718b04..73cae47e 100644
--- a/app/src/main/java/com/enqualcomm/support/MainActivity.java
+++ b/app/src/main/java/com/enqualcomm/support/MainActivity.java
@@ -9,10 +9,7 @@ import android.graphics.Color;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
-import android.os.StatFs;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -22,7 +19,6 @@ import com.enqualcomm.support.utils.DeviceInfoUtil;
 import com.enqualcomm.support.utils.IBeaconUtil;
 import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.ImageUtil;
-import com.enqualcomm.support.utils.SharPreferenceUtil;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
 
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 068d2d74..b7befc03 100644
--- a/app/src/main/java/com/enqualcomm/support/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -33,7 +33,7 @@ import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.FileCache;
 import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.NettyConnection;
-import com.enqualcomm.support.utils.SharPreferenceUtil;
+import com.enqualcomm.support.utils.SharePreferenceUtil;
 import com.enqualcomm.support.utils.SimSignalUtil;
 import com.enqualcomm.support.utils.TemperatureUtil;
 import com.enqualcomm.support.utils.TimeUtil;
@@ -373,7 +373,7 @@ public class Deliver extends AbstractConnectionService {
     }
 
     private boolean isSilence(Runtime paramRuntime) {
-        return SharPreferenceUtil.getPrefBoolean((paramRuntime.getContextProxy()).context, "KEY_ISSILENCE", false);
+        return SharePreferenceUtil.getPrefBoolean((paramRuntime.getContextProxy()).context, "KEY_ISSILENCE", false);
     }
 
     public static void releaseWakeLockForGetWifiList() {
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 54a98f8c..2001eaee 100644
--- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
@@ -32,7 +32,7 @@ import com.enqualcomm.support.utils.DBHelper;
 import com.enqualcomm.support.utils.ICAudioManager;
 import com.enqualcomm.support.utils.ICLogger;
 import com.enqualcomm.support.utils.MissedCallContentObserver;
-import com.enqualcomm.support.utils.SharPreferenceUtil;
+import com.enqualcomm.support.utils.SharePreferenceUtil;
 import com.enqualcomm.support.utils.TimeUtil;
 import com.enqualcomm.support.utils.Util;
 import com.enqualcomm.support.utils.VibrateUtil;
@@ -605,7 +605,7 @@ public class SilentManager extends AbstractInvokeHandlerService {
     }
 
     private void onSilentStateChange(boolean var1) {
-        SharPreferenceUtil.setPrefBoolean(mContext, "KEY_ISSILENCE", var1);
+        SharePreferenceUtil.setPrefBoolean(mContext, "KEY_ISSILENCE", var1);
         setSilentConfig(mContext, var1);
         try {
             if (this.alarms != null) {
diff --git a/app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java b/app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java
index 1ed34dab..901b6b6b 100644
--- a/app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java
+++ b/app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java
@@ -5,16 +5,11 @@ import android.os.Handler;
 import android.os.Message;
 
 import com.enqualcomm.support.bean.ICLocation;
-import com.enqualcomm.support.bean.Locations;
 import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.service.base.AbstractInvokeHandlerService;
 import com.enqualcomm.support.utils.Connection;
 import com.enqualcomm.support.utils.ICLogger;
-import com.enqualcomm.support.utils.SharPreferenceUtil;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import com.enqualcomm.support.utils.SharePreferenceUtil;
 
 import java.util.List;
 
@@ -64,8 +59,8 @@ public class UpLoadDataPoints extends AbstractInvokeHandlerService {
   public void onAttach(Connection paramConnection, Runtime paramRuntime) {
     this.mRuntime = paramRuntime;
     this.mHandler = new Handler();
-    String str1 = SharPreferenceUtil.getPrefString((paramRuntime.getContextProxy()).context, "key_device_key", null);
-    String str2 = SharPreferenceUtil.getPrefString((paramRuntime.getContextProxy()).context, "key_device_id", null);
+    String str1 = SharePreferenceUtil.getPrefString((paramRuntime.getContextProxy()).context, "key_device_key", null);
+    String str2 = SharePreferenceUtil.getPrefString((paramRuntime.getContextProxy()).context, "key_device_id", null);
     StringBuilder stringBuilder = new StringBuilder();
     stringBuilder.append("sharp_device_id=");
     stringBuilder.append(str2);
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 f767ee11..198fe150 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -302,7 +302,7 @@ public class ProcessReceiver extends BroadcastReceiver {
             return;
         }
         if (RESUME_ACTION.equals(str)) {
-            SharPreferenceUtil.setPrefBoolean(paramContext, "key_is_resume", paramIntent.getBooleanExtra("is_resume", false));
+            SharePreferenceUtil.setPrefBoolean(paramContext, "key_is_resume", paramIntent.getBooleanExtra("is_resume", false));
             return;
         } else if (ACTION_MESSAGE_SENT.equals(str)) {
 
@@ -409,8 +409,8 @@ public class ProcessReceiver extends BroadcastReceiver {
         } else if (DIALOG_ACTION.equals(str)) {
             if (paramIntent.hasExtra("contact")) {
                 contact = (Contact) paramIntent.getParcelableExtra("contact");
-                SharPreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
-                isSilence = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
+                SharePreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
+                isSilence = SharePreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
                 if (contact != null && !isSilence) {
                     if (!DeviceInfoUtil.isTopActivity(paramContext)) {
                         this.initMyDialog(paramContext, contact, 1, "", false);
@@ -422,8 +422,8 @@ public class ProcessReceiver extends BroadcastReceiver {
                 }
             } else if (paramIntent.hasExtra("sms")) {
                 String sms = paramIntent.getStringExtra("sms");
-                SharPreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
-                isSilence = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
+                SharePreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
+                isSilence = SharePreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
                 if (sms != null && !isSilence) {
                     //if (!DeviceInfoUtil.isTopActivity(paramContext)) {
                     this.initMyDialog(paramContext, null, 3, sms, false);
@@ -439,8 +439,8 @@ public class ProcessReceiver extends BroadcastReceiver {
                 if (paramIntent.hasExtra("needreply")) {
                     needreply = paramIntent.getBooleanExtra("needreply", false);
                 }
-                SharPreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
-                isSilence = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
+                SharePreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
+                isSilence = SharePreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
                 if (sms != null && !isSilence) {
                     if (!DeviceInfoUtil.isTopActivity(paramContext)) {
                         this.initMyDialog(paramContext, null, 4, sms, needreply);
@@ -452,8 +452,8 @@ public class ProcessReceiver extends BroadcastReceiver {
                 }
             } else if (paramIntent.hasExtra("findDev")) {
                 String finddevtxt = paramIntent.getStringExtra("findDev");
-                SharPreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
-                isSilence = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
+                SharePreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
+                isSilence = SharePreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
                 if (finddevtxt != null && !isSilence) {
                     this.initMyDialog(paramContext, null, 5, finddevtxt, false);
                     this.playFindDevVoice(paramContext);
@@ -463,8 +463,8 @@ public class ProcessReceiver extends BroadcastReceiver {
                 }
             } else if (paramIntent.hasExtra("takephoto")) {
                 String takephoto = paramIntent.getStringExtra("takephoto");
-                SharPreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
-                isSilence = SharPreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
+                SharePreferenceUtil.getPrefBoolean(paramContext, "key_is_resume", false);
+                isSilence = SharePreferenceUtil.getPrefBoolean(paramContext, "KEY_ISSILENCE", false);
                 if (takephoto != null && !isSilence) {
 
                     this.initMyDialog(paramContext, null, 6, takephoto, false);
diff --git a/app/src/main/java/com/enqualcomm/support/utils/ProfileManager.java b/app/src/main/java/com/enqualcomm/support/utils/ProfileManager.java
index 438bafe9..a8efe17e 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/ProfileManager.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProfileManager.java
@@ -1,11 +1,13 @@
 package com.enqualcomm.support.utils;
 
+import android.content.Context;
 import android.media.AudioManager;
 
 public class ProfileManager {
 
     //只声音，无振动（可用）
     public static void ringModel(AudioManager audio) {
+        //所有声音都正常，包括系统声音，来电响铃，媒体声音，闹钟，通知声音都有
         audio.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
         audio.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER,
                 AudioManager.VIBRATE_SETTING_OFF);
@@ -15,6 +17,7 @@ public class ProfileManager {
 
     //即有声音也有振动(可用)
     public static void ringAndVibrate(AudioManager audio) {
+        //所有声音都正常，包括系统声音，来电响铃，媒体声音，闹钟，通知声音都有
         audio.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
         audio.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER,
                 AudioManager.VIBRATE_SETTING_ON);
@@ -24,6 +27,7 @@ public class ProfileManager {
 
     //只能振动（可用）
     public static void vibrate(AudioManager audio) {
+        //该模式下，来电，通知保持震动没有声音；但是媒体，闹钟依然有声音。
         audio.setRingerMode(AudioManager.RINGER_MODE_VIBRATE);
         audio.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER,
                 AudioManager.VIBRATE_SETTING_ON);
@@ -33,10 +37,60 @@ public class ProfileManager {
 
     //无声无振动
     public static void noRingAndVibrate(AudioManager audio) {
+        //该模式下，来电响铃，通知，系统声音和震动都没有；闹钟，通话声音保持；
         audio.setRingerMode(AudioManager.RINGER_MODE_SILENT);
         audio.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER,
                 AudioManager.VIBRATE_SETTING_OFF);
         audio.setVibrateSetting(AudioManager.VIBRATE_TYPE_NOTIFICATION,
                 AudioManager.VIBRATE_SETTING_OFF);
     }
+
+
+    //全部静音
+    public static void silentAll(Context context, AudioManager audio) {
+        if (audio == null) {
+            return;
+        }
+        //先记录静音前的数据，以便复原
+        //STREAM_VOICE_CALL：通话声音
+        //STREAM_SYSTEM：系统声音，包括按键声音等
+        //STREAM_RING：来电响铃
+        //STREAM_MUSIC：媒体声音（包括音乐，视频，游戏声音）
+        //STREAM_ALARM：闹钟声音
+        //STREAM_NOTIFICATION：通知声音
+        int systemVolume = audio.getStreamVolume(AudioManager.STREAM_SYSTEM);
+        int ringVolume = audio.getStreamVolume(AudioManager.STREAM_RING);
+        int musicVolume = audio.getStreamVolume(AudioManager.STREAM_MUSIC);
+        int notificationVolume = audio.getStreamVolume(AudioManager.STREAM_NOTIFICATION);
+        int alarmVolume = audio.getStreamVolume(AudioManager.STREAM_ALARM);
+        SharePreferenceUtil.setPrefInt(context, "audio_systemVolume", systemVolume);
+        SharePreferenceUtil.setPrefInt(context, "audio_ringVolume", ringVolume);
+        SharePreferenceUtil.setPrefInt(context, "audio_musicVolume", musicVolume);
+        SharePreferenceUtil.setPrefInt(context, "audio_notificationVolume", notificationVolume);
+        SharePreferenceUtil.setPrefInt(context, "audio_alarmVolume", alarmVolume);
+        audio.setStreamVolume(AudioManager.STREAM_SYSTEM, 0, 0);
+        audio.setStreamVolume(AudioManager.STREAM_RING, 0, 0);
+        audio.setStreamVolume(AudioManager.STREAM_MUSIC, 0, 0);
+        audio.setStreamVolume(AudioManager.STREAM_NOTIFICATION, 0, 0);
+        audio.setStreamVolume(AudioManager.STREAM_ALARM, 0, 0);
+        ICLogger.d("silentAll...");
+    }
+
+    //恢复正常
+    public static void restoreSilent(Context context, AudioManager audio) {
+        if (audio == null) {
+            return;
+        }
+        int systemVolume = SharePreferenceUtil.getPrefInt(context, "audio_systemVolume", 5);
+        int ringVolume = SharePreferenceUtil.getPrefInt(context, "audio_ringVolume", 5);
+        int musicVolume = SharePreferenceUtil.getPrefInt(context, "audio_musicVolume", 5);
+        int notificationVolume = SharePreferenceUtil.getPrefInt(context, "audio_notificationVolume", 5);
+        int alarmVolume = SharePreferenceUtil.getPrefInt(context, "audio_alarmVolume", 5);
+        audio.setStreamVolume(AudioManager.STREAM_SYSTEM, systemVolume, 0);
+        audio.setStreamVolume(AudioManager.STREAM_RING, ringVolume, 0);
+        audio.setStreamVolume(AudioManager.STREAM_MUSIC, musicVolume, 0);
+        audio.setStreamVolume(AudioManager.STREAM_NOTIFICATION, notificationVolume, 0);
+        audio.setStreamVolume(AudioManager.STREAM_ALARM, alarmVolume, 0);
+        ICLogger.d("restoreSilent...");
+    }
 }
diff --git a/app/src/main/java/com/enqualcomm/support/utils/SharPreferenceUtil.java b/app/src/main/java/com/enqualcomm/support/utils/SharePreferenceUtil.java
similarity index 96%
rename from app/src/main/java/com/enqualcomm/support/utils/SharPreferenceUtil.java
rename to app/src/main/java/com/enqualcomm/support/utils/SharePreferenceUtil.java
index 9e66f474..fe78e798 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/SharPreferenceUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/SharePreferenceUtil.java
@@ -1,134 +1,132 @@
-package com.enqualcomm.support.utils;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.preference.PreferenceManager;
-
-public class SharPreferenceUtil {
-
-
-
-    public static void clearPreference(Context context, SharedPreferences sharedPref) {
-        sharedPref.edit().clear().commit();
-    }
-
-    public static boolean getPrefBoolean(Context context, String key, boolean value) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(key, value);
-    }
-
-    public static float getPrefFloat(Context context, String key, float value) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getFloat(key, value);
-    }
-
-    public static int getPrefInt(Context context, String key, int value) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getInt(key, value);
-    }
-
-    public static long getPrefLong(Context context, String key, long value) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getLong(key, value);
-    }
-
-    public static String getPrefString(Context context, String key, String value) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getString(key, value);
-    }
-
-    public static boolean hasKey(Context context, String key) {
-        return PreferenceManager.getDefaultSharedPreferences(context).contains(key);
-    }
-
-    public static void setPrefBoolean(Context context, String key, boolean value) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(key, value).commit();
-    }
-
-    public static void setPrefFloat(Context context, String key, float value) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putFloat(key, value).commit();
-    }
-
-    public static void setPrefInt(Context context, String key, int value) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putInt(key, value).commit();
-    }
-
-    public static void setPrefLong(Context context, String key, long value) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putLong(key, value).commit();
-    }
-
-    public static void setPrefString(Context context, String key, String value) {
-        PreferenceManager.getDefaultSharedPreferences(context).edit().putString(key, value).commit();
-    }
-
-//
-//    public static String getPrefStringPublic(Context context, String key, String value) {
-//        SharedPreferences sp=context.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_READABLE);
-//        return sp.getString(key, value);
-//    }
-//    public static void setPrefStringPublic(Context context, String key, String value) {
-//        SharedPreferences sp=context.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_WRITEABLE);
-//        sp.edit().putString(key, value).commit();
-//    }
-//    public static void setPrefIntPublic(Context context, String key, int value) {
-//        SharedPreferences sp=context.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_WRITEABLE);
-//        sp.edit().putInt(key, value).commit();
-//    }
-//    public static int getPrefIntPublic(Context context, String key, int value) {
-//        SharedPreferences sp=context.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_READABLE);
-//        return sp.getInt(key, value);
-//    }
-
-//// 其他应用读取写入访问的方法
-//    public static String getPrefStringPublic(Context context, String key, String value) {
-//
-//        String PREFERENCE_PACKAGE="com.enqualcomm.support";
-//        Context c;
-//        try {
-//            c = context.createPackageContext(PREFERENCE_PACKAGE, Context.CONTEXT_IGNORE_SECURITY);
-//            SharedPreferences sp=c.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_READABLE);
-//            return sp.getString(key, value);
-//        } catch (PackageManager.NameNotFoundException e) {
-//            // TODO Auto-generated catch block
-//            e.printStackTrace();
-//        }
-//        return value;
-//    }
-//    public static void setPrefStringPublic(Context context, String key, String value) {
-//        String PREFERENCE_PACKAGE="com.enqualcomm.support";
-//        Context c;
-//        try {
-//            c = context.createPackageContext(PREFERENCE_PACKAGE, Context.CONTEXT_IGNORE_SECURITY);
-//            SharedPreferences sp=c.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_WRITEABLE);
-//            sp.edit().putString(key, value).commit();
-//        } catch (PackageManager.NameNotFoundException e) {
-//            // TODO Auto-generated catch block
-//            e.printStackTrace();
-//        }
-//
-//    }
-//    public static void setPrefIntPublic(Context context, String key, int value) {
-//        String PREFERENCE_PACKAGE="com.enqualcomm.support";
-//        Context c;
-//        try {
-//            c = context.createPackageContext(PREFERENCE_PACKAGE, Context.CONTEXT_IGNORE_SECURITY);
-//            SharedPreferences sp=c.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_WRITEABLE);
-//            sp.edit().putInt(key, value).commit();
-//        } catch (PackageManager.NameNotFoundException e) {
-//            // TODO Auto-generated catch block
-//            e.printStackTrace();
-//        }
-//
-//    }
-//    public static int getPrefIntPublic(Context context, String key, int value) {
-//        String PREFERENCE_PACKAGE="com.enqualcomm.support";
-//        Context c;
-//        try {
-//            c = context.createPackageContext(PREFERENCE_PACKAGE, Context.CONTEXT_IGNORE_SECURITY);
-//            SharedPreferences sp=c.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_READABLE);
-//            return sp.getInt(key, value);
-//        } catch (PackageManager.NameNotFoundException e) {
-//            // TODO Auto-generated catch block
-//            e.printStackTrace();
-//        }
-//
-//        return value;
-//    }
-
-}
+package com.enqualcomm.support.utils;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+public class SharePreferenceUtil {
+
+
+    public static void clearPreference(Context context, SharedPreferences sharedPref) {
+        sharedPref.edit().clear().commit();
+    }
+
+    public static boolean getPrefBoolean(Context context, String key, boolean value) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(key, value);
+    }
+
+    public static float getPrefFloat(Context context, String key, float value) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getFloat(key, value);
+    }
+
+    public static int getPrefInt(Context context, String key, int value) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getInt(key, value);
+    }
+
+    public static long getPrefLong(Context context, String key, long value) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getLong(key, value);
+    }
+
+    public static String getPrefString(Context context, String key, String value) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getString(key, value);
+    }
+
+    public static boolean hasKey(Context context, String key) {
+        return PreferenceManager.getDefaultSharedPreferences(context).contains(key);
+    }
+
+    public static void setPrefBoolean(Context context, String key, boolean value) {
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putBoolean(key, value).commit();
+    }
+
+    public static void setPrefFloat(Context context, String key, float value) {
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putFloat(key, value).commit();
+    }
+
+    public static void setPrefInt(Context context, String key, int value) {
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putInt(key, value).commit();
+    }
+
+    public static void setPrefLong(Context context, String key, long value) {
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putLong(key, value).commit();
+    }
+
+    public static void setPrefString(Context context, String key, String value) {
+        PreferenceManager.getDefaultSharedPreferences(context).edit().putString(key, value).commit();
+    }
+
+//
+//    public static String getPrefStringPublic(Context context, String key, String value) {
+//        SharedPreferences sp=context.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_READABLE);
+//        return sp.getString(key, value);
+//    }
+//    public static void setPrefStringPublic(Context context, String key, String value) {
+//        SharedPreferences sp=context.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_WRITEABLE);
+//        sp.edit().putString(key, value).commit();
+//    }
+//    public static void setPrefIntPublic(Context context, String key, int value) {
+//        SharedPreferences sp=context.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_WRITEABLE);
+//        sp.edit().putInt(key, value).commit();
+//    }
+//    public static int getPrefIntPublic(Context context, String key, int value) {
+//        SharedPreferences sp=context.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_READABLE);
+//        return sp.getInt(key, value);
+//    }
+
+//// 其他应用读取写入访问的方法
+//    public static String getPrefStringPublic(Context context, String key, String value) {
+//
+//        String PREFERENCE_PACKAGE="com.enqualcomm.support";
+//        Context c;
+//        try {
+//            c = context.createPackageContext(PREFERENCE_PACKAGE, Context.CONTEXT_IGNORE_SECURITY);
+//            SharedPreferences sp=c.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_READABLE);
+//            return sp.getString(key, value);
+//        } catch (PackageManager.NameNotFoundException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//        return value;
+//    }
+//    public static void setPrefStringPublic(Context context, String key, String value) {
+//        String PREFERENCE_PACKAGE="com.enqualcomm.support";
+//        Context c;
+//        try {
+//            c = context.createPackageContext(PREFERENCE_PACKAGE, Context.CONTEXT_IGNORE_SECURITY);
+//            SharedPreferences sp=c.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_WRITEABLE);
+//            sp.edit().putString(key, value).commit();
+//        } catch (PackageManager.NameNotFoundException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//
+//    }
+//    public static void setPrefIntPublic(Context context, String key, int value) {
+//        String PREFERENCE_PACKAGE="com.enqualcomm.support";
+//        Context c;
+//        try {
+//            c = context.createPackageContext(PREFERENCE_PACKAGE, Context.CONTEXT_IGNORE_SECURITY);
+//            SharedPreferences sp=c.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_WRITEABLE);
+//            sp.edit().putInt(key, value).commit();
+//        } catch (PackageManager.NameNotFoundException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//
+//    }
+//    public static int getPrefIntPublic(Context context, String key, int value) {
+//        String PREFERENCE_PACKAGE="com.enqualcomm.support";
+//        Context c;
+//        try {
+//            c = context.createPackageContext(PREFERENCE_PACKAGE, Context.CONTEXT_IGNORE_SECURITY);
+//            SharedPreferences sp=c.getSharedPreferences("icprotocolconfig",Context.MODE_WORLD_READABLE);
+//            return sp.getInt(key, value);
+//        } catch (PackageManager.NameNotFoundException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//
+//        return value;
+//    }
+
+}
diff --git a/app/src/main/java/com/ic/protocols/protocol_anan.java b/app/src/main/java/com/ic/protocols/protocol_anan.java
index 2ea826a3..e1c4b837 100644
--- a/app/src/main/java/com/ic/protocols/protocol_anan.java
+++ b/app/src/main/java/com/ic/protocols/protocol_anan.java
@@ -8,6 +8,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
+import android.database.Cursor;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Environment;
@@ -477,7 +478,38 @@ public class protocol_anan {
 
     }
 
+    private static int targetStep = -1;
+
     public static StringMessage AP03(Runtime ds) {
+        //处理心跳数据的时候，处理一下运动目标是否达标，如果达表的，弹出一个窗，表扬一下。
+        int totalStepCount = ds.getTotalStepCount();
+        if (targetStep == -1) {
+            //读取数据库数据
+            Cursor query = ds.getContextProxy().getResolver().query(
+                    Uri.parse(FZDSettingsProvider.SETTINGS),
+                    new String[]{FZDDatabaseHelper.sValue},
+                    FZDDatabaseHelper.sKey + "=?",
+                    new String[]{cmdMap.get(CMD_TYPE.BP98)},
+                    null
+            );
+            if (query != null) {
+                if (query.moveToNext()) {
+                    targetStep = query.getInt(0);
+                }
+                query.close();
+            } else {
+                //不用多次查询，设置新的时候，赋值一下即可。
+                targetStep = 0;
+            }
+        }
+        ICLogger.d("target step == > " + targetStep);
+        //判断是否达标
+        if (totalStepCount >= targetStep) {
+            //弹窗提示
+            ICLogger.d("今日运动目标已达成...");
+            //TODO:
+
+        }
         //示例数据：IWAP03,06000908000102,5555,30#  IWAP03,000000null00000,0,0#
         return genStringMessage(cmdMap.get(CMD_TYPE.AP03),
                 new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP03))
@@ -488,7 +520,7 @@ public class protocol_anan {
                         .append(ds.getProtection())
                         .append(ds.getWorkModeStr())
                         .append(CMDSPLIT)
-                        .append(ds.getTotalStepCount())
+                        .append(totalStepCount)
                         .append(CMDSPLIT)
                         .append(ds.getRolltimes())
                         .append(CMDEND).toString());
@@ -924,16 +956,18 @@ public class protocol_anan {
             String trigger = split[3];
             ICLogger.d("trigger == > " + trigger);
             if ("1".equals(trigger)) {
-                ProfileManager.ringModel(audioManager);
+                ProfileManager.restoreSilent(mRuntime.getContextProxy().context, audioManager);
             } else {
-                ProfileManager.ringAndVibrate(audioManager);
+                ProfileManager.silentAll(mRuntime.getContextProxy().context, audioManager);
             }
             String cmdCode = split[2];
             int index = cmd.indexOf(cmdCode);
             //回复服务器
             mConnection.send(
                     genStringMessage(cmdMap.get(CMD_TYPE.AP26),
-                            new StringBuilder(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP26)).append(CMDSPLIT).append(cmd.substring(index)).append(CMDEND).toString())
+                            new StringBuilder(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP26))
+                                    .append(CMDSPLIT).append(cmd.substring(index))
+                                    .append(CMDEND).toString())
             );
         } catch (Exception e) {
             e.printStackTrace();
@@ -987,6 +1021,8 @@ public class protocol_anan {
             String responseCode = split[2];
             String value = split[3];
             ICLogger.d("value == > " + value);
+            //下一次心跳，会去数据库里查询
+            targetStep = -1;
             ContentValues contentValues = new ContentValues();
             contentValues.put(FZDDatabaseHelper.sKey, cmdMap.get(CMD_TYPE.BP98));
             contentValues.put(FZDDatabaseHelper.sValue, value);
diff --git a/app/src/main/java/com/ic/protocols/protocol_ic.java b/app/src/main/java/com/ic/protocols/protocol_ic.java
index 5fbfb747..b91d39be 100644
--- a/app/src/main/java/com/ic/protocols/protocol_ic.java
+++ b/app/src/main/java/com/ic/protocols/protocol_ic.java
@@ -137,7 +137,7 @@ public class protocol_ic {
         AP85,
         BP85,//设置闹钟
         AP86,
-        BP86,//绑定解绑
+        BP86,//心率周期
         AP87,
         BP87,//二维码更新
         AP88,