CNLive Android Team / ModulePedometer · Commits

Commit 8f64521309bdb8163fc7e9ccc66ce80844af2a9f

Authored by 韩亚云
2 parents b9245387 5adfa82f

报名页面跳转

Inline Side-by-side
Showing 9 changed files with 595 additions and 498 deletions
app/src/main/AndroidManifest.xml
  View file @8f64521
... ... @@ -13,9 +13,7 @@
13 13 android:roundIcon="@mipmap/ic_launcher_round"
14 14 android:supportsRtl="true"
15 15 android:theme="@style/AppTheme">
16   - <activity
17   - android:name=".MainActivity"
18   - android:theme="@style/Theme.AppCompat">
  16 + <activity android:name=".MainActivity">
19 17 <intent-filter>
20 18 <action android:name="android.intent.action.MAIN" />
21 19  
... ...
moudle_pedometer/build.gradle
  View file @8f64521
... ... @@ -105,5 +105,5 @@ dependencies {
105 105 //EasyPermission
106 106 implementation "pub.devrel:easypermissions:$rootProject.easypermissions"
107 107  
108   -// implementation 'com.sothree.slidinguppanel:library:3.4.0'
  108 + implementation 'com.sothree.slidinguppanel:library:3.4.0'
109 109 }
... ...
moudle_pedometer/src/main/AndroidManifest.xml
  View file @8f64521
... ... @@ -99,6 +99,8 @@
99 99 <activity
100 100 android:name="com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity"
101 101 android:process=":step" />
  102 + <!--android:theme="@style/Theme.AppCompat.Light.NoActionBar"-->
  103 +
102 104 <activity
103 105 android:name="com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity"
104 106 android:process=":step" />
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
  View file @8f64521
... ... @@ -333,6 +333,13 @@ public class RunMainFragmentView implements MvpView {
333 333 RunningMapActivity.startActivity(fragment.getActivity(), runningMapBean);
334 334 }
335 335 });
  336 +
  337 + fragment.binding.rlClose.setOnClickListener(new View.OnClickListener() {
  338 + @Override
  339 + public void onClick(View view) {
  340 + fragment.getActivity().finish();
  341 + }
  342 + });
