1 优化安装包体积

2 格式化代码

1 优化安装包体积
2 格式化代码
杨帅
1 parent f2c586c3
Showing 326 changed files with 108 additions and 138 deletions
app/build.gradle
app/src/main/java/com/example/modulepedometer/MainActivity.java
app/src/main/java/com/example/modulepedometer/MyApp.java
build.gradle
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/commonInfo/CollCommonInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/commonInfo/CommonInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/model/Constant.java
moudle_pedometer/src/main/res/drawable-hdpi/background.png
moudle_pedometer/src/main/res/drawable-hdpi/background.webp
moudle_pedometer/src/main/res/drawable-hdpi/bg_bg.png
moudle_pedometer/src/main/res/drawable-hdpi/bg_bg.webp
moudle_pedometer/src/main/res/drawable-hdpi/bg_tips_bottom_center.png
moudle_pedometer/src/main/res/drawable-hdpi/bg_tips_bottom_center.webp
moudle_pedometer/src/main/res/drawable-hdpi/bmcg.png
moudle_pedometer/src/main/res/drawable-hdpi/bmcg.webp
moudle_pedometer/src/main/res/drawable-hdpi/bmcg_has.png
moudle_pedometer/src/main/res/drawable-hdpi/bmcg_has.webp
moudle_pedometer/src/main/res/drawable-hdpi/bmcg_no.png
moudle_pedometer/src/main/res/drawable-hdpi/bmcg_no.webp
@@ -9,7 +9,7 @@ android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "com.cnlive.strike"
-        minSdkVersion 16
+        minSdkVersion 18
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"
@@ -9,6 +9,7 @@ import com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity;
 import com.cnlive.moudle.collectionTrace.ui.activity.RaceNameListActivity;
+import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
 import com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity;
