1 修改详情页相关UI

杨帅
1 parent a3662d3e
Showing 7 changed files with 136 additions and 23 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/ALLScoreDetailFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.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_run_detail_street.xml
@@ -76,6 +76,19 @@ 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());
+                        }
+                        //开始进行轨迹查询
+
+                    }
                 }
                 //查询失败
                 else {
@@ -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,23 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         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);
@@ -281,6 +301,47 @@ 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())) {
@@ -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"
@@ -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" />