336 343 }
337 344  
338 345 public void setSQLPauseTime() {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
  View file @8f64521
1 1 package com.cnlive.moudle.pedometer.frame.view;
2 2  
3 3 import android.content.Context;
  4 +import android.content.Intent;
  5 +import android.util.Log;
  6 +import android.view.View;
4 7  
  8 +import com.cnlive.moudle.pedometer.ui.activity.PedometerMainActivity;
  9 +import com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity;
5 10 import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment;
6 11 import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment;
  12 +import com.cnlive.moudle.pedometer.utils.ScreenUtil;
7 13 import com.hannesdorfmann.mosby3.mvp.MvpView;
  14 +import com.sothree.slidinguppanel.SlidingUpPanelLayout;
8 15  
9 16 public class RunRaceDetailFragmentView implements MvpView {
  17 + private static final String TAG = "RunRaceDetailFragmentView";
  18 +
10 19 private RunRaceDetailFragment fragment;
11 20  
12 21 public RunRaceDetailFragmentView(RunRaceDetailFragment fragment) {
... ... @@ -16,4 +25,81 @@ public class RunRaceDetailFragmentView implements MvpView {
16 25 public Context getContext() {
17 26 return fragment == null ? null : fragment.getActivity();
18 27 }
  28 +
  29 + public void initView() {
  30 + fragment.binding.slidingLayout.setAnchorPoint(0.6f);
  31 + fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(fragment.getActivity(), 200));
  32 + fragment.binding.slidingLayout.setFadeOnClickListener(new View.OnClickListener() {
  33 + @Override
  34 + public void onClick(View view) {
  35 + }
  36 + });
  37 + fragment.binding.slidingLayout.addPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() {
  38 + @Override
  39 + public void onPanelSlide(View panel, float slideOffset) {
  40 + fragment.binding.includeStreet.rlStartBtn.setVisibility(View.GONE);
  41 + }
  42 +
  43 + @Override
  44 + public void onPanelStateChanged(View panel, SlidingUpPanelLayout.PanelState previousState, SlidingUpPanelLayout.PanelState newState) {
  45 + if (previousState == SlidingUpPanelLayout.PanelState.DRAGGING && newState == SlidingUpPanelLayout.PanelState.COLLAPSED) {
  46 + fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
  47 + }
  48 + }
  49 + });
  50 + //开始按钮点击事件(未滑动)
  51 + fragment.binding.includeStreet.rlStartBtn.setOnClickListener(new View.OnClickListener() {
  52 + @Override
  53 + public void onClick(View view) {
  54 + //立即报名
  55 + if ("0".equals(fragment.binding.includeStreet.rlStartBtn.getTag())) {
  56 + fragment.binding.includeStreet.rlStartBtn.setTag("1");
  57 + fragment.binding.includeStreet.tvRunNow.setText("现在开始");
  58 + fragment.binding.includeStreet.tvGoTip.setVisibility(View.VISIBLE);
  59 +
  60 + //设置滑动
  61 + fragment.binding.rlScrollViewStartBtn.setTag("1");
  62 + fragment.binding.tvRunNow.setText("现在开始");
  63 + fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
  64 + } else {
  65 + //开始运动
  66 + fragment.binding.includeStreet.rlStartBtn.setTag("0");
  67 + fragment.binding.includeStreet.tvRunNow.setText("立即报名");
  68 + fragment.binding.includeStreet.tvGoTip.setVisibility(View.GONE);
  69 + fragment.getActivity().startActivity(new Intent(getContext(), PedometerMainActivity.class));
  70 + //设置滑动
  71 + fragment.binding.rlScrollViewStartBtn.setTag("0");
  72 + fragment.binding.tvRunNow.setText("立即报名");
  73 + fragment.binding.tvGoTip.setVisibility(View.GONE);
  74 + }
  75 + }
  76 + });
  77 + //开始按钮点击事件(用户进行滑动滑动)
  78 + fragment.binding.rlScrollViewStartBtn.setOnClickListener(new View.OnClickListener() {
  79 + @Override
  80 + public void onClick(View view) {
  81 + //立即报名
  82 + if ("0".equals(fragment.binding.rlScrollViewStartBtn.getTag())) {
  83 + fragment.binding.rlScrollViewStartBtn.setTag("1");
  84 + fragment.binding.tvRunNow.setText("现在开始");
  85 + fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
  86 + //设置未滑动
  87 + fragment.binding.includeStreet.rlStartBtn.setTag("1");
  88 + fragment.binding.includeStreet.tvRunNow.setText("现在开始");
  89 + fragment.binding.includeStreet.tvGoTip.setVisibility(View.VISIBLE);
  90 + } else {
  91 + //开始运动
  92 + fragment.binding.rlScrollViewStartBtn.setTag("0");
  93 + fragment.binding.tvRunNow.setText("立即报名");
  94 + fragment.binding.tvGoTip.setVisibility(View.GONE);
  95 + fragment.getActivity().startActivity(new Intent(getContext(), PedometerMainActivity.class));
  96 + //设置未滑动
  97 + fragment.binding.includeStreet.rlStartBtn.setTag("0");
  98 + fragment.binding.includeStreet.tvRunNow.setText("立即报名");
  99 + fragment.binding.includeStreet.tvGoTip.setVisibility(View.GONE);
  100 + }
  101 + fragment.getActivity().startActivity(new Intent(getContext(), PedometerMainActivity.class));
  102 + }
  103 + });
  104 + }
19 105 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunRaceDetailFragment.java
  View file @8f64521
... ... @@ -17,6 +17,7 @@ import com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView;
17 17 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
18 18 import com.example.moudle_pedometer.R;
19 19 import com.example.moudle_pedometer.databinding.FragmentRunRaceDetailBinding;
  20 +import com.sothree.slidinguppanel.SlidingUpPanelLayout;
20 21  
21 22 import java.util.ArrayList;
22 23 import java.util.List;
... ... @@ -47,52 +48,54 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
47 48 @Override
48 49 public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
49 50 super.onViewCreated(view, savedInstanceState);
50   -// test();
  51 + if (getMvpView() != null) {
  52 + getMvpView().initView();
  53 + }
51 54 }
52 55  
53   - private void test() {
54   - BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(getActivity());
55   - View view = getLayoutInflater().inflate(R.layout.bottom_sheet_dialog_run_race_detail, null);
56   - LinearLayout ll_end_point = view.findViewById(R.id.ll_end_point);
57   - bottomSheetDialog.setContentView(view);
58   - bottomSheetDialog.show();
59   - bottomSheetDialog.setCancelable(false);
60   - bottomSheetDialog.setCanceledOnTouchOutside(false);
61   - //以下设置是为了解决：下滑隐藏dialog后，再次调用show方法显示时，不能弹出Dialog----在真机测试时不写下面的方法也未发现问题
62   - View delegateView = bottomSheetDialog.getDelegate().findViewById(android.support.design.R.id.design_bottom_sheet);
63   - final BottomSheetBehavior<View> sheetBehavior = BottomSheetBehavior.from(delegateView);
64   - sheetBehavior.setPeekHeight(ScreenUtil.getScreenHeight(getActivity()) / 3);
65   - sheetBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
66   - //在下滑隐藏结束时才会触发
67   - @Override
68   - public void onStateChanged(@NonNull View bottomSheet, int newState) {
69   - if (newState == BottomSheetBehavior.STATE_HIDDEN) {
70   - Log.e(TAG, "onStateChanged: ");
71   - bottomSheetDialog.dismiss();
72   - sheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
73   - }
74   - }
75   -
76   - //每次滑动都会触发
77   - @Override
78   - public void onSlide(@NonNull View bottomSheet, float slideOffset) {
79   - Log.e(TAG, "onSlide: ");
80   - System.out.println("onSlide = [" + bottomSheet + "], slideOffset = [" + slideOffset + "]");
81   - }
82   - });
83   -
84   - String aa = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1559215229357&di=5db17f5fec9e9a221cc189778172e1cc&imgtype=0&src=http%3A%2F%2Fi0.hdslb.com%2Fbfs%2Farticle%2Fa8c6df0dd7455fdb133575965d0719ee17aab281.png";
85   - String bb = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1559215229356&di=0c69b8c0c4c9ababe6cbaad6baab7daa&imgtype=0&src=http%3A%2F%2Fi0.hdslb.com%2Fbfs%2Farticle%2Fd680da563ff3eef98ed0ed9ecaf77a9723d6cab1.jpg";
86   - String cc = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1559215229355&di=1f10e593f204a31eff3f731c3979897f&imgtype=0&src=http%3A%2F%2Fclubimg.club.vmall.com%2Fdata%2Fattachment%2Fforum%2F201904%2F19%2F072347eaumvasbmf6ugayz.png";
87   - String dd = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1559215229355&di=4626e51f57b8afd118b85b11670f5ad4&imgtype=0&src=http%3A%2F%2Fi0.hdslb.com%2Fbfs%2Farticle%2Fa66a2c06579a89860860a9b340da7441aafc8ad9.jpg";
88   - String ee = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1559215229355&di=a211d0b0a13ed984a660a2d567e43694&imgtype=0&src=http%3A%2F%2Fi0.hdslb.com%2Fbfs%2Farticle%2F43d728f77e3df78155ed81c95efc49f0ef34fd6a.jpg";
89   - List<String> data = new ArrayList<>();
90   - data.add(aa);
91   - data.add(bb);
92   - data.add(cc);
93   - data.add(dd);
94   - data.add(ee);
95   - FivePersonIconView fivePersonIconView = view.findViewById(R.id.five_join_person);
96   - fivePersonIconView.initIconData(data);
97   - }
  56 +// private void test() {
  57 +// BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(getActivity());
  58 +// View view = getLayoutInflater().inflate(R.layout.bottom_sheet_dialog_run_race_detail, null);
  59 +// LinearLayout ll_end_point = view.findViewById(R.id.ll_end_point);
  60 +// bottomSheetDialog.setContentView(view);
  61 +// bottomSheetDialog.show();
  62 +// bottomSheetDialog.setCancelable(false);
  63 +// bottomSheetDialog.setCanceledOnTouchOutside(false);
  64 +// //以下设置是为了解决：下滑隐藏dialog后，再次调用show方法显示时，不能弹出Dialog----在真机测试时不写下面的方法也未发现问题
  65 +// View delegateView = bottomSheetDialog.getDelegate().findViewById(android.support.design.R.id.design_bottom_sheet);
  66 +// final BottomSheetBehavior<View> sheetBehavior = BottomSheetBehavior.from(delegateView);
  67 +// sheetBehavior.setPeekHeight(ScreenUtil.getScreenHeight(getActivity()) / 3);
  68 +// sheetBehavior.setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
  69 +// //在下滑隐藏结束时才会触发
  70 +// @Override
  71 +// public void onStateChanged(@NonNull View bottomSheet, int newState) {
  72 +// if (newState == BottomSheetBehavior.STATE_HIDDEN) {
  73 +// Log.e(TAG, "onStateChanged: ");
  74 +// bottomSheetDialog.dismiss();
  75 +// sheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED);
  76 +// }
  77 +// }
  78 +//
  79 +// //每次滑动都会触发
  80 +// @Override
  81 +// public void onSlide(@NonNull View bottomSheet, float slideOffset) {
  82 +// Log.e(TAG, "onSlide: ");
  83 +// System.out.println("onSlide = [" + bottomSheet + "], slideOffset = [" + slideOffset + "]");
  84 +// }
  85 +// });
  86 +//
  87 +// String aa = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1559215229357&di=5db17f5fec9e9a221cc189778172e1cc&imgtype=0&src=http%3A%2F%2Fi0.hdslb.com%2Fbfs%2Farticle%2Fa8c6df0dd7455fdb133575965d0719ee17aab281.png";
  88 +// String bb = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1559215229356&di=0c69b8c0c4c9ababe6cbaad6baab7daa&imgtype=0&src=http%3A%2F%2Fi0.hdslb.com%2Fbfs%2Farticle%2Fd680da563ff3eef98ed0ed9ecaf77a9723d6cab1.jpg";
  89 +// String cc = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1559215229355&di=1f10e593f204a31eff3f731c3979897f&imgtype=0&src=http%3A%2F%2Fclubimg.club.vmall.com%2Fdata%2Fattachment%2Fforum%2F201904%2F19%2F072347eaumvasbmf6ugayz.png";
  90 +// String dd = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1559215229355&di=4626e51f57b8afd118b85b11670f5ad4&imgtype=0&src=http%3A%2F%2Fi0.hdslb.com%2Fbfs%2Farticle%2Fa66a2c06579a89860860a9b340da7441aafc8ad9.jpg";
  91 +// String ee = "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1559215229355&di=a211d0b0a13ed984a660a2d567e43694&imgtype=0&src=http%3A%2F%2Fi0.hdslb.com%2Fbfs%2Farticle%2F43d728f77e3df78155ed81c95efc49f0ef34fd6a.jpg";
  92 +// List<String> data = new ArrayList<>();
  93 +// data.add(aa);
  94 +// data.add(bb);
  95 +// data.add(cc);
  96 +// data.add(dd);
  97 +// data.add(ee);
  98 +// FivePersonIconView fivePersonIconView = view.findViewById(R.id.five_join_person);
  99 +// fivePersonIconView.initIconData(data);
  100 +// }
