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

韩亚云
2 parents e57ec000 b3f8d752
Showing 8 changed files with 394 additions and 99 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/OnGoingFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningFinishFragmetPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/MyRecordView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/OnGoingFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/OnGoingActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/OnGoingFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/StepUtil.java
 package com.cnlive.moudle.pedometer.frame.presenter;
+import android.content.Context;
+import android.view.View;
+
+import com.cnlive.libs.base.logic.Logic;
+import com.cnlive.libs.base.logic.callback.DataCallback;
+import com.cnlive.libs.base.logic.callback.FailureCallback;
+import com.cnlive.libs.base.logic.callback.StateCallback;
+import com.cnlive.libs.base.logic.callback.SuccessCallback;
 import com.cnlive.moudle.pedometer.frame.view.OnGoingFragmentView;
+import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
+import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
+import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
+import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+import java.util.HashMap;
+import java.util.Map;
+
+import io.reactivex.disposables.Disposable;
+
+import static com.cnlive.libs.base.logic.Config.STATE_IDLE;
+import static com.cnlive.libs.base.logic.Config.STATE_LOAD;
+
 public class OnGoingFragmentPresenter extends MvpBasePresenter<OnGoingFragmentView> {
+    public void getRunRaceDetailInfo(Context context, String id, String userId, String state) {
+        //设置请求参数
+        Map<String, String> paramsMap = new HashMap<>();
+        //赛事id
+        paramsMap.put("id", id);
+        paramsMap.put("sid", userId);
+//        0-用户使用 1-运营使用
+        paramsMap.put("state", state);
+        Logic.create(paramsMap).action(new Logic.Action<Map<String, String>, BaseInfo<RunRaceDetailInfo>>() {
+            @Override
+            public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo<RunRaceDetailInfo>> dataCallback) {
+                return SubscriptionRequest.service(ApiServiceRunLin.class, api -> api.getRunRaceDetail(stringStringMap)).subscribe(context, dataCallback);
+            }
+        }).<BaseInfo<RunRaceDetailInfo>>event()
+                .setStateCallback(new StateCallback() {
+                    @Override
+                    public void onState(int i) {
+                        if (getView() == null) {
+                            return;
+                        }
+                        if (i == STATE_LOAD) {
+                            getView().showLoadingView();
+                        } else if (i == STATE_IDLE) {
+                            getView().hideLoadingView();
+                        }
+                    }
+                })
+                .setFailureCallback(new FailureCallback() {
+                    @Override
+                    public void onFailure(int code, String message) {
+                        if (getView() == null) {
+                            return;
+                        }
+                        getView().hideLoadingView();
+                        getView().showRetryView(code, new View.OnClickListener() {
+                            @Override
+                            public void onClick(View view) {
+                                getRunRaceDetailInfo(context, id, userId,state);
+                            }
+                        });
+                    }
+                }).setSuccessCallback(new SuccessCallback<BaseInfo<RunRaceDetailInfo>>() {
+            @Override
+            public void onSuccess(BaseInfo<RunRaceDetailInfo> baseInfo) {
+                if (getView() == null) {
+                    return;
+                }
+                if (baseInfo.getData() != null) {
+                    getView().initView(baseInfo.getData());
+                }
+            }
+        }).start();
+
+    }
 }
@@ -2,24 +2,17 @@ package com.cnlive.moudle.pedometer.frame.presenter;
 import android.app.Activity;
 import android.content.Context;
-import android.graphics.Bitmap;
-import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
-import android.view.View;
 import android.widget.Toast;
-import com.baidu.mapapi.map.BaiduMap;
 import com.baidu.mapapi.model.LatLng;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.model.SortType;
-import com.cnlive.libs.base.logic.Event;
 import com.cnlive.libs.base.logic.Logic;
 import com.cnlive.libs.base.logic.callback.DataCallback;
 import com.cnlive.libs.base.logic.callback.FailureCallback;
