Commit 9df709a250ed6dd250a6bceff04436799fd67731
1 parent
d276b06b
1.;跑步结束页面
Showing
18 changed files
with
511 additions
and
45 deletions
moudle_pedometer/src/main/AndroidManifest.xml
| @@ -108,7 +108,7 @@ | @@ -108,7 +108,7 @@ | ||
| 108 | android:name="com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity" | 108 | android:name="com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity" |
| 109 | android:process=":step" /> | 109 | android:process=":step" /> |
| 110 | <activity | 110 | <activity |
| 111 | - android:name="com.cnlive.moudle.pedometer.ui.activity.FinishRuningMapActivity" | 111 | + android:name="com.cnlive.moudle.pedometer.ui.activity.RunningFinishActivity" |
| 112 | android:process=":step" /> | 112 | android:process=":step" /> |
| 113 | </application> | 113 | </application> |
| 114 | 114 |
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunningFinishFragmetPresenter.java
0 → 100644
| 1 | +package com.cnlive.moudle.pedometer.frame.presenter; | ||
| 2 | + | ||
| 3 | +import com.cnlive.moudle.pedometer.frame.view.RunningFinishFragmentView; | ||
| 4 | +import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter; | ||
| 5 | + | ||
| 6 | +public class RunningFinishFragmetPresenter extends MvpBasePresenter<RunningFinishFragmentView> { | ||
| 7 | +} |
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunMainFragmentView.java
| @@ -16,6 +16,8 @@ import com.cnlive.moudle.pedometer.model.Constant; | @@ -16,6 +16,8 @@ import com.cnlive.moudle.pedometer.model.Constant; | ||
| 16 | import com.cnlive.moudle.pedometer.model.MessageEvent; | 16 | import com.cnlive.moudle.pedometer.model.MessageEvent; |
| 17 | import com.cnlive.moudle.pedometer.service.StepService; | 17 | import com.cnlive.moudle.pedometer.service.StepService; |
| 18 | import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity; | 18 | import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity; |
| 19 | +import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity; | ||
| 20 | +import com.cnlive.moudle.pedometer.ui.activity.RunningFinishActivity; | ||
| 19 | import com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity; | 21 | import com.cnlive.moudle.pedometer.ui.activity.RunningMapActivity; |
| 20 | import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment; | 22 | import com.cnlive.moudle.pedometer.ui.fragment.RunMainFragment; |
| 21 | import com.cnlive.moudle.pedometer.ui.widget.SelectDialog; | 23 | import com.cnlive.moudle.pedometer.ui.widget.SelectDialog; |
| @@ -254,7 +256,7 @@ public class RunMainFragmentView implements MvpView { | @@ -254,7 +256,7 @@ public class RunMainFragmentView implements MvpView { | ||
| 254 | MySpHelper.getInstance(getContext(), Context.MODE_MULTI_PROCESS).putLong("stepStartTime", 0); | 256 | MySpHelper.getInstance(getContext(), Context.MODE_MULTI_PROCESS).putLong("stepStartTime", 0); |
| 255 | fragment.getActivity().stopService(new Intent(fragment.getActivity(), StepService.class)); | 257 | fragment.getActivity().stopService(new Intent(fragment.getActivity(), StepService.class)); |
| 256 | MySpHelper.getInstance(getContext(), Context.MODE_MULTI_PROCESS).putString("userId", ""); | 258 | MySpHelper.getInstance(getContext(), Context.MODE_MULTI_PROCESS).putString("userId", ""); |
| 257 | - | 259 | + RunningFinishActivity.startActivity(fragment.getActivity()); |
| 258 | // fragment.getActivity().finish(); | 260 | // fragment.getActivity().finish(); |
| 259 | } | 261 | } |
| 260 | }, "取消", new SelectDialog.DialogInterface() { | 262 | }, "取消", new SelectDialog.DialogInterface() { |
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunningFinishFragmentView.java
0 → 100644
| 1 | +package com.cnlive.moudle.pedometer.frame.view; | ||
| 2 | + | ||
| 3 | +import android.content.Context; | ||
| 4 | + | ||
| 5 | +import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment; | ||
| 6 | +import com.cnlive.moudle.pedometer.ui.fragment.RunningMapFragment; | ||
| 7 | +import com.hannesdorfmann.mosby3.mvp.MvpView; | ||
| 8 | + | ||
| 9 | +public class RunningFinishFragmentView implements MvpView { | ||
| 10 | + private RunningFinishFragment fragment; | ||
| 11 | + | ||
| 12 | + public RunningFinishFragmentView(RunningFinishFragment fragment) { | ||
| 13 | + this.fragment = fragment; | ||
| 14 | + } | ||
| 15 | + | ||
| 16 | + public Context getContext() { | ||
| 17 | + return fragment == null ? null : fragment.getActivity(); | ||
| 18 | + } | ||
| 19 | +} |
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/FinishRuningMapActivity.java deleted
100644 → 0
| 1 | -package com.cnlive.moudle.pedometer.ui.activity; | ||
| 2 | - | ||
| 3 | -import com.cnlive.libs.base.ui.QMUIFragmentActivity; | ||
| 4 | -import com.example.moudle_pedometer.R; | ||
| 5 | - | ||
| 6 | -public class FinishRuningMapActivity extends QMUIFragmentActivity { | ||
| 7 | - @Override | ||
| 8 | - protected int getContextViewId() { | ||
| 9 | - return R.id.fragment_finish_run_map; | ||
| 10 | - } | ||
| 11 | -} |
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunLineActivity.java
| @@ -6,6 +6,7 @@ import android.os.Bundle; | @@ -6,6 +6,7 @@ import android.os.Bundle; | ||
| 6 | import com.cnlive.libs.base.util.StatusBarUtil; | 6 | import com.cnlive.libs.base.util.StatusBarUtil; |
| 7 | import com.cnlive.libs.base.util.StatusBarUtil2; | 7 | import com.cnlive.libs.base.util.StatusBarUtil2; |
| 8 | import com.cnlive.moudle.pedometer.ui.fragment.RunLineFragment; | 8 | import com.cnlive.moudle.pedometer.ui.fragment.RunLineFragment; |
| 9 | +import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment; | ||
| 9 | import com.example.moudle_pedometer.R; | 10 | import com.example.moudle_pedometer.R; |
| 10 | 11 | ||
| 11 | /** | 12 | /** |
| @@ -22,5 +23,6 @@ public class RunLineActivity extends AppCompatActivity { | @@ -22,5 +23,6 @@ public class RunLineActivity extends AppCompatActivity { | ||
| 22 | setContentView(R.layout.activity_run_line); | 23 | setContentView(R.layout.activity_run_line); |
| 23 | 24 | ||
| 24 | getSupportFragmentManager().beginTransaction().replace(R.id.run_line_container, new RunLineFragment()).commit(); | 25 | getSupportFragmentManager().beginTransaction().replace(R.id.run_line_container, new RunLineFragment()).commit(); |
| 26 | + | ||
| 25 | } | 27 | } |
| 26 | } | 28 | } |
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
| @@ -34,7 +34,7 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity { | @@ -34,7 +34,7 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity { | ||
| 34 | 34 | ||
| 35 | @Override | 35 | @Override |
| 36 | protected int getContextViewId() { | 36 | protected int getContextViewId() { |
| 37 | - return R.id.fragment_run_trace_detail; | 37 | + return R.id.fragment_finish_run_map; |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | @Override | 40 | @Override |
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunningFinishActivity.java
0 → 100644
| 1 | +package com.cnlive.moudle.pedometer.ui.activity; | ||
| 2 | + | ||
| 3 | +import android.app.Activity; | ||
| 4 | +import android.content.Intent; | ||
| 5 | +import android.os.Bundle; | ||
| 6 | +import android.support.annotation.Nullable; | ||
| 7 | + | ||
| 8 | +import com.alibaba.android.arouter.facade.annotation.Route; | ||
| 9 | +import com.cnlive.libs.base.ui.QMUIFragment; | ||
| 10 | +import com.cnlive.libs.base.ui.QMUIFragmentActivity; | ||
| 11 | +import com.cnlive.libs.base.util.StatusBarUtil2; | ||
| 12 | +import com.cnlive.moudle.pedometer.model.RunningMapBean; | ||
| 13 | +import com.cnlive.moudle.pedometer.ui.fragment.RunRaceDetailFragment; | ||
| 14 | +import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment; | ||
| 15 | +import com.example.moudle_pedometer.R; | ||
| 16 | + | ||
| 17 | +/** | ||
| 18 | + * 跑步结束 | ||
| 19 | + * | ||
| 20 | + * @author ShinnyYang | ||
| 21 | + */ | ||
| 22 | +@Route(path = "/moudle_pedometer/RunningFinishActivity") | ||
| 23 | +public class RunningFinishActivity extends QMUIFragmentActivity { | ||
| 24 | + | ||
| 25 | + @Override | ||
| 26 | + protected int getContextViewId() { | ||
| 27 | + return R.id.fragment_run_trace_detail; | ||
| 28 | + } | ||
| 29 | + | ||
| 30 | + @Override | ||
| 31 | + protected void onCreate(Bundle savedInstanceState) { | ||
| 32 | + super.onCreate(savedInstanceState); | ||
| 33 | + StatusBarUtil2.setColor(this, getResources().getColor(R.color.run_main_bg), 0); | ||
| 34 | + addFragment(); | ||
| 35 | + | ||
| 36 | + } | ||
| 37 | + | ||
| 38 | + private void addFragment() { | ||
| 39 | + QMUIFragment fragment = new RunningFinishFragment(); | ||
| 40 | + getSupportFragmentManager().beginTransaction() | ||
| 41 | + .add(getContextViewId(), fragment, fragment.getClass().getSimpleName()) | ||
| 42 | + .addToBackStack(fragment.getClass().getSimpleName()) | ||
| 43 | + .commit(); | ||
| 44 | + } | ||
| 45 | + | ||
| 46 | + @Override | ||
| 47 | + protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) { | ||
| 48 | + super.onActivityResult(requestCode, resultCode, data); | ||
| 49 | + if (resultCode == 1002) { | ||
| 50 | + | ||
| 51 | + } | ||
| 52 | + } | ||
| 53 | + | ||
| 54 | + public static void startActivity(Activity activity) { | ||
| 55 | + Intent intent = new Intent(activity, RunningFinishActivity.class); | ||
| 56 | + activity.startActivity(intent); | ||
| 57 | + } | ||
| 58 | +} |
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunningFinishFragment.java
0 → 100644
| 1 | +package com.cnlive.moudle.pedometer.ui.fragment; | ||
| 2 | + | ||
| 3 | +import com.cnlive.libs.base.ui.QMUIFragment; | ||
| 4 | +import com.cnlive.moudle.pedometer.frame.presenter.RunningFinishFragmetPresenter; | ||
| 5 | +import com.cnlive.moudle.pedometer.frame.view.RunningFinishFragmentView; | ||
| 6 | +import com.example.moudle_pedometer.R; | ||
| 7 | +import com.example.moudle_pedometer.databinding.FragmentFinishRunMapBinding; | ||
| 8 | + | ||
| 9 | +public class RunningFinishFragment extends QMUIFragment<RunningFinishFragmentView, RunningFinishFragmetPresenter, FragmentFinishRunMapBinding> { | ||
| 10 | + @Override | ||
| 11 | + protected int getToolbarId() { | ||
| 12 | + return 0; | ||
| 13 | + } | ||
| 14 | + | ||
| 15 | + @Override | ||
| 16 | + public String getTitle() { | ||
| 17 | + return null; | ||
| 18 | + } | ||
| 19 | + | ||
| 20 | + @Override | ||
| 21 | + protected int getLayoutId() { | ||
| 22 | + return R.layout.fragment_finish_run_map; | ||
| 23 | + } | ||
| 24 | +} |
moudle_pedometer/src/main/res/drawable-hdpi/icon_run_route.png
0 → 100644
1.47 KB
moudle_pedometer/src/main/res/drawable-hdpi/icon_step.png
0 → 100644
1.52 KB
moudle_pedometer/src/main/res/drawable/shape_circle_gray.xml
0 → 100644
moudle_pedometer/src/main/res/layout/fragment_finish_run_map.xml
| @@ -8,8 +8,9 @@ | @@ -8,8 +8,9 @@ | ||
| 8 | android:layout_height="match_parent" | 8 | android:layout_height="match_parent" |
| 9 | android:gravity="bottom" | 9 | android:gravity="bottom" |
| 10 | sothree:umanoDragView="@+id/dragView" | 10 | sothree:umanoDragView="@+id/dragView" |
| 11 | + sothree:umanoFadeColor="@color/black_20" | ||
| 11 | sothree:umanoOverlay="true" | 12 | sothree:umanoOverlay="true" |
| 12 | - sothree:umanoPanelHeight="100dp" | 13 | + sothree:umanoPanelHeight="220dp" |
| 13 | sothree:umanoParallaxOffset="100dp" | 14 | sothree:umanoParallaxOffset="100dp" |
| 14 | sothree:umanoScrollableView="@+id/scrollView" | 15 | sothree:umanoScrollableView="@+id/scrollView" |
| 15 | sothree:umanoShadowHeight="0dp"> | 16 | sothree:umanoShadowHeight="0dp"> |
| @@ -59,7 +60,7 @@ | @@ -59,7 +60,7 @@ | ||
| 59 | <FrameLayout | 60 | <FrameLayout |
| 60 | android:id="@+id/dragView" | 61 | android:id="@+id/dragView" |
| 61 | android:layout_width="match_parent" | 62 | android:layout_width="match_parent" |
| 62 | - android:layout_height="match_parent" | 63 | + android:layout_height="wrap_content" |
| 63 | android:clickable="true" | 64 | android:clickable="true" |
| 64 | android:focusable="false" | 65 | android:focusable="false" |
| 65 | android:orientation="vertical"> | 66 | android:orientation="vertical"> |
| @@ -68,6 +69,7 @@ | @@ -68,6 +69,7 @@ | ||
| 68 | android:id="@+id/scrollView" | 69 | android:id="@+id/scrollView" |
| 69 | android:layout_width="match_parent" | 70 | android:layout_width="match_parent" |
| 70 | android:layout_height="wrap_content" | 71 | android:layout_height="wrap_content" |
| 72 | + android:layout_marginBottom="60dp" | ||
| 71 | android:scrollbars="none"> | 73 | android:scrollbars="none"> |
| 72 | 74 | ||
| 73 | <LinearLayout | 75 | <LinearLayout |
| @@ -75,24 +77,20 @@ | @@ -75,24 +77,20 @@ | ||
| 75 | android:layout_width="match_parent" | 77 | android:layout_width="match_parent" |
| 76 | android:layout_height="wrap_content" | 78 | android:layout_height="wrap_content" |
| 77 | android:orientation="vertical"> | 79 | android:orientation="vertical"> |
| 78 | - <!--跑道--> | 80 | + <!--用户个人信息--> |
| 79 | <include | 81 | <include |
| 80 | - android:id="@+id/include_street" | ||
| 81 | - layout="@layout/layout_run_detail_street" /> | ||
| 82 | - <!--成绩--> | 82 | + android:id="@+id/include_finish_user_info" |
| 83 | + layout="@layout/layout_finish_user_info" /> | ||
| 84 | + <!--总步数--> | ||
| 83 | <include | 85 | <include |
| 84 | - android:id="@+id/include_person_score" | ||
| 85 | - android:visibility="visible" | ||
| 86 | - layout="@layout/layout_run_detail_person_score" /> | ||
| 87 | - <!--排行--> | 86 | + android:id="@+id/include_finish_step" |
| 87 | + layout="@layout/layout_finish_step" | ||
| 88 | + android:visibility="visible" /> | ||
| 89 | + <!--跑步路线--> | ||
| 88 | <include | 90 | <include |
| 89 | - android:id="@+id/include_rank" | ||
| 90 | - android:visibility="visible" | ||
| 91 | - layout="@layout/layout_run_detail_rank" /> | ||
| 92 | - <!--路线介绍--> | ||
| 93 | - <include | ||
| 94 | - android:id="@+id/include_street_introduce" | ||
| 95 | - layout="@layout/layout_run_detail_street_introduce" /> | 91 | + android:id="@+id/include_finish_run_route" |
| 92 | + layout="@layout/layout_finish_running_route" | ||
| 93 | + android:visibility="visible" /> | ||
| 96 | </LinearLayout> | 94 | </LinearLayout> |
| 97 | 95 | ||
| 98 | </ScrollView> | 96 | </ScrollView> |
| @@ -111,22 +109,10 @@ | @@ -111,22 +109,10 @@ | ||
| 111 | android:layout_height="wrap_content" | 109 | android:layout_height="wrap_content" |
| 112 | android:layout_centerInParent="true" | 110 | android:layout_centerInParent="true" |
| 113 | android:tag="0" | 111 | android:tag="0" |
| 114 | - android:text="@string/run_race_btn_sign_up" | 112 | + android:text="保存中" |
| 115 | android:textColor="@color/white" | 113 | android:textColor="@color/white" |
| 116 | android:textSize="18sp" /> | 114 | android:textSize="18sp" /> |
| 117 | 115 | ||
| 118 | - <TextView | ||
| 119 | - android:id="@+id/tv_go_tip" | ||
| 120 | - android:layout_width="wrap_content" | ||
| 121 | - android:layout_height="wrap_content" | ||
| 122 | - android:layout_alignParentRight="true" | ||
| 123 | - android:layout_centerInParent="true" | ||
| 124 | - android:layout_centerVertical="true" | ||
| 125 | - android:layout_marginRight="10dp" | ||
| 126 | - android:text="Go!" | ||
| 127 | - android:textColor="@color/white" | ||
| 128 | - android:textSize="18sp" | ||
| 129 | - android:visibility="gone" /> | ||
| 130 | 116 | ||
| 131 | </RelativeLayout> | 117 | </RelativeLayout> |
| 132 | </FrameLayout> | 118 | </FrameLayout> |
moudle_pedometer/src/main/res/layout/fragment_run_race_detail.xml
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | android:layout_height="match_parent" | 8 | android:layout_height="match_parent" |
| 9 | android:gravity="bottom" | 9 | android:gravity="bottom" |
| 10 | sothree:umanoDragView="@+id/dragView" | 10 | sothree:umanoDragView="@+id/dragView" |
| 11 | - sothree:umanoFadeColor="@color/transparent" | 11 | + sothree:umanoFadeColor="@color/black_20" |
| 12 | sothree:umanoOverlay="true" | 12 | sothree:umanoOverlay="true" |
| 13 | sothree:umanoPanelHeight="142dp" | 13 | sothree:umanoPanelHeight="142dp" |
| 14 | sothree:umanoParallaxOffset="250dp" | 14 | sothree:umanoParallaxOffset="250dp" |
moudle_pedometer/src/main/res/layout/layout_finish_running_route.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | + android:layout_width="match_parent" | ||
| 4 | + android:layout_height="match_parent" | ||
| 5 | + android:layout_margin="10dp" | ||
| 6 | + android:background="@drawable/shape_10dp_white_raduis_bg" | ||
| 7 | + android:orientation="vertical"> | ||
| 8 | + <!--跑步路线--> | ||
| 9 | + <LinearLayout | ||
| 10 | + android:layout_width="match_parent" | ||
| 11 | + android:layout_height="wrap_content" | ||
| 12 | + android:layout_marginTop="10dp" | ||
| 13 | + android:gravity="bottom"> | ||
| 14 | + | ||
| 15 | + <ImageView | ||
| 16 | + android:layout_width="30dp" | ||
| 17 | + android:layout_height="30dp" | ||
| 18 | + android:layout_marginLeft="10dp" | ||
| 19 | + android:background="@drawable/icon_run_route" /> | ||
| 20 | + | ||
| 21 | + <TextView | ||
| 22 | + android:layout_width="wrap_content" | ||
| 23 | + android:layout_height="wrap_content" | ||
| 24 | + android:layout_marginBottom="1dp" | ||
| 25 | + android:text="跑步路线" | ||
| 26 | + android:textColor="@color/black" | ||
| 27 | + android:textSize="12sp" /> | ||
| 28 | + </LinearLayout> | ||
| 29 | + <!--起点--> | ||
| 30 | + <LinearLayout | ||
| 31 | + android:layout_width="match_parent" | ||
| 32 | + android:layout_height="wrap_content" | ||
| 33 | + android:layout_marginTop="10dp" | ||
| 34 | + android:gravity="center_vertical"> | ||
| 35 | + | ||
| 36 | + <View | ||
| 37 | + android:layout_width="10dp" | ||
| 38 | + android:layout_height="10dp" | ||
| 39 | + android:layout_marginLeft="15dp" | ||
| 40 | + android:background="@drawable/shape_circle_green" /> | ||
| 41 | + | ||
| 42 | + <TextView | ||
| 43 | + android:layout_width="wrap_content" | ||
| 44 | + android:layout_height="wrap_content" | ||
| 45 | + android:layout_marginLeft="10dp" | ||
| 46 | + android:text="@string/layout_street_start_point" | ||
| 47 | + android:textColor="@color/text_gray" | ||
| 48 | + android:textSize="14sp" /> | ||
| 49 | + | ||
| 50 | + <TextView | ||
| 51 | + android:layout_width="wrap_content" | ||
| 52 | + android:layout_height="wrap_content" | ||
| 53 | + android:layout_marginLeft="10dp" | ||
| 54 | + android:text="首都师范大学操场东门" | ||
| 55 | + android:textColor="@color/black" | ||
| 56 | + android:textSize="15sp" /> | ||
| 57 | + </LinearLayout> | ||
| 58 | + <!--竖线--> | ||
| 59 | + <View | ||
| 60 | + android:layout_width="1dp" | ||
| 61 | + android:layout_height="30dp" | ||
| 62 | + android:layout_marginLeft="19dp" | ||
| 63 | + android:layout_marginTop="-3dp" | ||
| 64 | + android:background="@color/vertical_line" /> | ||
| 65 | + <!--终点--> | ||
| 66 | + <LinearLayout | ||
| 67 | + android:layout_width="match_parent" | ||
| 68 | + android:layout_height="wrap_content" | ||
| 69 | + android:layout_marginTop="-3dp" | ||
| 70 | + android:gravity="center_vertical"> | ||
| 71 | + | ||
| 72 | + <View | ||
| 73 | + android:layout_width="10dp" | ||
| 74 | + android:layout_height="10dp" | ||
| 75 | + android:layout_marginLeft="15dp" | ||
| 76 | + android:background="@drawable/shape_circle_red" /> | ||
| 77 | + | ||
| 78 | + <TextView | ||
| 79 | + android:layout_width="wrap_content" | ||
| 80 | + android:layout_height="wrap_content" | ||
| 81 | + android:layout_marginLeft="10dp" | ||
| 82 | + android:text="@string/layout_street_end_point" | ||
| 83 | + android:textColor="@color/text_gray" | ||
| 84 | + android:textSize="14sp" /> | ||
| 85 | + | ||
| 86 | + <TextView | ||
| 87 | + android:layout_width="wrap_content" | ||
| 88 | + android:layout_height="wrap_content" | ||
| 89 | + android:layout_marginLeft="10dp" | ||
| 90 | + android:text="首都师范大学操场东门" | ||
| 91 | + android:textColor="@color/black" | ||
| 92 | + android:textSize="15sp" /> | ||
| 93 | + </LinearLayout> | ||
| 94 | + <!--竖线--> | ||
| 95 | + <View | ||
| 96 | + android:layout_width="1dp" | ||
| 97 | + android:layout_height="30dp" | ||
| 98 | + android:layout_marginLeft="19dp" | ||
| 99 | + android:layout_marginTop="-3dp" | ||
| 100 | + android:background="@color/vertical_line" /> | ||
| 101 | + <!--时间--> | ||
| 102 | + <LinearLayout | ||
| 103 | + android:layout_width="match_parent" | ||
| 104 | + android:layout_height="wrap_content" | ||
| 105 | + android:layout_marginTop="-17dp" | ||
| 106 | + android:gravity="center_vertical"> | ||
| 107 | + | ||
| 108 | + <View | ||
| 109 | + android:layout_width="7dp" | ||
| 110 | + android:layout_height="7dp" | ||
| 111 | + android:layout_marginLeft="16dp" | ||
| 112 | + android:background="@drawable/shape_circle_gray" /> | ||
| 113 | + | ||
| 114 | + <LinearLayout | ||
| 115 | + android:layout_width="match_parent" | ||
| 116 | + android:layout_height="wrap_content" | ||
| 117 | + android:orientation="vertical"> | ||
| 118 | + | ||
| 119 | + <TextView | ||
| 120 | + android:layout_width="wrap_content" | ||
| 121 | + android:layout_height="wrap_content" | ||
| 122 | + android:layout_marginLeft="10dp" | ||
| 123 | + android:text="00:27:23" | ||
| 124 | + android:textColor="@color/black" | ||
| 125 | + android:textSize="18sp" | ||
| 126 | + android:textStyle="bold" /> | ||
| 127 | + | ||
| 128 | + <TextView | ||
| 129 | + android:layout_width="wrap_content" | ||
| 130 | + android:layout_height="wrap_content" | ||
| 131 | + android:layout_marginLeft="10dp" | ||
| 132 | + android:text="跑步记录时长" | ||
| 133 | + android:textColor="@color/text_gray" | ||
| 134 | + android:textSize="12sp" /> | ||
| 135 | + <!----> | ||
| 136 | + </LinearLayout> | ||
| 137 | + </LinearLayout> | ||
| 138 | + <!--竖线--> | ||
| 139 | + <View | ||
| 140 | + android:layout_width="1dp" | ||
| 141 | + android:layout_height="30dp" | ||
| 142 | + android:layout_marginLeft="19dp" | ||
| 143 | + android:layout_marginTop="-15dp" | ||
| 144 | + android:background="@color/vertical_line" /> | ||
| 145 | + <!----> | ||
| 146 | + <LinearLayout | ||
| 147 | + android:layout_width="match_parent" | ||
| 148 | + android:layout_height="wrap_content" | ||
| 149 | + android:layout_marginTop="-5dp" | ||
| 150 | + android:layout_marginBottom="10dp" | ||
| 151 | + android:gravity="center_vertical"> | ||
| 152 | + | ||
| 153 | + <View | ||
| 154 | + android:layout_width="7dp" | ||
| 155 | + android:layout_height="7dp" | ||
| 156 | + android:layout_marginLeft="16dp" | ||
| 157 | + android:background="@drawable/shape_circle_gray" /> | ||
| 158 | + | ||
| 159 | + <TextView | ||
| 160 | + android:layout_width="wrap_content" | ||
| 161 | + android:layout_height="wrap_content" | ||
| 162 | + android:layout_marginLeft="10dp" | ||
| 163 | + android:text="路线完成" | ||
| 164 | + android:textColor="@color/black" | ||
| 165 | + android:textSize="15sp" | ||
| 166 | + android:textStyle="bold" /> | ||
| 167 | + </LinearLayout> | ||
| 168 | + <!----> | ||
| 169 | +</LinearLayout> | ||
| 0 | \ No newline at end of file | 170 | \ No newline at end of file |
moudle_pedometer/src/main/res/layout/layout_finish_step.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | + android:layout_width="match_parent" | ||
| 4 | + android:layout_height="80dp" | ||
| 5 | + android:layout_margin="10dp" | ||
| 6 | + android:background="@drawable/shape_10dp_white_raduis_bg" | ||
| 7 | + android:orientation="vertical"> | ||
| 8 | + | ||
| 9 | + <LinearLayout | ||
| 10 | + android:layout_width="wrap_content" | ||
| 11 | + android:layout_height="wrap_content" | ||
| 12 | + android:layout_marginLeft="10dp" | ||
| 13 | + android:layout_marginTop="10dp" | ||
| 14 | + android:gravity="bottom"> | ||
| 15 | + | ||
| 16 | + <ImageView | ||
| 17 | + android:layout_width="25dp" | ||
| 18 | + android:layout_height="25dp" | ||
| 19 | + android:background="@drawable/icon_step" /> | ||
| 20 | + | ||
| 21 | + <TextView | ||
| 22 | + android:layout_width="wrap_content" | ||
| 23 | + android:layout_height="wrap_content" | ||
| 24 | + android:layout_marginLeft="10dp" | ||
| 25 | + android:text="总步数" /> | ||
| 26 | + </LinearLayout> | ||
| 27 | + <!----> | ||
| 28 | + <LinearLayout | ||
| 29 | + android:layout_width="match_parent" | ||
| 30 | + android:layout_height="match_parent" | ||
| 31 | + android:paddingBottom="10dp" | ||
| 32 | + android:gravity="center"> | ||
| 33 | + | ||
| 34 | + <TextView | ||
| 35 | + android:layout_width="wrap_content" | ||
| 36 | + android:layout_height="wrap_content" | ||
| 37 | + android:text="1233" | ||
| 38 | + android:textColor="@color/green_round" | ||
| 39 | + android:textSize="25sp" | ||
| 40 | + android:textStyle="bold" /> | ||
| 41 | + | ||
| 42 | + <TextView | ||
| 43 | + android:layout_width="wrap_content" | ||
| 44 | + android:layout_height="wrap_content" | ||
| 45 | + android:layout_marginLeft="10dp" | ||
| 46 | + android:layout_marginTop="4dp" | ||
| 47 | + android:text="步" | ||
| 48 | + android:textColor="@color/black" | ||
| 49 | + android:textSize="12sp" | ||
| 50 | + android:textStyle="bold" /> | ||
| 51 | + </LinearLayout> | ||
| 52 | + <!----> | ||
| 53 | +</LinearLayout> | ||
| 0 | \ No newline at end of file | 54 | \ No newline at end of file |
moudle_pedometer/src/main/res/layout/layout_finish_user_info.xml
0 → 100644
| 1 | +<?xml version="1.0" encoding="utf-8"?> | ||
| 2 | +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | + xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| 4 | + android:layout_width="match_parent" | ||
| 5 | + android:layout_height="match_parent" | ||
| 6 | + android:layout_margin="10dp"> | ||
| 7 | + | ||
| 8 | + <LinearLayout | ||
| 9 | + android:layout_width="match_parent" | ||
| 10 | + android:layout_height="170dp" | ||
| 11 | + android:layout_marginTop="30dp" | ||
| 12 | + android:background="@drawable/shape_10dp_white_raduis_bg" | ||
| 13 | + android:orientation="vertical"> | ||
| 14 | + | ||
| 15 | + <TextView | ||
| 16 | + android:layout_width="wrap_content" | ||
| 17 | + android:layout_height="wrap_content" | ||
| 18 | + android:layout_marginLeft="80dp" | ||
| 19 | + android:layout_marginTop="10dp" | ||
| 20 | + android:text="用户昵称" | ||
| 21 | + android:textColor="@color/black" | ||
| 22 | + android:textSize="15sp" /> | ||
| 23 | + <!----> | ||
| 24 | + <LinearLayout | ||
| 25 | + android:layout_width="match_parent" | ||
| 26 | + android:layout_height="wrap_content" | ||
| 27 | + android:gravity="center_vertical"> | ||
| 28 | + | ||
| 29 | + <LinearLayout | ||
| 30 | + android:layout_width="0dp" | ||
| 31 | + android:layout_height="wrap_content" | ||
| 32 | + android:layout_weight="1" | ||
| 33 | + android:orientation="vertical"> | ||
| 34 | + | ||
| 35 | + <TextView | ||
| 36 | + android:layout_width="wrap_content" | ||
| 37 | + android:layout_height="wrap_content" | ||
| 38 | + android:layout_marginLeft="15dp" | ||
| 39 | + android:layout_marginTop="15dp" | ||
| 40 | + android:text="奥森公园南路" | ||
| 41 | + android:textColor="@color/black" | ||
| 42 | + android:textSize="15sp" /> | ||
| 43 | + | ||
| 44 | + <TextView | ||
| 45 | + android:layout_width="wrap_content" | ||
| 46 | + android:layout_height="wrap_content" | ||
| 47 | + android:layout_marginLeft="15dp" | ||
| 48 | + android:layout_marginTop="5dp" | ||
| 49 | + android:text="2019/06/10 9:51" | ||
| 50 | + android:textColor="@color/text_gray" /> | ||
| 51 | + </LinearLayout> | ||
| 52 | + <!----> | ||
| 53 | + <LinearLayout | ||
| 54 | + android:layout_width="0dp" | ||
| 55 | + android:layout_height="wrap_content" | ||
| 56 | + android:layout_weight="1" | ||
| 57 | + android:gravity="right|bottom"> | ||
| 58 | + | ||
| 59 | + <TextView | ||
| 60 | + android:layout_width="wrap_content" | ||
| 61 | + android:layout_height="wrap_content" | ||
| 62 | + android:layout_marginRight="10dp" | ||
| 63 | + android:text="1.53" | ||
| 64 | + android:textColor="@color/black" | ||
| 65 | + android:textSize="35sp" | ||
| 66 | + android:textStyle="bold" /> | ||
| 67 | + | ||
| 68 | + <TextView | ||
| 69 | + android:layout_width="wrap_content" | ||
| 70 | + android:layout_height="wrap_content" | ||
| 71 | + android:layout_marginRight="15dp" | ||
| 72 | + android:text="公里" | ||
| 73 | + android:textColor="@color/black" | ||
| 74 | + android:textSize="15sp" /> | ||
| 75 | + </LinearLayout> | ||
| 76 | + <!----> | ||
| 77 | + </LinearLayout> | ||
| 78 | + <!--横线--> | ||
| 79 | + <View | ||
| 80 | + android:layout_width="match_parent" | ||
| 81 | + android:layout_height="1dp" | ||
| 82 | + android:layout_marginTop="10dp" | ||
| 83 | + android:background="@color/line" /> | ||
| 84 | + <!--配速和用时--> | ||
| 85 | + <LinearLayout | ||
| 86 | + android:layout_width="match_parent" | ||
| 87 | + android:layout_height="wrap_content" | ||
| 88 | + android:layout_marginTop="10sp"> | ||
| 89 | + <!----> | ||
| 90 | + <LinearLayout | ||
| 91 | + android:layout_width="0dp" | ||
| 92 | + android:layout_height="wrap_content" | ||
| 93 | + android:layout_weight="1" | ||
| 94 | + android:gravity="center" | ||
| 95 | + android:orientation="vertical"> | ||
| 96 | + | ||
| 97 | + <TextView | ||
| 98 | + android:layout_width="wrap_content" | ||
| 99 | + android:layout_height="wrap_content" | ||
| 100 | + android:text="34'33''" | ||
| 101 | + android:textColor="@color/black" | ||
| 102 | + android:textSize="20sp" | ||
| 103 | + android:textStyle="bold" /> | ||
| 104 | + | ||
| 105 | + <TextView | ||
| 106 | + android:layout_width="wrap_content" | ||
| 107 | + android:layout_height="wrap_content" | ||
| 108 | + android:layout_marginTop="5dp" | ||
| 109 | + android:text="配速" | ||
| 110 | + android:textColor="@color/black" | ||
| 111 | + android:textSize="15sp" /> | ||
| 112 | + </LinearLayout> | ||
| 113 | + <!----> | ||
| 114 | + <LinearLayout | ||
| 115 | + android:layout_width="0dp" | ||
| 116 | + android:layout_height="wrap_content" | ||
| 117 | + android:layout_weight="1" | ||
| 118 | + android:gravity="center" | ||
| 119 | + android:orientation="vertical"> | ||
| 120 | + | ||
| 121 | + <TextView | ||
| 122 | + android:layout_width="wrap_content" | ||
| 123 | + android:layout_height="wrap_content" | ||
| 124 | + android:text="00:00:00" | ||
| 125 | + android:textColor="@color/black" | ||
| 126 | + android:textSize="20sp" | ||
| 127 | + android:textStyle="bold" /> | ||
| 128 | + | ||
| 129 | + <TextView | ||
| 130 | + android:layout_width="wrap_content" | ||
| 131 | + android:layout_height="wrap_content" | ||
| 132 | + android:layout_marginTop="5dp" | ||
| 133 | + android:text="用时" | ||
| 134 | + android:textColor="@color/black" | ||
| 135 | + android:textSize="15sp" /> | ||
| 136 | + </LinearLayout> | ||
| 137 | + <!----> | ||
| 138 | + </LinearLayout> | ||
| 139 | + <!----> | ||
| 140 | + </LinearLayout> | ||
| 141 | + | ||
| 142 | + <com.qmuiteam.qmui.widget.QMUIRadiusImageView | ||
| 143 | + android:id="@+id/qm_iv1" | ||
| 144 | + android:layout_width="60dp" | ||
| 145 | + android:layout_height="60dp" | ||
| 146 | + android:layout_marginLeft="10dp" | ||
| 147 | + android:background="@drawable/tc_ic_workout_level_adjust_coach" | ||
| 148 | + app:qmui_corner_radius="100dp" /> | ||
| 149 | +</FrameLayout> | ||
| 0 | \ No newline at end of file | 150 | \ No newline at end of file |
moudle_pedometer/src/main/res/values/colors.xml
| @@ -8,6 +8,7 @@ | @@ -8,6 +8,7 @@ | ||
| 8 | <color name="gray_round">#D6D6D6</color> | 8 | <color name="gray_round">#D6D6D6</color> |
| 9 | <color name="circle_stop">#40000000</color> | 9 | <color name="circle_stop">#40000000</color> |
| 10 | <color name="line">#EEEEEE</color> | 10 | <color name="line">#EEEEEE</color> |
| 11 | + <color name="vertical_line">#CACACA</color> | ||
| 11 | <color name="black">#000000</color> | 12 | <color name="black">#000000</color> |
| 12 | <color name="btn_green">#23D41E</color> | 13 | <color name="btn_green">#23D41E</color> |
| 13 | <color name="transparent">#00000000</color> | 14 | <color name="transparent">#00000000</color> |
| @@ -15,6 +16,8 @@ | @@ -15,6 +16,8 @@ | ||
| 15 | <!--圆形shape --> | 16 | <!--圆形shape --> |
| 16 | <!--半透明黑色--> | 17 | <!--半透明黑色--> |
| 17 | <color name="black_50">#80000000</color> | 18 | <color name="black_50">#80000000</color> |
| 19 | + <color name="black_20">#33000000</color> | ||
| 20 | + | ||
| 18 | <color name="white_50">#80FFFFFF</color> | 21 | <color name="white_50">#80FFFFFF</color> |
| 19 | 22 | ||
| 20 | <color name="green">#23D026</color> | 23 | <color name="green">#23D026</color> |