Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ModulePedometer

韩亚云
2 parents 11735502 881816d8
Showing 16 changed files with 178 additions and 133 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/CollRunningMapFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/StartTraceFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunMainFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunningMapFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/commonInfo/CommonInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningMapFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoMaster.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoSession.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningMapFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/TimeUtil.java
moudle_pedometer/src/main/res/layout/layout_run_detail_rank.xml
moudle_pedometer/src/main/res/values/strings.xml
@@ -287,81 +287,6 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter&lt;CollRunnin
     }
-    public void queryRealTimeTrace(Context context, String entityName, long activeTime) {
-        if (realTimeListRequest == null) {
-            List<String> names = new ArrayList<>();
-            names.add(entityName);
-            realTimeListRequest = new LocRequest();
-            realTimeListRequest.setServiceId(Constant.SERVICE_ID);
-            realTimeListRequest.setTag(Constant.TAG);
-        }
-        if (realTimePoints == null) {
-            realTimePoints = new ArrayList<>();
-        }
-
-        OnEntityListener onEntityListener = new OnEntityListener() {
-            Overlay realTimeOverlay = null;
-
-            @Override
-            public void onEntityListCallback(EntityListResponse entityListResponse) {
-                super.onEntityListCallback(entityListResponse);
-                Log.e(TAG, "onEntityListCallback");
-//                Toast.makeText(context, "onEntityListCallback", Toast.LENGTH_SHORT).show();
-            }
-
-            @Override
-            public void onSearchEntityCallback(SearchResponse searchResponse) {
-                super.onSearchEntityCallback(searchResponse);
-                Log.e(TAG, "onSearchEntityCallback");
-                Toast.makeText(context, "onSearchEntityCallback", Toast.LENGTH_SHORT).show();
-
-            }
-
-            @Override
-            public void onBoundSearchCallback(BoundSearchResponse boundSearchResponse) {
-                super.onBoundSearchCallback(boundSearchResponse);
-                Log.e(TAG, "onBoundSearchCallback");
-                Toast.makeText(context, "onBoundSearchCallback", Toast.LENGTH_SHORT).show();
-
-            }
-
-            @Override
-            public void onAroundSearchCallback(AroundSearchResponse aroundSearchResponse) {
-                super.onAroundSearchCallback(aroundSearchResponse);
-                Log.e(TAG, "onAroundSearchCallback");
-                Toast.makeText(context, "onAroundSearchCallback", Toast.LENGTH_SHORT).show();
-
-            }
-
-            @Override
-            public void onPolygonSearchCallback(PolygonSearchResponse polygonSearchResponse) {
-                super.onPolygonSearchCallback(polygonSearchResponse);
-                Log.e(TAG, "onPolygonSearchCallback");
-                Toast.makeText(context, "onPolygonSearchCallback", Toast.LENGTH_SHORT).show();
-            }
-
-            @Override
-            public void onDistrictSearchCallback(DistrictSearchResponse districtSearchResponse) {
-                super.onDistrictSearchCallback(districtSearchResponse);
-                Log.e(TAG, "onDistrictSearchCallback");
-                Toast.makeText(context, "onDistrictSearchCallback", Toast.LENGTH_SHORT).show();
-
-            }
-
-            /**实时定位回调接口
-             * @param traceLocation
-             */
-            @Override
-            public void onReceiveLocation(TraceLocation traceLocation) {
-                super.onReceiveLocation(traceLocation);
-            }
-        };
-        //查询实时轨迹
-        if (StepService.mClient != null) {
-            StepService.mClient.queryRealTimeLoc(realTimeListRequest, onEntityListener);
-        }
-
-    }
     //创建地理围栏
     public void createFence(Context context, List<com.baidu.trace.model.LatLng> latLngs) {
@@ -481,25 +406,25 @@ public class CollRunningMapFragmentPresenter extends MvpBasePresenter&lt;CollRunnin
-        FenceListRequest request = FenceListRequest.buildServerRequest(Constant.TAG, Constant.SERVICE_ID, "yangshuai", null, CoordType.gcj02);
-
-        //发起查询围栏请求
-        if (StepService.mClient != null) {
-            StepService.mClient.queryFenceList(request, onFenceListener);
-        }
-
-        List<Long> fenid = new ArrayList<>();
-        fenid.add(1L);
-        MonitoredStatusRequest request1 = MonitoredStatusRequest.buildServerRequest(Constant.TAG,
-                Constant.SERVICE_ID, "yangshuai", fenid);
-        Handler handler = new Handler();
-        Runnable runnable = new Runnable() {
-            @Override
-            public void run() {
-                StepService.mClient.queryMonitoredStatus(request1, onFenceListener);
-            }
-        };
-        handler.postDelayed(runnable, 5000);
+//        FenceListRequest request = FenceListRequest.buildServerRequest(Constant.TAG, Constant.SERVICE_ID, "yangshuai", null, CoordType.gcj02);
+//
+//        //发起查询围栏请求
+//        if (StepService.mClient != null) {
+//            StepService.mClient.queryFenceList(request, onFenceListener);
+//        }
+//
+//        List<Long> fenid = new ArrayList<>();
+//        fenid.add(1L);
+//        MonitoredStatusRequest request1 = MonitoredStatusRequest.buildServerRequest(Constant.TAG,
+//                Constant.SERVICE_ID, "yangshuai", fenid);
+//        Handler handler = new Handler();
+//        Runnable runnable = new Runnable() {
+//            @Override
+//            public void run() {
+//                StepService.mClient.queryMonitoredStatus(request1, onFenceListener);
+//            }
+//        };
+//        handler.postDelayed(runnable, 5000);
     }
     public void query() {
@@ -17,6 +17,7 @@ import com.baidu.location.LocationClient;
 import com.baidu.location.LocationClientOption;
 import com.cnlive.moudle.collectionTrace.service.CollKeepLiveService;
 import com.cnlive.moudle.collectionTrace.service.CollStepService;
+import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningMapActivity;
 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunMainFragment;
 import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
@@ -157,18 +158,36 @@ public class CollRunMainFragmentView implements MvpView {
                 int hour = (int) ((SystemClock.elapsedRealtime() - chronometer.getBase()) / 1000 / 60 / 60);
                 int minute = (int) ((SystemClock.elapsedRealtime() - chronometer.getBase()) / 1000 / 60) % 60;
                 int second = (int) ((SystemClock.elapsedRealtime() - chronometer.getBase()) / 1000) % 60;
+//                if (hour < 1) {
+//                    if (minute == 59 && second == 59) {
+//                        chronometer.setFormat("0" + "%s");
+//                    } else {
+//                        chronometer.setFormat("0" + String.valueOf(hour) + ":%s");
+//                    }
+//                } else if (hour < 10) {
+//                    chronometer.setFormat("0" + "%s");
+//                } else {
+//                    chronometer.setFormat("%s");
+//                }
+                String result = "";
                 if (hour < 1) {
-                    if (minute == 59 && second == 59) {
-                        chronometer.setFormat("0" + "%s");
-                    } else {
-                        chronometer.setFormat("0" + String.valueOf(hour) + ":%s");
-                    }
-                } else if (hour < 10) {
-                    chronometer.setFormat("0" + "%s");
+                    result += "0" + hour + ":";
                 } else {
-                    chronometer.setFormat("%s");
+                    result += hour + ":";
+                }
+                if (minute < 10) {
+                    result += "0" + minute + ":";
+                } else {
+                    result += minute + ":";
+                }
+                if (second < 10) {
+                    result += "0" + second;
+                } else {
+                    result += second;
+                }
+                if (!TextUtils.isEmpty(result)) {
+                    chronometer.setFormat(result);
                 }
-
             }
         });