-import com.cnlive.libs.base.logic.callback.StateCallback;
 import com.cnlive.libs.base.logic.callback.SuccessCallback;
-import com.cnlive.libs.base.util.ToastUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.view.RunningFinishFragmentView;
 import com.cnlive.moudle.pedometer.model.Constant;
@@ -27,36 +20,24 @@ import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.net.ApiServiceRunLin;
 import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
-import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
-import com.cnlive.moudle.pedometer.service.StepService;
 import com.cnlive.moudle.pedometer.sql.entity.FailedEntity;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
 import com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
-import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
-import com.cnlive.moudle.pedometer.upload.UploadLogic;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.cnlive.moudle.pedometer.utils.StepUtil;
-import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import io.reactivex.disposables.Disposable;
-import static com.cnlive.libs.base.logic.Config.STATE_IDLE;
-import static com.cnlive.libs.base.logic.Config.STATE_LOAD;
-
 public class RunningFinishFragmetPresenter extends MvpBasePresenter<RunningFinishFragmentView> {
     private LBSTraceClient mClient = null;
     private List<LatLng> importPoints;
@@ -88,8 +69,7 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
             pace = runningFinishBean.getSpeed();
         }
         //  路线图
-        String roadmap = runningFinishBean.getRoadmap();
-        roadmap = "";
+        String roadmap = "";
         //经纬度
         String latLongitude = "";
         // 开始时间
@@ -104,7 +84,7 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
             isPause = "1";
         }
         //继续时间
-        String continueTime = "";
+        String continueTime = userStepEntity.getContinueTime() + "";
         //是否完成
         String completeStatus = runningFinishBean.getIsFinish();
         //设置步数
@@ -202,7 +182,14 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
         //查询当前用户的历史轨迹
         long startTime = userStepEntity.getStartTimeStamp();
         //获取当前的时间戳(秒)
-        long endTime = userStepEntity.getFinishTimeStamp();
+        long endTime = 0;
+        if (userStepEntity.getPauseCount() == 0) {
+            //没有暂停
+            endTime = userStepEntity.getFinishTimeStamp();
+        } else {
+            //暂停了
+            endTime = userStepEntity.getUserPauseTimeStamp();
+        }
         //获取当前的实体名称
         String entityName = CommonInfo.getUserId(context);
         //打的重要点
@@ -213,71 +200,128 @@ public class RunningFinishFragmetPresenter extends MvpBasePresenter&lt;RunningFinis
         if (mClient == null) {
             mClient = new LBSTraceClient(context);
         }