@@ -20,6 +21,7 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
         String uid = "358916";
         findViewById(R.id.recordd).setOnClickListener(new View.OnClickListener() {
             @Override
@@ -6,6 +6,7 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.baidu.mapapi.CoordType;
 import com.baidu.mapapi.SDKInitializer;
 import com.cnlive.libs.base.application.AppConfig;
+import com.cnlive.moudle.pedometer.model.Constant;
 public class MyApp extends Application {
     @Override
@@ -15,6 +16,11 @@ public class MyApp extends Application {
         AppConfig.init(getApplicationContext(), BuildConfig.APP_ID, BuildConfig.APP_KEY, BuildConfig.APP_SCERET,
                 0, BuildConfig.DEBUG, "", "",
                 userId, "", "", "", "", "", "", "", BuildConfig.BAIDU_MAP_APP_KEY);
+        if (AppConfig.isDebug()) {
+            Constant.SERVICE_ID = 213511;
+        } else {
+            Constant.SERVICE_ID = 214690;
+        }
         initARouter();
         //在使用SDK各组件之前初始化context信息，传入ApplicationContext
         SDKInitializer.initialize(getApplicationContext());
@@ -53,7 +53,7 @@ ext {
     compileSdkVersion = 28
     buildToolsVersion = "28.0.3"
-    minSdkVersion = 16
+    minSdkVersion = 18
     targetSdkVersion = 27
     //support 相关
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.6.5",
+            version: "0.6.6",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -5,6 +5,19 @@ import android.content.Context;
 import com.cnlive.moudle.pedometer.utils.MySpHelper;
 public class CollCommonInfo {
+    private static final String KEY_USER_ID = "collUserId";//用户ID
+    private static final String KEY_STEP_START_TIME = "collStepStartTime";//服务启动时间
+    private static final String KEY_WRITE_USER_STEP = "collWriteUserStep";//是否向数据库写入数据
+    private static final String KEY_IS_RUN_STEP_SERVICE = "collRunStepService";//是否运行计步服务
+    private static final String KEY_IS_RUN_KEEP_ALIVE_SERVICE = "collKeepAliveService";//是否运行保活服务
+    private static final String KEY_STREET_ID = "collStreetId";//赛事ID
+    private static final String KEY_IS_RUN_BAIDU_TRACE_SERVICE = "collRunBaiduTraceService";//是否运行百度鹰眼服务
+    private static final String KEY_IS_FIRST_STEP_SEND_TRACE_TIP = "collFirstStepSendTraceTip";//是否第一次启动鹰眼服务
+    private static final String KEY_USER_NICK_NAME = "collRunUserNickName";//用户昵称
+    private static final String KEY_USER_NICK_ICON = "collRunUserNickIcon";//用户头像
+
+
+
     /**
      * 设置计步时间
@@ -12,7 +25,7 @@ public class CollCommonInfo {
      * @param context
      */
     public static void setStepStartTime(Context context, long currentTime) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putLong("CollstepStartTime", currentTime);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putLong(KEY_STEP_START_TIME, currentTime);
     }
     /**
@@ -21,7 +34,7 @@ public class CollCommonInfo {
      * @param context
      */
     public static long getStepStartTime(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getLong("CollstepStartTime", 0);
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getLong(KEY_STEP_START_TIME, 0);
     }
     /**
@@ -30,7 +43,7 @@ public class CollCommonInfo {
      * @param context
      */
     public static void setIsWriteUserStep(Context context, boolean isAllow) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean("CollwriteUserStep:", isAllow);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean(KEY_WRITE_USER_STEP, isAllow);
     }
     /**
@@ -39,7 +52,7 @@ public class CollCommonInfo {
      * @param context
      */
     public static boolean getIsWriteUserStep(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("CollwriteUserStep", true);
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean(KEY_WRITE_USER_STEP, true);
     }
     /**
@@ -47,14 +60,14 @@ public class CollCommonInfo {
      * @param uid
      */
     public static void setUserId(Context context, String uid) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("ColluserId", uid);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString(KEY_USER_ID, uid);
     }
     /**
      * @param context
      */
     public static String getUserId(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("ColluserId", "");
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString(KEY_USER_ID, "");
     }
     /**
@@ -64,7 +77,7 @@ public class CollCommonInfo {
      * @param isAllow
      */
     public static void setIsRunStepService(Context context, boolean isAllow) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean("CollrunStepService", isAllow);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean(KEY_IS_RUN_STEP_SERVICE, isAllow);
     }
@@ -75,7 +88,7 @@ public class CollCommonInfo {
      * @param isAllow
      */
     public static void setIsRunKeepAliveService(Context context, boolean isAllow) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean("CollKeepAliveService", isAllow);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean(KEY_IS_RUN_KEEP_ALIVE_SERVICE, isAllow);
     }
@@ -85,7 +98,7 @@ public class CollCommonInfo {
      * @param context
      */
     public static boolean getIsRunKeepAliveService(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("CollKeepAliveService", false);
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean(KEY_IS_RUN_KEEP_ALIVE_SERVICE, false);
     }
     /**
@@ -94,7 +107,7 @@ public class CollCommonInfo {
      * @param context
      */
     public static boolean getIsRunStepService(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("CollrunStepService", false);
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean(KEY_IS_RUN_STEP_SERVICE, false);
     }
     /**
@@ -104,7 +117,7 @@ public class CollCommonInfo {
      * @param streetId
      */
     public static void setStreetId(Context context, String streetId) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("CollstreetId", streetId);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString(KEY_STREET_ID, streetId);
     }
     /**
@@ -113,7 +126,7 @@ public class CollCommonInfo {
      * @param context
      */
     public static String getStreetId(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("CollstreetId", "");
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString(KEY_STREET_ID, "");
     }
     /**
@@ -123,7 +136,7 @@ public class CollCommonInfo {
      * @param isRun
      */
     public static void setTsRunBaiduTraceService(Context context, boolean isRun) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean("CollRunBaiduTraceService", isRun);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean(KEY_IS_RUN_BAIDU_TRACE_SERVICE, isRun);
     }
     /**
@@ -132,7 +145,7 @@ public class CollCommonInfo {
      * @param context
      */
     public static boolean getIsRunBaiduTraceService(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("CollRunBaiduTraceService", true);
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean(KEY_IS_RUN_BAIDU_TRACE_SERVICE, true);
     }
     /**
@@ -142,7 +155,7 @@ public class CollCommonInfo {
      * @param isAllow
      */
     public static void setIsFirstStepSendTraceTip(Context context, boolean isAllow) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean("CollFirstStepSendTraceTip", isAllow);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean(KEY_IS_FIRST_STEP_SEND_TRACE_TIP, isAllow);
     }
     /**
@@ -152,7 +165,7 @@ public class CollCommonInfo {
      * @param context
      */
     public static boolean getIsFirstStepSendTraceTip(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("CollFirstStepSendTraceTip", true);
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean(KEY_IS_FIRST_STEP_SEND_TRACE_TIP, true);
     }
     /**
@@ -162,7 +175,7 @@ public class CollCommonInfo {
      * @param nickName
      */
     public static void setUserNickName(Context context, String nickName) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("CollRunUserNickName", nickName);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString(KEY_USER_NICK_NAME, nickName);
     }
