From: snickersun <snickersun@qq.com>
Date: Tue, 4 Feb 2020 07:02:51 +0000 (+0800)
Subject: 修改package 名称为 com.enqualcomm.support.
X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=d31095866ba5d4e0ec44a5399b90a84d377d826a;p=icsupport.git

修改package 名称为 com.enqualcomm.support.
解决与com.enqualcomm.message 通讯问题。已经可以实现微聊。
---

diff --git a/app/app.iml b/app/app.iml
index 95ac0dd5..325d8851 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -19,7 +19,7 @@
         <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="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
         <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
diff --git a/app/build.gradle b/app/build.gradle
index 6b9b91a2..d1a2093b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
     def currentVersionCode = getVersionCode()
     def currentVersionName = releaseTime()
     defaultConfig {
-        applicationId "com.ic.protocol"
+        applicationId "com.enqualcomm.support"
         minSdkVersion 19
         targetSdkVersion 25
         versionCode currentVersionCode
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e11fe1ee..ecd63bed 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -120,7 +120,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.ic.protocol.MainActivity">
+        <activity android:name="com.enqualcomm.support.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -130,7 +130,7 @@
 
         <service android:name="com.enqualcomm.support.CoreService">   <!--协议通讯服务-->
             <intent-filter>
-                <action android:name="com.ic.protocol.startsrv" />
+                <action android:name="com.enqualcomm.support.startsrv" />
                 <action android:name="com.enqualcomm.support.ACTION_ALARM" />
                 <action android:name="com.enqualcomm.support.HEART_ALARM" />
             </intent-filter>
@@ -140,14 +140,14 @@
         <provider
             android:authorities="com.enqualcomm.support"
             android:exported="true"
-            android:name="com.ic.protocol.ICContentProvider"/>
+            android:name="com.enqualcomm.support.ICContentProvider"/>
 
-        <receiver android:exported="true" android:name="com.ic.protocol.BootCompleteReceiver">
+        <receiver android:exported="true" android:name="com.enqualcomm.support.BootCompleteReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
-        <receiver android:exported="true" android:name="com.ic.protocol.utils.ProcessReceiver">
+        <receiver android:exported="true" android:name="com.enqualcomm.support.utils.ProcessReceiver">
             <intent-filter>
                 <action android:name="com.enqualcomm.support.DIALOG"/>
                 <action android:name="com.enqualcomm.imessage.RESUME_ACTION"/>
diff --git a/app/src/main/java/com/ic/protocol/BootCompleteReceiver.java b/app/src/main/java/com/enqualcomm/support/BootCompleteReceiver.java
similarity index 80%
rename from app/src/main/java/com/ic/protocol/BootCompleteReceiver.java
rename to app/src/main/java/com/enqualcomm/support/BootCompleteReceiver.java
index 2d62be3d..26043809 100644
--- a/app/src/main/java/com/ic/protocol/BootCompleteReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/BootCompleteReceiver.java
@@ -1,10 +1,10 @@
-package com.ic.protocol;
+package com.enqualcomm.support;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import com.ic.protocol.utils.Logger;
+import com.enqualcomm.support.utils.Logger;
 
 public class BootCompleteReceiver extends BroadcastReceiver {
   public void onReceive(Context paramContext, Intent paramIntent) {
diff --git a/app/src/main/java/com/ic/protocol/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
similarity index 96%
rename from app/src/main/java/com/ic/protocol/Config.java
rename to app/src/main/java/com/enqualcomm/support/Config.java
index 6b9a326c..d8f3975e 100644
--- a/app/src/main/java/com/ic/protocol/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -1,4 +1,4 @@
-package com.ic.protocol;
+package com.enqualcomm.support;
 
 import android.text.TextUtils;
 import org.json.JSONException;
diff --git a/app/src/main/java/com/ic/protocol/Constants.java b/app/src/main/java/com/enqualcomm/support/Constants.java
similarity index 97%
rename from app/src/main/java/com/ic/protocol/Constants.java
rename to app/src/main/java/com/enqualcomm/support/Constants.java
index 08ad4bd6..d9711964 100644
--- a/app/src/main/java/com/ic/protocol/Constants.java
+++ b/app/src/main/java/com/enqualcomm/support/Constants.java
@@ -1,4 +1,4 @@
-package com.ic.protocol;
+package com.enqualcomm.support;
 
 import android.net.Uri;
 
diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java
index 3e9b7aa8..415c55e1 100644
--- a/app/src/main/java/com/enqualcomm/support/CoreService.java
+++ b/app/src/main/java/com/enqualcomm/support/CoreService.java
@@ -19,37 +19,37 @@ import android.util.Log;
 import android.widget.Toast;
 
 import com.ic.jni.ICJniUtils;
-import com.ic.protocol.Constants;
-import com.ic.protocol.GSensorListener;
-import com.ic.protocol.LocationClient;
-import com.ic.protocol.adapter.LBSHelper;
-import com.ic.protocol.adapter.protocolAPIHelper;
-import com.ic.protocol.bean.Runtime;
-import com.ic.protocol.bean.StringMessage;
-import com.ic.protocol.bean.heartRateStatus;
-import com.ic.protocol.service.CheckSIM;
-import com.ic.protocol.service.Deliver;
-import com.ic.protocol.service.HeartRateManager;
-import com.ic.protocol.service.Initialize;
-import com.ic.protocol.service.KeepAlive;
-import com.ic.protocol.service.SendChatMessage;
-import com.ic.protocol.service.SilentManager;
-import com.ic.protocol.service.UpLoadDataPoints;
-import com.ic.protocol.service.base.AbstractConnectionService;
-import com.ic.protocol.service.base.AbstractInvokeHandlerService;
-import com.ic.protocol.utils.AlarmHelper;
-import com.ic.protocol.utils.AlarmWakeUp;
-import com.ic.protocol.utils.BatteryUtil;
-import com.ic.protocol.utils.ConnectionListener;
-import com.ic.protocol.utils.ContextProxy;
-import com.ic.protocol.utils.DBHelper;
-import com.ic.protocol.utils.FileOutputUtil;
-import com.ic.protocol.utils.Logger;
-import com.ic.protocol.utils.NettyConnection;
-import com.ic.protocol.utils.SharPreferenceUtil;
-import com.ic.protocol.utils.SimSignalUtil;
-import com.ic.protocol.utils.TimeUtil;
-import com.ic.protocol.utils.Util;
+import com.enqualcomm.support.Constants;
+import com.enqualcomm.support.GSensorListener;
+import com.enqualcomm.support.LocationClient;
+import com.enqualcomm.support.adapter.LBSHelper;
+import com.enqualcomm.support.adapter.protocolAPIHelper;
+import com.enqualcomm.support.bean.Runtime;
+import com.enqualcomm.support.bean.StringMessage;
+import com.enqualcomm.support.bean.heartRateStatus;
+import com.enqualcomm.support.service.CheckSIM;
+import com.enqualcomm.support.service.Deliver;
+import com.enqualcomm.support.service.HeartRateManager;
+import com.enqualcomm.support.service.Initialize;
+import com.enqualcomm.support.service.KeepAlive;
+import com.enqualcomm.support.service.SendChatMessage;
+import com.enqualcomm.support.service.SilentManager;
+import com.enqualcomm.support.service.UpLoadDataPoints;
+import com.enqualcomm.support.service.base.AbstractConnectionService;
+import com.enqualcomm.support.service.base.AbstractInvokeHandlerService;
+import com.enqualcomm.support.utils.AlarmHelper;
+import com.enqualcomm.support.utils.AlarmWakeUp;
+import com.enqualcomm.support.utils.BatteryUtil;
+import com.enqualcomm.support.utils.ConnectionListener;
+import com.enqualcomm.support.utils.ContextProxy;
+import com.enqualcomm.support.utils.DBHelper;
+import com.enqualcomm.support.utils.FileOutputUtil;
+import com.enqualcomm.support.utils.Logger;
+import com.enqualcomm.support.utils.NettyConnection;
+import com.enqualcomm.support.utils.SharPreferenceUtil;
+import com.enqualcomm.support.utils.SimSignalUtil;
+import com.enqualcomm.support.utils.TimeUtil;
+import com.enqualcomm.support.utils.Util;
 
 import java.lang.ref.WeakReference;
 import chestnut.ui.Toastc;
@@ -67,18 +67,18 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
-import static com.ic.protocol.Constants.ACTION_ALARM_ADD_DATAPOINTS;
-import static com.ic.protocol.Constants.ACTION_EQC_ALARM;
-import static com.ic.protocol.Constants.ACTION_HEATR_RATE_START;
-import static com.ic.protocol.Constants.ACTION_LOCATION_ALARM;
-import static com.ic.protocol.Constants.HEART_ALARM;
-import static com.ic.protocol.Constants.KEY_SAVE_STEP_COUNT;
-import static com.ic.protocol.Constants.KEY_STEP_COUNT;
-import static com.ic.protocol.Constants.SLEEP_ALARM;
-import static com.ic.protocol.Constants.STEP_COUNT_ALARM_ACTION;
-import static com.ic.protocol.Constants.WAKE_ALARM;
-import static com.ic.protocol.Constants.WEATHER_ALARM;
-import static com.ic.protocol.bean.ICLocation.*;
+import static com.enqualcomm.support.Constants.ACTION_ALARM_ADD_DATAPOINTS;
+import static com.enqualcomm.support.Constants.ACTION_EQC_ALARM;
+import static com.enqualcomm.support.Constants.ACTION_HEATR_RATE_START;
+import static com.enqualcomm.support.Constants.ACTION_LOCATION_ALARM;
+import static com.enqualcomm.support.Constants.HEART_ALARM;
+import static com.enqualcomm.support.Constants.KEY_SAVE_STEP_COUNT;
+import static com.enqualcomm.support.Constants.KEY_STEP_COUNT;
+import static com.enqualcomm.support.Constants.SLEEP_ALARM;
+import static com.enqualcomm.support.Constants.STEP_COUNT_ALARM_ACTION;
+import static com.enqualcomm.support.Constants.WAKE_ALARM;
+import static com.enqualcomm.support.Constants.WEATHER_ALARM;
+import static com.enqualcomm.support.bean.ICLocation.*;
 
 
 public class CoreService extends Service {
@@ -276,7 +276,7 @@ public class CoreService extends Service {
         StringBuilder stringBuilder = new StringBuilder();
         stringBuilder.append(getExternalCacheDir());
         stringBuilder.append("/contacts.db");
-        FileOutputUtil.copyFolder("/data/data/com.ic.protocol/databases", stringBuilder.toString());
+        FileOutputUtil.copyFolder("/data/data/com.enqualcomm.support/databases", stringBuilder.toString());
     }
 
     private AbstractInvokeHandlerService getInvokeHandlerServiceChain() {
diff --git a/app/src/main/java/com/ic/protocol/CrashHandler.java b/app/src/main/java/com/enqualcomm/support/CrashHandler.java
similarity index 96%
rename from app/src/main/java/com/ic/protocol/CrashHandler.java
rename to app/src/main/java/com/enqualcomm/support/CrashHandler.java
index e60e5b77..e0fc8028 100644
--- a/app/src/main/java/com/ic/protocol/CrashHandler.java
+++ b/app/src/main/java/com/enqualcomm/support/CrashHandler.java
@@ -1,4 +1,4 @@
-package com.ic.protocol;
+package com.enqualcomm.support;
 
 import android.content.Context;
 import android.content.pm.PackageInfo;
diff --git a/app/src/main/java/com/ic/protocol/GSensorListener.java b/app/src/main/java/com/enqualcomm/support/GSensorListener.java
similarity index 84%
rename from app/src/main/java/com/ic/protocol/GSensorListener.java
rename to app/src/main/java/com/enqualcomm/support/GSensorListener.java
index 3d66a101..d660cafd 100644
--- a/app/src/main/java/com/ic/protocol/GSensorListener.java
+++ b/app/src/main/java/com/enqualcomm/support/GSensorListener.java
@@ -1,14 +1,14 @@
-package com.ic.protocol;
+package com.enqualcomm.support;
 
 
 import android.os.Handler;
 import android.os.Message;
 
 import com.ic.jni.ICJniUtils;
-import com.ic.protocol.bean.Runtime;
+import com.enqualcomm.support.bean.Runtime;
 
-import com.ic.protocol.utils.FileOutputUtil;
-import com.ic.protocol.utils.Logger;
+import com.enqualcomm.support.utils.FileOutputUtil;
+import com.enqualcomm.support.utils.Logger;
 
 /**
  * 由于Gsensor用的硬件计步，只需要保证打开计步器即可
diff --git a/app/src/main/java/com/ic/protocol/ICApplication.java b/app/src/main/java/com/enqualcomm/support/ICApplication.java
similarity index 95%
rename from app/src/main/java/com/ic/protocol/ICApplication.java
rename to app/src/main/java/com/enqualcomm/support/ICApplication.java
index e4101eb7..d78344d7 100644
--- a/app/src/main/java/com/ic/protocol/ICApplication.java
+++ b/app/src/main/java/com/enqualcomm/support/ICApplication.java
@@ -1,4 +1,4 @@
-package com.ic.protocol;
+package com.enqualcomm.support;
 
 import android.app.Application;
 import android.content.Context;
diff --git a/app/src/main/java/com/ic/protocol/ICContentProvider.java b/app/src/main/java/com/enqualcomm/support/ICContentProvider.java
similarity index 97%
rename from app/src/main/java/com/ic/protocol/ICContentProvider.java
rename to app/src/main/java/com/enqualcomm/support/ICContentProvider.java
index 69ffb4a1..7b3fb168 100644
--- a/app/src/main/java/com/ic/protocol/ICContentProvider.java
+++ b/app/src/main/java/com/enqualcomm/support/ICContentProvider.java
@@ -1,4 +1,4 @@
-package com.ic.protocol;
+package com.enqualcomm.support;
 
 import android.content.ContentProvider;
 import android.content.ContentUris;
diff --git a/app/src/main/java/com/ic/protocol/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
similarity index 92%
rename from app/src/main/java/com/ic/protocol/LocationClient.java
rename to app/src/main/java/com/enqualcomm/support/LocationClient.java
index ddc37d44..b09d1525 100644
--- a/app/src/main/java/com/ic/protocol/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -1,4 +1,4 @@
-package com.ic.protocol;
+package com.enqualcomm.support;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -11,24 +11,24 @@ import android.os.SystemClock;
 import android.provider.Settings;
 
 import com.ic.jni.ICJniUtils;
-import com.ic.protocol.adapter.LBSHelper;
-import com.ic.protocol.adapter.protocolAPIHelper;
-import com.ic.protocol.bean.ICLocation;
-import com.ic.protocol.bean.StringMessage;
-import com.ic.protocol.service.Deliver;
-import com.ic.protocol.service.KeepAlive;
+import com.enqualcomm.support.adapter.LBSHelper;
+import com.enqualcomm.support.adapter.protocolAPIHelper;
+import com.enqualcomm.support.bean.ICLocation;
+import com.enqualcomm.support.bean.StringMessage;
+import com.enqualcomm.support.service.Deliver;
+import com.enqualcomm.support.service.KeepAlive;
 import com.enqualcomm.support.CoreService;
-import com.ic.protocol.utils.CellInfoUtil;
-import com.ic.protocol.utils.DeviceInfoUtil;
-import com.ic.protocol.utils.FileCache;
-import com.ic.protocol.utils.FileOutputUtil;
-import com.ic.protocol.utils.Logger;
-import com.ic.protocol.utils.NettyConnection;
-import com.ic.protocol.utils.ServiceUtil;
-import com.ic.protocol.utils.SharPreferenceUtil;
-import com.ic.protocol.utils.SimSignalUtil;
-import com.ic.protocol.bean.Runtime;
-import com.ic.protocol.utils.TimeUtil;
+import com.enqualcomm.support.utils.CellInfoUtil;
+import com.enqualcomm.support.utils.DeviceInfoUtil;
+import com.enqualcomm.support.utils.FileCache;
+import com.enqualcomm.support.utils.FileOutputUtil;
+import com.enqualcomm.support.utils.Logger;
+import com.enqualcomm.support.utils.NettyConnection;
+import com.enqualcomm.support.utils.ServiceUtil;
+import com.enqualcomm.support.utils.SharPreferenceUtil;
+import com.enqualcomm.support.utils.SimSignalUtil;
+import com.enqualcomm.support.bean.Runtime;
+import com.enqualcomm.support.utils.TimeUtil;
 
 import java.util.Timer;
 import java.util.TimerTask;
@@ -44,7 +44,7 @@ import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
 
 import static android.location.LocationManager.GPS_PROVIDER;
-import static com.ic.protocol.Constants.HEART_ALARM;
+import static com.enqualcomm.support.Constants.HEART_ALARM;
 
 public class LocationClient {
   private static final String TAG = LocationClient.class.getSimpleName();
diff --git a/app/src/main/java/com/ic/protocol/MainActivity.java b/app/src/main/java/com/enqualcomm/support/MainActivity.java
similarity index 98%
rename from app/src/main/java/com/ic/protocol/MainActivity.java
rename to app/src/main/java/com/enqualcomm/support/MainActivity.java
index 9f4cb621..b33bc394 100644
--- a/app/src/main/java/com/ic/protocol/MainActivity.java
+++ b/app/src/main/java/com/enqualcomm/support/MainActivity.java
@@ -1,4 +1,4 @@
-package com.ic.protocol;
+package com.enqualcomm.support;
 
 import android.content.Context;
 import android.content.Intent;
@@ -17,7 +17,7 @@ import android.widget.ToggleButton;
 import com.enqualcomm.support.R;
 import com.ic.jni.ICJniUtils;
 import com.enqualcomm.support.CoreService;
-import com.ic.protocol.utils.Logger;
+import com.enqualcomm.support.utils.Logger;
 
 import java.util.Timer;
 import java.util.TimerTask;
diff --git a/app/src/main/java/com/ic/protocol/MySqlitOpenHelper.java b/app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java
similarity index 96%
rename from app/src/main/java/com/ic/protocol/MySqlitOpenHelper.java
rename to app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java
index ed93b17c..95f7ef67 100644
--- a/app/src/main/java/com/ic/protocol/MySqlitOpenHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/MySqlitOpenHelper.java
@@ -1,10 +1,10 @@
-package com.ic.protocol;
+package com.enqualcomm.support;
 
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
-import com.ic.protocol.utils.Logger;
+import com.enqualcomm.support.utils.Logger;
 
 
 public class MySqlitOpenHelper extends SQLiteOpenHelper {
diff --git a/app/src/main/java/com/ic/protocol/NMEAListener.java b/app/src/main/java/com/enqualcomm/support/NMEAListener.java
similarity index 95%
rename from app/src/main/java/com/ic/protocol/NMEAListener.java
rename to app/src/main/java/com/enqualcomm/support/NMEAListener.java
index 4b90094a..b9bbaf5b 100644
--- a/app/src/main/java/com/ic/protocol/NMEAListener.java
+++ b/app/src/main/java/com/enqualcomm/support/NMEAListener.java
@@ -1,4 +1,4 @@
-package com.ic.protocol;
+package com.enqualcomm.support;
 
 import android.content.Context;
 import android.location.Criteria;
@@ -11,11 +11,11 @@ import android.location.LocationManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import com.ic.protocol.bean.ICLocation;
-import com.ic.protocol.bean.Runtime;
-import com.ic.protocol.utils.FileOutputUtil;
-import com.ic.protocol.utils.Logger;
-import com.ic.protocol.utils.TimeUtil;
+import com.enqualcomm.support.bean.ICLocation;
+import com.enqualcomm.support.bean.Runtime;
+import com.enqualcomm.support.utils.FileOutputUtil;
+import com.enqualcomm.support.utils.Logger;
+import com.enqualcomm.support.utils.TimeUtil;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/ic/protocol/ParseUpdate.java b/app/src/main/java/com/enqualcomm/support/ParseUpdate.java
similarity index 95%
rename from app/src/main/java/com/ic/protocol/ParseUpdate.java
rename to app/src/main/java/com/enqualcomm/support/ParseUpdate.java
index 3c9053c2..95dad8ac 100644
--- a/app/src/main/java/com/ic/protocol/ParseUpdate.java
+++ b/app/src/main/java/com/enqualcomm/support/ParseUpdate.java
@@ -1,11 +1,11 @@
-package com.ic.protocol;
+package com.enqualcomm.support;
 
 import android.content.Intent;
 
-import com.ic.protocol.bean.StringMessage;
-import com.ic.protocol.bean.Update;
-import com.ic.protocol.utils.Util;
-import com.ic.protocol.bean.Runtime;
+import com.enqualcomm.support.bean.StringMessage;
+import com.enqualcomm.support.bean.Update;
+import com.enqualcomm.support.utils.Util;
+import com.enqualcomm.support.bean.Runtime;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -329,9 +329,3 @@ public class ParseUpdate extends Object implements Observable.OnSubscribe<Update
 //    paramSubscriber.onCompleted();
   }
 }
-
-
-/* Location:              D:\android\ApkIDE3.3\ApkIDE\Worksrc\com.enqualcomm.support\!\com\enqualcomm\support\task\ParseUpdate.class
- * Java compiler version: 6 (50.0)
- * JD-Core Version:       1.0.7
- */
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/protocol/PassData.java b/app/src/main/java/com/enqualcomm/support/PassData.java
similarity index 79%
rename from app/src/main/java/com/ic/protocol/PassData.java
rename to app/src/main/java/com/enqualcomm/support/PassData.java
index 0a503535..36096977 100644
--- a/app/src/main/java/com/ic/protocol/PassData.java
+++ b/app/src/main/java/com/enqualcomm/support/PassData.java
@@ -1,8 +1,8 @@
-package com.ic.protocol;
+package com.enqualcomm.support;
 
 
-import com.ic.protocol.bean.StringMessage;
-import com.ic.protocol.utils.Logger;
+import com.enqualcomm.support.bean.StringMessage;
+import com.enqualcomm.support.utils.Logger;
 
 import rx.Observable;
 import rx.Subscriber;
@@ -53,8 +53,3 @@ public class PassData extends Object implements Observable.OnSubscribe<String> {
   }
 }
 
-
-/* Location:              D:\android\ApkIDE3.3\ApkIDE\Worksrc\com.enqualcomm.support\!\com\enqualcomm\support\task\PassData.class
- * Java compiler version: 6 (50.0)
- * JD-Core Version:       1.0.7
- */
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java b/app/src/main/java/com/enqualcomm/support/adapter/LBSHelper.java
similarity index 96%
rename from app/src/main/java/com/ic/protocol/adapter/LBSHelper.java
rename to app/src/main/java/com/enqualcomm/support/adapter/LBSHelper.java
index 9c8f4999..98dc2bb7 100644
--- a/app/src/main/java/com/ic/protocol/adapter/LBSHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/adapter/LBSHelper.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.adapter;
+package com.enqualcomm.support.adapter;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -21,9 +21,9 @@ import android.telephony.TelephonyManager;
 import android.telephony.cdma.CdmaCellLocation;
 import android.telephony.gsm.GsmCellLocation;
 
-import com.ic.protocol.bean.Runtime;
-import com.ic.protocol.utils.FileOutputUtil;
-import com.ic.protocol.utils.Logger;
+import com.enqualcomm.support.bean.Runtime;
+import com.enqualcomm.support.utils.FileOutputUtil;
+import com.enqualcomm.support.utils.Logger;
 
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java b/app/src/main/java/com/enqualcomm/support/adapter/protocolAPIHelper.java
similarity index 90%
rename from app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
rename to app/src/main/java/com/enqualcomm/support/adapter/protocolAPIHelper.java
index 77f5cadc..e9832088 100644
--- a/app/src/main/java/com/ic/protocol/adapter/protocolAPIHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/adapter/protocolAPIHelper.java
@@ -1,32 +1,41 @@
-package com.ic.protocol.adapter;
+package com.enqualcomm.support.adapter;
 
+import android.content.ComponentName;
 import android.content.Intent;
+import android.net.Uri;
+import android.os.Environment;
+import android.os.Messenger;
 import android.util.Log;
 
-import com.ic.protocol.Config;
-import com.ic.protocol.bean.Contact;
-import com.ic.protocol.bean.Content;
-import com.ic.protocol.bean.ICLocation;
-import com.ic.protocol.bean.Runtime;
-import com.ic.protocol.bean.StringMessage;
-import com.ic.protocol.bean.VoiceContent;
-import com.ic.protocol.bean.voicePacket;
+import com.enqualcomm.support.Config;
+import com.enqualcomm.support.bean.Contact;
+import com.enqualcomm.support.bean.Content;
+import com.enqualcomm.support.bean.ICLocation;
+import com.enqualcomm.support.bean.Runtime;
+import com.enqualcomm.support.bean.StringMessage;
+import com.enqualcomm.support.bean.VoiceContent;
+import com.enqualcomm.support.bean.voicePacket;
 import com.enqualcomm.support.CoreService;
-import com.ic.protocol.service.Deliver;
-import com.ic.protocol.utils.Connection;
-import com.ic.protocol.utils.DBHelper;
-import com.ic.protocol.utils.Logger;
-import com.ic.protocol.utils.NettyConnection;
-import com.ic.protocol.utils.ProcessReceiver;
-import com.ic.protocol.utils.SharPreferenceUtil;
-import com.ic.protocol.utils.TimeUtil;
-import com.ic.protocol.utils.Util;
-
+import com.enqualcomm.support.service.Deliver;
+import com.enqualcomm.support.utils.Connection;
+import com.enqualcomm.support.utils.DBHelper;
+import com.enqualcomm.support.utils.Logger;
+import com.enqualcomm.support.utils.NettyConnection;
+import com.enqualcomm.support.utils.ProcessReceiver;
+import com.enqualcomm.support.utils.ServiceUtil;
+import com.enqualcomm.support.utils.SharPreferenceUtil;
+import com.enqualcomm.support.utils.TimeUtil;
+import com.enqualcomm.support.utils.Util;
+
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import static com.ic.protocol.LocationClient.LOCATION_CYCLE;
-import static com.ic.protocol.LocationClient.LOCATION_MODE;
+import static com.enqualcomm.support.Constants.ACTION_EQC_ALARM;
+import static com.enqualcomm.support.Constants.ACTION_IMESSAGE;
+import static com.enqualcomm.support.LocationClient.LOCATION_CYCLE;
+import static com.enqualcomm.support.LocationClient.LOCATION_MODE;
+import static com.enqualcomm.support.bean.Contact.GROUP_ALL;
 import static java.lang.Math.abs;
 
 public class protocolAPIHelper {
@@ -296,7 +305,7 @@ public class protocolAPIHelper {
     public void handleBP00(String cmd){
         String[] msg=cmd.split(CMDSPLIT);
 //        get Msg :IWBP00,20191229171933,8# (size)24
-//        12-30 01:19:33.861 6492-6492/com.ic.protocol I/ICSrv.protocolAPIHelper: found cmd keyid=BP00 ,keyname=BP00 ,  IWBP00,20191229171933,8
+//        12-30 01:19:33.861 6492-6492/com.enqualcomm.support I/ICSrv.protocolAPIHelper: found cmd keyid=BP00 ,keyname=BP00 ,  IWBP00,20191229171933,8
 
         if (msg.length>=3) {
             log("handleBP00", "Set Datetime " + msg[1]);
@@ -654,7 +663,11 @@ public class protocolAPIHelper {
 
                }
             }
-            contactArray.add(new Contact(Contact.CATEGORY_ADMIN,"GROUP","123"));
+//            contactArray.add(new Contact(Contact.CATEGORY_GROUP,"All","666"));
+//            contactArray.add(new Contact(Contact.CATEGORY_PARTNER,"PARTNER","666"));
+//            contactArray.add(new Contact(Contact.CATEGORY_CARE,"CARE","666"));
+//            contactArray.add(new Contact(Contact.CATEGORY_VOLTE,"VOLTE","666"));
+
             runtime.getDbHelper().saveContacts(contactArray,true,false,true,false,false);
 
         }else{
@@ -833,7 +846,7 @@ public class protocolAPIHelper {
             Logger.i("服务器在"+time+" 收到语音 "+packetIndex+"/"+packetCount+" "+ (receiveSuccess==1?"成功":"失敗"));
             if (receiveSuccess == 1){
                 //如果服务器接收 语音成功，则设置下一个要发送的语音包Index，当index == packetCount的时候表示所有包发送完毕，停止继续发送
-                voicePacket.getInstanceSent().setCurrentIndexToSent(++packetIndex);
+                voicePacket.getInstanceSent().setCurrentIndexToSent(packetIndex);
             }
             //发送消息，再次检查要发送的语音包，确认其发送完毕
             connection.DeliverCMDMessageToSystem("BP07","SentVoicePacket");
@@ -1110,10 +1123,24 @@ public static String AP15(String index){
             log("================"+voicePacket.getInstance().toString());
             if (voicePacket.getInstance().isFinished())
             {
-                String amrFilepath=Util.saveFile(voicePacket.getInstance().getVoicePacketBytes(),0,voicePacket.getInstance().getVoicePacketLen(),runtime.getCacheDir(),voicePacket.getInstance().getName()+".amr");
+
+                String dir = Environment.getExternalStorageDirectory()+ "/Android/VoiceCache";
+                String amrFilepath=Util.saveFile(voicePacket.getInstance().getVoicePacketBytes(),0,voicePacket.getInstance().getVoicePacketLen(),new File(dir),"receive_"+voicePacket.getInstance().getPacketTime()+".amr");
                 Logger.i("save Amr file to "+amrFilepath);
                 voicePacket.getInstance().clearPacket();
-                runtime.getDbHelper().insertMessage( VoiceContent.placeHolderIn(Content.CATEGORY_VOICE,"1234567890",amrFilepath));
+                VoiceContent voiceContent=VoiceContent.placeHolderIn(Content.CONTACT_CATEGORY_GROUP,GROUP_ALL,amrFilepath);
+
+
+                final Uri uri2 = runtime.getDbHelper().insertMessage( voiceContent);
+
+                //回复UI消息，表示已经接收到
+                voiceContent.status = 3;
+                voiceContent.serverTime = TimeUtil.getSystemTime3();
+                voiceContent.preview = String.valueOf(Util.getDuration(voiceContent.content));
+                runtime.getDbHelper().updateMessage(voiceContent, uri2);
+
+                runtime.getContextProxy().sendBroadcast(ACTION_IMESSAGE, runtime);
+
 
             }
 
@@ -1125,6 +1152,16 @@ public static String AP15(String index){
 
     }
 
+    public void sendBroadcast(String cmd, Runtime dev) {
+
+              ComponentName componentName = new ComponentName("com.eqc.watch", "com.eqc.watch.launcher.ChatActivity");
+              Intent intent = new Intent("android.intent.action.MAIN");
+//              intent.putExtra("ACTIVITY_TYPE", 2);
+//              intent.addCategory("android.intent.category.DEFAULT");
+              intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+              intent.setComponent(componentName);
+              dev.getContextProxy().context.startActivity(intent);
+    }
 
     //白名单开关（下行协议号：BP84，响应：AP84）
     public static String AP84(String index,int success){
diff --git a/app/src/main/java/com/ic/protocol/bean/Alarm.java b/app/src/main/java/com/enqualcomm/support/bean/Alarm.java
similarity index 94%
rename from app/src/main/java/com/ic/protocol/bean/Alarm.java
rename to app/src/main/java/com/enqualcomm/support/bean/Alarm.java
index 45341e6a..14abfa7f 100644
--- a/app/src/main/java/com/ic/protocol/bean/Alarm.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Alarm.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
 public class Alarm {
   public String name;
diff --git a/app/src/main/java/com/ic/protocol/bean/Antioff.java b/app/src/main/java/com/enqualcomm/support/bean/Antioff.java
similarity index 94%
rename from app/src/main/java/com/ic/protocol/bean/Antioff.java
rename to app/src/main/java/com/enqualcomm/support/bean/Antioff.java
index 8f77d440..f622b1dc 100644
--- a/app/src/main/java/com/ic/protocol/bean/Antioff.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Antioff.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
 public class Antioff {
   public String cur_sys_status;
diff --git a/app/src/main/java/com/ic/protocol/bean/Contact.java b/app/src/main/java/com/enqualcomm/support/bean/Contact.java
similarity index 93%
rename from app/src/main/java/com/ic/protocol/bean/Contact.java
rename to app/src/main/java/com/enqualcomm/support/bean/Contact.java
index 1decbbf8..78ff4d8c 100644
--- a/app/src/main/java/com/ic/protocol/bean/Contact.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Contact.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -26,7 +26,7 @@ public class Contact implements Parcelable {
   
   public static final String GROUP_FAMILY = "1@-1";
   
-  String GROUP_ALL = "1@-3";
+  public static final String GROUP_ALL = "1@-3";
   
   String GROUP_PARTNER = "1@-2";
   
diff --git a/app/src/main/java/com/ic/protocol/bean/Content.java b/app/src/main/java/com/enqualcomm/support/bean/Content.java
similarity index 95%
rename from app/src/main/java/com/ic/protocol/bean/Content.java
rename to app/src/main/java/com/enqualcomm/support/bean/Content.java
index f9ded198..f4b60607 100644
--- a/app/src/main/java/com/ic/protocol/bean/Content.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Content.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
 public abstract class Content {
   public static final int CATEGORY_EMOJI = 5;
diff --git a/app/src/main/java/com/ic/protocol/bean/DeviceStatus.java b/app/src/main/java/com/enqualcomm/support/bean/DeviceStatus.java
similarity index 90%
rename from app/src/main/java/com/ic/protocol/bean/DeviceStatus.java
rename to app/src/main/java/com/enqualcomm/support/bean/DeviceStatus.java
index 5043d81f..7c575fa1 100644
--- a/app/src/main/java/com/ic/protocol/bean/DeviceStatus.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/DeviceStatus.java
@@ -1,6 +1,6 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
-import com.ic.protocol.utils.Logger;
+import com.enqualcomm.support.utils.Logger;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/app/src/main/java/com/ic/protocol/bean/ICLocation.java b/app/src/main/java/com/enqualcomm/support/bean/ICLocation.java
similarity index 95%
rename from app/src/main/java/com/ic/protocol/bean/ICLocation.java
rename to app/src/main/java/com/enqualcomm/support/bean/ICLocation.java
index c921356c..b8af069c 100644
--- a/app/src/main/java/com/ic/protocol/bean/ICLocation.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/ICLocation.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
 import java.util.HashMap;
 
diff --git a/app/src/main/java/com/ic/protocol/bean/Locations.java b/app/src/main/java/com/enqualcomm/support/bean/Locations.java
similarity index 91%
rename from app/src/main/java/com/ic/protocol/bean/Locations.java
rename to app/src/main/java/com/enqualcomm/support/bean/Locations.java
index e0d9ec06..fb0833e8 100644
--- a/app/src/main/java/com/ic/protocol/bean/Locations.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Locations.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/app/src/main/java/com/ic/protocol/bean/NoticeContent.java b/app/src/main/java/com/enqualcomm/support/bean/NoticeContent.java
similarity index 96%
rename from app/src/main/java/com/ic/protocol/bean/NoticeContent.java
rename to app/src/main/java/com/enqualcomm/support/bean/NoticeContent.java
index 951d578a..1802bd5f 100644
--- a/app/src/main/java/com/ic/protocol/bean/NoticeContent.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/NoticeContent.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
 
 import java.io.File;
diff --git a/app/src/main/java/com/ic/protocol/bean/NotificationParam.java b/app/src/main/java/com/enqualcomm/support/bean/NotificationParam.java
similarity index 82%
rename from app/src/main/java/com/ic/protocol/bean/NotificationParam.java
rename to app/src/main/java/com/enqualcomm/support/bean/NotificationParam.java
index eb464220..7014ef20 100644
--- a/app/src/main/java/com/ic/protocol/bean/NotificationParam.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/NotificationParam.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
 public class NotificationParam {
   public static final int ADD_NEW_ONE = 1;
@@ -46,9 +46,3 @@ public class NotificationParam {
     return stringBuilder.toString();
   }
 }
-
-
-/* Location:              D:\android\ApkIDE3.3\ApkIDE\Worksrc\com.enqualcomm.support\!\com\enqualcomm\support\bean\NotificationParam.class
- * Java compiler version: 6 (50.0)
- * JD-Core Version:       1.0.7
- */
\ No newline at end of file
diff --git a/app/src/main/java/com/ic/protocol/bean/Runtime.java b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
similarity index 94%
rename from app/src/main/java/com/ic/protocol/bean/Runtime.java
rename to app/src/main/java/com/enqualcomm/support/bean/Runtime.java
index 6d0d9648..2d341413 100644
--- a/app/src/main/java/com/ic/protocol/bean/Runtime.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java
@@ -1,10 +1,10 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
 
-import com.ic.protocol.adapter.LBSHelper;
-import com.ic.protocol.utils.ContextProxy;
-import com.ic.protocol.utils.DBHelper;
-import com.ic.protocol.utils.Logger;
+import com.enqualcomm.support.adapter.LBSHelper;
+import com.enqualcomm.support.utils.ContextProxy;
+import com.enqualcomm.support.utils.DBHelper;
+import com.enqualcomm.support.utils.Logger;
 
 import java.io.File;
 import java.text.ParseException;
diff --git a/app/src/main/java/com/ic/protocol/bean/Silent.java b/app/src/main/java/com/enqualcomm/support/bean/Silent.java
similarity index 94%
rename from app/src/main/java/com/ic/protocol/bean/Silent.java
rename to app/src/main/java/com/enqualcomm/support/bean/Silent.java
index 2b4e8531..7cfb951b 100644
--- a/app/src/main/java/com/ic/protocol/bean/Silent.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Silent.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
 public class Silent {
   public String cur_sys_status;
diff --git a/app/src/main/java/com/ic/protocol/bean/StepCount.java b/app/src/main/java/com/enqualcomm/support/bean/StepCount.java
similarity index 88%
rename from app/src/main/java/com/ic/protocol/bean/StepCount.java
rename to app/src/main/java/com/enqualcomm/support/bean/StepCount.java
index c53feff7..7ab19fde 100644
--- a/app/src/main/java/com/ic/protocol/bean/StepCount.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/StepCount.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
 public class StepCount {
   String date;
diff --git a/app/src/main/java/com/ic/protocol/bean/StheartRate.java b/app/src/main/java/com/enqualcomm/support/bean/StheartRate.java
similarity index 94%
rename from app/src/main/java/com/ic/protocol/bean/StheartRate.java
rename to app/src/main/java/com/enqualcomm/support/bean/StheartRate.java
index 6da73fb8..686431c8 100644
--- a/app/src/main/java/com/ic/protocol/bean/StheartRate.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/StheartRate.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
 public class StheartRate {
   public String end;
diff --git a/app/src/main/java/com/ic/protocol/bean/StringMessage.java b/app/src/main/java/com/enqualcomm/support/bean/StringMessage.java
similarity index 93%
rename from app/src/main/java/com/ic/protocol/bean/StringMessage.java
rename to app/src/main/java/com/enqualcomm/support/bean/StringMessage.java
index a89833a4..9a2adc27 100644
--- a/app/src/main/java/com/ic/protocol/bean/StringMessage.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/StringMessage.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/com/ic/protocol/bean/Update.java b/app/src/main/java/com/enqualcomm/support/bean/Update.java
similarity index 96%
rename from app/src/main/java/com/ic/protocol/bean/Update.java
rename to app/src/main/java/com/enqualcomm/support/bean/Update.java
index 56c2f5d0..318dda88 100644
--- a/app/src/main/java/com/ic/protocol/bean/Update.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Update.java
@@ -1,6 +1,6 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
-import com.ic.protocol.utils.Logger;
+import com.enqualcomm.support.utils.Logger;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/com/ic/protocol/bean/VoiceContent.java b/app/src/main/java/com/enqualcomm/support/bean/VoiceContent.java
similarity index 92%
rename from app/src/main/java/com/ic/protocol/bean/VoiceContent.java
rename to app/src/main/java/com/enqualcomm/support/bean/VoiceContent.java
index 43acfa68..7bad9445 100644
--- a/app/src/main/java/com/ic/protocol/bean/VoiceContent.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/VoiceContent.java
@@ -1,6 +1,6 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
-import com.ic.protocol.utils.Util;
+import com.enqualcomm.support.utils.Util;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/ic/protocol/bean/Weather.java b/app/src/main/java/com/enqualcomm/support/bean/Weather.java
similarity index 93%
rename from app/src/main/java/com/ic/protocol/bean/Weather.java
rename to app/src/main/java/com/enqualcomm/support/bean/Weather.java
index cd640d47..8e8bae08 100644
--- a/app/src/main/java/com/ic/protocol/bean/Weather.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/Weather.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
 public class Weather {
   public String cur_Temperature;
diff --git a/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java b/app/src/main/java/com/enqualcomm/support/bean/heartRateStatus.java
similarity index 93%
rename from app/src/main/java/com/ic/protocol/bean/heartRateStatus.java
rename to app/src/main/java/com/enqualcomm/support/bean/heartRateStatus.java
index f744006d..0c08da39 100644
--- a/app/src/main/java/com/ic/protocol/bean/heartRateStatus.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/heartRateStatus.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
 import com.ic.jni.ICJniUtils;
 
diff --git a/app/src/main/java/com/ic/protocol/bean/voicePacket.java b/app/src/main/java/com/enqualcomm/support/bean/voicePacket.java
similarity index 93%
rename from app/src/main/java/com/ic/protocol/bean/voicePacket.java
rename to app/src/main/java/com/enqualcomm/support/bean/voicePacket.java
index f7169d4b..b7dcee42 100644
--- a/app/src/main/java/com/ic/protocol/bean/voicePacket.java
+++ b/app/src/main/java/com/enqualcomm/support/bean/voicePacket.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.bean;
+package com.enqualcomm.support.bean;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -51,7 +51,8 @@ public class voicePacket {
         byte[] packetData;
         voicepacketItem(int _currentId,     int _packetLen,  byte[] _packetData){
             packetLen=_packetLen;
-            packetData=_packetData;
+            packetData=new byte[packetLen];
+            System.arraycopy(_packetData,0,packetData,0,packetLen);
             currentId=_currentId;
         }
         public byte[] getPacketData()
@@ -61,6 +62,7 @@ public class voicePacket {
         public int getPacketLen(){
             return packetLen;
         }
+
     }
     public boolean appendVoice(String _Name, String _appendIndex,int _packetCount,int _currentId, int _packetLen, byte[] _packetData){
         boolean ret=false;
diff --git a/app/src/main/java/com/ic/protocol/service/AudioService.java b/app/src/main/java/com/enqualcomm/support/service/AudioService.java
similarity index 93%
rename from app/src/main/java/com/ic/protocol/service/AudioService.java
rename to app/src/main/java/com/enqualcomm/support/service/AudioService.java
index e6b4211e..e31af749 100644
--- a/app/src/main/java/com/ic/protocol/service/AudioService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/AudioService.java
@@ -1,10 +1,10 @@
-package com.ic.protocol.service;
+package com.enqualcomm.support.service;
 
 import android.content.res.AssetFileDescriptor;
 import android.content.res.AssetManager;
 import android.media.MediaPlayer;
 
-import com.ic.protocol.utils.Logger;
+import com.enqualcomm.support.utils.Logger;
 
 
 public class AudioService implements MediaPlayer.OnErrorListener, MediaPlayer.OnCompletionListener {
diff --git a/app/src/main/java/com/ic/protocol/service/CheckSIM.java b/app/src/main/java/com/enqualcomm/support/service/CheckSIM.java
similarity index 90%
rename from app/src/main/java/com/ic/protocol/service/CheckSIM.java
rename to app/src/main/java/com/enqualcomm/support/service/CheckSIM.java
index ba14d439..6b99f328 100644
--- a/app/src/main/java/com/ic/protocol/service/CheckSIM.java
+++ b/app/src/main/java/com/enqualcomm/support/service/CheckSIM.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.service;
+package com.enqualcomm.support.service;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -6,10 +6,10 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.telephony.TelephonyManager;
 
-import com.ic.protocol.bean.Runtime;
-import com.ic.protocol.bean.StringMessage;
-import com.ic.protocol.service.base.AbstractConnectionService;
-import com.ic.protocol.utils.Connection;
+import com.enqualcomm.support.bean.Runtime;
+import com.enqualcomm.support.bean.StringMessage;
+import com.enqualcomm.support.service.base.AbstractConnectionService;
+import com.enqualcomm.support.utils.Connection;
 
 import static android.telephony.TelephonyManager.SIM_STATE_ABSENT;
 import static android.telephony.TelephonyManager.SIM_STATE_READY;
diff --git a/app/src/main/java/com/ic/protocol/service/Deliver.java b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
similarity index 92%
rename from app/src/main/java/com/ic/protocol/service/Deliver.java
rename to app/src/main/java/com/enqualcomm/support/service/Deliver.java
index aa9a1be9..31e05a84 100644
--- a/app/src/main/java/com/ic/protocol/service/Deliver.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Deliver.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.service;
+package com.enqualcomm.support.service;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -17,24 +17,24 @@ import android.os.SystemClock;
 import android.text.TextUtils;
 
 import com.enqualcomm.support.CoreService;
-import com.ic.protocol.LocationClient;
-import com.ic.protocol.adapter.protocolAPIHelper;
-import com.ic.protocol.bean.StringMessage;
-import com.ic.protocol.bean.VoiceContent;
-import com.ic.protocol.bean.voicePacket;
-import com.ic.protocol.service.base.AbstractConnectionService;
-import com.ic.protocol.utils.AlarmHelper;
-import com.ic.protocol.utils.AlarmWakeUp;
-import com.ic.protocol.utils.Connection;
-import com.ic.protocol.bean.Runtime;
-import com.ic.protocol.utils.DBHelper;
-import com.ic.protocol.utils.FileCache;
-import com.ic.protocol.utils.FileOutputUtil;
-import com.ic.protocol.utils.Logger;
-import com.ic.protocol.utils.NettyConnection;
-import com.ic.protocol.utils.ServiceUtil;
-import com.ic.protocol.utils.SharPreferenceUtil;
-import com.ic.protocol.utils.SimSignalUtil;
+import com.enqualcomm.support.LocationClient;
+import com.enqualcomm.support.adapter.protocolAPIHelper;
+import com.enqualcomm.support.bean.StringMessage;
+import com.enqualcomm.support.bean.VoiceContent;
+import com.enqualcomm.support.bean.voicePacket;
+import com.enqualcomm.support.service.base.AbstractConnectionService;
+import com.enqualcomm.support.utils.AlarmHelper;
+import com.enqualcomm.support.utils.AlarmWakeUp;
+import com.enqualcomm.support.utils.Connection;
+import com.enqualcomm.support.bean.Runtime;
+import com.enqualcomm.support.utils.DBHelper;
+import com.enqualcomm.support.utils.FileCache;
+import com.enqualcomm.support.utils.FileOutputUtil;
+import com.enqualcomm.support.utils.Logger;
+import com.enqualcomm.support.utils.NettyConnection;
+import com.enqualcomm.support.utils.ServiceUtil;
+import com.enqualcomm.support.utils.SharPreferenceUtil;
+import com.enqualcomm.support.utils.SimSignalUtil;
 
 import java.util.ArrayList;
 import java.util.concurrent.LinkedBlockingDeque;
@@ -49,7 +49,7 @@ import rx.schedulers.Schedulers;
 
 import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-import static com.ic.protocol.Constants.ACTION_WAKEUP_ALARM;
+import static com.enqualcomm.support.Constants.ACTION_WAKEUP_ALARM;
 
 /**
  * 负责发送除了login，心跳之外的所有指令
@@ -403,14 +403,16 @@ public static void sendLocationMSG( String Msg){
     Logger.i("Deliver receive cmd "+paramStringMessage.cmd());
     if (cmd.equals("BP07") || cmd.equals("SentVoicePacket")){
     //收到BP07 表示服务器收到一个voicePacket 分包成功，开始检查下一个包是否存在需要发送。
-      //收到SentVoicePacket 表示 有一个VoiceMessage要发送，需要开始检查并发送语音分包。
+      //收到SentVoicePacket 表示 有一个VoiceMessage要发送，需要从第0个包开始发送语音分包。
+
      voicePacket voicepacket= voicePacket.getInstanceSent();
+
      if (voicepacket.getCurrentIndexToSent() < voicepacket.getPacketCount()){
        Logger.i("voicepacket "+voicepacket.getName()+" "+voicepacket.getPacketTime()+" send "+(voicepacket.getCurrentIndexToSent()+1)+"/"+voicepacket.getPacketCount());
        ((NettyConnection)mConnection).sendMsg(
                protocolAPIHelper.AP07(voicepacket.getPacketTime(),
                        voicepacket.getPacketCount(),
-                       voicepacket.getCurrentIndexToSent(),
+                       (voicepacket.getCurrentIndexToSent()+1),
                        voicepacket.getVoicePacketWithIndex(voicepacket.getCurrentIndexToSent()).getPacketLen(),
                        voicepacket.getVoicePacketWithIndex(voicepacket.getCurrentIndexToSent()).getPacketData())
        );
diff --git a/app/src/main/java/com/ic/protocol/service/HeartRateManager.java b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
similarity index 89%
rename from app/src/main/java/com/ic/protocol/service/HeartRateManager.java
rename to app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
index 5a31a183..53959205 100644
--- a/app/src/main/java/com/ic/protocol/service/HeartRateManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/HeartRateManager.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.service;
+package com.enqualcomm.support.service;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -12,22 +12,22 @@ import android.os.Messenger;
 import android.os.PowerManager;
 
 import com.ic.jni.ICJniUtils;
-import com.ic.protocol.LocationClient;
-import com.ic.protocol.adapter.protocolAPIHelper;
-import com.ic.protocol.bean.Runtime;
-import com.ic.protocol.bean.StringMessage;
-import com.ic.protocol.bean.heartRateStatus;
-import com.ic.protocol.service.base.AbstractInvokeHandlerService;
-import com.ic.protocol.utils.Connection;
-import com.ic.protocol.utils.Logger;
-import com.ic.protocol.utils.NettyConnection;
-import com.ic.protocol.utils.SimSignalUtil;
-import com.ic.protocol.utils.TimeUtil;
+import com.enqualcomm.support.LocationClient;
+import com.enqualcomm.support.adapter.protocolAPIHelper;
+import com.enqualcomm.support.bean.Runtime;
+import com.enqualcomm.support.bean.StringMessage;
+import com.enqualcomm.support.bean.heartRateStatus;
+import com.enqualcomm.support.service.base.AbstractInvokeHandlerService;
+import com.enqualcomm.support.utils.Connection;
+import com.enqualcomm.support.utils.Logger;
+import com.enqualcomm.support.utils.NettyConnection;
+import com.enqualcomm.support.utils.SimSignalUtil;
+import com.enqualcomm.support.utils.TimeUtil;
 
 import java.util.Timer;
 import java.util.TimerTask;
 
-import static com.ic.protocol.Constants.ACTION_HEATR_RATE_START;
+import static com.enqualcomm.support.Constants.ACTION_HEATR_RATE_START;
 
 public class HeartRateManager extends AbstractInvokeHandlerService {
   private int mNetworkType;
diff --git a/app/src/main/java/com/ic/protocol/service/Initialize.java b/app/src/main/java/com/enqualcomm/support/service/Initialize.java
similarity index 84%
rename from app/src/main/java/com/ic/protocol/service/Initialize.java
rename to app/src/main/java/com/enqualcomm/support/service/Initialize.java
index 2198f5d0..618189f2 100644
--- a/app/src/main/java/com/ic/protocol/service/Initialize.java
+++ b/app/src/main/java/com/enqualcomm/support/service/Initialize.java
@@ -1,18 +1,18 @@
-package com.ic.protocol.service;
+package com.enqualcomm.support.service;
 
 import android.database.Cursor;
 
-import com.ic.protocol.Config;
-import com.ic.protocol.ICContentProvider;
-import com.ic.protocol.adapter.protocolAPIHelper;
-import com.ic.protocol.bean.StringMessage;
-import com.ic.protocol.service.base.AbstractConnectionService;
-import com.ic.protocol.utils.Connection;
-import com.ic.protocol.bean.Runtime;
-import com.ic.protocol.utils.DeviceInfoUtil;
-import com.ic.protocol.utils.Logger;
-import com.ic.protocol.utils.SharPreferenceUtil;
-import com.ic.protocol.utils.SimSignalUtil;
+import com.enqualcomm.support.Config;
+import com.enqualcomm.support.ICContentProvider;
+import com.enqualcomm.support.adapter.protocolAPIHelper;
+import com.enqualcomm.support.bean.StringMessage;
+import com.enqualcomm.support.service.base.AbstractConnectionService;
+import com.enqualcomm.support.utils.Connection;
+import com.enqualcomm.support.bean.Runtime;
+import com.enqualcomm.support.utils.DeviceInfoUtil;
+import com.enqualcomm.support.utils.Logger;
+import com.enqualcomm.support.utils.SharPreferenceUtil;
+import com.enqualcomm.support.utils.SimSignalUtil;
 
 import org.json.JSONObject;
 import org.json.JSONTokener;
diff --git a/app/src/main/java/com/ic/protocol/service/KeepAlive.java b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
similarity index 89%
rename from app/src/main/java/com/ic/protocol/service/KeepAlive.java
rename to app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
index e6be1922..1222c4bc 100644
--- a/app/src/main/java/com/ic/protocol/service/KeepAlive.java
+++ b/app/src/main/java/com/enqualcomm/support/service/KeepAlive.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.service;
+package com.enqualcomm.support.service;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -9,17 +9,17 @@ import android.util.Log;
 
 import com.eiot.watch_lib.LauncherCtrl;
 import com.enqualcomm.support.CoreService;
-import com.ic.protocol.adapter.protocolAPIHelper;
-import com.ic.protocol.bean.StringMessage;
-import com.ic.protocol.service.base.AbstractConnectionService;
-import com.ic.protocol.utils.AlarmHelper;
-import com.ic.protocol.utils.AlarmWakeUp;
-import com.ic.protocol.utils.Connection;
-import com.ic.protocol.utils.Logger;
-import com.ic.protocol.utils.NettyConnection;
-import com.ic.protocol.utils.NetworkObservable;
-import com.ic.protocol.utils.ServiceUtil;
-import com.ic.protocol.bean.Runtime;
+import com.enqualcomm.support.adapter.protocolAPIHelper;
+import com.enqualcomm.support.bean.StringMessage;
+import com.enqualcomm.support.service.base.AbstractConnectionService;
+import com.enqualcomm.support.utils.AlarmHelper;
+import com.enqualcomm.support.utils.AlarmWakeUp;
+import com.enqualcomm.support.utils.Connection;
+import com.enqualcomm.support.utils.Logger;
+import com.enqualcomm.support.utils.NettyConnection;
+import com.enqualcomm.support.utils.NetworkObservable;
+import com.enqualcomm.support.utils.ServiceUtil;
+import com.enqualcomm.support.bean.Runtime;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/app/src/main/java/com/ic/protocol/service/SendChatMessage.java b/app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java
similarity index 72%
rename from app/src/main/java/com/ic/protocol/service/SendChatMessage.java
rename to app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java
index cad69f8a..fbeda2bd 100644
--- a/app/src/main/java/com/ic/protocol/service/SendChatMessage.java
+++ b/app/src/main/java/com/enqualcomm/support/service/SendChatMessage.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.service;
+package com.enqualcomm.support.service;
 
 import android.content.Context;
 import android.content.Intent;
@@ -7,12 +7,20 @@ import android.os.Bundle;
 import android.os.Message;
 import android.os.Messenger;
 
-import com.ic.protocol.bean.Runtime;
-import com.ic.protocol.bean.VoiceContent;
-import com.ic.protocol.service.base.AbstractInvokeHandlerService;
-import com.ic.protocol.utils.Connection;
-import com.ic.protocol.utils.Logger;
-import com.ic.protocol.utils.SimSignalUtil;
+import com.enqualcomm.support.CoreService;
+import com.enqualcomm.support.bean.Runtime;
+import com.enqualcomm.support.bean.VoiceContent;
+import com.enqualcomm.support.service.base.AbstractInvokeHandlerService;
+import com.enqualcomm.support.utils.Connection;
+import com.enqualcomm.support.utils.Logger;
+import com.enqualcomm.support.utils.NettyConnection;
+import com.enqualcomm.support.utils.SimSignalUtil;
+import com.enqualcomm.support.utils.TimeUtil;
+import com.enqualcomm.support.utils.Util;
+
+import rx.Observable;
+
+import static com.enqualcomm.support.bean.Content.CONTACT_CATEGORY_GROUP;
 
 public class SendChatMessage extends AbstractInvokeHandlerService {
   private static final int LOCATION_TYPE = 7;
@@ -110,8 +118,6 @@ public class SendChatMessage extends AbstractInvokeHandlerService {
   
   public boolean onUserRequest(Message paramMessage, Connection paramConnection, final Runtime runtime) {
 
-    final Messenger callback2;
-
     Logger.i("=============received Message What="+paramMessage.what);
     int i = 1;
     switch (paramMessage.what) {
@@ -127,37 +133,29 @@ public class SendChatMessage extends AbstractInvokeHandlerService {
         Logger.i(" msg.what 101 category="+category+", filepath="+filepath+",number="+number);
 
 
-        if (filepath != null && number != null) {
+          if (filepath == null || number == null || category == -1)
+            return true;
 
+            //创建voiceConent并添加到数据
+            final VoiceContent voiceContent = VoiceContent.placeHolderOut(CONTACT_CATEGORY_GROUP, number, filepath);
+            final Uri uri2 = runtime.getDbHelper().insertOrUpdate(voiceContent, bundle.getLong("id"));
+
+            //回复UI消息，表示已经接收到
+            Messenger messenger = paramMessage.replyTo;
+            callback(messenger, 200);
+          voiceContent.status = 3;
+          voiceContent.serverTime = TimeUtil.getSystemTime3();
+//          voiceContent.content = Util.cutFile(voiceContent.content, runtime.getCacheDir());
+          voiceContent.preview = String.valueOf(Util.getDuration(voiceContent.content));
+          runtime.getDbHelper().updateMessage(voiceContent, uri2);
+
+
+
+          // 把voiceContent拆解成1024的分包
+            Util.parseToVoicePacketSent(voiceContent, runtime);
+            //trigger 分包发送
+            ((NettyConnection) paramConnection).DeliverCMDMessageToSystem("SentVoicePacket", "");
 
-          final VoiceContent voiceContent = VoiceContent.placeHolderOut(category, filepath, number);
-          final Uri uri2 = runtime.getDbHelper().insertOrUpdate(voiceContent);
-         Messenger messenger = paramMessage.replyTo;
-//          Observable.create(new SendFileMessage(fileMessage, paramRuntime)).subscribeOn(Schedulers.io()).subscribe(new Subscriber<String>() {
-//                public void onCompleted() {}
-//
-//                public void onError(Throwable param1Throwable) {
-//                  Logger.i("发送失败");
-//                  SendChatMessage.this.callback(callback2, 500);
-//                  this.val$voiceContent.status = 5;
-//                  runtime.getDbHelper().updateMessage(voiceContent, uri2);
-//                }
-//
-//                public void onNext(String param1String) {
-//                  StringBuilder stringBuilder = new StringBuilder();
-//                  stringBuilder.append("发送成功:");
-//                  stringBuilder.append(param1String);
-//                  Logger.i(stringBuilder.toString());
-//                  SendChatMessage.this.callback(callback2, 200);
-//                  this.val$voiceContent.status = 3;
-//                  this.val$voiceContent.serverTime = TimeUtil.getSystemTime3();
-//                  this.val$voiceContent.preview = (this.val$voiceContent.content = Util.cutFile(this.val$voiceContent.content, runtime.getCacheDir())).valueOf(Util.getDuration(this.val$voiceContent.content));
-//                  runtime.getDbHelper().updateMessage(voiceContent, uri2);
-//                }
-//              });
-        } else {
-          return true;
-        }
       case 1000:
         break;
     }
diff --git a/app/src/main/java/com/ic/protocol/service/SilentManager.java b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
similarity index 95%
rename from app/src/main/java/com/ic/protocol/service/SilentManager.java
rename to app/src/main/java/com/enqualcomm/support/service/SilentManager.java
index 2dd39417..9039d07d 100644
--- a/app/src/main/java/com/ic/protocol/service/SilentManager.java
+++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.service;
+package com.enqualcomm.support.service;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -17,21 +17,21 @@ import android.telephony.TelephonyManager;
 
 
 import com.enqualcomm.support.CoreService;
-import com.ic.protocol.ICContentProvider;
-import com.ic.protocol.bean.Alarm;
-import com.ic.protocol.bean.Antioff;
-import com.ic.protocol.bean.NoticeContent;
-import com.ic.protocol.bean.Runtime;
-import com.ic.protocol.bean.Silent;
-import com.ic.protocol.bean.StheartRate;
-import com.ic.protocol.utils.Connection;
-import com.ic.protocol.service.base.AbstractInvokeHandlerService;
-import com.ic.protocol.utils.AlarmHelper;
-import com.ic.protocol.utils.DBHelper;
-import com.ic.protocol.utils.Logger;
+import com.enqualcomm.support.ICContentProvider;
+import com.enqualcomm.support.bean.Alarm;
+import com.enqualcomm.support.bean.Antioff;
+import com.enqualcomm.support.bean.NoticeContent;
+import com.enqualcomm.support.bean.Runtime;
+import com.enqualcomm.support.bean.Silent;
+import com.enqualcomm.support.bean.StheartRate;
+import com.enqualcomm.support.utils.Connection;
+import com.enqualcomm.support.service.base.AbstractInvokeHandlerService;
+import com.enqualcomm.support.utils.AlarmHelper;
+import com.enqualcomm.support.utils.DBHelper;
+import com.enqualcomm.support.utils.Logger;
 
-import com.ic.protocol.utils.SharPreferenceUtil;
-import com.ic.protocol.utils.TimeUtil;
+import com.enqualcomm.support.utils.SharPreferenceUtil;
+import com.enqualcomm.support.utils.TimeUtil;
 
 import java.util.ArrayList;
 import java.util.Calendar;
diff --git a/app/src/main/java/com/ic/protocol/service/SynchronousTime.java b/app/src/main/java/com/enqualcomm/support/service/SynchronousTime.java
similarity index 83%
rename from app/src/main/java/com/ic/protocol/service/SynchronousTime.java
rename to app/src/main/java/com/enqualcomm/support/service/SynchronousTime.java
index 772e93fe..f12d74a8 100644
--- a/app/src/main/java/com/ic/protocol/service/SynchronousTime.java
+++ b/app/src/main/java/com/enqualcomm/support/service/SynchronousTime.java
@@ -1,16 +1,16 @@
-package com.ic.protocol.service;
+package com.enqualcomm.support.service;
 
 import android.os.SystemClock;
 
-import com.ic.protocol.adapter.protocolAPIHelper;
-import com.ic.protocol.bean.Runtime;
-import com.ic.protocol.bean.StringMessage;
-import com.ic.protocol.service.base.AbstractConnectionService;
-import com.ic.protocol.utils.Connection;
-import com.ic.protocol.utils.Logger;
-import com.ic.protocol.utils.NettyConnection;
-import com.ic.protocol.utils.TimeUtil;
-import  com.ic.protocol.bean.Runtime;
+import com.enqualcomm.support.adapter.protocolAPIHelper;
+import com.enqualcomm.support.bean.Runtime;
+import com.enqualcomm.support.bean.StringMessage;
+import com.enqualcomm.support.service.base.AbstractConnectionService;
+import com.enqualcomm.support.utils.Connection;
+import com.enqualcomm.support.utils.Logger;
+import com.enqualcomm.support.utils.NettyConnection;
+import com.enqualcomm.support.utils.TimeUtil;
+import  com.enqualcomm.support.bean.Runtime;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/app/src/main/java/com/ic/protocol/service/UpLoadDataPoints.java b/app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java
similarity index 87%
rename from app/src/main/java/com/ic/protocol/service/UpLoadDataPoints.java
rename to app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java
index c6f1a95e..4ec24f98 100644
--- a/app/src/main/java/com/ic/protocol/service/UpLoadDataPoints.java
+++ b/app/src/main/java/com/enqualcomm/support/service/UpLoadDataPoints.java
@@ -1,16 +1,16 @@
-package com.ic.protocol.service;
+package com.enqualcomm.support.service;
 
 import android.content.Intent;
 import android.os.Handler;
 import android.os.Message;
 
-import com.ic.protocol.bean.ICLocation;
-import com.ic.protocol.bean.Locations;
-import com.ic.protocol.bean.Runtime;
-import com.ic.protocol.service.base.AbstractInvokeHandlerService;
-import com.ic.protocol.utils.Connection;
-import com.ic.protocol.utils.Logger;
-import com.ic.protocol.utils.SharPreferenceUtil;
+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.Logger;
+import com.enqualcomm.support.utils.SharPreferenceUtil;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/app/src/main/java/com/ic/protocol/service/base/AbstractConnectionService.java b/app/src/main/java/com/enqualcomm/support/service/base/AbstractConnectionService.java
similarity index 89%
rename from app/src/main/java/com/ic/protocol/service/base/AbstractConnectionService.java
rename to app/src/main/java/com/enqualcomm/support/service/base/AbstractConnectionService.java
index 1882c52d..67383c37 100644
--- a/app/src/main/java/com/ic/protocol/service/base/AbstractConnectionService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/base/AbstractConnectionService.java
@@ -1,8 +1,8 @@
-package com.ic.protocol.service.base;
+package com.enqualcomm.support.service.base;
 
-import com.ic.protocol.bean.StringMessage;
-import com.ic.protocol.utils.Connection;
-import com.ic.protocol.bean.Runtime;
+import com.enqualcomm.support.bean.StringMessage;
+import com.enqualcomm.support.utils.Connection;
+import com.enqualcomm.support.bean.Runtime;
 
 public abstract class AbstractConnectionService implements ConnectionService {
   protected AbstractConnectionService nextService;
diff --git a/app/src/main/java/com/ic/protocol/service/base/AbstractInvokeHandlerService.java b/app/src/main/java/com/enqualcomm/support/service/base/AbstractInvokeHandlerService.java
similarity index 90%
rename from app/src/main/java/com/ic/protocol/service/base/AbstractInvokeHandlerService.java
rename to app/src/main/java/com/enqualcomm/support/service/base/AbstractInvokeHandlerService.java
index 9d0a6b84..0b2b8a4c 100644
--- a/app/src/main/java/com/ic/protocol/service/base/AbstractInvokeHandlerService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/base/AbstractInvokeHandlerService.java
@@ -1,10 +1,10 @@
-package com.ic.protocol.service.base;
+package com.enqualcomm.support.service.base;
 
 import android.content.Intent;
 import android.os.Message;
 
-import com.ic.protocol.utils.Connection;
-import com.ic.protocol.bean.Runtime;
+import com.enqualcomm.support.utils.Connection;
+import com.enqualcomm.support.bean.Runtime;
 
 public abstract class AbstractInvokeHandlerService implements InvokeHandlerService {
   protected AbstractInvokeHandlerService nextService;
diff --git a/app/src/main/java/com/ic/protocol/service/base/BaseService.java b/app/src/main/java/com/enqualcomm/support/service/base/BaseService.java
similarity index 62%
rename from app/src/main/java/com/ic/protocol/service/base/BaseService.java
rename to app/src/main/java/com/enqualcomm/support/service/base/BaseService.java
index ee3d33fd..794ecf07 100644
--- a/app/src/main/java/com/ic/protocol/service/base/BaseService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/base/BaseService.java
@@ -1,8 +1,8 @@
-package com.ic.protocol.service.base;
+package com.enqualcomm.support.service.base;
 
 
-import com.ic.protocol.utils.Connection;
-import com.ic.protocol.bean.Runtime;
+import com.enqualcomm.support.utils.Connection;
+import com.enqualcomm.support.bean.Runtime;
 public interface BaseService {
   void onAlarmClock(Connection paramConnection, Runtime paramRuntime);
   
diff --git a/app/src/main/java/com/ic/protocol/service/base/ConnectionService.java b/app/src/main/java/com/enqualcomm/support/service/base/ConnectionService.java
similarity index 62%
rename from app/src/main/java/com/ic/protocol/service/base/ConnectionService.java
rename to app/src/main/java/com/enqualcomm/support/service/base/ConnectionService.java
index bc3f77a0..09cbfba5 100644
--- a/app/src/main/java/com/ic/protocol/service/base/ConnectionService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/base/ConnectionService.java
@@ -1,8 +1,8 @@
-package com.ic.protocol.service.base;
+package com.enqualcomm.support.service.base;
 
-import com.ic.protocol.bean.StringMessage;
-import com.ic.protocol.utils.Connection;
-import com.ic.protocol.bean.Runtime;
+import com.enqualcomm.support.bean.StringMessage;
+import com.enqualcomm.support.utils.Connection;
+import com.enqualcomm.support.bean.Runtime;
 
 public interface ConnectionService extends BaseService {
   boolean onConnectionClose(Connection paramConnection, Runtime paramRuntime);
diff --git a/app/src/main/java/com/ic/protocol/service/base/InvokeHandlerService.java b/app/src/main/java/com/enqualcomm/support/service/base/InvokeHandlerService.java
similarity index 67%
rename from app/src/main/java/com/ic/protocol/service/base/InvokeHandlerService.java
rename to app/src/main/java/com/enqualcomm/support/service/base/InvokeHandlerService.java
index 41dc8e94..edbc02ab 100644
--- a/app/src/main/java/com/ic/protocol/service/base/InvokeHandlerService.java
+++ b/app/src/main/java/com/enqualcomm/support/service/base/InvokeHandlerService.java
@@ -1,10 +1,10 @@
-package com.ic.protocol.service.base;
+package com.enqualcomm.support.service.base;
 
 import android.content.Intent;
 import android.os.Message;
 
-import com.ic.protocol.utils.Connection;
-import com.ic.protocol.bean.Runtime;
+import com.enqualcomm.support.utils.Connection;
+import com.enqualcomm.support.bean.Runtime;
 public interface InvokeHandlerService extends BaseService {
   boolean onUserRequest(Intent paramIntent, Connection paramConnection, Runtime paramRuntime);
   
diff --git a/app/src/main/java/com/ic/protocol/utils/AlarmHelper.java b/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java
similarity index 96%
rename from app/src/main/java/com/ic/protocol/utils/AlarmHelper.java
rename to app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java
index 67050488..d5f8195a 100644
--- a/app/src/main/java/com/ic/protocol/utils/AlarmHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/AlarmHelper.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
diff --git a/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java b/app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java
similarity index 88%
rename from app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java
rename to app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java
index 14321104..7b273be5 100644
--- a/app/src/main/java/com/ic/protocol/utils/AlarmWakeUp.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/AlarmWakeUp.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -6,8 +6,8 @@ import android.content.Intent;
 import android.os.SystemClock;
 import android.util.Log;
 
-import com.ic.protocol.bean.Contact;
-import com.ic.protocol.bean.Runtime;
+import com.enqualcomm.support.bean.Contact;
+import com.enqualcomm.support.bean.Runtime;
 import com.enqualcomm.support.CoreService;
 
 public class AlarmWakeUp {
diff --git a/app/src/main/java/com/ic/protocol/utils/BatteryUtil.java b/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java
similarity index 93%
rename from app/src/main/java/com/ic/protocol/utils/BatteryUtil.java
rename to app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java
index 7938e4e4..9d94eb7a 100644
--- a/app/src/main/java/com/ic/protocol/utils/BatteryUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -6,7 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 
-import com.ic.protocol.bean.Runtime;
+import com.enqualcomm.support.bean.Runtime;
 
 public class BatteryUtil {
   private BroadcastReceiver batteryChangedReceiver = new BroadcastReceiver() {
@@ -78,7 +78,7 @@ public class BatteryUtil {
         if ("android.intent.action.BATTERY_LOW".equals(param1Intent.getAction())) {
           BatteryUtil.this.mRuntime.setBatteryLow(true);
           Logger.i("lowbattery finish video_end_call");
-          ComponentName componentName = new ComponentName("com.ic.protocol", "com.enqualcomm.support.CoreService");
+          ComponentName componentName = new ComponentName("com.enqualcomm.support", "com.enqualcomm.support.CoreService");
           Intent intent = (new Intent("com.enqualcomm.support.lowbatteryMsg")).setComponent(componentName);
           (mRuntime.getContextProxy()).context.startService(intent);
         }
diff --git a/app/src/main/java/com/ic/protocol/utils/CameraUtil.java b/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java
similarity index 95%
rename from app/src/main/java/com/ic/protocol/utils/CameraUtil.java
rename to app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java
index f1a6f139..dbe360a3 100644
--- a/app/src/main/java/com/ic/protocol/utils/CameraUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/CameraUtil.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.content.Context;
 import android.content.Intent;
@@ -17,7 +17,7 @@ import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 
-import static com.ic.protocol.Constants.ACTION_REMOTE_CAMERA;
+import static com.enqualcomm.support.Constants.ACTION_REMOTE_CAMERA;
 
 public class CameraUtil implements SurfaceTexture.OnFrameAvailableListener {
   Context context;
diff --git a/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java b/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java
similarity index 95%
rename from app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java
rename to app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java
index 2843cb5c..c0c1f5f4 100644
--- a/app/src/main/java/com/ic/protocol/utils/CellInfoUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/CellInfoUtil.java
@@ -1,11 +1,11 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.os.Handler;
 import android.os.Message;
 import android.os.PowerManager;
 
-import com.ic.protocol.GSensorListener;
-import com.ic.protocol.bean.Runtime;
+import com.enqualcomm.support.GSensorListener;
+import com.enqualcomm.support.bean.Runtime;
 
 public class CellInfoUtil {
   static int BSSS = 0;
diff --git a/app/src/main/java/com/ic/protocol/utils/Connection.java b/app/src/main/java/com/enqualcomm/support/utils/Connection.java
similarity index 74%
rename from app/src/main/java/com/ic/protocol/utils/Connection.java
rename to app/src/main/java/com/enqualcomm/support/utils/Connection.java
index 72deabad..2106dd0d 100644
--- a/app/src/main/java/com/ic/protocol/utils/Connection.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/Connection.java
@@ -1,6 +1,6 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
-import com.ic.protocol.bean.StringMessage;
+import com.enqualcomm.support.bean.StringMessage;
 
 public interface Connection {
   void close();
diff --git a/app/src/main/java/com/ic/protocol/utils/ConnectionListener.java b/app/src/main/java/com/enqualcomm/support/utils/ConnectionListener.java
similarity index 60%
rename from app/src/main/java/com/ic/protocol/utils/ConnectionListener.java
rename to app/src/main/java/com/enqualcomm/support/utils/ConnectionListener.java
index 88fc69f3..d86dd446 100644
--- a/app/src/main/java/com/ic/protocol/utils/ConnectionListener.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ConnectionListener.java
@@ -1,7 +1,7 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 
-import com.ic.protocol.bean.StringMessage;
+import com.enqualcomm.support.bean.StringMessage;
 
 public interface ConnectionListener {
   void onConnectionClose();
diff --git a/app/src/main/java/com/ic/protocol/utils/ContextProxy.java b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
similarity index 94%
rename from app/src/main/java/com/ic/protocol/utils/ContextProxy.java
rename to app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
index 41cdda63..369852dd 100644
--- a/app/src/main/java/com/ic/protocol/utils/ContextProxy.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ContextProxy.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -17,12 +17,12 @@ import android.telephony.TelephonyManager;
 import android.util.Log;
 
 
-import com.ic.protocol.ICContentProvider;
-import com.ic.protocol.bean.Alarm;
-import com.ic.protocol.bean.NoticeContent;
-import com.ic.protocol.bean.Silent;
-import com.ic.protocol.bean.Runtime;
-import com.ic.protocol.bean.VoiceContent;
+import com.enqualcomm.support.ICContentProvider;
+import com.enqualcomm.support.bean.Alarm;
+import com.enqualcomm.support.bean.NoticeContent;
+import com.enqualcomm.support.bean.Silent;
+import com.enqualcomm.support.bean.Runtime;
+import com.enqualcomm.support.bean.VoiceContent;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -31,7 +31,7 @@ import java.util.Iterator;
 
 import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-import static com.ic.protocol.Constants.ACTION_ISCONNECTED;
+import static com.enqualcomm.support.Constants.ACTION_ISCONNECTED;
 
 public class ContextProxy {
   private static final long ONE_WEEK = 604800000L;
@@ -280,7 +280,7 @@ public class ContextProxy {
     }
   }
 
-  
+
   public void sendBroadcast(String cmd, Runtime dev) {
     Intent intent = new Intent();
     intent.putExtra("longitude", dev.getLocationInstance().getLocation().lon);
diff --git a/app/src/main/java/com/ic/protocol/utils/CustomNotification.java b/app/src/main/java/com/enqualcomm/support/utils/CustomNotification.java
similarity index 96%
rename from app/src/main/java/com/ic/protocol/utils/CustomNotification.java
rename to app/src/main/java/com/enqualcomm/support/utils/CustomNotification.java
index 5092852a..a4929df7 100644
--- a/app/src/main/java/com/ic/protocol/utils/CustomNotification.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/CustomNotification.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.app.Dialog;
 import android.content.Context;
diff --git a/app/src/main/java/com/ic/protocol/utils/DBHelper.java b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
similarity index 93%
rename from app/src/main/java/com/ic/protocol/utils/DBHelper.java
rename to app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
index b629afee..9d1af19e 100644
--- a/app/src/main/java/com/ic/protocol/utils/DBHelper.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/DBHelper.java
@@ -1,5 +1,5 @@
 
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.content.ContentProviderOperation;
 import android.content.ContentResolver;
@@ -17,17 +17,17 @@ import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.RawContacts;
 import android.text.TextUtils;
 
-import com.ic.protocol.ICContentProvider;
-import com.ic.protocol.bean.Alarm;
-import com.ic.protocol.bean.Antioff;
-import com.ic.protocol.bean.Contact;
-import com.ic.protocol.bean.Content;
-import com.ic.protocol.bean.DeviceStatus;
-import com.ic.protocol.bean.NoticeContent;
-import com.ic.protocol.bean.NotificationParam;
-import com.ic.protocol.bean.Silent;
-import com.ic.protocol.bean.StheartRate;
-import com.ic.protocol.bean.Weather;
+import com.enqualcomm.support.ICContentProvider;
+import com.enqualcomm.support.bean.Alarm;
+import com.enqualcomm.support.bean.Antioff;
+import com.enqualcomm.support.bean.Contact;
+import com.enqualcomm.support.bean.Content;
+import com.enqualcomm.support.bean.DeviceStatus;
+import com.enqualcomm.support.bean.NoticeContent;
+import com.enqualcomm.support.bean.NotificationParam;
+import com.enqualcomm.support.bean.Silent;
+import com.enqualcomm.support.bean.StheartRate;
+import com.enqualcomm.support.bean.Weather;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -36,11 +36,11 @@ import java.util.concurrent.TimeUnit;
 import rx.Observable;
 import rx.functions.Action1;
 
-import static com.ic.protocol.bean.Contact.CATEGORY_ADMIN;
-import static com.ic.protocol.bean.Contact.CATEGORY_CALL;
-import static com.ic.protocol.bean.Contact.CATEGORY_CARE;
-import static com.ic.protocol.bean.Contact.CATEGORY_PARTNER;
-import static com.ic.protocol.bean.Contact.CATEGORY_VIDEO;
+import static com.enqualcomm.support.bean.Contact.CATEGORY_ADMIN;
+import static com.enqualcomm.support.bean.Contact.CATEGORY_CALL;
+import static com.enqualcomm.support.bean.Contact.CATEGORY_CARE;
+import static com.enqualcomm.support.bean.Contact.CATEGORY_PARTNER;
+import static com.enqualcomm.support.bean.Contact.CATEGORY_VIDEO;
 
 public class DBHelper {
   private static long lastUpdateTime;
@@ -92,6 +92,11 @@ public class DBHelper {
     resolver.delete(ICContentProvider.CONTACT_URI, where, (String[])null);
   }
 
+  //确保数据库中有一个Group通讯录，供微聊使用
+  public void createMessageGroupID(ContentResolver resolver){
+
+  }
+
   private Uri insertDownLoadInfo(String var1, int var2, int var3, String var4) {
     ContentValues var5 = new ContentValues();
     var5.put("IMSI", var1);
diff --git a/app/src/main/java/com/ic/protocol/utils/DeviceInfoUtil.java b/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java
similarity index 95%
rename from app/src/main/java/com/ic/protocol/utils/DeviceInfoUtil.java
rename to app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java
index 9cdf0cc6..e489cc27 100644
--- a/app/src/main/java/com/ic/protocol/utils/DeviceInfoUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/DeviceInfoUtil.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.app.ActivityManager;
 import android.content.Context;
@@ -8,7 +8,7 @@ import android.os.Build;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 
-import com.ic.protocol.bean.StepCount;
+import com.enqualcomm.support.bean.StepCount;
 
 import java.io.FileInputStream;
 import java.util.ArrayList;
diff --git a/app/src/main/java/com/ic/protocol/utils/FileCache.java b/app/src/main/java/com/enqualcomm/support/utils/FileCache.java
similarity index 95%
rename from app/src/main/java/com/ic/protocol/utils/FileCache.java
rename to app/src/main/java/com/enqualcomm/support/utils/FileCache.java
index 3497e499..51342716 100644
--- a/app/src/main/java/com/ic/protocol/utils/FileCache.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/FileCache.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import java.io.File;
 import java.util.concurrent.locks.ReentrantLock;
diff --git a/app/src/main/java/com/ic/protocol/utils/FileOutputUtil.java b/app/src/main/java/com/enqualcomm/support/utils/FileOutputUtil.java
similarity index 95%
rename from app/src/main/java/com/ic/protocol/utils/FileOutputUtil.java
rename to app/src/main/java/com/enqualcomm/support/utils/FileOutputUtil.java
index 7830f1a3..a56aa2f8 100644
--- a/app/src/main/java/com/ic/protocol/utils/FileOutputUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/FileOutputUtil.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.content.Context;
 
diff --git a/app/src/main/java/com/ic/protocol/utils/Logger.java b/app/src/main/java/com/enqualcomm/support/utils/Logger.java
similarity index 95%
rename from app/src/main/java/com/ic/protocol/utils/Logger.java
rename to app/src/main/java/com/enqualcomm/support/utils/Logger.java
index 38cb45b5..eb8597a9 100644
--- a/app/src/main/java/com/ic/protocol/utils/Logger.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/Logger.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.util.Log;
 
diff --git a/app/src/main/java/com/ic/protocol/utils/NettyConnection.java b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
similarity index 93%
rename from app/src/main/java/com/ic/protocol/utils/NettyConnection.java
rename to app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
index b9b0be2c..a7ff9099 100644
--- a/app/src/main/java/com/ic/protocol/utils/NettyConnection.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/NettyConnection.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -7,10 +7,10 @@ import android.os.Message;
 import android.os.SystemClock;
 
 
-import com.ic.protocol.LocationClient;
-import com.ic.protocol.adapter.protocolAPIHelper;
-import com.ic.protocol.bean.StringMessage;
-import com.ic.protocol.service.HeartRateManager;
+import com.enqualcomm.support.LocationClient;
+import com.enqualcomm.support.adapter.protocolAPIHelper;
+import com.enqualcomm.support.bean.StringMessage;
+import com.enqualcomm.support.service.HeartRateManager;
 import com.enqualcomm.support.CoreService;
 
 import java.io.UnsupportedEncodingException;
@@ -24,9 +24,9 @@ import rx.Subscription;
 import rx.android.schedulers.AndroidSchedulers;
 import rx.schedulers.Schedulers;
 
-import static com.ic.protocol.utils.RxSocket.SocketStatus.CONNECTED;
-import static com.ic.protocol.utils.RxSocket.SocketStatus.DIS_CONNECT;
-import com.ic.protocol.bean.Runtime;
+import static com.enqualcomm.support.utils.RxSocket.SocketStatus.CONNECTED;
+import static com.enqualcomm.support.utils.RxSocket.SocketStatus.DIS_CONNECT;
+import com.enqualcomm.support.bean.Runtime;
 
 public class NettyConnection implements Connection {
   private static long realtime_old;
@@ -68,6 +68,10 @@ public class NettyConnection implements Connection {
                                 DeliverCMDMessageToSystem("BP03",cmd);//通知下面线程状态变化
 
                                 break;
+
+                            case BP07:
+                                API.handleBP07(cmd,NettyConnection.this);
+                                break;
                             case BPTM:
                                 API.handleBPTM(cmd);
                                 Logger.i("服务器收到校时命令APTM");
@@ -177,7 +181,7 @@ public class NettyConnection implements Connection {
                     switch (type) {
                         case BP28:
                             API.handleBP28(NettyConnection.this,cmd, runtime,bytes);
-                            Logger.i("服务器收到语音BP28");
+                            Logger.i("收到服务器语音BP28");
                             DeliverCMDMessageToSystem("BP28", "");//通知下面线程状态变化
                             break;
                     }
diff --git a/app/src/main/java/com/ic/protocol/utils/NetworkObservable.java b/app/src/main/java/com/enqualcomm/support/utils/NetworkObservable.java
similarity index 95%
rename from app/src/main/java/com/ic/protocol/utils/NetworkObservable.java
rename to app/src/main/java/com/enqualcomm/support/utils/NetworkObservable.java
index ab0a27b6..b1861e4b 100644
--- a/app/src/main/java/com/ic/protocol/utils/NetworkObservable.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/NetworkObservable.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -8,7 +8,7 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
 
-import com.ic.protocol.service.KeepAlive;
+import com.enqualcomm.support.service.KeepAlive;
 
 import rx.Observable;
 import rx.subjects.BehaviorSubject;
diff --git a/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
similarity index 95%
rename from app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java
rename to app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
index f87b5657..2e4613b4 100644
--- a/app/src/main/java/com/ic/protocol/utils/ProcessReceiver.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ProcessReceiver.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -19,9 +19,9 @@ import android.view.View;
 
 import com.enqualcomm.support.R;
 import com.ic.jni.ICJniUtils;
-import com.ic.protocol.bean.Contact;
-import com.ic.protocol.service.AudioService;
-import com.ic.protocol.service.HeartRateManager;
+import com.enqualcomm.support.bean.Contact;
+import com.enqualcomm.support.service.AudioService;
+import com.enqualcomm.support.service.HeartRateManager;
 
 import java.util.concurrent.TimeUnit;
 
@@ -32,11 +32,11 @@ import rx.schedulers.Schedulers;
 
 import static android.os.PowerManager.ACQUIRE_CAUSES_WAKEUP;
 import static android.os.PowerManager.SCREEN_DIM_WAKE_LOCK;
-import static com.ic.protocol.Constants.ACTION_HEATR_RATE_START;
-import static com.ic.protocol.Constants.ACTION_REMOTE_CAMERA;
-import static com.ic.protocol.Constants.RESUME_ACTION;
-import static com.ic.protocol.Constants.SOS_ACTION;
-import static com.ic.protocol.Constants.STEP_COUNT_ALARM_ACTION;
+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.RESUME_ACTION;
+import static com.enqualcomm.support.Constants.SOS_ACTION;
+import static com.enqualcomm.support.Constants.STEP_COUNT_ALARM_ACTION;
 
 public class ProcessReceiver extends BroadcastReceiver {
   private static final int MICRO_CHAT = 2;
diff --git a/app/src/main/java/com/ic/protocol/utils/RxSocket.java b/app/src/main/java/com/enqualcomm/support/utils/RxSocket.java
similarity index 99%
rename from app/src/main/java/com/ic/protocol/utils/RxSocket.java
rename to app/src/main/java/com/enqualcomm/support/utils/RxSocket.java
index 3ee09048..599e4467 100644
--- a/app/src/main/java/com/ic/protocol/utils/RxSocket.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/RxSocket.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import java.net.InetSocketAddress;
 import java.net.SocketOptions;
diff --git a/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java b/app/src/main/java/com/enqualcomm/support/utils/ServiceUtil.java
similarity index 89%
rename from app/src/main/java/com/ic/protocol/utils/ServiceUtil.java
rename to app/src/main/java/com/enqualcomm/support/utils/ServiceUtil.java
index b64ce171..ab675e90 100644
--- a/app/src/main/java/com/ic/protocol/utils/ServiceUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/ServiceUtil.java
@@ -1,10 +1,10 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.annotation.SuppressLint;
 
-import com.ic.protocol.LocationClient;
-import com.ic.protocol.bean.StringMessage;
-import com.ic.protocol.service.Deliver;
+import com.enqualcomm.support.LocationClient;
+import com.enqualcomm.support.bean.StringMessage;
+import com.enqualcomm.support.service.Deliver;
 
 import java.util.concurrent.LinkedBlockingDeque;
 
diff --git a/app/src/main/java/com/ic/protocol/utils/SharPreferenceUtil.java b/app/src/main/java/com/enqualcomm/support/utils/SharPreferenceUtil.java
similarity index 96%
rename from app/src/main/java/com/ic/protocol/utils/SharPreferenceUtil.java
rename to app/src/main/java/com/enqualcomm/support/utils/SharPreferenceUtil.java
index 6e6ac0f9..f121c75d 100644
--- a/app/src/main/java/com/ic/protocol/utils/SharPreferenceUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/SharPreferenceUtil.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/app/src/main/java/com/ic/protocol/utils/SimSignalUtil.java b/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java
similarity index 95%
rename from app/src/main/java/com/ic/protocol/utils/SimSignalUtil.java
rename to app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java
index 55b5225d..baba2021 100644
--- a/app/src/main/java/com/ic/protocol/utils/SimSignalUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/SimSignalUtil.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -9,7 +9,7 @@ import android.os.PowerManager;
 import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.view.Display;
-import com.ic.protocol.bean.Runtime;
+import com.enqualcomm.support.bean.Runtime;
 
 import static android.content.Context.POWER_SERVICE;
 import static android.telephony.TelephonyManager.NETWORK_TYPE_CDMA;
diff --git a/app/src/main/java/com/ic/protocol/utils/TimeUtil.java b/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java
similarity index 96%
rename from app/src/main/java/com/ic/protocol/utils/TimeUtil.java
rename to app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java
index 118f24ea..b30642b7 100644
--- a/app/src/main/java/com/ic/protocol/utils/TimeUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/TimeUtil.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/app/src/main/java/com/ic/protocol/utils/Util.java b/app/src/main/java/com/enqualcomm/support/utils/Util.java
similarity index 76%
rename from app/src/main/java/com/ic/protocol/utils/Util.java
rename to app/src/main/java/com/enqualcomm/support/utils/Util.java
index 3d925381..057e0d8f 100644
--- a/app/src/main/java/com/ic/protocol/utils/Util.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/Util.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -13,11 +13,14 @@ import android.os.Build;
 
 
 import java.io.ByteArrayOutputStream;
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.InetAddress;
+import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.UUID;
@@ -25,7 +28,9 @@ import java.util.UUID;
 import okio.BufferedSink;
 import okio.Okio;
 import okio.Source;
-import com.ic.protocol.bean.Runtime;
+import com.enqualcomm.support.bean.Runtime;
+import com.enqualcomm.support.bean.VoiceContent;
+import com.enqualcomm.support.bean.voicePacket;
 
 import static android.content.Context.CONNECTIVITY_SERVICE;
 
@@ -282,137 +287,7 @@ public class Util {
 //    }
     return null;
   }
-  
-  public static byte[] decode(byte[] paramArrayOfByte) {
-    int i = paramArrayOfByte.length;
-    byte[] arrayOfByte = new byte[i];
-//    byte b2 = 0;
-//    byte b1 = 0;
-//    while (b2 < i) {
-//      if (paramArrayOfByte[b2] == 56) {
-//        byte b4 = b2 + true;
-//        byte b3 = b1;
-//        if (paramArrayOfByte[b4] == 0) {
-//          arrayOfByte[b1] = 56;
-//          b3 = b1 + true;
-//        }
-//        b2 = b4;
-//        b1 = b3;
-//        if (paramArrayOfByte[b4] == 2) {
-//          b1 = b3 + 1;
-//          arrayOfByte[b3] = 58;
-//          b2 = b4;
-//        }
-//      } else if (paramArrayOfByte[b2] == 57) {
-//        byte b4 = b2 + 1;
-//        byte b3 = b1;
-//        if (paramArrayOfByte[b4] == 0) {
-//          arrayOfByte[b1] = 57;
-//          b3 = b1 + 1;
-//        }
-//        b2 = b4;
-//        b1 = b3;
-//        if (paramArrayOfByte[b4] == 2) {
-//          b1 = b3 + 1;
-//          arrayOfByte[b3] = 59;
-//          b2 = b4;
-//        }
-//      } else if (paramArrayOfByte[b2] == 62) {
-//        byte b4 = b2 + 1;
-//        byte b3 = b1;
-//        if (paramArrayOfByte[b4] == 0) {
-//          arrayOfByte[b1] = 62;
-//          b3 = b1 + 1;
-//        }
-//        b2 = b4;
-//        b1 = b3;
-//        if (paramArrayOfByte[b4] == 2) {
-//          b1 = b3 + 1;
-//          arrayOfByte[b3] = 64;
-//          b2 = b4;
-//        }
-//      } else if (paramArrayOfByte[b2] == 42) {
-//        byte b4 = b2 + 1;
-//        byte b3 = b1;
-//        if (paramArrayOfByte[b4] == 0) {
-//          arrayOfByte[b1] = 42;
-//          b3 = b1 + 1;
-//        }
-//        b2 = b4;
-//        b1 = b3;
-//        if (paramArrayOfByte[b4] == 2) {
-//          b1 = b3 + 1;
-//          arrayOfByte[b3] = 44;
-//          b2 = b4;
-//        }
-//      } else {
-//        byte b = b1 + 1;
-//        arrayOfByte[b1] = paramArrayOfByte[b2];
-//        b1 = b;
-//      }
-//      b2++;
-//    }
-//    paramArrayOfByte = new byte[b1];
-//    System.arraycopy(arrayOfByte, 0, paramArrayOfByte, 0, b1);
-    return paramArrayOfByte;
-  }
-  
-  public static byte[] encode(byte[] paramArrayOfByte) {
-    int i = paramArrayOfByte.length;
-    byte[] arrayOfByte = new byte[i * 2];
-//    byte b2 = 0;
-//    byte b1 = 0;
-//    while (b2 < i) {
-//      if (paramArrayOfByte[b2] == 56) {
-//        boolean bool = b1 + true;
-//        arrayOfByte[b1] = 56;
-//        b1 = bool + true;
-//        arrayOfByte[bool] = 0;
-//      } else if (paramArrayOfByte[b2] == 58) {
-//        boolean bool = b1 + true;
-//        arrayOfByte[b1] = 56;
-//        b1 = bool + true;
-//        arrayOfByte[bool] = 2;
-//      } else if (paramArrayOfByte[b2] == 57) {
-//        boolean bool = b1 + true;
-//        arrayOfByte[b1] = 57;
-//        b1 = bool + true;
-//        arrayOfByte[bool] = 0;
-//      } else if (paramArrayOfByte[b2] == 59) {
-//        boolean bool = b1 + true;
-//        arrayOfByte[b1] = 57;
-//        b1 = bool + true;
-//        arrayOfByte[bool] = 2;
-//      } else if (paramArrayOfByte[b2] == 62) {
-//        boolean bool = b1 + true;
-//        arrayOfByte[b1] = 62;
-//        b1 = bool + true;
-//        arrayOfByte[bool] = 0;
-//      } else if (paramArrayOfByte[b2] == 64) {
-//        boolean bool = b1 + true;
-//        arrayOfByte[b1] = 62;
-//        b1 = bool + true;
-//        arrayOfByte[bool] = 2;
-//      } else if (paramArrayOfByte[b2] == 42) {
-//        boolean bool = b1 + true;
-//        arrayOfByte[b1] = 42;
-//        b1 = bool + true;
-//        arrayOfByte[bool] = 0;
-//      } else if (paramArrayOfByte[b2] == 44) {
-//        boolean bool = b1 + true;
-//        arrayOfByte[b1] = 42;
-//        b1 = bool + true;
-//        arrayOfByte[bool] = 2;
-//      } else {
-//        arrayOfByte[b1] = paramArrayOfByte[b2];
-//        b1++;
-//      }
-//      b2++;
-//    }
-//    paramArrayOfByte = new byte[b1];
-//    System.arraycopy(arrayOfByte, 0, paramArrayOfByte, 0, b1);
-    return paramArrayOfByte;
-  }
+
   
   public static int getDuration(String amrfilePath) {
     if (amrfilePath != null) {
@@ -435,14 +310,7 @@ public class Util {
     return 0;
   }
   
-  @TargetApi(Build.VERSION_CODES.GINGERBREAD)
-  public static String getRealName(byte[] paramArrayOfByte) {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
-      return new String(decode(paramArrayOfByte), UTF_16);
-    }else
-      return null;
-  }
-  
+
   public static boolean isConnectWifi(Context paramContext) {
     ConnectivityManager connectivityManager = (ConnectivityManager)paramContext.getSystemService(CONNECTIVITY_SERVICE);
     NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
@@ -611,5 +479,37 @@ public class Util {
   public static void turnOnWifiForConnect(Context paramContext, Runtime paramRuntime) {
     paramRuntime.getContextProxy().getWifiManager().setWifiEnabled(true);
   }
+
+
+  public static boolean parseToVoicePacketSent(VoiceContent voiceContent,Runtime runtime){
+
+    long filesize;
+    File  voicefile=new File(voiceContent.content);
+    if (voicefile.exists()) {
+      filesize = voicefile.length();
+
+      int count= (int)(filesize/1024);
+      if ((filesize%1024)>0)
+          count++;
+      Logger.i("File "+voiceContent.content+", size "+filesize+", count "+count);
+      voicePacket.getInstanceSent().clearPacket();
+      try {
+        FileInputStream fis = new FileInputStream(voicefile);
+        byte[] audiobuf = new byte[1024];
+        for (int i = 0; i < count; i++) {
+          int readbytes=fis.read(audiobuf,0,1024);
+          voicePacket.getInstanceSent().appendVoice(voiceContent.contactNumber, "", count, i, readbytes, audiobuf);
+        }
+        fis.close();
+        voicePacket.getInstanceSent().setCurrentIndexToSent(0);
+        voicePacket.getInstanceSent().setPacketTime(TimeUtil.getSystemTime3());
+        return true;
+      }catch (Exception e){
+        e.printStackTrace();
+      }
+
+    }
+    return false;
+  }
 }
 
diff --git a/app/src/main/java/com/ic/protocol/utils/WakeLockUtil.java b/app/src/main/java/com/enqualcomm/support/utils/WakeLockUtil.java
similarity index 88%
rename from app/src/main/java/com/ic/protocol/utils/WakeLockUtil.java
rename to app/src/main/java/com/enqualcomm/support/utils/WakeLockUtil.java
index 20fa3951..a9b08b3d 100644
--- a/app/src/main/java/com/ic/protocol/utils/WakeLockUtil.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/WakeLockUtil.java
@@ -1,4 +1,4 @@
-package com.ic.protocol.utils;
+package com.enqualcomm.support.utils;
 
 import android.content.Context;
 import android.os.PowerManager;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index eec68303..87a9f753 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -8,7 +8,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.ic.protocol.MainActivity">
+    tools:context="com.enqualcomm.support.MainActivity">
 
     <LinearLayout
         android:layout_width="match_parent"