@@ -422,7 +441,7 @@ public class CollRunMainFragmentView implements MvpView {
                 }
                 runningMapBean.setDistance(fragment.binding.tvRunDistance.getText().toString());
                 runningMapBean.setCurrentSpeed(fragment.binding.tvSpeed.getText().toString());
-                RunningMapActivity.startActivity(fragment.getActivity(), runningMapBean);
+                CollRunningMapActivity.startActivity(fragment.getActivity(), runningMapBean);
             }
         });
@@ -452,7 +471,6 @@ public class CollRunMainFragmentView implements MvpView {
     }
-
     /**
      * 更新行走距离
      *
@@ -117,6 +117,7 @@ public class StartTraceFragmentView implements MvpView, SensorEventListener {
      * 启动计步服务
      */
     public void startStepService(Context context) {
+        CollCommonInfo.setIsFirstStepSendTraceTip(getContext(),true);
         QMUITipDialogUtil.loadingDialog(getContext(), "请稍后", false);
         if (CollCommonInfo.getStepStartTime(context) == 0) {
             CollCommonInfo.setStepStartTime(context, TimeUtil.getNowTimeStamp());
@@ -16,6 +16,7 @@ import com.cnlive.moudle.collectionTrace.frame.presenter.CollRunMainFragmentPres
 import com.cnlive.moudle.collectionTrace.frame.view.CollRunMainFragmentView;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
+import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRunMainBinding;
@@ -124,4 +125,5 @@ public class CollRunMainFragment extends QMUIFragment&lt;CollRunMainFragmentView, C
         return 0;
     }
+
 }