@@ -172,7 +185,7 @@ public class CollCommonInfo {
      * @param context
      */
     public static String getUserNickName(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("CollRunUserNickName", "");
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString(KEY_USER_NICK_NAME, "");
     }
@@ -183,7 +196,7 @@ public class CollCommonInfo {
      * @param userIcon
      */
     public static void setUserIcon(Context context, String userIcon) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("CollRunUserNickIcon", userIcon);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString(KEY_USER_NICK_ICON, userIcon);
     }
@@ -193,7 +206,7 @@ public class CollCommonInfo {
      * @param context
      */
     public static String getUserIcon(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("CollRunUserNickIcon", "");
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString(KEY_USER_NICK_ICON, "");
     }
@@ -202,13 +215,13 @@ public class CollCommonInfo {
      * @param context
      */
     public static void reset(Context context) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("CollwriteUserStep");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("CollstepStartTime");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("CollrunStepService");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("CollstepStartTime");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("CollKeepAliveService");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("CollRunBaiduTraceService");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("CollFirstStepSendTraceTip");
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_WRITE_USER_STEP);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_STEP_START_TIME);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_IS_RUN_STEP_SERVICE);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_STEP_START_TIME);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_IS_RUN_KEEP_ALIVE_SERVICE);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_IS_RUN_BAIDU_TRACE_SERVICE);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_IS_FIRST_STEP_SEND_TRACE_TIP);
     }
@@ -6,24 +6,19 @@ import com.cnlive.moudle.pedometer.utils.MySpHelper;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 public class CommonInfo {
-
-//    /**
-//     * 设置计步时间
-//     *
-//     * @param context
-//     */
-//    public static void setStepStartTime(Context context, long currentTime) {
-//        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putLong("stepStartTime", currentTime);
-//    }
-//
-//    /**
-//     * 获取计步时间
-//     *
-//     * @param context
-//     */
-//    public static long getStepStartTime(Context context) {
-//        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getLong("stepStartTime", 0);
-//    }
+    private static final String KEY_USER_ID = "runUserId";//用户ID
+    private static final String KEY_WRITE_USER_STEP = "runWriteUserStep";//是否允许写入步数
+    private static final String KEY_RUN_WRITE_USER_STEP = "runStepService";//是否运行计步服务
+    private static final String KEY_KEEP_ALIVE_SERVICE = "runKeepAliveService";//是否运行保活服务
+    private static final String KEY_EVENT_ID = "runStreetId";//赛事id
+    private static final String KEY_RUN_BAIDU_TRACE_SERVICE = "runBaiduTraceService";//是否运行百度服务
+    private static final String KEY_FIRST_STEP_SEND_TIP = "runFirstStepSendTraceTip";//是否是第一次启动鹰眼服务
+    private static final String KEY_FENCE_ID = "runFenceId";//围栏ID
+    private static final String KEY_USER_NICK_NAME = "runUserNickName";//用户昵称
+    private static final String KEY_USER_NICK_ICON = "runUserNickIcon";//用户头像
+    private static final String KEY_USER_PHONE = "runUserPhone";//用户电话
+    private static final String KEY_IS_FIRST_SHOW_TIME_TIP = "runIsFirstShowTimeTip";//是否是第一次显示倒计时
+    private static final String KEY_IS_PAUSE_STATE = "runIsPauseState";//是否点击暂停按钮
     /**
@@ -32,7 +27,7 @@ public class CommonInfo {
      * @param context
      */
     public static void setIsWriteUserStep(Context context, boolean isAllow) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean("writeUserStep:", isAllow);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean(KEY_WRITE_USER_STEP, isAllow);
     }
     /**
@@ -41,7 +36,7 @@ public class CommonInfo {
      * @param context
      */
     public static boolean getIsWriteUserStep(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("writeUserStep", true);
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean(KEY_WRITE_USER_STEP, true);
     }
     /**
@@ -49,14 +44,14 @@ public class CommonInfo {
      * @param uid
      */
     public static void setUserId(Context context, String uid) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("userId", uid);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString(KEY_USER_ID, uid);
     }
     /**
      * @param context
      */
     public static String getUserId(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("userId", "");
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString(KEY_USER_ID, "");
     }
     /**
@@ -66,7 +61,7 @@ public class CommonInfo {
      * @param isAllow
      */
     public static void setIsRunStepService(Context context, boolean isAllow) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean("runStepService", isAllow);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean(KEY_RUN_WRITE_USER_STEP, isAllow);
     }
