CNLive Android Team / ModulePedometer · Commits

Commit 47688717619d30a9b5ea5140a8d4ad707d7e36c2

Authored by 韩亚云
2 parents aca9a266 d8c0fbcd

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

Inline Side-by-side
Showing 6 changed files with 15 additions and 5 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
  View file @4768871
... ... @@ -137,6 +137,10 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
137 137  
138 138 @Override
139 139 public void onPanelStateChanged(View panel, SlidingUpPanelLayout.PanelState previousState, SlidingUpPanelLayout.PanelState newState) {
  140 + if (newState == SlidingUpPanelLayout.PanelState.EXPANDED) {
  141 + fragment.binding.includeStreet.ivSlideIcon.setVisibility(View.GONE);
  142 +
  143 + }
140 144 if (newState == SlidingUpPanelLayout.PanelState.ANCHORED) {
141 145 if (isChangeMapState) {
142 146 if (null != baiduMap) {
... ... @@ -152,7 +156,7 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
152 156 }
153 157 isChangeMapState = false;
154 158 } else if (newState == SlidingUpPanelLayout.PanelState.COLLAPSED) {
155   -
  159 + fragment.binding.includeStreet.ivSlideIcon.setVisibility(View.VISIBLE);
156 160 if (null != baiduMap) {
157 161 if (0 == initZoom) {
158 162 initZoom = DEFULT_ZOOM;
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunningMapFragmentView.java
  View file @4768871
... ... @@ -393,6 +393,7 @@ public class CollRunningMapFragmentView implements MvpView, SensorEventListener
393 393 //跳转界面
394 394 CollRunningFinishActivity.startActivity(fragment.getActivity());
395 395 fragment.getActivity().finish();
  396 +
396 397 }
397 398 });
398 399 endSelectDialog.setCancelable(false);
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/adapter/RunListAdapter.java
  View file @4768871
... ... @@ -3,6 +3,7 @@ package com.cnlive.moudle.collectionTrace.ui.adapter;
3 3 import android.app.Activity;
4 4 import android.support.annotation.NonNull;
5 5 import android.support.v7.widget.RecyclerView;
  6 +import android.text.TextUtils;
6 7 import android.view.LayoutInflater;
7 8 import android.view.View;
8 9 import android.view.ViewGroup;
... ... @@ -44,7 +45,11 @@ public class RunListAdapter extends RecyclerView.Adapter<RunListAdapter.MyViewHo
44 45 public void onBindViewHolder(@NonNull MyViewHolder myViewHolder, int i) {
45 46 myViewHolder.line_name.setText(list.get(i).getTitle());
46 47 myViewHolder.activity_time.setText(TimeUtil.getStampToTime(list.get(i).getStart_time(), "yyyy.MM.dd") + "——" + TimeUtil.getStampToTime(list.get(i).getEnd_time(), "yyyy.MM.dd"));
47   - myViewHolder.line_address.setText(list.get(i).getAddress() + " " + list.get(i).getMileage());
  48 + if (!TextUtils.isEmpty(list.get(i).getMileage())) {
  49 + myViewHolder.line_address.setText(list.get(i).getAddress() + "\t\t全长" + list.get(i).getMileage() + "公里");
  50 + } else {
  51 + myViewHolder.line_address.setText(list.get(i).getAddress());
  52 + }
48 53 //添加轨迹
49 54 myViewHolder.add_path.setOnClickListener(new View.OnClickListener() {
50 55 @Override
... ...
moudle_pedometer/src/main/res/layout/fragment_collect_run_race_detail.xml
  View file @4768871
... ... @@ -25,7 +25,7 @@
25 25 sothree:umanoDragView="@+id/dragView"
26 26 sothree:umanoFadeColor="@color/black_20"
27 27 sothree:umanoOverlay="true"
28   - sothree:umanoParallaxOffset="300dp"
  28 + sothree:umanoParallaxOffset="400dp"
29 29 sothree:umanoScrollableView="@+id/scrollView"
30 30 sothree:umanoShadowHeight="0dp">
31 31  
... ...
moudle_pedometer/src/main/res/layout/fragment_run_race_detail.xml
  View file @4768871
... ... @@ -14,8 +14,7 @@
14 14 sothree:umanoDragView="@+id/dragView"
15 15 sothree:umanoFadeColor="@color/black_20"
16 16 sothree:umanoOverlay="true"
17   -
18   - sothree:umanoParallaxOffset="250dp"
  17 + sothree:umanoParallaxOffset="400dp"
19 18 sothree:umanoScrollableView="@+id/scrollView"
20 19 sothree:umanoShadowHeight="0dp">
21 20  
... ...
moudle_pedometer/src/main/res/layout/layout_collect_run_detail_street.xml
  View file @4768871
... ... @@ -25,6 +25,7 @@
25 25 android:orientation="vertical">
26 26  
27 27 <ImageView
  28 + android:id="@+id/iv_slide_icon"
28 29 android:layout_width="13dp"
29 30 android:layout_height="7dp"
30 31 android:layout_gravity="center_horizontal"
... ...