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

韩亚云
2 parents 304ac9a7 27acc1f9
Showing 15 changed files with 552 additions and 27 deletions
moudle_pedometer/src/main/AndroidManifest.xml
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/ALLScoreDetailFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/OnGoingFragmentPresenter.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/res/drawable-hdpi/icon_run_white_back.png
moudle_pedometer/src/main/res/drawable-xhdpi/icon_run_white_back.png
moudle_pedometer/src/main/res/drawable-xxhdpi/icon_run_white_back.png
moudle_pedometer/src/main/res/layout/fragment_run_race_detail.xml
moudle_pedometer/src/main/res/layout/layout_finish_running_route.xml
moudle_pedometer/src/main/res/layout/layout_finish_user_info.xml
moudle_pedometer/src/main/res/layout/layout_run_detail_street.xml
moudle_pedometer/src/main/res/values/ids.xml
@@ -135,12 +135,15 @@
             android:process=":step" />
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.UploadFailDetailActivity"
-            android:launchMode="singleTask"
-           />
+            android:launchMode="singleTask" />
         <!--全部成绩详情页-->
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.ALLScoreDetailActivity"
             android:launchMode="singleTask" />
+        <!--进行中的活动-->
+        <activity
+            android:name="com.cnlive.moudle.pedometer.ui.activity.OnGoingActivity"
+            android:launchMode="singleTask" />
         <!--************************************************路径工具**********************************************-->
         <service
             android:name="com.cnlive.moudle.collectionTrace.service.CollKeepLiveService"