@@ -26,7 +26,6 @@ import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentCollectRunningMapBinding;
-import com.example.moudle_pedometer.databinding.FragmentRunningMapBinding;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -118,8 +117,6 @@ public class CollRunningMapFragment extends QMUIFragment&lt;CollRunningMapFragmentV
             long endTime = current;
 //            Log.e(TAG, "onViewCreated: " + "hour:" + hour + ",minute" + minute + ",second:" + second);
             getPresenter().queryHistoryTrace(getActivity(), StepService.entityName, startTime, endTime);
-            //查询实时轨迹
-//            getPresenter().queryRealTimeTrace(getActivity(), StepService.entityName, startTime);
         }
@@ -26,6 +26,24 @@ public class CommonInfo {
     }
     /**
+     * 设置计步完成时间
+     *
+     * @param context
+     */
+    public static void setStepEndTime(Context context, long currentTime) {
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putLong("stepEndTime", currentTime);
+    }
+
+    /**
+     * 获取计步完成时间
+     *
+     * @param context
+     */
+    public static long getStepEndTime(Context context) {
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getLong("stepEndTime", 0);
+    }
+
+    /**
      * 是否允许写入步数
      *
      * @param context
@@ -175,6 +193,27 @@ public class CommonInfo {
         return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getInt("FenceId", -1);
     }
+    /**
+     * 设置用户昵称
+     *
+     * @param context
+     * @param nickName
+     */
+    public static void setUserNickName(Context context, String nickName) {
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("RunUserNickName", nickName);
+
+    }
+
+    /**
+     * 获取用户昵称
+     *
+     * @param context
+     */
+    public static void getUserNickName(Context context) {
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserNickName", "");
+
+    }
+
     /*重置
      * @param context
      */
@@ -188,6 +227,8 @@ public class CommonInfo {
         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("stepEndTime");
+
     }