98 101 }
... ...
moudle_pedometer/src/main/res/layout/fragment_run_main.xml
  View file @8f64521
... ... @@ -18,6 +18,7 @@
18 18 android:orientation="vertical">
19 19  
20 20 <RelativeLayout
  21 + android:id="@+id/rl_close"
21 22 android:layout_width="match_parent"
22 23 android:layout_height="wrap_content">
23 24  
... ... @@ -407,8 +408,7 @@
407 408 android:layout_width="match_parent"
408 409 android:layout_height="match_parent"
409 410 android:background="@color/run_main_time_bg"
410   - android:gravity="center"
411   - >
  411 + android:gravity="center">
412 412  
413 413 <TextView
414 414 android:id="@+id/tv_time_count_down"
... ...
moudle_pedometer/src/main/res/layout/fragment_run_race_detail.xml
  View file @8f64521
... ... @@ -2,184 +2,133 @@
2 2 <layout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 xmlns:app="http://schemas.android.com/apk/res-auto">
4 4  
5   - <!--<FrameLayout-->
6   - <!--android:layout_width="match_parent"-->
7   - <!--android:layout_height="match_parent">-->
8   -
9   - <!--<com.baidu.mapapi.map.MapView-->
10   - <!--android:id="@+id/mapView"-->
11   - <!--android:layout_width="match_parent"-->
12   - <!--android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>-->
13   -
14   - <!--<FrameLayout-->
15   - <!--android:layout_width="40dp"-->
16   - <!--android:layout_height="40dp"-->
17   - <!--android:layout_margin="10dp"-->
18   - <!--android:background="@drawable/shape_circle_50_black">-->
19   -
20   - <!--<ImageView-->
21   - <!--android:layout_width="10dp"-->
22   - <!--android:layout_height="20dp"-->
23   - <!--android:layout_gravity="center"-->
24   - <!--android:background="@drawable/ic_white_back" />-->
25   - <!--</FrameLayout>-->
26   -
27   - <!--<FrameLayout-->
28   - <!--android:layout_width="40dp"-->
29   - <!--android:layout_height="40dp"-->
30   - <!--android:layout_gravity="right"-->
31   - <!--android:layout_margin="10dp"-->
32   - <!--android:background="@drawable/shape_circle_50_black">-->
33   -
34   - <!--<ImageView-->
35   - <!--android:layout_width="15dp"-->
36   - <!--android:layout_height="15dp"-->
37   - <!--android:layout_gravity="center"-->
38   - <!--android:background="@drawable/icon_share" />-->
39   - <!--</FrameLayout>-->
40   - <!--&lt;!&ndash;&ndash;&gt;-->
41   -
42   - <!--<com.sothree.slidinguppanel.SlidingUpPanelLayout -->
43   - <!--android:id="@+id/sliding_layout"-->
44   - <!--android:layout_width="match_parent"-->
45   - <!--android:layout_height="match_parent"-->
46   - <!--android:layout_gravity="bottom"-->
47   - <!--android:gravity="bottom"-->
48   - <!--sothree:umanoPanelHeight="68dp"-->
49   - <!--sothree:umanoShadowHeight="4dp">-->
50   -
51   - <!--<TextView-->
52   - <!--android:layout_width="match_parent"-->
53   - <!--android:layout_height="match_parent"-->
54   - <!--android:gravity="center"-->
55   - <!--android:text="Main Content"-->
56   - <!--android:textSize="16sp" />-->
57   -
58   - <!--<TextView-->
59   - <!--android:layout_width="match_parent"-->
60   - <!--android:layout_height="match_parent"-->
61   - <!--android:gravity="center|top"-->
62   - <!--android:text="The Awesome Sliding Up Panel"-->
63   - <!--android:textSize="16sp" />-->
64   - <!--</com.sothree.slidinguppanel.SlidingUpPanelLayout>-->
65   - <!--&lt;!&ndash;按钮&ndash;&gt;-->
66   - <!--<RelativeLayout-->
67   - <!--android:layout_width="match_parent"-->
68   - <!--android:layout_height="40sp"-->
69   - <!--android:layout_gravity="bottom"-->
70   - <!--android:background="@color/green">-->
71   -
72   - <!--<TextView-->
73   - <!--android:id="@+id/tv_run_now"-->
74   - <!--android:layout_width="wrap_content"-->
75   - <!--android:layout_height="wrap_content"-->
76   - <!--android:layout_centerInParent="true"-->
77   - <!--android:text="现在开始"-->
78   - <!--android:textColor="@color/white"-->
79   - <!--android:textSize="18sp" />-->
80   -
81   - <!--<TextView-->
82   - <!--android:layout_width="wrap_content"-->
83   - <!--android:layout_height="wrap_content"-->
84   - <!--android:layout_alignParentRight="true"-->
85   - <!--android:layout_centerInParent="true"-->
86   - <!--android:layout_centerVertical="true"-->
87   - <!--android:layout_marginRight="10dp"-->
88   - <!--android:text="Go!"-->
89   - <!--android:textColor="@color/white"-->
90   - <!--android:textSize="18sp" />-->
91   -
92   - <!--</RelativeLayout>-->
93   -
94   -
95   - <!--</FrameLayout>-->
96   -<LinearLayout
97   - android:layout_width="match_parent"
98   - android:layout_height="match_parent"></LinearLayout>
99   -
100   - <!--<com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"-->
101   - <!--android:id="@+id/sliding_layout"-->
102   - <!--android:layout_width="match_parent"-->
103   - <!--android:layout_height="match_parent"-->
104   - <!--android:gravity="bottom"-->
105   - <!--sothree:umanoDragView="@+id/dragView"-->
106   - <!--sothree:umanoOverlay="true"-->
107   - <!--sothree:umanoPanelHeight="68dp"-->
108   - <!--sothree:umanoParallaxOffset="100dp"-->
109   - <!--sothree:umanoScrollableView="@+id/list"-->
110   - <!--sothree:umanoShadowHeight="4dp">-->
111   -
112   - <!--&lt;!&ndash; MAIN CONTENT &ndash;&gt;-->
113   - <!--<FrameLayout-->
114   - <!--android:layout_width="match_parent"-->
115   - <!--android:layout_height="match_parent"-->
116   - <!--android:orientation="vertical">-->
117   -
118   - <!--<TextView-->
119   - <!--android:id="@+id/main"-->
120   - <!--android:layout_width="match_parent"-->
121   - <!--android:layout_height="match_parent"-->
122   - <!--android:layout_marginTop="?attr/actionBarSize"-->
123   - <!--android:clickable="true"-->
124   - <!--android:focusable="false"-->
125   - <!--android:focusableInTouchMode="true"-->
126   - <!--android:gravity="center"-->
127   - <!--android:text="Main Content"-->
128   - <!--android:textSize="16sp" />-->
129   - <!--</FrameLayout>-->
130   -
131   - <!--&lt;!&ndash; SLIDING LAYOUT &ndash;&gt;-->
132   - <!--<LinearLayout-->
133   - <!--android:id="@+id/dragView"-->
134   - <!--android:layout_width="match_parent"-->
135   - <!--android:layout_height="match_parent"-->
136   - <!--android:background="#ffffff"-->
137   - <!--android:clickable="true"-->
138   - <!--android:focusable="false"-->
139   - <!--android:orientation="vertical">-->
140   -
141   - <!--<LinearLayout-->
142   - <!--android:layout_width="match_parent"-->
143   - <!--android:layout_height="68dp"-->
144   - <!--android:orientation="horizontal">-->
145   -
146   - <!--<TextView-->
147   - <!--android:id="@+id/name"-->
148   - <!--android:layout_width="0dp"-->
149   - <!--android:layout_height="match_parent"-->
150   - <!--android:layout_weight="1"-->
151   - <!--android:gravity="center_vertical"-->
152   - <!--android:paddingLeft="10dp"-->
153   - <!--android:textSize="14sp" />-->
154   -
155   - <!--<Button-->
156   - <!--android:id="@+id/follow"-->
157   - <!--android:layout_width="wrap_content"-->
158   - <!--android:layout_height="match_parent"-->
159   - <!--android:gravity="center_vertical|right"-->
160   - <!--android:paddingLeft="10dp"-->
161   - <!--android:paddingRight="10dp"-->
162   - <!--android:textSize="14sp" />-->
163   -
164   - <!--</LinearLayout>-->
165   -
166   - <!--<include-->
167   - <!--android:id="@+id/list"-->
168   - <!--layout="@layout/layout_run_detail_street" />-->
169   -
170   - <!--&lt;!&ndash;<ScrollView&ndash;&gt;-->
171   - <!--&lt;!&ndash;android:id="@+id/sv"&ndash;&gt;-->
172   - <!--&lt;!&ndash;android:layout_width="match_parent"&ndash;&gt;-->
173   - <!--&lt;!&ndash;android:layout_height="0dp"&ndash;&gt;-->
174   - <!--&lt;!&ndash;android:layout_weight="1"&ndash;&gt;-->
175   - <!--&lt;!&ndash;>&ndash;&gt;-->
176   - <!--&lt;!&ndash;<TextView&ndash;&gt;-->
177   - <!--&lt;!&ndash;android:layout_width="match_parent"&ndash;&gt;-->
178   - <!--&lt;!&ndash;android:layout_height="wrap_content"&ndash;&gt;-->
179   - <!--&lt;!&ndash;android:text="The standard Lorem Ipsum passage, used since the 1500Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.Section 1.10.32 of written by Cicero in 45 t perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?1914 translation by H. RackhamBut I must explain to you how all this mistaken idea of denouncing pleasure and praising pain was born and I will give you a complete accouof the system, and expound the actual teachings of the great explorer of the truth, the master-builder of human happiness. No one rejects, dislikes, or avoids pleasure itself, because it is pleasure, but because those who do not know how to pursue pleasure rationally encounter consequences that are extremely painful. Nor again is there anyone who loves or pursues or desires to obtain pain of itself, because it is pain, but because occasionally circumstances occur in which toil and pain can procure him some great pleasure. To take a trivial example, which of us ever undertakes laborious physical exercise, except to obtain some advantage from it? But who has any right to find fault with a man who chooses to enjoy a pleasure that has no annoying consequences, or one who avoids a pain that produces no resultant pleasure?At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus id quod maxime placeat facere possimus, omnis voluptas assumenda est, omnis dolor repellendus. Temporibus autem quibusdam et aut officiis debitis aut rerum necessitatibus saepe eveniet ut et voluptates repudiandae sint et molestiae non recusandae. Itaque earum rerum hic tenetur a sapiente delectus, ut aut reiciendis voluptatibus maiores alias consequatur aut perferendis doloribus asperiores repellat."/>&ndash;&gt;-->
180   - <!--&lt;!&ndash;</ScrollView>&ndash;&gt;-->
181   - <!--</LinearLayout>-->
182   - <!--</com.sothree.slidinguppanel.SlidingUpPanelLayout>-->
  5 + <com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
  6 + android:id="@+id/sliding_layout"
  7 + android:layout_width="match_parent"
  8 + android:layout_height="match_parent"
  9 + android:gravity="bottom"
  10 + sothree:umanoDragView="@+id/dragView"
  11 + sothree:umanoOverlay="true"
  12 + sothree:umanoPanelHeight="100dp"
  13 + sothree:umanoParallaxOffset="100dp"
  14 + sothree:umanoScrollableView="@+id/scrollView"
  15 + sothree:umanoShadowHeight="4dp">
  16 +
  17 + <!-- MAIN CONTENT -->
  18 + <FrameLayout
  19 + android:layout_width="match_parent"
  20 + android:layout_height="match_parent">
  21 +
  22 + <com.baidu.mapapi.map.MapView
  23 + android:id="@+id/mapView"
  24 + android:layout_width="match_parent"
  25 + android:layout_height="match_parent"></com.baidu.mapapi.map.MapView>
  26 +
  27 + <FrameLayout
  28 + android:layout_width="40dp"
  29 + android:layout_height="40dp"
  30 + android:layout_margin="10dp"
  31 + android:background="@drawable/shape_circle_50_black">
  32 +
  33 + <ImageView
  34 + android:layout_width="10dp"
  35 + android:layout_height="20dp"
  36 + android:layout_gravity="center"
  37 + android:background="@drawable/ic_white_back" />
  38 + </FrameLayout>
  39 +
  40 + <FrameLayout
  41 + android:layout_width="40dp"
  42 + android:layout_height="40dp"
  43 + android:layout_gravity="right"
  44 + android:layout_margin="10dp"
  45 + android:background="@drawable/shape_circle_50_black">
  46 +
  47 + <ImageView
  48 + android:layout_width="15dp"
  49 + android:layout_height="15dp"
  50 + android:layout_gravity="center"
  51 + android:background="@drawable/icon_share" />
  52 + </FrameLayout>
  53 + <!---->
  54 +
  55 +
  56 + </FrameLayout>
  57 +
  58 + <!-- SLIDING LAYOUT -->
  59 + <FrameLayout
  60 + android:id="@+id/dragView"
  61 + android:layout_width="match_parent"
  62 + android:layout_height="match_parent"
  63 + android:background="#ffffff"
  64 + android:clickable="true"
  65 + android:focusable="false"
  66 + android:orientation="vertical">
  67 +
  68 + <ScrollView
  69 + android:id="@+id/scrollView"
  70 + android:layout_width="match_parent"
  71 + android:layout_height="wrap_content">
  72 +
  73 + <LinearLayout
  74 + android:id="@+id/ll_root"
  75 + android:layout_width="match_parent"
  76 + android:layout_height="wrap_content"
  77 + android:orientation="vertical">
  78 + <!--跑道-->
  79 + <include
  80 + android:id="@+id/include_street"
  81 + layout="@layout/layout_run_detail_street" />
  82 + <!--成绩-->
  83 + <include
  84 + android:id="@+id/include_person_score"
  85 + layout="@layout/layout_run_detail_person_score" />
  86 + <!--排行-->
  87 + <include
  88 + android:id="@+id/include_rank"
  89 + layout="@layout/layout_run_detail_rank" />
  90 + <!--路线介绍-->
  91 + <include
  92 + android:id="@+id/include_street_introduce"
  93 + layout="@layout/layout_run_detail_street_introduce" />
  94 + </LinearLayout>
  95 +
  96 + </ScrollView>
  97 + <!--按钮-->
  98 + <RelativeLayout
  99 + android:id="@+id/rl_scrollView_startBtn"
  100 + android:layout_width="match_parent"
  101 + android:layout_height="40sp"
  102 + android:layout_gravity="bottom"
  103 + android:background="@color/green"
  104 + android:tag="0">
  105 +
  106 + <TextView
  107 + android:id="@+id/tv_run_now"
  108 + android:layout_width="wrap_content"
  109 + android:layout_height="wrap_content"
  110 + android:layout_centerInParent="true"
  111 + android:tag="0"
  112 + android:text="立即报名"
  113 + android:textColor="@color/white"
  114 + android:textSize="18sp" />
  115 +
  116 + <TextView
  117 + android:id="@+id/tv_go_tip"
  118 + android:layout_width="wrap_content"
  119 + android:layout_height="wrap_content"
  120 + android:layout_alignParentRight="true"
  121 + android:layout_centerInParent="true"
  122 + android:layout_centerVertical="true"
  123 + android:layout_marginRight="10dp"
  124 + android:text="Go!"
  125 + android:textColor="@color/white"
  126 + android:textSize="18sp"
  127 + android:visibility="gone" />
  128 +
  129 + </RelativeLayout>
  130 + </FrameLayout>
  131 + </com.sothree.slidinguppanel.SlidingUpPanelLayout>
