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

韩亚云
2 parents 375a509b 654f65fb
Showing 25 changed files with 453 additions and 360 deletions
.idea/gradle.xml
moudle_pedometer/build.gradle
moudle_pedometer/proguard-rules.pro
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunRaceDetailFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/StartTraceFragment.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/frame/view/RunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/net/bean/RunRaceDetailInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/KeepLiveService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/service/StepService.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/PedometerMainActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunMainFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunRaceDetailFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningFinishFragment.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
@@ -3,20 +3,14 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/app_user" />
-            <option value="$PROJECT_DIR$/lib_network" />
             <option value="$PROJECT_DIR$/library_baidumap" />
             <option value="$PROJECT_DIR$/moudle_pedometer" />
-            <option value="$PROJECT_DIR$/share" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
@@ -109,5 +109,7 @@ dependencies {
     implementation 'com.sothree.slidinguppanel:library:3.4.0'
     implementation project(':library_baidumap')
+    //加载动画
+    implementation 'com.wang.avi:library:2.1.3'
 }
@@ -19,3 +19,6 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+#加载动画
+-keep class com.wang.avi.** { *; }
+-keep class com.wang.avi.indicators.** { *; }
 \ No newline at end of file
@@ -5,6 +5,7 @@ import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -28,7 +29,7 @@ import static android.content.Context.SENSOR_SERVICE;
  * @author ShinnyYang
  */
 public class CollRunRaceDetailFragment extends QMUIFragment<CollRunRaceDetailFragmentView, CollRunRaceDetailFragmentPresenter, FragmentCollectRunRaceDetailBinding> {
-    private static final String TAG = "CollRunRaceDetailFragment";
+    private static final String TAG = "CollRunRaceDetail";
     private SensorManager mSensorManager;
     @Override
@@ -55,6 +56,7 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra
             @Override
             public void onClick(View view) {
                 //todo 自己测试用
+                getActivity().finish();
                 getActivity().startActivity(new Intent(getActivity(), RunLineActivity.class));
             }
         });