@@ -277,7 +277,7 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
                         for (int i = 0; i < importHash.size(); i++) {
                             if (!importHash.get(i)) {
                                 result++;
-                                Log.e(TAG, "onHistoryTrackCallback: 没过:" + i + importHash.get(i));
+//                                Log.e(TAG, "onHistoryTrackCallback: 没过:" + i + importHash.get(i));
                             }
                         }
                         if (result > importPoints.size() * 0.4) {
@@ -150,7 +150,7 @@ public class RunMainFragmentView implements MvpView {
                             if (firstTimeFlag) {
                                 firstTimeFlag = false;
                                 fragment.binding.chronometer.setFormat("00:00:01");
-                                fragment.binding.chronometer.setBase(SystemClock.elapsedRealtime()-50000000);
+                                fragment.binding.chronometer.setBase(SystemClock.elapsedRealtime());
                                 fragment.binding.chronometer.start();
                             }
                         }
@@ -310,10 +310,10 @@ public class RunMainFragmentView implements MvpView {
                                                 public void onClick(SelectDialog dialog) {
                                                     CommonInfo.setIsRunKeepAliveService(getContext(), false);
                                                     CommonInfo.setIsWriteUserStep(getContext(), false);
+                                                    //设置运动结束时间
+                                                    CommonInfo.setStepEndTime(getContext(), TimeUtil.getNowTimeStamp());
                                                     fragment.binding.cpCurrent.setVisibility(View.GONE);
                                                     ButtonAnimUtil.setViewDefault(fragment.binding.flStop);
-                                                    //清空数据
-                                                    CommonInfo.reset(getContext());
                                                     dialog.dismiss();
                                                     if (StepService.mClient != null) {
                                                         StepService.mClient.stopGather(StepService.traceListener);
@@ -458,7 +458,6 @@ public class RunMainFragmentView implements MvpView {
     }
-
     /**
      * 更新行走距离
      *
@@ -46,6 +46,7 @@ import com.baidu.mapapi.search.route.WalkingRoutePlanOption;
 import com.baidu.mapapi.search.route.WalkingRouteResult;
 import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.model.SortType;
+import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.service.KeepLiveService;
@@ -308,7 +309,6 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         }
         //判断用户是否报名
-        Log.e(TAG, "initView: 是否报名"+runRaceDetailInfo.isSignResult() );
         if (runRaceDetailInfo.isSignResult()) {
             fragment.binding.rlScrollViewStartBtn.setTag("1");
             fragment.binding.tvRunNow.setText("现在开始");
@@ -396,6 +396,13 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                 fragment.getActivity().finish();
             }
         });
+        //todo 查看排行榜点击
+        fragment.binding.includeRank.tvCatAllRank.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+            }
+        });
     }
     public void initMap() {
@@ -853,6 +860,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
      * 启动计步服务
      */
     public void startStepService(Context context) {
+        CommonInfo.setIsFirstStepSendTraceTip(getContext(), true);
         QMUITipDialogUtil.loadingDialog(getContext(), "请稍后", false);
         if (CommonInfo.getStepStartTime(context) == 0) {
             CommonInfo.setStepStartTime(context, TimeUtil.getNowTimeStamp());
@@ -21,14 +21,14 @@ public class DaoMaster extends AbstractDaoMaster {
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
-        UserStepEntityDao.createTable(db, ifNotExists);
         CollUserStepEntityDao.createTable(db, ifNotExists);
+        UserStepEntityDao.createTable(db, ifNotExists);
     }
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
-        UserStepEntityDao.dropTable(db, ifExists);
         CollUserStepEntityDao.dropTable(db, ifExists);
+        UserStepEntityDao.dropTable(db, ifExists);
     }
     /**
@@ -47,8 +47,8 @@ public class DaoMaster extends AbstractDaoMaster {
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
-        registerDaoClass(UserStepEntityDao.class);
         registerDaoClass(CollUserStepEntityDao.class);
+        registerDaoClass(UserStepEntityDao.class);
     }
     public DaoSession newSession() {
@@ -8,11 +8,11 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
-import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
+import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
-import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
+import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
@@ -23,40 +23,40 @@ import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
  */
 public class DaoSession extends AbstractDaoSession {
-    private final DaoConfig userStepEntityDaoConfig;
     private final DaoConfig collUserStepEntityDaoConfig;
+    private final DaoConfig userStepEntityDaoConfig;
-    private final UserStepEntityDao userStepEntityDao;
     private final CollUserStepEntityDao collUserStepEntityDao;
+    private final UserStepEntityDao userStepEntityDao;
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
-        userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
-        userStepEntityDaoConfig.initIdentityScope(type);
-
         collUserStepEntityDaoConfig = daoConfigMap.get(CollUserStepEntityDao.class).clone();
         collUserStepEntityDaoConfig.initIdentityScope(type);
-        userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
+        userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
+        userStepEntityDaoConfig.initIdentityScope(type);
+
         collUserStepEntityDao = new CollUserStepEntityDao(collUserStepEntityDaoConfig, this);
+        userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
-        registerDao(UserStepEntity.class, userStepEntityDao);
         registerDao(CollUserStepEntity.class, collUserStepEntityDao);
+        registerDao(UserStepEntity.class, userStepEntityDao);
     }
     public void clear() {
-        userStepEntityDaoConfig.clearIdentityScope();
         collUserStepEntityDaoConfig.clearIdentityScope();
-    }
-
-    public UserStepEntityDao getUserStepEntityDao() {
-        return userStepEntityDao;
+        userStepEntityDaoConfig.clearIdentityScope();
     }
     public CollUserStepEntityDao getCollUserStepEntityDao() {
         return collUserStepEntityDao;
     }
+    public UserStepEntityDao getUserStepEntityDao() {
+        return userStepEntityDao;
+    }
+
 }
@@ -135,6 +135,7 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
                             binding.birthday.getText().toString().trim().equals("未选择") ? "" : binding.birthday.getText().toString().trim());
                 } else {
                     QMUITipDialogUtil.dismessDialog();
+                    QMUITipDialogUtil.messageDialog(getContext(),"报名失败,请稍后重试!",2);
                 }
             }
@@ -133,7 +133,7 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
             com.baidu.trace.model.LatLng tempLatLng = new com.baidu.trace.model.LatLng(latLng.latitude, latLng.longitude);
             fenceLatLngs.add(tempLatLng);
         }