183 132  
184 133  
185 134 </layout>
186 135 \ No newline at end of file
... ...
moudle_pedometer/src/main/res/layout/layout_run_detail_street.xml
  View file @8f64521
1 1 <?xml version="1.0" encoding="utf-8"?>
2   -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3   - xmlns:FivePersonIconView="http://schemas.android.com/apk/res-auto"
4   - android:layout_width="match_parent"
5   - android:layout_height="wrap_content">
  2 +<layout xmlns:android="http://schemas.android.com/apk/res/android">
6 3  
7   - <LinearLayout
  4 + <LinearLayout xmlns:FivePersonIconView="http://schemas.android.com/apk/res-auto"
8 5 android:layout_width="match_parent"
9   - android:layout_height="wrap_content"
10   - android:orientation="vertical"
11   - android:paddingLeft="10dp">
12   - <!--活动标题-->
13   - <TextView
14   - android:id="@+id/tv_race_title"
15   - android:layout_width="wrap_content"
16   - android:layout_height="wrap_content"
17   - android:layout_marginTop="10dp"
18   - android:text="奥森南园跑道"
19   - android:textSize="18sp"
20   - android:textStyle="bold" />
21   - <!--活动地点-->
22   - <LinearLayout
23   - android:layout_width="match_parent"
24   - android:layout_height="wrap_content"
25   - android:layout_marginTop="10dp">
  6 + android:layout_height="wrap_content">