@@ -108,6 +110,7 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra
     @Override
     public void onDestroy() {
         super.onDestroy();
+
         if (getMvpView() != null) {
             getMvpView().onDestroy();
         }
@@ -4,6 +4,7 @@ import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.util.Log;
 import android.view.View;
 import com.cnlive.libs.base.ui.QMUIFragment;
@@ -15,6 +16,7 @@ import com.example.moudle_pedometer.databinding.FragmentStartCollectTraceBinding
 import static android.content.Context.SENSOR_SERVICE;
 public class StartTraceFragment extends QMUIFragment<StartTraceFragmentView, StartTraceFragmentPresenter, FragmentStartCollectTraceBinding> {
+    private static final String TAG = "StartTraceFragment";
     private SensorManager mSensorManager;
     @Override
@@ -143,6 +143,10 @@ public class CommonInfo {
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("writeUserStep");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("stepStartTime");
         MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("runStepService");
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).removeKey("stepStartTime");
+        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");
     }
@@ -228,7 +228,11 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
                     queryHistoryTrace(context, entityName, startTime, endTime);
                 } else {
                     if (getView() != null) {
-
+                        if (trackPoints.size() == 1) {
+                            getView().setHistoryLastPoint(trackPoints.get(0));
+                        } else if (trackPoints.size() > 1) {
+                            getView().setHistoryLastPoint(trackPoints.get(trackPoints.size() - 1));
+                        }
                         //开始比较(杨帅的思路)
 //                        for (int i = 0; i < trackPoints.size(); i++) {
 //                            if (matchIndex < importPoints.size() - 1) {
@@ -262,9 +266,9 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
                             LatLng importLatLng = importPoints.get(i);
                             for (int j = index; j < trackPoints.size(); j++) {
                                 double distance = DistanceUtil.getDistance(importLatLng, trackPoints.get(j));
-                                if (distance<100){
-                                    importHash.put(i,true);
-                                    index=j;
+                                if (distance < 50) {
+                                    importHash.put(i, true);
+                                    index = j;
                                 }
                             }
                         }
@@ -284,6 +288,7 @@ public class RunningMapFragmentPresenter extends MvpBasePresenter&lt;RunningMapFrag
                         }
                         Log.e(TAG, "结果: " + result);
                         Log.e(TAG, "onHistoryTrackCallback: 轨迹点:" + trackPoints.size() + ",详情" + GsonUtil.GsonString(trackPoints));
+
                         MyMapUtil.drawHistoryTrack(context, getView().baiduMap, trackPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
 //                        MyMapUtil.drawMapLineRoutePoint(context, getView().baiduMap, MyMapUtil.optimizePoints(routePoints), R.color.red);
                     }
@@ -25,6 +25,7 @@ import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.model.RunningMapBean;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
+import com.cnlive.moudle.pedometer.service.KeepLiveService;
 import com.cnlive.moudle.pedometer.service.StepService;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity;
@@ -236,6 +237,7 @@ public class RunMainFragmentView implements MvpView {
             public void onClick(View view) {
                 //继续记录轨迹
                 if (StepService.mClient != null && StepService.traceListener != null) {
+                    CommonInfo.setTsRunBaiduTraceService(getContext(), true);
                     StepService.mClient.startTrace(StepService.mTrace, StepService.traceListener);
                 }
                 needWriteDataFlag = true;
@@ -301,6 +303,7 @@ public class RunMainFragmentView implements MvpView {
                                             SelectDialog selectDialog = new SelectDialog(fragment.getActivity(), "确定结束运动吗?", "确定", new SelectDialog.DialogInterface() {
                                                 @Override
                                                 public void onClick(SelectDialog dialog) {
+                                                    CommonInfo.setIsRunKeepAliveService(getContext(), false);
                                                     CommonInfo.setIsWriteUserStep(getContext(), false);
                                                     fragment.binding.cpCurrent.setVisibility(View.GONE);
                                                     ButtonAnimUtil.setViewDefault(fragment.binding.flStop);
@@ -374,6 +377,7 @@ public class RunMainFragmentView implements MvpView {
             public void onClick(View view) {
                 //暂停轨迹记录
                 if (StepService.mClient != null && StepService.traceListener != null) {
+                    CommonInfo.setTsRunBaiduTraceService(getContext(), false);
                     StepService.mClient.stopGather(StepService.traceListener);
                 }
                 //将当前计时器时间戳写入数据库
@@ -457,8 +461,11 @@ public class RunMainFragmentView implements MvpView {
         if (CommonInfo.getStepStartTime(context) == 0) {
             CommonInfo.setStepStartTime(context, TimeUtil.getNowTimeStamp());
         }
-        Intent intent = new Intent(fragment.getActivity(), StepService.class);
-        intent.putExtra("userId", userId);
+        CommonInfo.setIsRunKeepAliveService(context, true);
+        CommonInfo.setIsRunStepService(context, true);
+        CommonInfo.setTsRunBaiduTraceService(context, true);
+        CommonInfo.setIsWriteUserStep(context, true);
+        Intent intent = new Intent(fragment.getActivity(), KeepLiveService.class);
         ContextCompat.startForegroundService(fragment.getActivity(), intent);
     }
@@ -141,7 +141,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         //隐藏空视图
         fragment.binding.emptyLayout.setVisibility(View.GONE);
         //显示立即报名按钮
-        fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
+//        fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
         //设置底部卡片第一次可滑动的位置
         fragment.binding.slidingLayout.setAnchorPoint(0.6f);
         fragment.binding.slidingLayout.addPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() {
@@ -170,18 +170,18 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                 }
-                if (slideOffset == 0) {
-                    //在初始位置
-                    if (fragment.binding.includeStreet.rlStartBtn.getVisibility() == View.GONE) {
-                        fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
-                    }
-
-                } else {
-                    //用户进行滑动
-                    if (fragment.binding.includeStreet.rlStartBtn.getVisibility() == View.VISIBLE) {
-                        fragment.binding.includeStreet.rlStartBtn.setVisibility(View.GONE);
-                    }
-                }
+//                if (slideOffset == 0) {
+//                    //在初始位置
+//                    if (fragment.binding.includeStreet.rlStartBtn.getVisibility() == View.GONE) {
+//                        fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
+//                    }
+//
+//                } else {
+//                    //用户进行滑动
+//                    if (fragment.binding.includeStreet.rlStartBtn.getVisibility() == View.VISIBLE) {
+//                        fragment.binding.includeStreet.rlStartBtn.setVisibility(View.GONE);
+//                    }
+//                }
             }
             @Override
@@ -244,7 +244,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         }
         //判断是否显示个人排行榜
-        if (!TextUtils.isEmpty(runRaceDetailInfo.getUserMileage())) {
+        if (runRaceDetailInfo.isIndividualAchievement()) {
             //显示
             fragment.binding.includePersonScore.llPersonScoreRoot.setVisibility(View.VISIBLE);
             //设置完成人数
@@ -272,7 +272,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             fragment.binding.includePersonScore.llPersonScoreRoot.setVisibility(View.GONE);
         }
         //设置是否显示排行榜
-        if (!TextUtils.isEmpty(runRaceDetailInfo.getFirstFaceUrl())) {
+        if (runRaceDetailInfo.isRanking()) {
             fragment.binding.includeRank.llRankRoot.setVisibility(View.VISIBLE);
             //设置第一名头像
             GlideApp.with(getContext()).load(runRaceDetailInfo.getFirstFaceUrl()).into(fragment.binding.includeRank.ivFirstPersonUrl);
@@ -299,53 +299,64 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             GlideApp.with(getContext()).load(runRaceDetailInfo.getRoadmap()).into(fragment.binding.includeStreetIntroduce.ivRoadMao);
         }
-        //开始按钮点击事件(未滑动)
-        fragment.binding.includeStreet.rlStartBtn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (fragment.getActivity() == null) {
-                    return;
-                }
-                //立即报名
-                if ("0".equals(fragment.binding.includeStreet.rlStartBtn.getTag())) {
-                    fragment.binding.includeStreet.rlStartBtn.setTag("1");
-                    fragment.binding.includeStreet.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_start_now));
-                    fragment.binding.includeStreet.tvGoTip.setVisibility(View.VISIBLE);
+        //判断用户是否报名
+        if (runRaceDetailInfo.isSignResult()){
+            fragment.binding.rlScrollViewStartBtn.setTag("1");
+            fragment.binding.tvRunNow.setText("现在开始");
+            fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
+        }else {
+            fragment.binding.rlScrollViewStartBtn.setTag("0");
+            fragment.binding.tvRunNow.setText("立即报名");
+            fragment.binding.tvGoTip.setVisibility(View.GONE);
+        }
-                    //设置滑动
-                    fragment.binding.rlScrollViewStartBtn.setTag("1");
-                    fragment.binding.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_start_now));
-                    fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
-                    RegistrationInfoActivity.newInstance(fragment.getActivity(), 1001);
-                } else {
-                    //计算当前位置与起点坐标距离
-                    if (firstLatLng != null && trackPoints != null && trackPoints.size() > 0) {
-                        double distance = DistanceUtil.getDistance(firstLatLng, trackPoints.get(0));
-                        if (distance < 20) {
-                            //开始运动
-                            fragment.binding.includeStreet.rlStartBtn.setTag("0");
-                            fragment.binding.includeStreet.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_sign_up));
-                            fragment.binding.includeStreet.tvGoTip.setVisibility(View.GONE);
-                            fragment.getActivity().startActivity(new Intent(getContext(), PedometerMainActivity.class));
-                            //设置滑动
-                            fragment.binding.rlScrollViewStartBtn.setTag("0");
-                            fragment.binding.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_sign_up));
-                            fragment.binding.tvGoTip.setVisibility(View.GONE);
-                        } else {
-                            TipDialog tipDialog = new TipDialog(getContext(), getContext().getResources().getString(R.string.run_race_far_tip), "我知道了", R.color.green_round, new TipDialog.DialogInterface() {
-                                @Override
-                                public void onClick(TipDialog dialog) {
-                                    dialog.dismiss();
-                                }
-                            });
-                            tipDialog.show();
-                            tipDialog.setCancelable(false);
-                            tipDialog.setCanceledOnTouchOutside(false);
-                        }
-                    }
-                }
-            }
-        });
+//        //开始按钮点击事件(未滑动)
+//        fragment.binding.includeStreet.rlStartBtn.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                if (fragment.getActivity() == null) {
+//                    return;
+//                }
+//                //立即报名
+//                if ("0".equals(fragment.binding.includeStreet.rlStartBtn.getTag())) {
+//                    fragment.binding.includeStreet.rlStartBtn.setTag("1");
+//                    fragment.binding.includeStreet.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_start_now));
+//                    fragment.binding.includeStreet.tvGoTip.setVisibility(View.VISIBLE);
+//
+//                    //设置滑动
+//                    fragment.binding.rlScrollViewStartBtn.setTag("1");
+//                    fragment.binding.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_start_now));
+//                    fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
+//                    RegistrationInfoActivity.newInstance(fragment.getActivity(), 1001);
+//                } else {
+//                    //计算当前位置与起点坐标距离
+//                    if (firstLatLng != null && trackPoints != null && trackPoints.size() > 0) {
+//                        double distance = DistanceUtil.getDistance(firstLatLng, trackPoints.get(0));
+//                        if (distance < 20) {
+//                            //开始运动
+//                            fragment.binding.includeStreet.rlStartBtn.setTag("0");
+//                            fragment.binding.includeStreet.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_sign_up));
+//                            fragment.binding.includeStreet.tvGoTip.setVisibility(View.GONE);
+//                            fragment.getActivity().startActivity(new Intent(getContext(), PedometerMainActivity.class));
+//                            //设置滑动
+//                            fragment.binding.rlScrollViewStartBtn.setTag("0");
+//                            fragment.binding.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_sign_up));
+//                            fragment.binding.tvGoTip.setVisibility(View.GONE);
+//                        } else {
+//                            TipDialog tipDialog = new TipDialog(getContext(), getContext().getResources().getString(R.string.run_race_far_tip), "我知道了", R.color.green_round, new TipDialog.DialogInterface() {
+//                                @Override
+//                                public void onClick(TipDialog dialog) {
+//                                    dialog.dismiss();
+//                                }
+//                            });
+//                            tipDialog.show();
+//                            tipDialog.setCancelable(false);
+//                            tipDialog.setCanceledOnTouchOutside(false);
+//                        }
+//                    }
+//                }
+//            }
+//        });
         //开始按钮点击事件(用户进行滑动滑动)
         fragment.binding.rlScrollViewStartBtn.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -441,6 +441,21 @@ public class RunningMapFragmentView implements MvpView, SensorEventListener {
     }