-        getPresenter().createFence(getActivity(), fenceLatLngs);
+//        getPresenter().createFence(getActivity(), fenceLatLngs);
     }
     @Override
@@ -197,7 +197,19 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
         }
         //超出范围
         else if (messageEvent.getMessageType() == Constant.EXIT_RANGE) {
-            ChineseToSpeechUtil.speech(getActivity().getApplicationContext(), "您已偏离预定轨迹!");
+            ChineseToSpeechUtil.speech(getActivity().getApplicationContext(), getString(R.string.exit_range_tip));
+            if (mVibrator != null) {
+                //设置震动周期，数组表示时间：等待+执行，单位是毫秒，下面操作代表:等待100，执行100，等待100，执行1000，
+                //后面的数字如果为-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始
+                mVibrator.vibrate(new long[]{100, 1000, 100, 1000}, -1);
+            }
+            if (tipDialog != null) {
+                tipDialog.show();
+            }
+        }
+        //进入范围
+        else if (messageEvent.getMessageType() == Constant.ENTER_RANGE) {
+            ChineseToSpeechUtil.speech(getActivity().getApplicationContext(), getString(R.string.enter_range_tip));
             if (mVibrator != null) {
                 //设置震动周期，数组表示时间：等待+执行，单位是毫秒，下面操作代表:等待100，执行100，等待100，执行1000，
                 //后面的数字如果为-1代表不重复，之执行一次，其他代表会重复，0代表从数组的第0个位置开始
 package com.cnlive.moudle.pedometer.utils;
+import android.widget.Chronometer;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -95,4 +97,40 @@ public class TimeUtil {
         SimpleDateFormat df = new SimpleDateFormat(formate);
         return df.format(new Date());
     }
+
+
+    /**
+     * @param cmt Chronometer控件
+     * @return 小时+分钟+秒数  的所有秒数
+     */
+    public static String getChronometerSeconds(Chronometer cmt) {
+        int totalss = 0;
+        String string = cmt.getText().toString();
+        if (string.length() == 7) {
+
+            String[] split = string.split(":");
+            String string2 = split[0];
+            int hour = Integer.parseInt(string2);
+            int Hours = hour * 3600;
+            String string3 = split[1];
+            int min = Integer.parseInt(string3);
+            int Mins = min * 60;
+            int SS = Integer.parseInt(split[2]);
+            totalss = Hours + Mins + SS;
+            return String.valueOf(totalss);
+        } else if (string.length() == 5) {
+
+            String[] split = string.split(":");
+            String string3 = split[0];
+            int min = Integer.parseInt(string3);
+            int Mins = min * 60;
+            int SS = Integer.parseInt(split[1]);
+
+            totalss = Mins + SS;
+            return String.valueOf(totalss);
+        }
+        return String.valueOf(totalss);
+
+
+    }
 }
@@ -36,6 +36,7 @@
                     android:textStyle="bold" />
                 <TextView
+                    android:id="@+id/tv_cat_all_rank"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="10dp"
@@ -81,6 +81,8 @@
     <string name="again_up">重新上传</string>
     <string name="myrecord">我的记录</string>
     <string name="up_fail">上传失败</string>
+    <string name="enter_range_tip">您已回归轨迹 继续参与运动吧</string>
+    <string name="exit_range_tip">您已偏离路径轨迹 请您计时回归路径!</string>
 </resources>