@@ -19,6 +19,7 @@ import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  
+import java.util.ArrayList;
 import java.util.List;
  
 public class ALLScoreDetailFragmentPresenter extends MvpBasePresenter<ALLScoreDetailFragmentView> {
@@ -56,6 +57,7 @@ public class ALLScoreDetailFragmentPresenter extends MvpBasePresenter&lt;ALLScoreDe
         if (mClient == null) {
             mClient = new LBSTraceClient(context);
         }
+        List<LatLng> allResultList = new ArrayList<>();
         MyMapUtil.queryHistoryTrace(context, mClient, entityName, startTime, endTime, new MyMapUtil.CallBack() {
             @Override
             public void success(List<LatLng> resultPoints) {
@@ -66,6 +68,7 @@ public class ALLScoreDetailFragmentPresenter extends MvpBasePresenter&lt;ALLScoreDe
                             //用户暂停了
                             if (runningFinishBean.isPause()) {
                                 MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, R.drawable.icon_start, 0);
+                                allResultList.addAll(resultPoints);
                             }
                             //用户没有暂停
                             else {
@@ -76,6 +79,30 @@ public class ALLScoreDetailFragmentPresenter extends MvpBasePresenter&lt;ALLScoreDe
                         }
  
                     }
+                    //如果用户点击暂停按钮,进行分段查询
+                    if (runningFinishBean.isPause()) {
+                        long continueTime = 0;
+                        if (!TextUtils.isEmpty(runningFinishBean.getUserContinueTime())) {
+                            continueTime = Long.parseLong(runningFinishBean.getUserContinueTime());
+                        }
+                        long userFinishTime = 0;
+                        if (!TextUtils.isEmpty(runningFinishBean.getUserFinishTime())) {
+                            userFinishTime = Long.parseLong(runningFinishBean.getUserFinishTime());
+                        }
+                        //开始进行轨迹查询
+                        MyMapUtil.queryHistoryTrace(context, mClient, entityName, continueTime, userFinishTime, new MyMapUtil.CallBack() {
+                            @Override
+                            public void success(List<LatLng> resultPoints) {
+                                if (null != resultPoints && resultPoints.size() > 1) {
+                                    MyMapUtil.drawHistoryTrack(context, getView().baiduMap, resultPoints, SortType.asc, R.color.red, 0, R.drawable.icon_end);
+                                    //设置地图自动缩放
+                                    allResultList.addAll(resultPoints);
+                                    MyMapUtil.setMapAutoZoom(getView().baiduMap, allResultList, -2f);
+                                }
+                            }
+                        });
+//
+                    }
                 }
                 //查询失败
                 else {
+package com.cnlive.moudle.pedometer.frame.presenter;
+
+import com.cnlive.moudle.pedometer.frame.view.OnGoingFragmentView;
+import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
+
+public class OnGoingFragmentPresenter extends MvpBasePresenter<OnGoingFragmentView> {
+}
+package com.cnlive.moudle.pedometer.frame.view;
+
+import android.app.Activity;
+import android.content.Context;
+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.mapapi.map.BaiduMap;
+import com.baidu.mapapi.map.MapView;
+import com.baidu.mapapi.map.UiSettings;
+import com.baidu.mapapi.model.LatLng;
+import com.baidu.mapapi.utils.DistanceUtil;
+import com.baidu.trace.LBSTraceClient;
+import com.baidu.trace.model.SortType;
+import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
+import com.cnlive.moudle.pedometer.model.Constant;
+import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
+import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity;
+import com.cnlive.moudle.pedometer.ui.activity.RegistrationInfoActivity;
+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.GsonUtil;
+import com.cnlive.moudle.pedometer.utils.MyMapUtil;
+import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
+import com.cnlive.moudle.pedometer.utils.ScreenUtil;
+import com.cnlive.moudle.pedometer.utils.StepUtil;
+import com.cnlive.moudle.pedometer.utils.TimeUtil;
+import com.cnlive.strike.application.GlideApp;
+import com.example.moudle_pedometer.R;
+import com.hannesdorfmann.mosby3.mvp.MvpView;
+import com.qmuiteam.qmui.util.QMUIStatusBarHelper;
+import com.sothree.slidinguppanel.SlidingUpPanelLayout;
+
+import java.util.List;
+
+public class OnGoingFragmentView implements MvpView {
+    private OnGoingFragment fragment;
+    private BaiduMap baiduMap;
+    private MapView mMapView;
+    private UiSettings mUiSettings;
+    public RunRaceDetailInfo runRaceDetailInfo;
+
+    public OnGoingFragmentView(OnGoingFragment fragment) {
+        this.fragment = fragment;
+    }
+
+    public Activity getContext() {
+        return fragment == null ? null : fragment.getActivity();
+    }
+
+    public void initView(RunRaceDetailInfo runRaceDetailInfo) {
+
+        if (fragment.getActivity() == null) {
+            return;
+        }
+        this.runRaceDetailInfo = runRaceDetailInfo;
+        //轨迹开始时间
+        long startTime = 0;
+        //轨迹结束时间
+        long endTime = 0;
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getStartTime()) && !TextUtils.isEmpty(runRaceDetailInfo.getEndTime()) && !TextUtils.isEmpty(runRaceDetailInfo.getEntityName())) {
+            startTime = Long.parseLong(runRaceDetailInfo.getStartTime());
+            endTime = Long.parseLong(runRaceDetailInfo.getEndTime());
+            //todo 注意后续查询历史轨迹的时候,必须查数据库中的时间,因为涉及到历史运动恢复,所以不能用这个sp文件中的,这里设置,只是为了在服务启动成功后,
+
+            //显示地图
+            fragment.binding.mapView.setVisibility(View.VISIBLE);
+            //显示底部滑动卡片
+//        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+            //隐藏空视图
+            fragment.binding.emptyLayout.setVisibility(View.GONE);
+            //显示立即报名按钮
+//        fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
+            //设置底部卡片第一次可滑动的位置
+            fragment.binding.slidingLayout.setAnchorPoint(0.6f);
+            fragment.binding.slidingLayout.addPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() {
+                @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 (fragment.binding.flTop.getVisibility() == View.VISIBLE) {
+                            QMUIStatusBarHelper.setStatusBarLightMode(fragment.getActivity());
+                            StatusBarUtil2.setColor(fragment.getActivity(), getContext().getResources().getColor(R.color.white), 0);
+                            fragment.binding.flTop.setVisibility(View.GONE);
+                        }
+                    }
+                    //设置卡片缩放特效
+                    if (slideOffset >= 0 && slideOffset <= 1) {
+                        int leakWidth = (int) (ScreenUtil.dip2px(getContext(), 15) / 0.6);
+                        LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+                        int current = (int) (leakWidth * slideOffset);
+//                    Log.e(TAG, "current: " + current + ",leakWidth:" + leakWidth + ",ScreenUtil:" + ScreenUtil.dip2px(getContext(), 15));
+                        if (slideOffset == 0) {
+                            layoutParams.setMargins(ScreenUtil.dip2px(getContext(), 15), 0, ScreenUtil.dip2px(getContext(), 15), 0);
+                            fragment.binding.includeStreet.llFirstPanelRoot.setLayoutParams(layoutParams);
+                            fragment.binding.includeStreet.llBottomPanel.setLayoutParams(layoutParams);
+                        }
+                        if (leakWidth - ScreenUtil.dip2px(getContext(), current) <= ScreenUtil.dip2px(getContext(), 15)) {
+                            if (leakWidth - ScreenUtil.dip2px(getContext(), current) >= 0) {
+                                layoutParams.setMargins(leakWidth - ScreenUtil.dip2px(getContext(), current), 0, leakWidth - ScreenUtil.dip2px(getContext(), current), 0);
+                            } else {
+                                layoutParams.setMargins(0, 0, 0, 0);
+                            }
+
+                            fragment.binding.includeStreet.llFirstPanelRoot.setLayoutParams(layoutParams);
+                            fragment.binding.includeStreet.llBottomPanel.setLayoutParams(layoutParams);
+                        }
+
+                    }
+
+//                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
+                public void onPanelStateChanged(View panel, SlidingUpPanelLayout.PanelState previousState, SlidingUpPanelLayout.PanelState newState) {
+//                Log.e(TAG, "previousState: " + previousState + ",newState:" + newState);
+                    if (previousState == SlidingUpPanelLayout.PanelState.ANCHORED && newState == SlidingUpPanelLayout.PanelState.DRAGGING) {
+                        if (fragment.binding.flTop.getVisibility() != View.VISIBLE) {
+                            QMUIStatusBarHelper.setStatusBarDarkMode(fragment.getActivity());
+                            StatusBarUtil2.setColor(fragment.getActivity(), getContext().getResources().getColor(R.color.run_main_bg), 0);
+                            fragment.binding.flTop.setVisibility(View.VISIBLE);
+
+                        }
+                    } 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);
+                            fragment.binding.flTop.setVisibility(View.VISIBLE);
+
+                        }
+                    } 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);
+                        }
+                    }
+
+                }
+            });
+            //卡片滑动上层标题
+            fragment.binding.llTopBack.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if (getContext() == null) {
+                        return;
+                    }
+                    fragment.getActivity().finish();
+                }
+            });
+            /*************************设置相关页面数据***************************/
+            if (runRaceDetailInfo.getFenceId() != null) {
+                //设置围栏ID
+                CommonInfo.setFenceId(getContext(), Integer.parseInt(runRaceDetailInfo.getFenceId()));
+            }
+            //设置标题
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getTitle())) {
+                fragment.binding.includeStreet.tvRaceTitle.setText(runRaceDetailInfo.getTitle());
+                //根据标题字数动态设置卡片高度
+                if (runRaceDetailInfo.getTitle().length() > 19) {
+                    fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 200));
+                } else {
+                    fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 181));
+                }
+                fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+            }
+            //设置活动地点
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getAddress())) {
+                fragment.binding.includeStreet.tvAddress.setText(runRaceDetailInfo.getAddress());
+                //设置活动距离
+                if (!TextUtils.isEmpty(runRaceDetailInfo.getMileage())) {
+                    fragment.binding.includeStreet.tvAddress.append("\t\t" + runRaceDetailInfo.getMileage());
+                }
+            }
+
+            //设置起点
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getStartLocation())) {
+                fragment.binding.includeStreet.tvStartAddr.setText(runRaceDetailInfo.getStartLocation());
+            }
+            //设置终点
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getEndLocation())) {
+                fragment.binding.includeStreet.tvEndAddr.setText(runRaceDetailInfo.getEndLocation());
+            }
+            //设置起始报名时间
+            if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_start_time(), "yyyy.MM.dd"))) {
+                fragment.binding.includeStreet.tvSignUpStartTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_start_time(), "yyyy.MM.dd"));
+
+            }
+            //设置终止报名时间
+            if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_end_time(), "yyyy.MM.dd"))) {
+                fragment.binding.includeStreet.tvSignUpEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_end_time(), "yyyy.MM.dd"));
+            }
+            //设置活动开始时间
+            if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getStart_time(), "yyyy.MM.dd"))) {
+                fragment.binding.includeStreet.tvActiveStartTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getStart_time(), "yyyy.MM.dd"));
+            }
+            //设置活动结束时间
+            if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy.MM.dd"))) {
+                fragment.binding.includeStreet.tvActiveEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy.MM.dd"));
+            }
+            //设置活动类型
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getEventType())) {
+                fragment.binding.includeStreet.tvEventType.setText(runRaceDetailInfo.getEventType());
+            }
+            //设置参加人数
+            fragment.binding.includeStreet.tvSignPerson.setText(runRaceDetailInfo.getSignupNum() + "");
+            //设置报名完成的头像
+            List<String> joinFaceIcon = runRaceDetailInfo.getFaceUrl();
+            if (joinFaceIcon != null && joinFaceIcon.size() > 0) {
+                fragment.binding.includeStreet.fiveJoinPerson.setVisibility(View.VISIBLE);
+                //设置头像数据
+                fragment.binding.includeStreet.fiveJoinPerson.initIconData(joinFaceIcon);
+            } else {
+                fragment.binding.includeStreet.fiveJoinPerson.setVisibility(View.INVISIBLE);
+            }
+
+            //判断是否显示个人排行榜
+            if (runRaceDetailInfo.isIndividualAchievement()) {
+                //显示
+                fragment.binding.includePersonScore.llPersonScoreRoot.setVisibility(View.VISIBLE);
+                //设置完成人数
+                if (!TextUtils.isEmpty(runRaceDetailInfo.getFinishNum())) {
+                    fragment.binding.includeRank.tvFinishPerson.setText(runRaceDetailInfo.getFinishNum());
+                }
+                //设置个人行走距离
+                if (!TextUtils.isEmpty(runRaceDetailInfo.getUserMileage())) {
+                    fragment.binding.includePersonScore.tvUserDistance.setText(runRaceDetailInfo.getUserMileage());
+                }
+                //设置行走步数
+                if (!TextUtils.isEmpty(runRaceDetailInfo.getStep())) {
+                    fragment.binding.includePersonScore.tvStep.setText(runRaceDetailInfo.getStep());
+                }
+                //设置用时
+                if (!TextUtils.isEmpty(runRaceDetailInfo.getEmployTime())) {
+                    fragment.binding.includePersonScore.tvEmployTime.setText(runRaceDetailInfo.getEmployTime());
+                }
+                //设置配速
+                if (!TextUtils.isEmpty(runRaceDetailInfo.getPace())) {
+                    fragment.binding.includePersonScore.tvSpeed.setText(runRaceDetailInfo.getPace());
+                }
+            } else {
+                //隐藏
+                fragment.binding.includePersonScore.llPersonScoreRoot.setVisibility(View.GONE);
+            }
+            //设置是否显示排行榜
+            if (runRaceDetailInfo.isRanking()) {
+                fragment.binding.includeRank.llRankRoot.setVisibility(View.VISIBLE);
+                //设置第一名头像
+                GlideApp.with(getContext()).load(runRaceDetailInfo.getFirstFaceUrl()).into(fragment.binding.includeRank.ivFirstPersonUrl);
+                //设置排行榜头像
+                List<String> finishFaceUrl = runRaceDetailInfo.getFinishFaceUrl();
+                if (finishFaceUrl != null && finishFaceUrl.size() > 0) {
+                    fragment.binding.includeRank.fiveRankPerson.initIconData(finishFaceUrl);
+                }
+                //设置第一名昵称
+                if (!TextUtils.isEmpty(runRaceDetailInfo.getFirstName())) {
+                    fragment.binding.includeRank.tvKingNickName.setText(runRaceDetailInfo.getFirstName());
+                }
+            } else {
+                fragment.binding.includeRank.llRankRoot.setVisibility(View.GONE);
+
+            }
+            //设置路线描述
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getDescription())) {
+                fragment.binding.includeStreetIntroduce.tvStreetIntroduce.setText(runRaceDetailInfo.getDescription());
+            }
+            //设置路线介绍的图片
+            if (!TextUtils.isEmpty(runRaceDetailInfo.getRoadmap())) {
+                //设置路线图
+                GlideApp.with(getContext()).load(runRaceDetailInfo.getRoadmap()).into(fragment.binding.includeStreetIntroduce.ivRoadMao);
+
+            }
+
+            //开始按钮点击事件(用户进行滑动滑动)
+            fragment.binding.rlScrollViewStartBtn.setVisibility(View.GONE);
+            //查看全部成绩点击事件
+            fragment.binding.includePersonScore.checkAllCord.setOnClickListener(v -> {
+                RaceRecordActivity.newInstance(fragment.getActivity(), runRaceDetailInfo.getTitle());
+            });
+
+            fragment.binding.includeStreet.fiveJoinPerson.setOnClickListener(v -> {
+                TakePartActivity.newInstance(fragment.getActivity());
+            });
+            //返回按钮
+            fragment.binding.ivBack.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if (fragment.getActivity() == null) {
+                        return;
+                    }
+                    fragment.getActivity().finish();
+                }
+            });
+            //todo 查看排行榜点击
+            fragment.binding.includeRank.tvCatAllRank.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    ARouter.getInstance().build("/web/WebViewColorActivity")
+                            .withString("url", "http://wjjh5test.cnlive.com/cnSportList.html" + "?sid=" + CommonInfo.getUserId(fragment.getActivity()) + "&eventId=" + CommonInfo.getStreetId(fragment.getActivity()))
+                            .withString("title", "排行榜")
+                            .navigation(fragment.getActivity());
+                }
+            });
+        }
+    }
+}
 \ No newline at end of file