26 7  
27   - <ImageView
28   - android:layout_width="20dp"
29   - android:layout_height="20dp"
30   - android:background="@drawable/icon_race_location_green" />
31   -
32   - <TextView
33   - android:layout_width="wrap_content"
34   - android:layout_height="wrap_content"
35   - android:layout_marginLeft="5dp"
36   - android:text="活动地点"
37   - android:textColor="@color/bottom_sheet_dialog_race_location_text"
38   - android:textSize="14sp" />
39   - </LinearLayout>
40   - <!--活动地点详情-->
41 8 <LinearLayout
  9 + android:id="@+id/ll_run_detail_street_root"
42 10 android:layout_width="match_parent"
43 11 android:layout_height="wrap_content"
44   - android:layout_marginTop="10dp">
  12 + android:orientation="vertical">
45 13  
46   - <TextView
47   - android:layout_width="wrap_content"
48   - android:layout_height="wrap_content"
49   - android:layout_marginLeft="25dp"
50   - android:text="北京"
51   - android:textColor="@color/black"
52   - android:textSize="15sp" />
53   -
54   - <TextView
55   - android:layout_width="wrap_content"
56   - android:layout_height="wrap_content"
57   - android:layout_marginLeft="25dp"
58   - android:text="首都师范大学"
59   - android:textColor="@color/black"
60   - android:textSize="15sp" />
61   -
62   - <TextView
63   - android:layout_width="wrap_content"
  14 + <LinearLayout
  15 + android:id="@+id/ll_bottom_first_panel"
  16 + android:layout_width="match_parent"