+        List<LatLng> allResults = new ArrayList<>();
         MyMapUtil.queryHistoryTrace(context, mClient, entityName, startTime, endTime, new MyMapUtil.CallBack() {
             @Override
             public void success(List<LatLng> resultPoints) {
                 if (resultPoints != null) {
                     if (getView() != null) {
+                        allResults.addAll(resultPoints);
                         QMUITipDialogUtil.dismessDialog();
-                        MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
-                        //先判断是否到达终点
-                        if (!userStepEntity.getIsArriveEndPoint()) {
-                            runningFinishBean.setIsFinish("0");
+                        //判断用户是否点击暂停按钮
+                        if (userStepEntity.getPauseCount() == 0) {
+                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, R.drawable.icon_end);
+                            //没有点击暂停
+                            //先判断是否到达终点
+                            checkUserIsFinish(resultPoints, userStepEntity, runningFinishBean, context);
+                            saveRouteData(context, userStepEntity, runningFinishBean);
                         } else {
-                            if (importPoints != null) {
-                                //判断是否完成
-                                boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, resultPoints, Constant.PASS_RATE);
-                                if (isFinish) {
-                                    Toast.makeText(context, "完成", Toast.LENGTH_LONG).show();
-                                    runningFinishBean.setIsFinish("1");
-                                } else {
-                                    Toast.makeText(context, "没有完成", Toast.LENGTH_LONG).show();
-                                    runningFinishBean.setIsFinish("0");
-                                }
-                            }
+                            MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, 0);
                         }
-                        saveRouteData(context, userStepEntity, runningFinishBean);
+                        //如果点击暂停
+                        if (userStepEntity.getPauseCount() != 0) {
+                            long contineTime = userStepEntity.getContinueTime();
+                            long finishTime = userStepEntity.getFinishTimeStamp();
+                            //开始查询
+                            MyMapUtil.queryHistoryTrace(context, mClient, entityName, contineTime, finishTime, new MyMapUtil.CallBack() {
+                                @Override
+                                public void success(List<LatLng> resultPoints) {
+                                    if (null != resultPoints) {
+                                        allResults.addAll(resultPoints);
+                                        //判断用户是否完成
+                                        if (importPoints != null) {
+                                            //先判断是否到达终点
+                                            checkUserIsFinish(resultPoints, userStepEntity, runningFinishBean, context);
+                                            saveRouteData(context, userStepEntity, runningFinishBean);
+                                        }
+
+                                    } else {
+                                        //查询失败
+                                        QMUITipDialogUtil.dismessDialog();
+                                        queryTraceFaile(context, userStepEntity, runningFinishBean);
+                                        //
+                                    }
+                                }
+                            });
+                        }
                     }
                 }
                 //查询失败
                 else {
                     QMUITipDialogUtil.dismessDialog();
-                    if (failTraceDialog == null) {
-                        failTraceDialog = new SelectDialog(context, "获取轨迹失败,是否重试?", "重试", new SelectDialog.DialogInterface() {
-                            @Override
-                            public void onClick(SelectDialog dialog) {
-                                dialog.dismiss();
-                                queryHistoryTrace(context, userStepEntity, runningFinishBean);
-                            }
-                        }, "暂存", new SelectDialog.DialogInterface() {
-                            @Override
-                            public void onClick(SelectDialog dialog) {
-                                dialog.dismiss();
-                                StepUtil.clearRunData(context, CommonInfo.getUserId(context));
-                                CommonInfo.reset(context);
-                                //跳转到上传失败列表
-                                LineUpAgainActivity.newInstance(context);
-                                //关闭当前窗口
-                                context.finish();
+                    queryTraceFaile(context, userStepEntity, runningFinishBean);
+                }
+            }
+        });
-                            }
-                        });
-                        failTraceDialog.setCanceledOnTouchOutside(false);
-                        failTraceDialog.setCancelable(false);
-                        if (!failTraceDialog.isShowing()) {
-                            failTraceDialog.show();
-                        }
+    }
-                    } else {
-                        if (!failTraceDialog.isShowing()) {
-                            failTraceDialog.show();
-                        }
-                    }
+    /**
+     * 判断用户是否完成
+     *
+     * @param resultPoints
+     * @param userStepEntity
+     * @param runningFinishBean
+     * @param context
+     */
+    public void checkUserIsFinish(List<LatLng> resultPoints, UserStepEntity userStepEntity, RunningFinishBean runningFinishBean, Activity context) {
+        if (!userStepEntity.getIsArriveEndPoint()) {
+            runningFinishBean.setIsFinish("0");
+        } else {
+            if (importPoints != null) {
+                //判断是否完成
+                boolean isFinish = MyMapUtil.checkIsFinishTrace(importPoints, resultPoints, Constant.PASS_RATE);
+                if (isFinish) {
+                    Toast.makeText(context, "完成", Toast.LENGTH_LONG).show();
+                    runningFinishBean.setIsFinish("1");
+                } else {
+                    Toast.makeText(context, "没有完成", Toast.LENGTH_LONG).show();
+                    runningFinishBean.setIsFinish("0");
                 }
             }
-        });
+        }
+    }
+    /**
+     * 查询历史轨迹失败
+     *
+     * @param context
+     * @param userStepEntity
+     * @param runningFinishBean
+     */
+    public void queryTraceFaile(Activity context, UserStepEntity userStepEntity, RunningFinishBean runningFinishBean) {
+        if (failTraceDialog == null) {
+            failTraceDialog = new SelectDialog(context, "获取轨迹失败,是否重试?", "重试", new SelectDialog.DialogInterface() {
+                @Override
+                public void onClick(SelectDialog dialog) {
+                    dialog.dismiss();
+                    queryHistoryTrace(context, userStepEntity, runningFinishBean);
+                }
+            }, "暂存", new SelectDialog.DialogInterface() {
+                @Override
+                public void onClick(SelectDialog dialog) {
+                    dialog.dismiss();
+                    StepUtil.clearRunData(context, CommonInfo.getUserId(context));
+                    CommonInfo.reset(context);
+                    //跳转到上传失败列表
+                    LineUpAgainActivity.newInstance(context);
+                    //关闭当前窗口
+                    context.finish();
+
+                }
+            });
+            failTraceDialog.setCanceledOnTouchOutside(false);
+            failTraceDialog.setCancelable(false);
+            if (!failTraceDialog.isShowing()) {
+                failTraceDialog.show();
+            }
+
+        } else {
+            if (!failTraceDialog.isShowing()) {
+                failTraceDialog.show();
+            }
+        }
     }