+    /**
+     * 设置从历史轨迹中查询到的最新点
+     *
+     * @param lastPoint
+     */
+    public void setHistoryLastPoint(LatLng lastPoint) {
+        if (currentPoints != null) {
+            currentPoints.clear();
+            currentPoints.add(lastPoint);
+        } else {
+            currentPoints = new ArrayList<>();
+            currentPoints.add(lastPoint);
+        }
+    }
+
     public void onResume() {
         if (mMapView != null) {
@@ -17,6 +17,9 @@ public class RunRaceDetailInfo {
      * endLocation : 首都师范大学操场西门
      * end_time : 1571140800000
      * eventType : 徒步
+     * ranking : true
+     * individualAchievement : true
+     * signResult : false
      * faceUrl : ["http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557039035723_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557034319038_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2018/0902/1535858459612_small.jpg"]
      * finishFaceUrl : ["http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557039035723_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2019/0523/1558599016203_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2019/0523/1558599016203_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2019/0523/1558599016203_small.jpg","http://yweb0.cnliveimg.com/images/headImg/2019/0523/1558599016203_small.jpg"]
      * finishNum : 33
@@ -44,6 +47,9 @@ public class RunRaceDetailInfo {
     private String endLocation;
     private long end_time;
     private String eventType;
+    private boolean ranking;
+    private boolean individualAchievement;
+    private boolean signResult;
     private String finishNum;
     private String firstEmployTime;
     private String firstFaceUrl;
@@ -112,6 +118,30 @@ public class RunRaceDetailInfo {
         this.eventType = eventType;
     }
+    public boolean isRanking() {
+        return ranking;
+    }
+
+    public void setRanking(boolean ranking) {
+        this.ranking = ranking;
+    }
+
+    public boolean isIndividualAchievement() {
+        return individualAchievement;
+    }
+
+    public void setIndividualAchievement(boolean individualAchievement) {
+        this.individualAchievement = individualAchievement;
+    }
+
+    public boolean isSignResult() {
+        return signResult;
+    }
+
+    public void setSignResult(boolean signResult) {
+        this.signResult = signResult;
+    }
+
     public String getFinishNum() {
         return finishNum;
     }
@@ -64,9 +64,6 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
     public void onCreate() {
         super.onCreate();
         instance = this;
-//        if (!ServiceUtils.isServiceRunning(getApplicationContext(), "com.cnlive.moudle.pedometer.service.StepService")) {
-//            startService(new Intent(getApplicationContext(), StepService.class));
-//        }
         init();
         initBroadCastReceiver();
         handler = new Handler();
@@ -78,13 +75,13 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
                 if (isRun) {
                     handler.postDelayed(this, 5000);
                 } else {
-//                    try {
-//                        if (myReceiver != null) {
-//                            unregisterReceiver(myReceiver);
-//                        }
-//                    } catch (Exception e) {
-//                        Log.e(TAG, "run: ");
-//                    }
+                    try {
+                        if (myReceiver != null) {
+                            unregisterReceiver(myReceiver);
+                        }
+                    } catch (Exception e) {
+                        Log.e(TAG, "run: ");
+                    }
                     stopPlaySong();
                     stopForeground(true);
                 }
@@ -94,11 +91,6 @@ public class KeepLiveService extends Service implements MediaPlayer.OnCompletion
     }
-    @Override
-    public void onTaskRemoved(Intent rootIntent) {
-        super.onTaskRemoved(rootIntent);
-        Log.e("onTaskRemoved", "onTaskRemoved");
-    }
     /**
      * 初始化广播
@@ -48,6 +48,7 @@ import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
 import com.cnlive.moudle.pedometer.utils.MySpHelper;
 import com.cnlive.moudle.pedometer.utils.ServiceUtils;
+import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import org.greenrobot.eventbus.EventBus;
@@ -168,9 +169,7 @@ public class StepService extends Service implements SensorEventListener {
     public void onCreate() {
         super.onCreate();
         init();
-        showStartForegroundNotification();
         initBroadcastReceiver();
-        CommonInfo.setIsRunKeepAliveService(getApplicationContext(), true);
         if (!ServiceUtils.isServiceRunning(getApplicationContext(), "com.cnlive.moudle.pedometer.service.KeepLiveService")) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 startForegroundService(new Intent(getApplicationContext(), KeepLiveService.class));
@@ -178,6 +177,7 @@ public class StepService extends Service implements SensorEventListener {
                 startService(new Intent(getApplicationContext(), KeepLiveService.class));
             }
         }
+        showStartForegroundNotification();
     }
     private void initTrace() {
@@ -281,8 +281,6 @@ public class StepService extends Service implements SensorEventListener {
             public void onStartGatherCallback(int errorNo, String message) {
                 if (StatusCodes.SUCCESS == errorNo || StatusCodes.GATHER_STARTED == errorNo) {
                     Toast.makeText(getApplicationContext(), "开始采集", Toast.LENGTH_LONG).show();
-                    CommonInfo.setTsRunBaiduTraceService(getApplicationContext(), true);
-
                 }
             }
@@ -302,7 +300,6 @@ public class StepService extends Service implements SensorEventListener {
                     Toast.makeText(getApplicationContext(), "停止采集", Toast.LENGTH_LONG).show();
                     if (mClient != null) {
                         mClient.stopTrace(mTrace, traceListener);
-                        CommonInfo.setTsRunBaiduTraceService(getApplicationContext(), false);
                     }
                 }
             }
@@ -353,7 +350,7 @@ public class StepService extends Service implements SensorEventListener {
             mClient.startTrace(mTrace, traceListener);
             long stepStartTime = CommonInfo.getStepStartTime(getApplicationContext());
             if (stepStartTime == 0) {
-                CommonInfo.getStepStartTime(getApplicationContext());
+                CommonInfo.setStepStartTime(getApplicationContext(), TimeUtil.getCurrentTime());
             }
         }
@@ -372,7 +369,7 @@ public class StepService extends Service implements SensorEventListener {
             if (!EventBus.getDefault().isRegistered(this)) {
                 EventBus.getDefault().register(this);
             }
-            CommonInfo.setIsWriteUserStep(getApplicationContext(), true);
+
             entityName = userId;
             initTodayData(userId);
             initTrace();
@@ -449,7 +446,7 @@ public class StepService extends Service implements SensorEventListener {
                 .setSmallIcon(R.mipmap.ic_launcher)
 //                .setCustomContentView(remoteViews)
                 .setContentTitle(getResources().getString(R.string.app_name))
-                .setContentText("正在记录你的运动")
+                .setContentText("正在记录您的运动")
                 .setCategory(Notification.CATEGORY_SERVICE)
                 .setSound(null)
                 .setWhen(System.currentTimeMillis())
@@ -22,6 +22,7 @@ import com.baidu.mapapi.CoordType;
 import com.baidu.mapapi.SDKInitializer;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.ui.QMUIFragmentActivity;
+import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
@@ -53,7 +54,6 @@ public class PedometerMainActivity extends QMUIFragmentActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        StatusBarUtil2.setColor(this, getResources().getColor(R.color.run_main_bg), 0);
 //        setContentView(R.layout.activity_pedometer_main);
     }
@@ -14,6 +14,7 @@ import com.baidu.mapapi.CoordType;
 import com.baidu.mapapi.SDKInitializer;
 import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.ui.QMUIFragmentActivity;
+import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.RunningMapBean;
@@ -52,7 +53,6 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        StatusBarUtil2.setColor(this, getResources().getColor(R.color.run_main_bg), 0);
         //判断用户是否结束运动
         boolean isRunStep = CommonInfo.getIsRunStepService(this);
         //没有找到相关记录
@@ -86,8 +86,8 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     @Override
     public void onBackPressed() {
         super.onBackPressed();
-        if (fragment != null) {
-            if (fragment instanceof RunMainFragment) {
+        if (getCurrentFragment()!=null) {
+            if (getCurrentFragment() instanceof RunMainFragment) {
                 return;
             }
         }
@@ -8,6 +8,7 @@ import android.util.Log;
 import android.view.View;
 import com.cnlive.libs.base.ui.QMUIFragment;
+import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.pedometer.frame.presenter.RunMainFragmentPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RunMainFragmentView;
@@ -17,6 +18,7 @@ import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRunMainBinding;
+import com.qmuiteam.qmui.util.QMUIStatusBarHelper;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -29,6 +31,8 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
+        QMUIStatusBarHelper.setStatusBarDarkMode(getActivity());
+        StatusBarUtil2.setColor(getActivity(), getResources().getColor(R.color.run_main_bg), 0);
         EventBus.getDefault().register(this);
         if (getMvpView() != null) {
             new Handler().postDelayed(new Runnable() {
@@ -103,6 +107,7 @@ public class RunMainFragment extends QMUIFragment&lt;RunMainFragmentView, RunMainFr
             }
         }
     }
+
     /**
      * 屏蔽边缘返回
      * 杨帅
@@ -14,6 +14,7 @@ import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import com.cnlive.libs.base.ui.QMUIFragment;
+import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.RunRaceDetailFragmentPresenter;
 import com.cnlive.moudle.pedometer.frame.view.RunRaceDetailFragmentView;
@@ -24,6 +25,7 @@ import com.cnlive.moudle.pedometer.utils.ScreenUtil;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
 import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRunRaceDetailBinding;
+import com.qmuiteam.qmui.util.QMUIStatusBarHelper;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
 import org.greenrobot.eventbus.EventBus;
@@ -60,7 +62,8 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-
+        QMUIStatusBarHelper.setStatusBarLightMode(getActivity());
+        StatusBarUtil2.setColor(getActivity(), getResources().getColor(R.color.white), 0);
         mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务
         if (getMvpView() != null) {
             getMvpView().initMap();
@@ -46,6 +46,8 @@ public class RunningFinishFragment extends QMUIFragment&lt;RunningFinishFragmentVie
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         StepUtil.clearRunData(getActivity(), CommonInfo.getUserId(getActivity()));
+        //todo测试用
+        CommonInfo.reset(getActivity());
         if (getArguments() != null) {
             runningFinishBean = (RunningFinishBean) getArguments().getSerializable("runningFinishBean");
             if (runningFinishBean != null) {
@@ -55,6 +57,7 @@ public class RunningFinishFragment extends QMUIFragment&lt;RunningFinishFragmentVie
             }
         }
     }
+
     /**
      * 屏蔽边缘返回
      * 杨帅
@@ -121,7 +121,7 @@ public class RunningMapFragment extends QMUIFragment&lt;RunningMapFragmentView, Run
 //            long startTime = current - hour * 3600 * 1000 - minute * 60 * 1000 - second * 1000;
             long endTime = current;
 //            Log.e(TAG, "onViewCreated: " + "hour:" + hour + ",minute" + minute + ",second:" + second);
-            getPresenter().queryHistoryTrace(getActivity(), StepService.entityName, startTime, endTime);
+            getPresenter().queryHistoryTrace(getActivity(), StepService.entityName, 1560859257, endTime);
             //查询实时轨迹
             getPresenter().queryRealTimeTrace(getActivity(), StepService.entityName, startTime);
@@ -14,7 +14,7 @@ public class TimeUtil {
      * @return
      */
     public static long getCurrentTime() {
-        return System.currentTimeMillis() / 1000;
+        return System.currentTimeMillis();
     }
     /**
@@ -73,7 +73,7 @@ public class TimeUtil {
      *
      * @return 格式化后的日期
      */
-    public static String getStampToTime(long time,String pattern) {
+    public static String getStampToTime(long time, String pattern) {
         SimpleDateFormat sdf = new SimpleDateFormat(pattern);
         Date date = new Date(time);
         return sdf.format(date);
@@ -2,132 +2,142 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/sliding_layout"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="bottom"
-        sothree:umanoDragView="@+id/dragView"
-        sothree:umanoFadeColor="@color/black_20"
-        sothree:umanoOverlay="true"
-        sothree:umanoPanelHeight="360dp"
-        sothree:umanoParallaxOffset="100dp"
-        sothree:umanoScrollableView="@+id/scrollView"
-        sothree:umanoShadowHeight="0dp">
-
-        <!-- MAIN CONTENT -->
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <com.baidu.mapapi.map.MapView
-                android:id="@+id/mapView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
-            <!--地图上面加一层类似于全透明黑色蒙版-->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="#0D000000"
-                android:clickable="false"
-                android:focusable="false"
-                android:focusableInTouchMode="false"></LinearLayout>
-
-            <FrameLayout
-                android:id="@+id/fl_back"
-                android:layout_width="55dp"
-                android:layout_height="55dp"
-                android:background="@drawable/button_fab_white"
-                android:focusable="true">
-
-                <ImageView
-                    android:layout_width="12dp"
-                    android:layout_height="20dp"
-                    android:layout_gravity="center"
-                    android:layout_marginLeft="-2dp"
-                    android:background="@drawable/icon_back"
-                    android:focusable="false" />
-            </FrameLayout>
+        android:layout_height="match_parent">
+        <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/sliding_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="bottom"
+            sothree:umanoDragView="@+id/dragView"
+            sothree:umanoFadeColor="@color/black_20"
+            sothree:umanoOverlay="true"
+            sothree:umanoPanelHeight="310dp"
+            sothree:umanoParallaxOffset="100dp"
+            sothree:umanoScrollableView="@+id/scrollView"
+            sothree:umanoShadowHeight="0dp">
+
+            <!-- MAIN CONTENT -->
             <FrameLayout
-                android:layout_width="55dp"
-                android:layout_height="55dp"
-                android:layout_gravity="right"
-                android:background="@drawable/button_fab_white"
-                android:focusable="true">
-
-                <ImageView
-                    android:layout_width="19dp"
-                    android:layout_height="18dp"
-                    android:layout_gravity="center"
-                    android:background="@drawable/icon_share" />
-            </FrameLayout>
-            <!---->
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+                <com.baidu.mapapi.map.MapView
+                    android:id="@+id/mapView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
+                <!--地图上面加一层类似于全透明黑色蒙版-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="#0D000000"
+                    android:clickable="false"
+                    android:focusable="false"
+                    android:focusableInTouchMode="false"></LinearLayout>
+
+                <FrameLayout
+                    android:id="@+id/fl_back"
+                    android:layout_width="55dp"
+                    android:layout_height="55dp"
+                    android:background="@drawable/button_fab_white"
+                    android:focusable="true">
+
+                    <ImageView
+                        android:layout_width="12dp"
+                        android:layout_height="20dp"
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="-2dp"
+                        android:background="@drawable/icon_back"
+                        android:focusable="false" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="55dp"
+                    android:layout_height="55dp"
+                    android:layout_gravity="right"
+                    android:background="@drawable/button_fab_white"
+                    android:focusable="true">
+
+                    <ImageView
+                        android:layout_width="19dp"
+                        android:layout_height="18dp"
+                        android:layout_gravity="center"
+                        android:background="@drawable/icon_share" />
+                </FrameLayout>
+                <!---->
-        </FrameLayout>
-        <!-- SLIDING LAYOUT -->
-        <FrameLayout
-            android:id="@+id/dragView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clickable="true"
-            android:focusable="false"
-            android:orientation="vertical">
+            </FrameLayout>
-            <ScrollView
-                android:id="@+id/scrollView"
+            <!-- SLIDING LAYOUT -->
+            <FrameLayout
+                android:id="@+id/dragView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="60dp"
-                android:scrollbars="none">
+                android:clickable="true"
+                android:focusable="false"
+                android:orientation="vertical">
-                <LinearLayout
-                    android:id="@+id/ll_root"
+                <ScrollView
+                    android:id="@+id/scrollView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical">
-                    <!--用户个人信息-->
-                    <include
-                        android:id="@+id/include_finish_user_info"
-                        layout="@layout/layout_finish_user_info" />
-                    <!--总步数-->
-                    <include
-                        android:id="@+id/include_finish_step"
-                        layout="@layout/layout_finish_step"
-                        android:visibility="visible" />
-                    <!--跑步路线-->
-                    <include
-                        android:id="@+id/include_finish_run_route"
-                        layout="@layout/layout_finish_running_route"
-                        android:visibility="visible" />
-                </LinearLayout>
-
-            </ScrollView>
-            <!--按钮-->
-            <RelativeLayout
-                android:id="@+id/rl_scrollView_startBtn"
-                android:layout_width="match_parent"
-                android:layout_height="40sp"
-                android:layout_gravity="bottom"
-                android:background="@color/green_round"
-                android:tag="0">
-
-                <TextView
-                    android:id="@+id/tv_run_now"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:tag="0"
-                    android:text="保存中"
-                    android:textColor="@color/white"
-                    android:textSize="18sp" />
-
-
-            </RelativeLayout>
-        </FrameLayout>
-    </com.sothree.slidinguppanel.SlidingUpPanelLayout>
-
+                    android:layout_marginBottom="60dp"
+                    android:scrollbars="none">
+
+                    <LinearLayout
+                        android:id="@+id/ll_root"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+                        <!--用户个人信息-->
+                        <include
+                            android:id="@+id/include_finish_user_info"
+                            layout="@layout/layout_finish_user_info" />
+                        <!--总步数-->
+                        <include
+                            android:id="@+id/include_finish_step"
+                            layout="@layout/layout_finish_step"
+                            android:visibility="visible" />
+                        <!--跑步路线-->
+                        <include
+                            android:id="@+id/include_finish_run_route"
+                            layout="@layout/layout_finish_running_route"
+                            android:visibility="visible" />
+                    </LinearLayout>
+
+                </ScrollView>
+            </FrameLayout>
+        </com.sothree.slidinguppanel.SlidingUpPanelLayout>
+        <!--按钮-->
+        <LinearLayout
+            android:id="@+id/rl_scrollView_startBtn"
+            android:layout_width="match_parent"
+            android:layout_height="40sp"
+            android:layout_gravity="bottom"
+            android:background="@color/green_round"
+            android:gravity="center"
+            android:tag="0">
+
+            <com.wang.avi.AVLoadingIndicatorView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                app:indicatorColor="@color/white"
+                app:indicatorName="BallSpinFadeLoaderIndicator" />
+
+            <TextView
+                android:id="@+id/tv_run_now"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_marginLeft="5dp"
+                android:tag="0"
+                android:text="保存中"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+        </LinearLayout>
+    </FrameLayout>
 </layout>
 \ No newline at end of file
@@ -33,7 +33,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_weight="1.5"
+                    android:layout_weight="1"
                     android:gravity="center"
                     android:paddingLeft="50dp">
@@ -260,19 +260,21 @@
                             android:id="@+id/ll_two_bottom_button"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                            android:gravity="center"
-                            android:visibility="gone">
+                            android:gravity="center_horizontal"
+                            android:visibility="gone"
+
+                            >
                             <LinearLayout
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
-                                android:layout_marginRight="70dp"
+                                android:layout_marginRight="50dp"
                                 android:orientation="vertical">
                                 <FrameLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginTop="5dp"
+                                    android:layout_marginTop="10dp"
                                     android:visibility="invisible">
                                     <ImageView
@@ -327,7 +329,7 @@
                                     android:id="@+id/fl_stop_tip"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginTop="5dp"
+                                    android:layout_marginTop="10dp"
                                     android:visibility="invisible">
                                     <ImageView
@@ -2,147 +2,151 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-    <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/sliding_layout"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="bottom"
-        sothree:umanoDragView="@+id/dragView"
-        sothree:umanoFadeColor="@color/black_20"
-        sothree:umanoOverlay="true"
-        sothree:umanoPanelHeight="141dp"
-        sothree:umanoParallaxOffset="250dp"
-        sothree:umanoScrollableView="@+id/scrollView"
-        sothree:umanoShadowHeight="0dp">
-
-        <!-- MAIN CONTENT -->
-        <FrameLayout
-            android:id="@+id/fl_root"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:layout_height="match_parent">
-            <com.baidu.mapapi.map.MapView
-                android:id="@+id/mapView"
+        <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
+            android:id="@+id/sliding_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="bottom"
+            sothree:umanoDragView="@+id/dragView"
+            sothree:umanoFadeColor="@color/black_20"
+            sothree:umanoOverlay="true"
+            sothree:umanoPanelHeight="141dp"
+            sothree:umanoParallaxOffset="250dp"
+            sothree:umanoScrollableView="@+id/scrollView"
+            sothree:umanoShadowHeight="0dp">
+
+            <!-- MAIN CONTENT -->
+            <FrameLayout
+                android:id="@+id/fl_root"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
+                android:layout_height="match_parent">
-            <!--地图上面加一层类似于全透明黑色蒙版-->
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="#0D000000"
-                android:clickable="false"
-                android:focusable="false"
-                android:focusableInTouchMode="false"></LinearLayout>
-
-            <ImageView
-                android:id="@+id/iv_back"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_margin="10dp"
-                android:background="@drawable/xqy_return" />
-
-
-            <ImageView
-                android:id="@+id/iv_share"
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:layout_gravity="right"
-                android:layout_margin="10dp"
-                android:background="@drawable/xqt_share"
-                android:visibility="gone" />
-            <!---->
-            <com.cnlive.strike.ui.widget.UIEmptyView
-                android:id="@+id/empty_layout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/color_fff"
-                android:focusable="true"
-                android:focusableInTouchMode="true"
-                android:visibility="gone" />
+                <com.baidu.mapapi.map.MapView
+                    android:id="@+id/mapView"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
-        </FrameLayout>
+                <!--地图上面加一层类似于全透明黑色蒙版-->
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="#0D000000"
+                    android:clickable="false"
+                    android:focusable="false"
+                    android:focusableInTouchMode="false"></LinearLayout>
+
+                <ImageView
+                    android:id="@+id/iv_back"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_margin="10dp"
+                    android:background="@drawable/xqy_return" />
+
+
+                <ImageView
+                    android:id="@+id/iv_share"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_gravity="right"
+                    android:layout_margin="10dp"
+                    android:background="@drawable/xqt_share"
+                    android:visibility="gone" />
+                <!---->
+                <com.cnlive.strike.ui.widget.UIEmptyView
+                    android:id="@+id/empty_layout"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@color/color_fff"
+                    android:focusable="true"
+                    android:focusableInTouchMode="true"
+                    android:visibility="gone" />
-        <!-- SLIDING LAYOUT -->
-        <FrameLayout
-            android:id="@+id/dragView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clickable="false"
-            android:focusable="false">
+            </FrameLayout>
-            <ScrollView
-                android:id="@+id/scrollView"
+            <!-- SLIDING LAYOUT -->
+            <FrameLayout
+                android:id="@+id/dragView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:scrollbars="none">
+                android:clickable="false"
+                android:focusable="false">
-                <LinearLayout
-                    android:id="@+id/ll_root"
+                <ScrollView
+                    android:id="@+id/scrollView"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
-                    <!--跑道-->
-                    <include
-                        android:id="@+id/include_street"
-                        layout="@layout/layout_run_detail_street" />
-                    <!--成绩-->
-                    <include
-                        android:id="@+id/include_person_score"
-                        layout="@layout/layout_run_detail_person_score"
-                        android:visibility="visible" />
-                    <!--排行-->
-                    <include
-                        android:id="@+id/include_rank"
-                        layout="@layout/layout_run_detail_rank"
-                        android:visibility="visible" />
-                    <!---->
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="20dp"
-                        android:background="#F4F4F4" />
-                    <!--路线介绍-->
-                    <include
-                        android:id="@+id/include_street_introduce"
-                        layout="@layout/layout_run_detail_street_introduce" />
-                </LinearLayout>
-
-            </ScrollView>
-            <!--按钮-->
-            <RelativeLayout
-                android:id="@+id/rl_scrollView_startBtn"
-                android:layout_width="match_parent"
-                android:layout_height="40sp"
-                android:layout_gravity="bottom"
-                android:background="@color/green_round"
-                android:tag="0">
-
-                <TextView
-                    android:id="@+id/tv_run_now"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:tag="0"
-                    android:text="@string/run_race_btn_sign_up"
-                    android:textColor="@color/white"
-                    android:textSize="18sp" />
-
-                <TextView
-                    android:id="@+id/tv_go_tip"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerInParent="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginRight="10dp"
-                    android:text="Go!"
-                    android:textColor="@color/white"
-                    android:textSize="18sp"
-                    android:visibility="gone" />
-
-            </RelativeLayout>
-        </FrameLayout>
-    </com.sothree.slidinguppanel.SlidingUpPanelLayout>
+                    android:layout_height="match_parent"
+                    android:scrollbars="none">
+                    <LinearLayout
+                        android:id="@+id/ll_root"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+                        <!--跑道-->
+                        <include
+                            android:id="@+id/include_street"
+                            layout="@layout/layout_run_detail_street" />
+                        <!--成绩-->
+                        <include
+                            android:id="@+id/include_person_score"
+                            layout="@layout/layout_run_detail_person_score"
+                            android:visibility="visible" />
+                        <!--排行-->
+                        <include
+                            android:id="@+id/include_rank"
+                            layout="@layout/layout_run_detail_rank"
+                            android:visibility="visible" />
+                        <!---->
+                        <View
+                            android:layout_width="match_parent"
+                            android:layout_height="20dp"
+                            android:background="#F4F4F4" />
+                        <!--路线介绍-->
+                        <include
+                            android:id="@+id/include_street_introduce"
+                            layout="@layout/layout_run_detail_street_introduce" />
+                    </LinearLayout>
+
+                </ScrollView>
+
+            </FrameLayout>
+        </com.sothree.slidinguppanel.SlidingUpPanelLayout>
+        <!--按钮-->
+        <RelativeLayout
+            android:id="@+id/rl_scrollView_startBtn"
+            android:layout_width="match_parent"
+            android:layout_height="40sp"
+            android:layout_gravity="bottom"
+            android:background="@color/green_round"
+            android:tag="0">
+
+            <TextView
+                android:id="@+id/tv_run_now"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:tag="0"
+                android:text="@string/run_race_btn_sign_up"
+                android:textColor="@color/white"
+                android:textSize="18sp" />
+
+            <TextView
+                android:id="@+id/tv_go_tip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerInParent="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="10dp"
+                android:text="Go!"
+                android:textColor="@color/white"
+                android:textSize="18sp"
+                android:visibility="gone" />
+        </RelativeLayout>
+    </FrameLayout>
 </layout>
 \ No newline at end of file
@@ -56,7 +56,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="3dp"
+                    android:layout_marginBottom="4dp"
                     android:text="GPS"
                     android:textColor="@color/text_black"
                     android:textSize="12sp"
@@ -67,7 +67,7 @@
                     android:layout_width="18dp"
                     android:layout_height="5dp"
                     android:layout_marginLeft="5dp"
-                    android:layout_marginBottom="3dp" />
+                    android:layout_marginBottom="4dp" />
             </LinearLayout>
             <!---->
             <TextView
@@ -104,7 +104,7 @@
                     android:layout_width="20dp"
                     android:layout_height="20dp"
                     android:layout_gravity="center"
-                    android:layout_marginBottom="3dp"
+                    android:layout_marginBottom="4dp"
                     android:background="@drawable/rt_ic_location_blank"
                     android:focusable="false" />
             </FrameLayout>
@@ -84,7 +84,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="40sp"
                     android:background="@color/green_round"
-                    android:tag="0">
+                    android:tag="0"
+                    android:visibility="gone">
                     <TextView
                         android:id="@+id/tv_run_now"