@@ -14,6 +14,7 @@ import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.Toast;
  
@@ -57,6 +58,7 @@ import com.baidu.trace.model.SortType;
 import com.cnlive.libs.base.logic.Event;
 import com.cnlive.libs.base.logic.callback.FailureCallback;
 import com.cnlive.libs.base.logic.callback.SuccessCallback;
+import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
@@ -83,6 +85,7 @@ import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.cnlive.strike.application.GlideApp;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
+import com.qmuiteam.qmui.util.QMUIStatusBarHelper;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
  
 import java.io.File;
@@ -242,6 +245,24 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         fragment.binding.slidingLayout.addPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() {
             @Override
             public void onPanelSlide(View panel, float slideOffset) {
+                //设置顶层卡片特效
+                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);
+                        fragment.binding.flTop.setVisibility(View.GONE);
+                    }
+                }
+                //设置卡片缩放特效
                 if (slideOffset >= 0 && slideOffset <= 1) {
                     int leakWidth = (int) (ScreenUtil.dip2px(getContext(), 15) / 0.6);
                     LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
@@ -281,6 +302,46 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
  
             @Override
             public void onPanelStateChanged(View panel, SlidingUpPanelLayout.PanelState previousState, SlidingUpPanelLayout.PanelState newState) {
+//                Log.e(TAG, "previousState: " + previousState + ",newState:" + newState);
+                if (previousState == SlidingUpPanelLayout.PanelState.ANCHORED && newState == SlidingUpPanelLayout.PanelState.DRAGGING) {
+                    if (fragment.binding.flTop.getVisibility() != View.VISIBLE) {
+                        QMUIStatusBarHelper.setStatusBarDarkMode(fragment.getActivity());
+                        StatusBarUtil2.setColor(fragment.getActivity(), getContext().getResources().getColor(R.color.run_main_bg), 0);
+                        fragment.binding.flTop.setVisibility(View.VISIBLE);
+
+                    }
+                } 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);
+                        fragment.binding.flTop.setVisibility(View.VISIBLE);
+
+                    }
+                } 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);
+                    }
+                }
+
+            }
+        });
+        //卡片滑动上层标题
+        fragment.binding.llTopBack.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (getContext() == null) {
+                    return;
+                }
+                fragment.getActivity().finish();
             }
         });
         /*************************设置相关页面数据***************************/