@@ -7,6 +7,7 @@ import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
 import com.cnlive.moudle.pedometer.net.bean.MyRecordInfo;
+import com.cnlive.moudle.pedometer.ui.activity.OnGoingActivity;
 import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity;
 import com.cnlive.moudle.pedometer.ui.adapter.MyRecordAdapter;
 import com.cnlive.moudle.pedometer.ui.fragment.MyRecordFragment;
@@ -28,6 +29,7 @@ public class MyRecordView implements MvpView {
     public QMUITipDialog loadingDiaog;
     private List<MyRecordInfo.ListBean> list = new ArrayList<>();
     private MyRecordAdapter adapter;
+
     public MyRecordView(MyRecordFragment fragment) {
         this.fragment = fragment;
         loadingDiaog = new QMUITipDialog.Builder(fragment.getActivity())
@@ -37,39 +39,44 @@ public class MyRecordView implements MvpView {
     }
-    public void onSuccess(BaseInfo<MyRecordInfo> myRecordInfoBaseInfo){
+    public void onSuccess(BaseInfo<MyRecordInfo> myRecordInfoBaseInfo) {
         hideLoading();
-        if(fragment.currentPage == 1){
+        if (fragment.currentPage == 1) {
             list.clear();
             list.addAll(myRecordInfoBaseInfo.getData().getList());
-            if(adapter == null){
-                adapter = new MyRecordAdapter(list,fragment.state,fragment.getActivity());
+            if (adapter == null) {
+                adapter = new MyRecordAdapter(list, fragment.state, fragment.getActivity());
                 fragment.binding.myRecordRecy.setAdapter(adapter);
                 adapter.setClickListener(new MyRecordAdapter.OnClickListener() {
                     @Override
                     public void onClickListener(MyRecordInfo.ListBean bean, int position) {
-                        RunRaceDetailActivity.startActivity(fragment.getActivity(),bean.getId()+"",null,null,null,null);
+                        if ("0".equals(fragment.state)) {
+                            RunRaceDetailActivity.startActivity(fragment.getActivity(), bean.getId() + "", null, null, null, null);
+                        } else {
+                            OnGoingActivity.startActivity(fragment.getActivity(), bean.getId() + "", null, null, null, null);
+
+                        }
                     }
                 });
-            }else {
+            } else {
                 adapter.notifyDataSetChanged();
             }
         }
-        if(list.size() != 0){
+        if (list.size() != 0) {
             fragment.binding.empty.setVisibility(View.GONE);
             fragment.binding.emptyRy.setVisibility(View.GONE);
             fragment.binding.refreshLayout.setVisibility(View.VISIBLE);
-        }else {
+        } else {
             showEmpty();
         }
-        if(myRecordInfoBaseInfo.getData().getList().size() < fragment.pageSize){
+        if (myRecordInfoBaseInfo.getData().getList().size() < fragment.pageSize) {
             fragment.binding.refreshLayout.setEnableLoadMore(false);
-        }else {
+        } else {
             fragment.binding.refreshLayout.setEnableLoadMore(true);
         }
-        if(fragment.currentPage > 1){
+        if (fragment.currentPage > 1) {
             list.addAll(myRecordInfoBaseInfo.getData().getList());
             adapter.notifyDataSetChanged();
         }
@@ -77,13 +84,13 @@ public class MyRecordView implements MvpView {
         fragment.binding.refreshLayout.finishLoadMore();
     }
-    public void initView(){
+    public void initView() {
         fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
         fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
         fragment.binding.myRecordRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
     }
-    public void showErr(String msg){
+    public void showErr(String msg) {
         fragment.binding.refreshLayout.finishRefresh();
         fragment.binding.refreshLayout.finishLoadMore();
         if (list.size() == 0) {
@@ -96,7 +103,7 @@ public class MyRecordView implements MvpView {
                 @Override
                 public void onClick(View v) {
                     fragment.currentPage = 1;
-                    fragment.getPresenter().setData(fragment.getActivity(), CommonInfo.getUserId(fragment.getActivity()),fragment.state,fragment.currentPage,fragment.pageSize);
+                    fragment.getPresenter().setData(fragment.getActivity(), CommonInfo.getUserId(fragment.getActivity()), fragment.state, fragment.currentPage, fragment.pageSize);
                 }
             });
             fragment.binding.empty.setLoadingShowing(false);
@@ -114,7 +121,7 @@ public class MyRecordView implements MvpView {
         AlertUtil.showDeftToast(fragment.getActivity(), message);
     }
-    public void showEmpty(){
+    public void showEmpty() {
         fragment.binding.empty.setVisibility(View.GONE);
         fragment.binding.refreshLayout.setVisibility(View.GONE);
         fragment.binding.emptyRy.setVisibility(View.VISIBLE);
@@ -2,16 +2,23 @@ package com.cnlive.moudle.pedometer.frame.view;
 import android.app.Activity;
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.baidu.location.LocationClient;
+import com.baidu.location.LocationClientOption;
 import com.baidu.mapapi.map.BaiduMap;
+import com.baidu.mapapi.map.BitmapDescriptorFactory;
 import com.baidu.mapapi.map.MapView;
+import com.baidu.mapapi.map.MyLocationConfiguration;
 import com.baidu.mapapi.map.UiSettings;
 import com.baidu.mapapi.model.LatLng;
+import com.baidu.mapapi.search.route.RoutePlanSearch;
 import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.model.SortType;
@@ -25,6 +32,7 @@ import com.cnlive.moudle.pedometer.ui.activity.TakePartActivity;
 import com.cnlive.moudle.pedometer.ui.fragment.OnGoingFragment;
 import com.cnlive.moudle.pedometer.ui.widget.SelectDialog;
 import com.cnlive.moudle.pedometer.ui.widget.TipDialog;
+import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
@@ -45,6 +53,7 @@ public class OnGoingFragmentView implements MvpView {
     private MapView mMapView;
     private UiSettings mUiSettings;
     public RunRaceDetailInfo runRaceDetailInfo;
+    private LBSTraceClient mClient = null;
     public OnGoingFragmentView(OnGoingFragment fragment) {
         this.fragment = fragment;
@@ -68,7 +77,22 @@ public class OnGoingFragmentView implements MvpView {
             startTime = Long.parseLong(runRaceDetailInfo.getStartTime());
             endTime = Long.parseLong(runRaceDetailInfo.getEndTime());
             //todo 注意后续查询历史轨迹的时候,必须查数据库中的时间,因为涉及到历史运动恢复,所以不能用这个sp文件中的,这里设置,只是为了在服务启动成功后,
+            mClient = new LBSTraceClient(getContext());
+            //获取轨迹
+            if (mClient != null) {
+                MyMapUtil.queryHistoryTrace(getContext(), mClient, runRaceDetailInfo.getEntityName(), startTime, endTime, new MyMapUtil.CallBack() {
+                    @Override
+                    public void success(List<LatLng> resultPoints) {
+                        if (resultPoints != null && resultPoints.size() > 1) {
+                            MyMapUtil.drawServerLineTrack(getContext(), baiduMap, resultPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
+                            //设置地图自动缩放
+                            MyMapUtil.setMapAutoZoom(baiduMap, resultPoints, -1.5f);
+                        }
+                    }
+                });
+
+            }
             //显示地图
             fragment.binding.mapView.setVisibility(View.VISIBLE);
             //显示底部滑动卡片
@@ -83,15 +107,16 @@ public class OnGoingFragmentView implements MvpView {
                 @Override
                 public void onPanelSlide(View panel, float slideOffset) {
                     //设置顶层卡片特效
-//                if (slideOffset > 0.6) {
-//                    fragment.binding.llTop.setVisibility(View.VISIBLE);
-////                    ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) fragment.binding.scrollView.getLayoutParams();
-////                    params.topMargin = ScreenUtil.dip2px(getContext(), 50);
-////                    fragment.binding.scrollView.setLayoutParams(params);
-//                } else {
-//                    fragment.binding.llTop.setVisibility(View.GONE);
-//                }
-                    if (slideOffset <= 0.6) {
+                    if (slideOffset > 0.7) {
+                        double alpha = (255 / (1 - 0.6)) * (slideOffset - 0.6);
+                        if (alpha > 60) {
+                            fragment.binding.flTop.getBackground().setAlpha((int) alpha);
+                            fragment.binding.flTop.setVisibility(View.VISIBLE);
+                            QMUIStatusBarHelper.setStatusBarDarkMode(fragment.getActivity());
+                            StatusBarUtil2.setColor(fragment.getActivity(), getContext().getResources().getColor(R.color.run_main_bg), 0);
+
+                        }
+                    } else {
                         if (fragment.binding.flTop.getVisibility() == View.VISIBLE) {
                             QMUIStatusBarHelper.setStatusBarLightMode(fragment.getActivity());
                             StatusBarUtil2.setColor(fragment.getActivity(), getContext().getResources().getColor(R.color.white), 0);
@@ -147,6 +172,7 @@ public class OnGoingFragmentView implements MvpView {
                         }
                     } else if (previousState == SlidingUpPanelLayout.PanelState.DRAGGING && newState == SlidingUpPanelLayout.PanelState.EXPANDED) {
+
                         if (fragment.binding.flTop.getVisibility() != View.VISIBLE) {
                             QMUIStatusBarHelper.setStatusBarDarkMode(fragment.getActivity());
                             StatusBarUtil2.setColor(fragment.getActivity(), getContext().getResources().getColor(R.color.run_main_bg), 0);
@@ -156,14 +182,12 @@ public class OnGoingFragmentView implements MvpView {
                     } else if (previousState == SlidingUpPanelLayout.PanelState.EXPANDED && newState == SlidingUpPanelLayout.PanelState.DRAGGING) {
                         QMUIStatusBarHelper.setStatusBarLightMode(fragment.getActivity());
                         StatusBarUtil2.setColor(fragment.getActivity(), getContext().getResources().getColor(R.color.white), 0);
-
                         if (fragment.binding.flTop.getVisibility() != View.GONE) {
                             fragment.binding.flTop.setVisibility(View.GONE);
                         }
                     } else if (previousState == SlidingUpPanelLayout.PanelState.DRAGGING && newState == SlidingUpPanelLayout.PanelState.ANCHORED) {
                         QMUIStatusBarHelper.setStatusBarLightMode(fragment.getActivity());
                         StatusBarUtil2.setColor(fragment.getActivity(), getContext().getResources().getColor(R.color.white), 0);
-
                         if (fragment.binding.flTop.getVisibility() != View.GONE) {
                             fragment.binding.flTop.setVisibility(View.GONE);
                         }
@@ -191,9 +215,9 @@ public class OnGoingFragmentView implements MvpView {
                 fragment.binding.includeStreet.tvRaceTitle.setText(runRaceDetailInfo.getTitle());
                 //根据标题字数动态设置卡片高度
                 if (runRaceDetailInfo.getTitle().length() > 19) {
-                    fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 200));
+                    fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 162));
                 } else {
-                    fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 181));
+                    fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 140));
                 }
                 fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
             }
@@ -336,4 +360,75 @@ public class OnGoingFragmentView implements MvpView {
             });
         }
     }
+
+    public void initMap() {
+        //隐藏底部滑动卡片
+        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
+        this.mMapView = fragment.binding.mapView;
+        if (baiduMap == null) {
+            baiduMap = mMapView.getMap();
+        }
+        if (mUiSettings == null) {
+            mUiSettings = baiduMap.getUiSettings();
+        }
+        //启动所有手势
+        mUiSettings.setAllGesturesEnabled(true);
+        //通过设置enable为true或false 选择是否显示缩放按钮
+        mMapView.showZoomControls(false);
+        mUiSettings.setEnlargeCenterWithDoubleClickEnable(true);
+        //隐藏自带的指南针，改用自定义指南针 杨帅
+        baiduMap.getUiSettings().setCompassEnabled(true);
+        //显示定位图层
+        baiduMap.setMyLocationEnabled(false);
+    }
+
+    /**
+     * 显示loading
+     */
+    public void showLoadingView() {
+        if (fragment.binding.emptyLayout == null) {
+            return;
+        }
+        fragment.binding.emptyLayout.show(true);
+    }
+
+    /**
+     * 隐藏loading
+     */
+    public void hideLoadingView() {
+        if (fragment.binding.emptyLayout == null) {
+            return;
+        }
+        fragment.binding.emptyLayout.hide();
+    }
+
+    /**
+     * 显示重试页面
+     *
+     * @param errorCode
+     * @param listener
+     */
+    public void showRetryView(int errorCode, View.OnClickListener listener) {
+        if (getContext() == null) {
+            return;
+        }
+        //隐藏地图
+        fragment.binding.mapView.setVisibility(View.GONE);
+        //显示空视图
+        fragment.binding.emptyLayout.setVisibility(View.VISIBLE);
+        //隐藏底部卡片
+        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
+        if (fragment.binding.emptyLayout == null) return;
+        String titleText = "";
+        String detailText = "";
+        if (errorCode == -3) {
+            titleText = getContext().getString(R.string.msg_failed_network_title);
+            detailText = getContext().getString(R.string.msg_failed_network_detail);
+        } else {
+            titleText = getContext().getString(R.string.msg_failed_other_title);
+            detailText = getContext().getString(R.string.msg_failed_other_detail);
+        }
+        fragment.binding.emptyLayout.show(false, titleText, detailText, getContext().getString(R.string.retry), R.drawable.wufalianjie, listener);
+    }
+
 }
 \ No newline at end of file
@@ -15,6 +15,7 @@ import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
 import android.widget.LinearLayout;
 import android.widget.Toast;
@@ -353,6 +354,14 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         //设置标题
         if (!TextUtils.isEmpty(runRaceDetailInfo.getTitle())) {
             fragment.binding.includeStreet.tvRaceTitle.setText(runRaceDetailInfo.getTitle());
+             fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+                 @Override
+                 public boolean onPreDraw() {
+                     Log.e(TAG, "initView: "+ fragment.binding.includeStreet.tvRaceTitle.getLineCount() );
+                     fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().removeOnPreDrawListener(this);
+                     return false;
+                 }
+             });
             //根据标题字数动态设置卡片高度
             if (runRaceDetailInfo.getTitle().length() > 19) {
                 fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 200));
 package com.cnlive.moudle.pedometer.ui.activity;
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.libs.base.ui.QMUIFragmentActivity;
+import com.cnlive.moudle.pedometer.ui.fragment.OnGoingFragment;
+import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
 import com.example.moudle_pedometer.R;
 /**
@@ -11,4 +18,32 @@ public class OnGoingActivity extends QMUIFragmentActivity {
     protected int getContextViewId() {
         return R.id.fragment_ongoing;
     }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        String eventId = getIntent().getExtras().getString("eventId");
+        if (null != eventId) {
+            addFragment(OnGoingFragment.newInstance(eventId));
+        }
+    }
+
+    public static void startActivity(Activity activity, String eventId, String userId, String userIcon, String userName, String userPhone) {
+        Intent intent = new Intent(activity, OnGoingActivity.class);
+        intent.putExtra("eventId", eventId);
+        intent.putExtra("userId", userId);
+        intent.putExtra("userIcon", userIcon);
+        intent.putExtra("userName", userName);
+        intent.putExtra("userPhone", userPhone);
+        activity.startActivity(intent);
+    }
+
+    private void addFragment(QMUIFragment fragment) {
+        getSupportFragmentManager().beginTransaction()
+                .add(getContextViewId(), fragment, fragment.getClass().getSimpleName())
+                .addToBackStack(fragment.getClass().getSimpleName())
+                .commit();
+    }
+
+
 }
@@ -2,14 +2,29 @@ package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 import android.view.View;
 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.OnGoingFragmentPresenter;
 import com.cnlive.moudle.pedometer.frame.view.OnGoingFragmentView;
+import com.example.moudle_pedometer.R;
 import com.example.moudle_pedometer.databinding.FragmentRunRaceDetailBinding;
+import com.qmuiteam.qmui.util.QMUIStatusBarHelper;
 public class OnGoingFragment extends QMUIFragment<OnGoingFragmentView, OnGoingFragmentPresenter, FragmentRunRaceDetailBinding> {
+    private String eventId;
+
+    public static OnGoingFragment newInstance(String eventId) {
+        OnGoingFragment fragment = new OnGoingFragment();
+        Bundle bundle = new Bundle();
+        bundle.putString("eventId", eventId);
+        fragment.setArguments(bundle);
+        return fragment;
+    }
+
     @Override
     protected int getToolbarId() {
         return 0;
@@ -22,11 +37,27 @@ public class OnGoingFragment extends QMUIFragment&lt;OnGoingFragmentView, OnGoingFr
     @Override
     protected int getLayoutId() {
-        return 0;
+        return R.layout.fragment_run_race_detail;
     }
     @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);
+        if (getMvpView() != null) {
+            getMvpView().initMap();
+        }
+        if (null!=getArguments()){
+            eventId=getArguments().getString("eventId");
+            if (!TextUtils.isEmpty(eventId)){
+                if (getPresenter() != null) {
+                    if (!TextUtils.isEmpty(CommonInfo.getStreetId(getActivity()))) {
+                        getPresenter().getRunRaceDetailInfo(getActivity(), eventId, CommonInfo.getUserId(getActivity()), "0");
+                    }
+                }
+            }
+        }
+
     }
 }
@@ -181,7 +181,7 @@ public class StepUtil {
             int miao = (int) (miaoMin * 60);
             return minute + "'" + miao + "''";
         } else {
-            return "--";
+            return "0";
         }
     }