Commit a3662d3eaba928b58213ee8bb9c0f5afe9e77e34

Authored by 杨帅
1 parent d55820bb

1 修改相关UI

moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/ALLScoreDetailFragmentView.java
@@ -3,12 +3,15 @@ package com.cnlive.moudle.pedometer.frame.view; @@ -3,12 +3,15 @@ package com.cnlive.moudle.pedometer.frame.view;
3 import android.content.Context; 3 import android.content.Context;
4 import android.text.TextUtils; 4 import android.text.TextUtils;
5 import android.view.View; 5 import android.view.View;
  6 +import android.view.ViewGroup;
  7 +import android.widget.LinearLayout;
6 8
7 import com.baidu.mapapi.map.BaiduMap; 9 import com.baidu.mapapi.map.BaiduMap;
8 import com.baidu.mapapi.map.MapView; 10 import com.baidu.mapapi.map.MapView;
9 import com.baidu.mapapi.map.UiSettings; 11 import com.baidu.mapapi.map.UiSettings;
10 import com.cnlive.moudle.pedometer.model.RunningFinishBean; 12 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
11 import com.cnlive.moudle.pedometer.ui.fragment.ALLScoreDetailFragment; 13 import com.cnlive.moudle.pedometer.ui.fragment.ALLScoreDetailFragment;
  14 +import com.cnlive.moudle.pedometer.utils.ScreenUtil;