@@ -293,9 +354,9 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             fragment.binding.includeStreet.tvRaceTitle.setText(runRaceDetailInfo.getTitle());
             //根据标题字数动态设置卡片高度
             if (runRaceDetailInfo.getTitle().length() > 19) {
-                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 149));
+                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 200));
             } else {
-                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 141));
+                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 181));
             }
             fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
         }
@@ -317,21 +378,21 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             fragment.binding.includeStreet.tvEndAddr.setText(runRaceDetailInfo.getEndLocation());
         }
         //设置起始报名时间
-        if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_start_time(), "yyyy-MM-dd"))) {
-            fragment.binding.includeStreet.tvSignUpStartTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_start_time(), "yyyy-MM-dd"));
+        if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_start_time(), "yyyy.MM.dd"))) {
+            fragment.binding.includeStreet.tvSignUpStartTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_start_time(), "yyyy.MM.dd"));
  
         }
         //设置终止报名时间
-        if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_end_time(), "yyyy-MM-dd"))) {
-            fragment.binding.includeStreet.tvSignUpEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_end_time(), "yyyy-MM-dd"));
+        if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_end_time(), "yyyy.MM.dd"))) {
+            fragment.binding.includeStreet.tvSignUpEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getSign_up_end_time(), "yyyy.MM.dd"));
         }
         //设置活动开始时间