64 17 android:layout_height="wrap_content"
65   - android:layout_marginLeft="25dp"
66   - android:text="全长4.42公里"
67   - android:textColor="@color/black"
68   - android:textSize="15sp" />
69   - </LinearLayout>
70   - <!--起点-->
71   - <LinearLayout
72   - android:layout_width="match_parent"
73   - android:layout_height="wrap_content"
74   - android:layout_marginTop="10dp"
75   - android:gravity="center_vertical">
76   -
77   - <View
78   - android:layout_width="10dp"
79   - android:layout_height="10dp"
80   - android:layout_marginLeft="25dp"
81   - android:background="@drawable/shape_circle_green" />
82   -
83   - <TextView
84   - android:layout_width="wrap_content"
  18 + android:orientation="vertical">
  19 + <!--活动标题-->
  20 + <TextView
  21 + android:id="@+id/tv_race_title"
  22 + android:layout_width="wrap_content"
  23 + android:layout_height="wrap_content"
  24 + android:layout_marginLeft="10dp"
  25 + android:layout_marginTop="10dp"
  26 + android:text="奥森南园跑道"
  27 + android:textSize="18sp"
  28 + android:textStyle="bold" />
  29 + <!--活动地点-->
  30 + <LinearLayout
  31 + android:layout_width="match_parent"
  32 + android:layout_height="wrap_content"
  33 + android:layout_marginLeft="10dp"
  34 + android:layout_marginTop="10dp">
  35 +
  36 + <ImageView
  37 + android:layout_width="20dp"
  38 + android:layout_height="20dp"
  39 + android:background="@drawable/icon_race_location_green" />
  40 +
  41 + <TextView
  42 + android:layout_width="wrap_content"
  43 + android:layout_height="wrap_content"
  44 + android:layout_marginLeft="5dp"
  45 + android:text="活动地点"
  46 + android:textColor="@color/bottom_sheet_dialog_race_location_text"
  47 + android:textSize="14sp" />
  48 + </LinearLayout>
  49 + <!--活动地点详情-->
  50 + <LinearLayout
  51 + android:layout_width="match_parent"
  52 + android:layout_height="wrap_content"
  53 + android:layout_marginLeft="10dp"
  54 + android:layout_marginTop="10dp">
  55 +
  56 + <TextView
  57 + android:layout_width="wrap_content"
  58 + android:layout_height="wrap_content"
  59 + android:layout_marginLeft="25dp"
  60 + android:text="北京"
  61 + android:textColor="@color/black"
  62 + android:textSize="15sp" />
  63 +
  64 + <TextView
  65 + android:layout_width="wrap_content"
  66 + android:layout_height="wrap_content"
  67 + android:layout_marginLeft="25dp"
  68 + android:text="首都师范大学"
  69 + android:textColor="@color/black"
  70 + android:textSize="15sp" />
  71 +
  72 + <TextView
  73 + android:layout_width="wrap_content"
  74 + android:layout_height="wrap_content"
  75 + android:layout_marginLeft="25dp"
  76 + android:text="全长4.42公里"
  77 + android:textColor="@color/black"
  78 + android:textSize="15sp" />
  79 + </LinearLayout>
  80 + <!--起点-->
  81 + <LinearLayout
  82 + android:layout_width="match_parent"
  83 + android:layout_height="wrap_content"
  84 + android:layout_marginLeft="10dp"
  85 + android:layout_marginTop="10dp"
  86 + android:gravity="center_vertical">
  87 +
  88 + <View
  89 + android:layout_width="10dp"
  90 + android:layout_height="10dp"
  91 + android:layout_marginLeft="25dp"
  92 + android:background="@drawable/shape_circle_green" />
  93 +
  94 + <TextView
  95 + android:layout_width="wrap_content"
  96 + android:layout_height="wrap_content"
  97 + android:layout_marginLeft="10dp"
  98 + android:text="(起)"
  99 + android:textColor="@color/bottom_sheet_dialog_race_location_text"
  100 + android:textSize="14sp" />
  101 +
  102 + <TextView
  103 + android:layout_width="wrap_content"
  104 + android:layout_height="wrap_content"
  105 + android:layout_marginLeft="10dp"
  106 + android:text="首都师范大学操场东门"
  107 + android:textColor="@color/black"
  108 + android:textSize="15sp" />
  109 + </LinearLayout>
  110 + <!--终点-->
  111 + <LinearLayout
  112 + android:id="@+id/ll_end_point"
  113 + android:layout_width="match_parent"
  114 + android:layout_height="wrap_content"
  115 + android:layout_marginLeft="10dp"
  116 + android:layout_marginTop="10dp"
  117 + android:gravity="center_vertical">
  118 +
  119 + <View
  120 + android:layout_width="10dp"
  121 + android:layout_height="10dp"
  122 + android:layout_marginLeft="25dp"
  123 + android:background="@drawable/shape_circle_red" />
  124 +
  125 + <TextView
  126 + android:layout_width="wrap_content"
  127 + android:layout_height="wrap_content"
  128 + android:layout_marginLeft="10dp"
  129 + android:text="(止)"
  130 + android:textColor="@color/bottom_sheet_dialog_race_location_text"
  131 + android:textSize="14sp" />
  132 +
  133 + <TextView
  134 + android:layout_width="wrap_content"
  135 + android:layout_height="wrap_content"
  136 + android:layout_marginLeft="10dp"
  137 + android:text="首都师范大学操场西门"
  138 + android:textColor="@color/black"
  139 + android:textSize="15sp" />
  140 + </LinearLayout>
  141 +
  142 + <!--按钮-->
  143 + <RelativeLayout
  144 + android:id="@+id/rl_start_btn"
  145 + android:layout_width="match_parent"
  146 + android:layout_height="40sp"
  147 + android:layout_marginTop="10dp"
  148 + android:background="@color/green"
  149 + android:tag="0">
  150 +
  151 + <TextView
  152 + android:id="@+id/tv_run_now"
  153 + android:layout_width="wrap_content"
  154 + android:layout_height="wrap_content"
  155 + android:layout_centerInParent="true"
  156 + android:text="开始报名"
  157 + android:textColor="@color/white"
  158 + android:textSize="18sp" />
  159 +
  160 + <TextView
  161 + android:id="@+id/tv_go_tip"
  162 + android:layout_width="wrap_content"
  163 + android:layout_height="wrap_content"
  164 + android:layout_alignParentRight="true"
  165 + android:layout_centerInParent="true"
  166 + android:layout_centerVertical="true"
  167 + android:layout_marginRight="10dp"
  168 + android:text="Go!"
  169 + android:textColor="@color/white"
  170 + android:textSize="18sp"
  171 + android:visibility="gone" />
  172 +
  173 + </RelativeLayout>
  174 + </LinearLayout>
  175 + <!--报名时间-->
  176 + <LinearLayout
  177 + android:layout_width="match_parent"
