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

韩亚云
2 parents aca9a266 d8c0fbcd
Showing 6 changed files with 15 additions and 5 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningMapFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/adapter/RunListAdapter.java
moudle_pedometer/src/main/res/layout/fragment_collect_run_race_detail.xml
moudle_pedometer/src/main/res/layout/fragment_run_race_detail.xml
moudle_pedometer/src/main/res/layout/layout_collect_run_detail_street.xml
@@ -137,6 +137,10 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
             @Override
             public void onPanelStateChanged(View panel, SlidingUpPanelLayout.PanelState previousState, SlidingUpPanelLayout.PanelState newState) {
+                if (newState == SlidingUpPanelLayout.PanelState.EXPANDED) {
+                    fragment.binding.includeStreet.ivSlideIcon.setVisibility(View.GONE);
+
+                }
                 if (newState == SlidingUpPanelLayout.PanelState.ANCHORED) {
                     if (isChangeMapState) {
                         if (null != baiduMap) {
@@ -152,7 +156,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
                     }
                     isChangeMapState = false;
                 } else if (newState == SlidingUpPanelLayout.PanelState.COLLAPSED) {
-
+                    fragment.binding.includeStreet.ivSlideIcon.setVisibility(View.VISIBLE);
                     if (null != baiduMap) {
                         if (0 == initZoom) {
                             initZoom = DEFULT_ZOOM;
@@ -393,6 +393,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener 
                     //跳转界面
                     CollRunningFinishActivity.startActivity(fragment.getActivity());
                     fragment.getActivity().finish();
+
                 }
             });
             endSelectDialog.setCancelable(false);
@@ -3,6 +3,7 @@ package com.cnlive.moudle.collectionTrace.ui.adapter;
 import android.app.Activity;
 import android.support.annotation.NonNull;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -44,7 +45,11 @@ public class RunListAdapter extends RecyclerView.Adapter&lt;RunListAdapter.MyViewHo
     public void onBindViewHolder(@NonNull MyViewHolder myViewHolder, int i) {
         myViewHolder.line_name.setText(list.get(i).getTitle());
         myViewHolder.activity_time.setText(TimeUtil.getStampToTime(list.get(i).getStart_time(), "yyyy.MM.dd") + "——" + TimeUtil.getStampToTime(list.get(i).getEnd_time(), "yyyy.MM.dd"));
-        myViewHolder.line_address.setText(list.get(i).getAddress() + "  " + list.get(i).getMileage());
+        if (!TextUtils.isEmpty(list.get(i).getMileage())) {
+            myViewHolder.line_address.setText(list.get(i).getAddress() + "\t\t全长" + list.get(i).getMileage() + "公里");
+        } else {
+            myViewHolder.line_address.setText(list.get(i).getAddress());
+        }
         //添加轨迹
         myViewHolder.add_path.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -25,7 +25,7 @@
                 sothree:umanoDragView="@+id/dragView"
                 sothree:umanoFadeColor="@color/black_20"
                 sothree:umanoOverlay="true"
-                sothree:umanoParallaxOffset="300dp"
+                sothree:umanoParallaxOffset="400dp"
                 sothree:umanoScrollableView="@+id/scrollView"
                 sothree:umanoShadowHeight="0dp">
@@ -14,8 +14,7 @@
             sothree:umanoDragView="@+id/dragView"
             sothree:umanoFadeColor="@color/black_20"
             sothree:umanoOverlay="true"
-
-            sothree:umanoParallaxOffset="250dp"
+            sothree:umanoParallaxOffset="400dp"
             sothree:umanoScrollableView="@+id/scrollView"
             sothree:umanoShadowHeight="0dp">
@@ -25,6 +25,7 @@
                     android:orientation="vertical">
                     <ImageView
+                        android:id="@+id/iv_slide_icon"
                         android:layout_width="13dp"
                         android:layout_height="7dp"
                         android:layout_gravity="center_horizontal"