-        if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getStart_time(), "yyyy-MM-dd"))) {
-            fragment.binding.includeStreet.tvActiveStartTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getStart_time(), "yyyy-MM-dd"));
+        if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getStart_time(), "yyyy.MM.dd"))) {
+            fragment.binding.includeStreet.tvActiveStartTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getStart_time(), "yyyy.MM.dd"));
         }
         //设置活动结束时间
-        if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy-MM-dd"))) {
-            fragment.binding.includeStreet.tvActiveEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy-MM-dd"));
+        if (!TextUtils.isEmpty(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy.MM.dd"))) {
+            fragment.binding.includeStreet.tvActiveEndTime.setText(TimeUtil.getStampToTime(runRaceDetailInfo.getEnd_time(), "yyyy.MM.dd"));
         }
         //设置活动类型
         if (!TextUtils.isEmpty(runRaceDetailInfo.getEventType())) {
@@ -582,7 +643,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             @Override
             public void onClick(View view) {
                 ARouter.getInstance().build("/web/WebViewColorActivity")
-                        .withString("url", "http://wjjh5test.cnlive.com/cnSportList.html"+"?sid="+CommonInfo.getUserId(fragment.getActivity())+"&eventId="+CommonInfo.getStreetId(fragment.getActivity()))
+                        .withString("url", "http://wjjh5test.cnlive.com/cnSportList.html" + "?sid=" + CommonInfo.getUserId(fragment.getActivity()) + "&eventId=" + CommonInfo.getStreetId(fragment.getActivity()))
                         .withString("title", "排行榜")
                         .navigation(fragment.getActivity());
             }
+package com.cnlive.moudle.pedometer.ui.activity;
+
+import com.cnlive.libs.base.ui.QMUIFragmentActivity;
+import com.example.moudle_pedometer.R;
+
+/**
+ * 进行中的活动点击事件
+ */
+public class OnGoingActivity extends QMUIFragmentActivity {
+    @Override
+    protected int getContextViewId() {
+        return R.id.fragment_ongoing;
+    }
+}
+package com.cnlive.moudle.pedometer.ui.fragment;
+
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.View;
+
+import com.cnlive.libs.base.ui.QMUIFragment;
+import com.cnlive.moudle.pedometer.frame.presenter.OnGoingFragmentPresenter;
+import com.cnlive.moudle.pedometer.frame.view.OnGoingFragmentView;
+import com.example.moudle_pedometer.databinding.FragmentRunRaceDetailBinding;
+
+public class OnGoingFragment extends QMUIFragment<OnGoingFragmentView, OnGoingFragmentPresenter, FragmentRunRaceDetailBinding> {
+    @Override
+    protected int getToolbarId() {
+        return 0;
+    }
+
+    @Override
+    public String getTitle() {
+        return null;
+    }
+
+    @Override
+    protected int getLayoutId() {
+        return 0;
+    }
+
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+    }
+}
@@ -72,6 +72,7 @@
                     android:id="@+id/scrollView"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:layout_marginTop="40dp"
                     android:scrollbars="none">
  
                     <LinearLayout
@@ -141,6 +142,40 @@
                 android:visibility="gone" />
  
         </RelativeLayout>
+
+        <FrameLayout
+            android:id="@+id/fl_top"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_gravity="top"
+            android:background="@color/run_main_bg"
+            android:gravity="center"
+            android:visibility="gone">
+
+            <LinearLayout
+                android:id="@+id/ll_top_back"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:gravity="center"
+                android:padding="10dp">
+
+                <ImageView
+                    android:layout_width="12dp"
+                    android:layout_height="20dp"
+                    android:background="@drawable/icon_run_white_back" />
+            </LinearLayout>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="路线详情"
+                android:textColor="@color/white"
+                android:textSize="18sp"
+                />
+        </FrameLayout>
+
         <com.cnlive.strike.ui.widget.UIEmptyView
             android:id="@+id/empty_layout"
             android:layout_width="match_parent"
@@ -174,6 +174,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
                 android:text="--"
+                android:textStyle="bold"
                 android:textColor="@color/text_gray"
                 android:textSize="11sp" />
         </LinearLayout>
@@ -8,7 +8,7 @@
  
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="190dp"
+            android:layout_height="195dp"
             android:layout_marginTop="30dp"
             android:background="@drawable/shape_10dp_white_raduis_bg"
             android:orientation="vertical">
@@ -3,8 +3,7 @@
  
     <LinearLayout xmlns:FivePersonIconView="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/white">
+        android:layout_height="wrap_content">
  
         <LinearLayout
             android:id="@+id/ll_run_detail_street_root"
@@ -25,7 +24,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="15dp"
                     android:layout_marginRight="15dp"
-                    android:background="@drawable/shape_left_right_10dp_white_raduis_bg"
+                    android:background="@color/white"
                     android:orientation="vertical">
                     <!--活动标题-->
                     <TextView
@@ -33,7 +32,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
-                        android:layout_marginTop="10dp"
+                        android:layout_marginTop="15dp"
                         android:text="--"
                         android:textColor="@color/text_black"
                         android:textSize="18sp"
@@ -78,15 +77,18 @@
                             android:textSize="15sp" />
  
                     </LinearLayout>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="1dp"
+                        android:layout_marginLeft="35dp"
+                        android:layout_marginTop="-5dp"
+                        android:layout_marginRight="35dp"
+                        android:layout_marginBottom="5dp"
+                        android:background="@color/line" />
                 </LinearLayout>
  
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginLeft="35dp"
-                    android:layout_marginRight="35dp"
-                    android:layout_marginBottom="5dp"
-                    android:background="@color/line" />
+
                 <!--按钮-->
                 <RelativeLayout
                     android:id="@+id/rl_start_btn"
@@ -129,6 +131,8 @@
                 android:layout_marginRight="15dp"
                 android:background="@color/white"
                 android:orientation="vertical">
+
+
                 <!--起点-->
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -242,7 +246,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="5dp"
-                        android:text="——"
+                        android:text="一"
                         android:textColor="@color/text_black"
                         android:textSize="15sp" />
  
@@ -304,7 +308,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
                         android:layout_marginLeft="5dp"
-                        android:text="——"
+                        android:text="一"
                         android:textColor="@color/text_black"
                         android:textSize="15sp" />
  
@@ -12,5 +12,7 @@
     <item name="fragment_upload_fail" type="id" />
     <!--全部成绩详情页-->
     <item name="fragment_all_score_detail" type="id" />
+    <!--进行中的活动-->
+    <item name="fragment_ongoing" type="id" />
  
 </resources>