@@ -77,7 +72,7 @@ public class CommonInfo {
      * @param isAllow
      */
     public static void setIsRunKeepAliveService(Context context, boolean isAllow) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean("KeepAliveService", isAllow);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean(KEY_KEEP_ALIVE_SERVICE, isAllow);
     }
@@ -87,7 +82,7 @@ public class CommonInfo {
      * @param context
      */
     public static boolean getIsRunKeepAliveService(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("KeepAliveService", false);
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean(KEY_KEEP_ALIVE_SERVICE, false);
     }
     /**
@@ -96,7 +91,7 @@ public class CommonInfo {
      * @param context
      */
     public static boolean getIsRunStepService(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("runStepService", false);
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean(KEY_RUN_WRITE_USER_STEP, false);
     }
     /**
@@ -106,7 +101,7 @@ public class CommonInfo {
      * @param streetId
      */
     public static void setStreetId(Context context, String streetId) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("streetId", streetId);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString(KEY_EVENT_ID, streetId);
     }
     /**
@@ -115,7 +110,7 @@ public class CommonInfo {
      * @param context
      */
     public static String getStreetId(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("streetId", "");
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString(KEY_EVENT_ID, "");
     }
     /**
@@ -125,7 +120,7 @@ public class CommonInfo {
      * @param isRun
      */
     public static void setTsRunBaiduTraceService(Context context, boolean isRun) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean("RunBaiduTraceService", isRun);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean(KEY_RUN_BAIDU_TRACE_SERVICE, isRun);
     }
     /**
@@ -134,7 +129,7 @@ public class CommonInfo {
      * @param context
      */
     public static boolean getIsRunBaiduTraceService(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("RunBaiduTraceService", true);
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean(KEY_RUN_BAIDU_TRACE_SERVICE, true);
     }
     /**
@@ -144,7 +139,7 @@ public class CommonInfo {
      * @param isAllow
      */
     public static void setIsFirstStepSendTraceTip(Context context, boolean isAllow) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean("FirstStepSendTraceTip", isAllow);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean(KEY_FIRST_STEP_SEND_TIP, isAllow);
     }
     /**
@@ -154,7 +149,7 @@ public class CommonInfo {
      * @param context
      */
     public static boolean getIsFirstStepSendTraceTip(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("FirstStepSendTraceTip", true);
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean(KEY_FIRST_STEP_SEND_TIP, true);
     }
     /**
@@ -164,7 +159,7 @@ public class CommonInfo {
      * @param id
      */
     public static void setFenceId(Context context, int id) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putInt("FenceId", id);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putInt(KEY_FENCE_ID, id);
     }
     /**
@@ -173,7 +168,7 @@ public class CommonInfo {
      * @param context
      */
     public static int getFenceId(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getInt("FenceId", -1);
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getInt(KEY_FENCE_ID, -1);
     }
     /**
@@ -183,7 +178,7 @@ public class CommonInfo {
      * @param nickName
      */
     public static void setUserNickName(Context context, String nickName) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("RunUserNickName", nickName);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString(KEY_USER_NICK_NAME, nickName);
     }