85 178 android:layout_height="wrap_content"
86 179 android:layout_marginLeft="10dp"
87   - android:text="(起)"
88   - android:textColor="@color/bottom_sheet_dialog_race_location_text"
89   - android:textSize="14sp" />
90   -
91   - <TextView
92   - android:layout_width="wrap_content"
  180 + android:layout_marginTop="10dp">
  181 +
  182 + <ImageView
  183 + android:layout_width="20dp"
  184 + android:layout_height="20dp"
  185 + android:background="@drawable/icon_race_location_green" />
  186 +
  187 + <TextView
  188 + android:layout_width="wrap_content"
  189 + android:layout_height="wrap_content"
  190 + android:layout_marginLeft="5dp"
  191 + android:text="报名时间"
  192 + android:textColor="@color/bottom_sheet_dialog_race_location_text"
  193 + android:textSize="14sp" />
  194 + </LinearLayout>
  195 + <!--时间-->
  196 + <LinearLayout
  197 + android:layout_width="match_parent"
93 198 android:layout_height="wrap_content"
94 199 android:layout_marginLeft="10dp"
95   - android:text="首都师范大学操场东门"
96   - android:textColor="@color/black"
97   - android:textSize="15sp" />
98   - </LinearLayout>
99   - <!--终点-->
100   - <LinearLayout
101   - android:id="@+id/ll_end_point"
102   - android:layout_width="match_parent"
103   - android:layout_height="wrap_content"
104   - android:layout_marginTop="10dp"
105   - android:gravity="center_vertical">
  200 + android:layout_marginTop="10dp">
  201 +
  202 + <TextView
  203 + android:layout_width="wrap_content"
  204 + android:layout_height="wrap_content"
  205 + android:layout_marginLeft="25dp"
  206 + android:text="2019.05.01"
  207 + android:textColor="@color/black"
  208 + android:textSize="15sp" />
  209 +
  210 + <TextView
  211 + android:layout_width="wrap_content"
  212 + android:layout_height="match_parent"
  213 + android:layout_marginLeft="5dp"
  214 + android:text="——"
  215 + android:textColor="@color/black"
  216 + android:textSize="15sp" />
  217 +
  218 + <TextView
  219 + android:layout_width="wrap_content"
  220 + android:layout_height="wrap_content"
  221 + android:layout_marginLeft="5dp"
  222 + android:text="2019.09.01"
  223 + android:textColor="@color/black"
  224 + android:textSize="15sp" />
  225 + </LinearLayout>
106 226  
107 227 <View
108   - android:layout_width="10dp"
109   - android:layout_height="10dp"
110   - android:layout_marginLeft="25dp"
111   - android:background="@drawable/shape_circle_red" />
112   -
113   - <TextView
114   - android:layout_width="wrap_content"
  228 + android:layout_width="match_parent"
  229 + android:layout_height="1dp"
  230 + android:layout_marginTop="5dp"
  231 + android:background="@color/line" />
  232 + <!--活动时间-->
  233 + <LinearLayout
  234 + android:layout_width="match_parent"
115 235 android:layout_height="wrap_content"
116 236 android:layout_marginLeft="10dp"
117   - android:text="(止)"
118   - android:textColor="@color/bottom_sheet_dialog_race_location_text"
119   - android:textSize="14sp" />
120   -
121   - <TextView
122   - android:layout_width="wrap_content"
  237 + android:layout_marginTop="10dp">
  238 +
  239 + <ImageView
  240 + android:layout_width="20dp"
  241 + android:layout_height="20dp"
  242 + android:background="@drawable/icon_race_location_green" />
  243 +
  244 + <TextView
  245 + android:layout_width="wrap_content"
  246 + android:layout_height="wrap_content"
  247 + android:layout_marginLeft="5dp"
  248 + android:text="活动时间"
  249 + android:textColor="@color/bottom_sheet_dialog_race_location_text"
  250 + android:textSize="14sp" />
  251 + </LinearLayout>
  252 + <!--活动时间的具体日期-->
  253 + <LinearLayout
  254 + android:layout_width="match_parent"