12 import com.cnlive.moudle.pedometer.utils.TimeUtil; 15 import com.cnlive.moudle.pedometer.utils.TimeUtil;
13 import com.example.moudle_pedometer.R; 16 import com.example.moudle_pedometer.R;
14 import com.hannesdorfmann.mosby3.mvp.MvpView; 17 import com.hannesdorfmann.mosby3.mvp.MvpView;
@@ -35,6 +38,10 @@ public class ALLScoreDetailFragmentView implements MvpView { @@ -35,6 +38,10 @@ public class ALLScoreDetailFragmentView implements MvpView {
35 38
36 public void initView(RunningFinishBean runningFinishBean) { 39 public void initView(RunningFinishBean runningFinishBean) {
37 this.runningFinishBean = runningFinishBean; 40 this.runningFinishBean = runningFinishBean;
  41 + //设置滚动视图下边距
  42 + ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) fragment.binding.scrollView.getLayoutParams();
  43 + params.bottomMargin = ScreenUtil.dip2px(getContext(), 20);
  44 + fragment.binding.scrollView.setLayoutParams(params);
38 //隐藏开始按钮 45 //隐藏开始按钮
39 fragment.binding.rlScrollViewStartBtn.setVisibility(View.GONE); 46 fragment.binding.rlScrollViewStartBtn.setVisibility(View.GONE);
40 //设置标题 47 //设置标题
@@ -53,7 +60,7 @@ public class ALLScoreDetailFragmentView implements MvpView { @@ -53,7 +60,7 @@ public class ALLScoreDetailFragmentView implements MvpView {
53 } 60 }
54 //设置完成时间 61 //设置完成时间
55 if (!TextUtils.isEmpty(runningFinishBean.getUserFinishTime())) { 62 if (!TextUtils.isEmpty(runningFinishBean.getUserFinishTime())) {
56 - fragment.binding.includeFinishUserInfo.tvDate.setText(TimeUtil.getStampToTime(Long.parseLong(runningFinishBean.getUserFinishTime())*1000, "yyyy/MM/dd HH:mm")); 63 + fragment.binding.includeFinishUserInfo.tvDate.setText(TimeUtil.getStampToTime(Long.parseLong(runningFinishBean.getUserFinishTime()) * 1000, "yyyy/MM/dd HH:mm"));
57 } 64 }
58 //设置起点 65 //设置起点
59 fragment.binding.includeFinishRunRoute.tvStartPoint.setText(runningFinishBean.getStartPoint()); 66 fragment.binding.includeFinishRunRoute.tvStartPoint.setText(runningFinishBean.getStartPoint());
@@ -66,7 +73,7 @@ public class ALLScoreDetailFragmentView implements MvpView { @@ -66,7 +73,7 @@ public class ALLScoreDetailFragmentView implements MvpView {
66 fragment.binding.includeFinishRunRoute.tvFinishState.setTextColor(getContext().getResources().getColor(R.color.green_round)); 73 fragment.binding.includeFinishRunRoute.tvFinishState.setTextColor(getContext().getResources().getColor(R.color.green_round));
67 } 74 }
68 //完成 75 //完成
69 - else if ("0".equals(runningFinishBean.getIsFinish())){ 76 + else if ("0".equals(runningFinishBean.getIsFinish())) {
70 fragment.binding.includeFinishRunRoute.tvFinishState.setText("路线未完成"); 77 fragment.binding.includeFinishRunRoute.tvFinishState.setText("路线未完成");
71 fragment.binding.includeFinishRunRoute.tvFinishState.setTextColor(getContext().getResources().getColor(R.color.red)); 78 fragment.binding.includeFinishRunRoute.tvFinishState.setTextColor(getContext().getResources().getColor(R.color.red));
72 } 79 }
moudle_pedometer/src/main/res/layout/fragment_self_record.xml
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 android:id="@+id/ry_record" 45 android:id="@+id/ry_record"
46 android:layout_width="match_parent" 46 android:layout_width="match_parent"
47 android:layout_height="wrap_content" 47 android:layout_height="wrap_content"
48 - android:layout_marginTop="10dp" 48 + android:layout_marginTop="-15dp"
49 android:background="@drawable/wdjl_backgroud" 49 android:background="@drawable/wdjl_backgroud"
50 android:padding="25dp"> 50 android:padding="25dp">
51 51
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 android:layout_width="wrap_content" 69 android:layout_width="wrap_content"
70 android:layout_height="wrap_content" 70 android:layout_height="wrap_content"
71 android:layout_centerHorizontal="true" 71 android:layout_centerHorizontal="true"
72 - android:layout_marginTop="20dp" 72 + android:layout_marginTop="10dp"
73 android:text="0.0" 73 android:text="0.0"
74 android:textColor="@color/white" 74 android:textColor="@color/white"
75 android:textSize="50sp" /> 75 android:textSize="50sp" />
@@ -250,7 +250,6 @@ @@ -250,7 +250,6 @@
250 android:layout_width="match_parent" 250 android:layout_width="match_parent"
251 android:layout_height="wrap_content" 251 android:layout_height="wrap_content"
252 android:layout_marginLeft="10dp" 252 android:layout_marginLeft="10dp"
253 - android:layout_marginTop="10dp"  
254 android:layout_marginRight="10dp"> 253 android:layout_marginRight="10dp">
255 254
256 <TextView 255 <TextView
moudle_pedometer/src/main/res/layout/layout_finish_running_route.xml
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 <!--竖线--> 66 <!--竖线-->
67 <View 67 <View
68 android:layout_width="1dp" 68 android:layout_width="1dp"
69 - android:layout_height="25dp" 69 + android:layout_height="18dp"
70 android:layout_marginLeft="17dp" 70 android:layout_marginLeft="17dp"
71 android:layout_marginTop="-3dp" 71 android:layout_marginTop="-3dp"
72 android:background="@color/vertical_line" /> 72 android:background="@color/vertical_line" />
moudle_pedometer/src/main/res/layout/layout_finish_user_info.xml
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 <LinearLayout 9 <LinearLayout
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 - android:layout_height="200dp" 11 + android:layout_height="190dp"
12 android:layout_marginTop="30dp" 12 android:layout_marginTop="30dp"
13 android:background="@drawable/shape_10dp_white_raduis_bg" 13 android:background="@drawable/shape_10dp_white_raduis_bg"
14 android:orientation="vertical"> 14 android:orientation="vertical">
@@ -85,7 +85,9 @@ @@ -85,7 +85,9 @@
85 <View 85 <View
86 android:layout_width="match_parent" 86 android:layout_width="match_parent"
87 android:layout_height="1dp" 87 android:layout_height="1dp"
  88 + android:layout_marginLeft="10dp"
88 android:layout_marginTop="10dp" 89 android:layout_marginTop="10dp"
  90 + android:layout_marginRight="10dp"
89 android:background="@color/line" /> 91 android:background="@color/line" />
90 <!--配速和用时--> 92 <!--配速和用时-->
91 <LinearLayout 93 <LinearLayout