@@ -193,7 +188,7 @@ public class CommonInfo {
      * @param context
      */
     public static String getUserNickName(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserNickName", "");
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString(KEY_USER_NICK_NAME, "");
     }
@@ -204,7 +199,7 @@ public class CommonInfo {
      * @param userIcon
      */
     public static void setUserIcon(Context context, String userIcon) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("RunUserNickIcon", userIcon);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString(KEY_USER_NICK_ICON, userIcon);
     }
@@ -214,7 +209,7 @@ public class CommonInfo {
      * @param context
      */
     public static String getUserIcon(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserNickIcon", "");
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString(KEY_USER_NICK_ICON, "");
     }
@@ -225,7 +220,7 @@ public class CommonInfo {
      * @param userIcon
      */
     public static void setUserPhone(Context context, String userIcon) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("RunUserPhone", userIcon);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString(KEY_USER_PHONE, userIcon);
     }
@@ -235,7 +230,7 @@ public class CommonInfo {
      * @param context
      */
     public static String getUserPhone(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserPhone", "");
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString(KEY_USER_PHONE, "");
     }
@@ -247,7 +242,7 @@ public class CommonInfo {
      * @param isAllow
      */
     public static void setIsFirstShowTimeTip(Context context, boolean isAllow) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean("IsFirstShowTimeTip", isAllow);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean(KEY_IS_FIRST_SHOW_TIME_TIP, isAllow);
     }
     /**
@@ -256,7 +251,7 @@ public class CommonInfo {
      * @param context
      */
     public static boolean getIsFirstShowTimeTip(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("IsFirstShowTimeTip", true);
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean(KEY_IS_FIRST_SHOW_TIME_TIP, true);
     }
     /**
@@ -266,7 +261,7 @@ public class CommonInfo {
      * @param isAllow
      */
     public static void setIsPauseState(Context context, boolean isAllow) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean("runIsPauseState", isAllow);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putBoolean(KEY_IS_PAUSE_STATE, isAllow);
     }
     /**
@@ -275,68 +270,23 @@ public class CommonInfo {
      * @param context
      */
     public static boolean getIsPause(Context context) {
-        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean("runIsPauseState", false);
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getBoolean(KEY_IS_PAUSE_STATE, false);
     }
-
-//    /**
-//     * 设置赛事标题
-//     *
-//     * @param context
-//     * @param streetTitle
-//     */
-//    public static void setStreetTitle(Context context, String streetTitle) {
-//        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("runStreetTitle", streetTitle);
-//
-//    }
-//
-//    /**
-//     * 获取赛事标题
-//     *
-//     * @param context
-//     */
-//    public static String getStreetTitle(Context context) {
-//        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("runStreetTitle", "");
-//
-//    }
-
-    //    /**
-//     * 设置起点经纬度
-//     *
-//     * @param context
-//     * @param startLatLng
-//     */
-//    public static void setStartLatLng(Context context, String startLatLng) {
-//        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("runStartLatLng", startLatLng);
-//
-//    }
-//
-//    /**
-//     * 设置终点经纬度
-//     *
-//     * @param context
-//     * @param endLatLng
-//     */
-//    public static void setEndLatLng(Context context, String endLatLng) {
-//        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("runEndLatLng", endLatLng);
-//
-//    }
     /*重置
      * @param context
      */
     public static void reset(Context context) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("IsFirstShowTimeTip");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("writeUserStep");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runStepService");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("KeepAliveService");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("RunBaiduTraceService");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("streetId");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("FirstStepSendTraceTip");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("FenceId");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("IsFirstShowTimeTip");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runIsPauseState");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runStreetTitle");
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_WRITE_USER_STEP);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_RUN_WRITE_USER_STEP);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_KEEP_ALIVE_SERVICE);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_RUN_BAIDU_TRACE_SERVICE);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_EVENT_ID);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_FIRST_STEP_SEND_TIP);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_FENCE_ID);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_IS_FIRST_SHOW_TIME_TIP);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_IS_PAUSE_STATE);
     }
@@ -345,14 +295,13 @@ public class CommonInfo {
      * @param context
      */
     public static void resetRace(Context context) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("IsFirstShowTimeTip");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("writeUserStep");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runStepService");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("KeepAliveService");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("RunBaiduTraceService");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("FirstStepSendTraceTip");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("IsFirstShowTimeTip");
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runIsPauseState");
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_WRITE_USER_STEP);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_RUN_WRITE_USER_STEP);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_KEEP_ALIVE_SERVICE);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_RUN_BAIDU_TRACE_SERVICE);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_FIRST_STEP_SEND_TIP);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_IS_FIRST_SHOW_TIME_TIP);
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey(KEY_IS_PAUSE_STATE);
     }
 }
@@ -25,7 +25,7 @@ public class Constant {
     /*************************************用户其他值,非标志位************************************************************/
-    public static final long SERVICE_ID = 213511;//公司账号
+    public static  long SERVICE_ID = 0;//公司账号
     //    public static final long SERVICE_ID = 213553;
     public static final int TAG = 1;
     public static final int GATHER_INTERVAL = 2;//位置采集周期
@@ -38,7 +38,7 @@ public class Constant {
     public static final int CHECK_ACCURACY = 50;//判断用户是否完成的精度范围
     public static final int LOCA_ACCURACY = 20;//定位过滤精度
     public static final int LOCA_END_POINT_ACCURACY = 20;//终点位置比较精度
-    public static final int LOCA_START_POINT_ACCURACY = 20;//起点位置比较精度
+    public static final int LOCA_START_POINT_ACCURACY = 200;//起点位置比较精度
     public static final int FENCE_OFFSET = 50;//围栏偏离距离
     public static final int FENCE_DENOISE = 20;//围栏去噪精度
     public static final int TAKE_POINT_MAX_SIZE = 100;//最大打点数量