123 255 android:layout_height="wrap_content"
124 256 android:layout_marginLeft="10dp"
125   - android:text="首都师范大学操场西门"
126   - android:textColor="@color/black"
127   - android:textSize="15sp" />
128   - </LinearLayout>
129   - <!--报名时间-->
130   - <LinearLayout
131   - android:layout_width="match_parent"
132   - android:layout_height="wrap_content"
133   - android:layout_marginTop="10dp">
134   -
135   - <ImageView
136   - android:layout_width="20dp"
137   - android:layout_height="20dp"
138   - android:background="@drawable/icon_race_location_green" />
139   -
140   - <TextView
141   - android:layout_width="wrap_content"
142   - android:layout_height="wrap_content"
143   - android:layout_marginLeft="5dp"
144   - android:text="报名时间"
145   - android:textColor="@color/bottom_sheet_dialog_race_location_text"
146   - android:textSize="14sp" />
147   - </LinearLayout>
148   - <!--时间-->
149   - <LinearLayout
150   - android:layout_width="match_parent"
151   - android:layout_height="wrap_content"
152   - android:layout_marginTop="10dp">
153   -
154   - <TextView
155   - android:layout_width="wrap_content"
156   - android:layout_height="wrap_content"
157   - android:layout_marginLeft="25dp"
158   - android:text="2019.05.01"
159   - android:textColor="@color/black"
160   - android:textSize="15sp" />
161   -
162   - <TextView
163   - android:layout_width="wrap_content"
164   - android:layout_height="match_parent"
165   - android:layout_marginLeft="5dp"
166   - android:text="——"
167   - android:textColor="@color/black"
168   - android:textSize="15sp" />
169   -
170   - <TextView
171   - android:layout_width="wrap_content"
172   - android:layout_height="wrap_content"
173   - android:layout_marginLeft="5dp"
174   - android:text="2019.09.01"
175   - android:textColor="@color/black"
176   - android:textSize="15sp" />
177   - </LinearLayout>
178   -
179   - <View
180   - android:layout_width="match_parent"
181   - android:layout_height="1dp"
182   - android:layout_marginTop="5dp"
183   - android:background="@color/line" />
184   - <!--活动时间-->
185   - <LinearLayout
186   - android:layout_width="match_parent"
187   - android:layout_height="wrap_content"
188   - android:layout_marginTop="10dp">
189   -
190   - <ImageView
191   - android:layout_width="20dp"
192   - android:layout_height="20dp"
193   - android:background="@drawable/icon_race_location_green" />
194   -
195   - <TextView
196   - android:layout_width="wrap_content"
197   - android:layout_height="wrap_content"
198   - android:layout_marginLeft="5dp"
199   - android:text="活动时间"
200   - android:textColor="@color/bottom_sheet_dialog_race_location_text"
201   - android:textSize="14sp" />
202   - </LinearLayout>
203   - <!--活动时间的具体日期-->
204   - <LinearLayout
205   - android:layout_width="match_parent"
206   - android:layout_height="wrap_content"
207   - android:layout_marginTop="10dp">
208   -
209   - <TextView
210   - android:layout_width="wrap_content"
211   - android:layout_height="wrap_content"
212   - android:layout_marginLeft="25dp"
213   - android:text="2019.05.01"
214   - android:textColor="@color/black"
215   - android:textSize="15sp" />
216   -
217   - <TextView
218   - android:layout_width="wrap_content"
219   - android:layout_height="match_parent"
220   - android:layout_marginLeft="5dp"
221   - android:text="——"
222   - android:textColor="@color/black"
223   - android:textSize="15sp" />
224   -
225   - <TextView
226   - android:layout_width="wrap_content"
227   - android:layout_height="wrap_content"
228   - android:layout_marginLeft="5dp"
229   - android:text="2019.09.01"
230   - android:textColor="@color/black"
231   - android:textSize="15sp" />
232   - </LinearLayout>
233   -
234   - <View
235   - android:layout_width="match_parent"
236   - android:layout_height="1dp"
237   - android:layout_marginTop="5dp"
238   - android:background="@color/line" />
239   - <!--参与人数-->
240   - <LinearLayout
241   - android:layout_width="match_parent"
242   - android:layout_height="wrap_content"
243   - android:layout_marginTop="10dp">
244   -
245   - <ImageView
246   - android:layout_width="20dp"
247   - android:layout_height="20dp"
248   - android:background="@drawable/icon_race_location_green" />
249   -
250   - <TextView
251   - android:layout_width="wrap_content"
252   - android:layout_height="wrap_content"
253   - android:layout_marginLeft="5dp"
254   - android:text="参与人数"
255   - android:textColor="@color/bottom_sheet_dialog_race_location_text"
256   - android:textSize="14sp" />
257   - </LinearLayout>
258   - <!--相关的人数-->
259   - <LinearLayout
260   - android:layout_width="match_parent"
261   - android:layout_height="wrap_content"
262   - android:gravity="center_vertical">
  257 + android:layout_marginTop="10dp">
  258 +
  259 + <TextView
  260 + android:layout_width="wrap_content"
  261 + android:layout_height="wrap_content"
  262 + android:layout_marginLeft="25dp"
  263 + android:text="2019.05.01"
  264 + android:textColor="@color/black"
  265 + android:textSize="15sp" />
  266 +
  267 + <TextView
  268 + android:layout_width="wrap_content"
  269 + android:layout_height="match_parent"
  270 + android:layout_marginLeft="5dp"
  271 + android:text="——"
  272 + android:textColor="@color/black"
  273 + android:textSize="15sp" />
  274 +
  275 + <TextView
  276 + android:layout_width="wrap_content"
  277 + android:layout_height="wrap_content"
  278 + android:layout_marginLeft="5dp"
  279 + android:text="2019.09.01"
  280 + android:textColor="@color/black"
  281 + android:textSize="15sp" />
  282 + </LinearLayout>
263 283  
264   - <TextView
265   - android:layout_width="wrap_content"
266   - android:layout_height="wrap_content"
267   - android:layout_marginLeft="25dp"
268   - android:text="123"
269   - android:textColor="@color/black"
270   - android:textSize="17sp"
271   - android:textStyle="bold" />
272   -
273   - <TextView
274   - android:layout_width="wrap_content"
  284 + <View
  285 + android:layout_width="match_parent"
  286 + android:layout_height="1dp"
  287 + android:layout_marginTop="5dp"
  288 + android:background="@color/line" />
  289 + <!--参与人数-->
  290 + <LinearLayout
  291 + android:layout_width="match_parent"
275 292 android:layout_height="wrap_content"
276   - android:layout_marginLeft="5dp"
277   - android:text="人参与"
278   - android:textColor="@color/black"
279   - android:textSize="15sp" />
280   -
  293 + android:layout_marginLeft="10dp"
  294 + android:layout_marginTop="10dp">
  295 +
  296 + <ImageView
  297 + android:layout_width="20dp"
  298 + android:layout_height="20dp"
  299 + android:background="@drawable/icon_race_location_green" />
  300 +
  301 + <TextView
  302 + android:layout_width="wrap_content"
  303 + android:layout_height="wrap_content"
  304 + android:layout_marginLeft="5dp"
  305 + android:text="参与人数"
  306 + android:textColor="@color/bottom_sheet_dialog_race_location_text"
  307 + android:textSize="14sp" />
  308 + </LinearLayout>
  309 + <!--相关的人数-->
281 310 <LinearLayout
282 311 android:layout_width="match_parent"
283 312 android:layout_height="wrap_content"
284   - android:gravity="right|center">
285   -
286   - <com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView
287   - android:id="@+id/five_join_person"
  313 + android:gravity="center_vertical">
  314 +
  315 + <TextView
  316 + android:layout_width="wrap_content"
  317 + android:layout_height="wrap_content"
  318 + android:layout_marginLeft="25dp"
  319 + android:text="123"
  320 + android:textColor="@color/black"
  321 + android:textSize="17sp"
  322 + android:textStyle="bold" />
  323 +
  324 + <TextView
  325 + android:layout_width="wrap_content"
  326 + android:layout_height="wrap_content"
  327 + android:layout_marginLeft="5dp"
  328 + android:text="人参与"
  329 + android:textColor="@color/black"
  330 + android:textSize="15sp" />
  331 +
  332 + <LinearLayout
288 333 android:layout_width="match_parent"
289   - android:layout_height="40dp"
290   - android:layout_marginRight="10dp"
291   - FivePersonIconView:showRightFlag="true"></com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView>
  334 + android:layout_height="wrap_content"
  335 + android:gravity="right|center">
  336 +
  337 + <com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView
  338 + android:id="@+id/five_join_person"
  339 + android:layout_width="match_parent"
  340 + android:layout_height="40dp"
  341 + android:layout_marginRight="10dp"
  342 + FivePersonIconView:showRightFlag="true"></com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView>
292 343  
293 344  
  345 + </LinearLayout>
294 346 </LinearLayout>
  347 + <!---->
295 348 </LinearLayout>
296   - <!---->
297 349 </LinearLayout>
298   -</LinearLayout>
299 350 \ No newline at end of file
  351 +</layout>
300 352 \ No newline at end of file
... ...