CNLive Android Team / ModulePedometer · Commits

Commit c7e206f4666b9007383ae6fb677330a90104d0fa

Authored by 韩亚云
1 parent 0a92a0d0

我的记录页面，报名页面，分享页面ui

Inline Side-by-side
Showing 61 changed files with 905 additions and 266 deletions
moudle_pedometer/build.gradle
  View file @c7e206f
@@ -73,8 +73,8 @@ dependencies { @@ -73,8 +73,8 @@ dependencies {
73 //glide 73 //glide
74 implementation "com.github.bumptech.glide:glide:$rootProject.glide" 74 implementation "com.github.bumptech.glide:glide:$rootProject.glide"
75 implementation "jp.wasabeef:glide-transformations:$rootProject.glideTransformations" 75 implementation "jp.wasabeef:glide-transformations:$rootProject.glideTransformations"
76 - implementation 'com.android.support:support-v4:28.0.0'  
77 implementation 'com.android.support.constraint:constraint-layout:1.1.3' 76 implementation 'com.android.support.constraint:constraint-layout:1.1.3'
  77 + implementation 'com.android.support:support-v4:28.0.0'
78 annotationProcessor "com.github.bumptech.glide:compiler:$rootProject.compiler" 78 annotationProcessor "com.github.bumptech.glide:compiler:$rootProject.compiler"
79 79
80 //-------------------------------------------------------- 80 //--------------------------------------------------------
moudle_pedometer/src/main/AndroidManifest.xml
  View file @c7e206f
@@ -52,7 +52,8 @@ @@ -52,7 +52,8 @@
52 android:required="true" /> 52 android:required="true" />
53 53
54 <application android:persistent="true"> 54 <application android:persistent="true">
55 - <activity android:name="com.cnlive.moudle.pedometer.ui.activity.TakePartActivity"></activity> 55 + <activity android:name="com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity"></activity>
  56 + <activity android:name="com.cnlive.moudle.pedometer.ui.activity.TakePartActivity" />
56 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.RunLineActivity" /> 57 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.RunLineActivity" />
57 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity" /> 58 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity" />
58 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.ShareRecordActivity" /> 59 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.ShareRecordActivity" />
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/SelfRecordPresenter.java 0 → 100644
  View file @c7e206f
  1 +package com.cnlive.moudle.pedometer.frame.presenter;
  2 +
  3 +import com.cnlive.moudle.pedometer.frame.view.SelfRecordView;
  4 +import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
  5 +
  6 +/**
  7 + * Created by hanyayun 019/06/12.
  8 + */
  9 +public class SelfRecordPresenter extends MvpBasePresenter<SelfRecordView> {
  10 + public void getData(){
  11 + getView().setData();
  12 + }
  13 +}
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/MyRecordView.java
  View file @c7e206f
@@ -7,6 +7,7 @@ import android.view.View; @@ -7,6 +7,7 @@ import android.view.View;
7 import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity; 7 import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity;
8 import com.cnlive.moudle.pedometer.ui.adapter.MyRecordAdapter; 8 import com.cnlive.moudle.pedometer.ui.adapter.MyRecordAdapter;
9 import com.cnlive.moudle.pedometer.ui.fragment.MyRecordFragment; 9 import com.cnlive.moudle.pedometer.ui.fragment.MyRecordFragment;
  10 +import com.example.moudle_pedometer.R;
10 import com.hannesdorfmann.mosby3.mvp.MvpView; 11 import com.hannesdorfmann.mosby3.mvp.MvpView;
11 12
12 import java.util.ArrayList; 13 import java.util.ArrayList;
@@ -49,9 +50,5 @@ public class MyRecordView implements MvpView { @@ -49,9 +50,5 @@ public class MyRecordView implements MvpView {
49 private void showEmpty(){ 50 private void showEmpty(){
50 fragment.binding.myRecordRecy.setVisibility(View.GONE); 51 fragment.binding.myRecordRecy.setVisibility(View.GONE);
51 fragment.binding.empty.setVisibility(View.VISIBLE); 52 fragment.binding.empty.setVisibility(View.VISIBLE);
52 -// fragment.binding.empty.setImage(R.drawable.history_zw_zt);  
53 - fragment.binding.empty.setLoadingShowing(false);  
54 - fragment.binding.empty.setDetailText("当前还没有相关活动哦~");  
55 - fragment.binding.empty.setTitleText("没有相关活动");  
56 } 53 }
57 } 54 }
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RaceRecorView.java
  View file @c7e206f
@@ -39,7 +39,7 @@ public class RaceRecorView implements MvpView { @@ -39,7 +39,7 @@ public class RaceRecorView implements MvpView {
39 fragment.getActivity().finish(); 39 fragment.getActivity().finish();
40 }); 40 });
41 fragment.binding.topbar.setTitle("奥森跑道全部成绩"); 41 fragment.binding.topbar.setTitle("奥森跑道全部成绩");
42 - fragment.binding.topbar.addRightImageButton(R.drawable.location_message, R.id.fragment_more) 42 + fragment.binding.topbar.addRightImageButton(R.drawable.share_img, R.id.fragment_more)
43 .setOnClickListener(v -> { 43 .setOnClickListener(v -> {
44 //分享 44 //分享
45 ShareRecordActivity.newInstance(fragment.getActivity()); 45 ShareRecordActivity.newInstance(fragment.getActivity());
@@ -49,9 +49,5 @@ public class RaceRecorView implements MvpView { @@ -49,9 +49,5 @@ public class RaceRecorView implements MvpView {
49 private void showEmpty(){ 49 private void showEmpty(){
50 fragment.binding.recordRecy.setVisibility(View.GONE); 50 fragment.binding.recordRecy.setVisibility(View.GONE);
51 fragment.binding.empty.setVisibility(View.VISIBLE); 51 fragment.binding.empty.setVisibility(View.VISIBLE);
52 -// fragment.binding.empty.setImage(R.drawable.history_zw_zt);  
53 - fragment.binding.empty.setLoadingShowing(false);  
54 - fragment.binding.empty.setDetailText("当前还没有相关成绩哦~");  
55 - fragment.binding.empty.setTitleText("报名参加");  
56 } 52 }
57 } 53 }
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RegistrationInfoView.java
  View file @c7e206f
@@ -92,6 +92,7 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener { @@ -92,6 +92,7 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
92 92
93 public void toResult(){ 93 public void toResult(){
94 fragment.binding.registerLy.setVisibility(View.GONE); 94 fragment.binding.registerLy.setVisibility(View.GONE);
  95 + fragment.binding.commitInfo.setVisibility(View.GONE);
95 fragment.binding.resultLy.setVisibility(View.VISIBLE); 96 fragment.binding.resultLy.setVisibility(View.VISIBLE);
96 } 97 }
97 98
@@ -105,6 +106,6 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener { @@ -105,6 +106,6 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
105 @Override 106 @Override
106 public void onDateSet(TimePickerDialog timePickerView, long millseconds) { 107 public void onDateSet(TimePickerDialog timePickerView, long millseconds) {
107 // 生日（非必填） 未选择 108 // 生日（非必填） 未选择
108 - fragment.binding.birthday.setText("生日（非必填） 未选择:"+DateTimeUtil.formatDateTime(millseconds, "yyyy年MM月dd日")); 109 + fragment.binding.birthday.setText("生日（非必填） "+DateTimeUtil.formatDateTime(millseconds, "yyyy年MM月dd日"));
109 } 110 }
110 } 111 }
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/SelfRecordView.java 0 → 100644
  View file @c7e206f
  1 +package com.cnlive.moudle.pedometer.frame.view;
  2 +
  3 +
  4 +import android.content.Intent;
  5 +import android.support.v7.widget.LinearLayoutManager;
  6 +import android.view.View;
  7 +
  8 +import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
  9 +import com.cnlive.moudle.pedometer.ui.activity.ShareRecordActivity;
  10 +import com.cnlive.moudle.pedometer.ui.adapter.RaceRecordAdapter;
  11 +import com.cnlive.moudle.pedometer.ui.fragment.SelfRecordFragment;
  12 +import com.example.moudle_pedometer.R;
  13 +import com.hannesdorfmann.mosby3.mvp.MvpView;
  14 +
  15 +import java.util.ArrayList;
  16 +import java.util.List;
  17 +
  18 +/**
  19 + * Created by hanyayun 019/06/12.
  20 + */
  21 +public class SelfRecordView implements MvpView{
  22 + SelfRecordFragment fragment;
  23 +
  24 + public SelfRecordView(SelfRecordFragment fragment) {
  25 + this.fragment = fragment;
  26 + }
  27 +
  28 + public void setData(){
  29 + List<String> raceRecordModels = new ArrayList<>();
  30 + raceRecordModels.add("0");
  31 + raceRecordModels.add("0");
  32 + raceRecordModels.add("0");
  33 + raceRecordModels.add("0");
  34 + fragment.binding.recordRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
  35 + fragment.binding.recordRecy.setAdapter(new RaceRecordAdapter(raceRecordModels,fragment.getActivity()));
  36 + }
  37 +
  38 + public void initView(){
  39 + fragment.binding.topbar.addLeftImageButton(R.drawable.top_back_black, R.id.fragment_back).setOnClickListener(v -> {
  40 + fragment.getActivity().finish();
  41 + });
  42 + fragment.binding.topbar.setTitle("奥森跑道全部成绩");
  43 + fragment.binding.topbar.addRightImageButton(R.drawable.share_img, R.id.fragment_more)
  44 + .setOnClickListener(v -> {
  45 + //分享
  46 + ShareRecordActivity.newInstance(fragment.getActivity());
  47 + });
  48 + }
  49 +
  50 + private void showEmpty(){
  51 + fragment.binding.recordRecy.setVisibility(View.GONE);
  52 + fragment.binding.empty.setVisibility(View.VISIBLE);
  53 + fragment.binding.checkAllLine.setOnClickListener(v -> {
  54 + Intent intent = new Intent(fragment.getActivity(), RunLineActivity.class);
  55 + fragment.getActivity().startActivity(intent);
  56 + });
  57 + }
  58 +}
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/SelfRecordActivity.java 0 → 100644
  View file @c7e206f
  1 +package com.cnlive.moudle.pedometer.ui.activity;
  2 +
  3 +import android.app.Activity;
  4 +import android.content.Intent;
  5 +import android.support.v7.app.AppCompatActivity;
  6 +import android.os.Bundle;
  7 +
  8 +import com.cnlive.libs.base.util.StatusBarUtil;
  9 +import com.cnlive.libs.base.util.StatusBarUtil2;
  10 +import com.cnlive.moudle.pedometer.ui.fragment.SelfRecordFragment;
  11 +import com.example.moudle_pedometer.R;
  12 +
  13 +/**
  14 + * 我的记录
  15 + * Created by hanyayun 019/06/12.
  16 + */
  17 +public class SelfRecordActivity extends AppCompatActivity {
  18 +
  19 + public static void newInstance(Activity context){
  20 + Intent intent = new Intent(context,SelfRecordActivity.class);
  21 + context.startActivity(intent);
  22 + }
  23 +
  24 + @Override
  25 + protected void onCreate(Bundle savedInstanceState) {
  26 + super.onCreate(savedInstanceState);
  27 + StatusBarUtil.setStatusBarWrite(this);
  28 + StatusBarUtil2.setColor(this, getResources().getColor(R.color.color_fff), 0);
  29 + setContentView(R.layout.activity_self_record);
  30 +
  31 + getSupportFragmentManager().beginTransaction().replace(R.id.record_container, new SelfRecordFragment()).commit();
  32 + }
  33 +}
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/ShareRecordActivity.java
  View file @c7e206f
@@ -29,7 +29,7 @@ public class ShareRecordActivity extends AppCompatActivity { @@ -29,7 +29,7 @@ public class ShareRecordActivity extends AppCompatActivity {
29 protected void onCreate(Bundle savedInstanceState) { 29 protected void onCreate(Bundle savedInstanceState) {
30 super.onCreate(savedInstanceState); 30 super.onCreate(savedInstanceState);
31 StatusBarUtil.setStatusBarWrite(this); 31 StatusBarUtil.setStatusBarWrite(this);
32 - StatusBarUtil2.setColor(this, getResources().getColor(R.color.green_round), 0); 32 + StatusBarUtil2.setColor(this, getResources().getColor(R.color.bg), 0);
33 setContentView(R.layout.activity_share_record); 33 setContentView(R.layout.activity_share_record);
34 34
35 share_back = findViewById(R.id.share_back); 35 share_back = findViewById(R.id.share_back);
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
  View file @c7e206f
@@ -7,12 +7,15 @@ import android.support.v7.widget.RecyclerView; @@ -7,12 +7,15 @@ import android.support.v7.widget.RecyclerView;
7 import android.view.LayoutInflater; 7 import android.view.LayoutInflater;
8 import android.view.View; 8 import android.view.View;
9 import android.view.ViewGroup; 9 import android.view.ViewGroup;
  10 +import android.widget.ImageView;
10 import android.widget.LinearLayout; 11 import android.widget.LinearLayout;
11 import android.widget.RelativeLayout; 12 import android.widget.RelativeLayout;
12 import android.widget.TextView; 13 import android.widget.TextView;
13 14
14 15
15 import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity; 16 import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity;
  17 +import com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity;
  18 +import com.cnlive.moudle.pedometer.ui.fragment.SelfRecordFragment;
16 import com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView; 19 import com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView;
17 import com.example.moudle_pedometer.R; 20 import com.example.moudle_pedometer.R;
18 21
@@ -49,10 +52,12 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView @@ -49,10 +52,12 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
49 public void onBindViewHolder(@NonNull MyViewHolder myViewHolder, int i) { 52 public void onBindViewHolder(@NonNull MyViewHolder myViewHolder, int i) {
50 if(isShow){ 53 if(isShow){
51 myViewHolder.my_record_ry.setVisibility(View.VISIBLE); 54 myViewHolder.my_record_ry.setVisibility(View.VISIBLE);
  55 + myViewHolder.has_report.setVisibility(View.GONE);
52 }else { 56 }else {
53 myViewHolder.my_record_ry.setVisibility(View.GONE); 57 myViewHolder.my_record_ry.setVisibility(View.GONE);
  58 + myViewHolder.has_report.setVisibility(View.VISIBLE);
54 } 59 }
55 - myViewHolder.my_record.setOnClickListener(v -> RaceRecordActivity.newInstance(context)); 60 + myViewHolder.my_record.setOnClickListener(v -> SelfRecordActivity.newInstance(context));
56 // myViewHolder.check_raking.setOnClickListener(v -> ); 61 // myViewHolder.check_raking.setOnClickListener(v -> );
57 if(clickListener != null){ 62 if(clickListener != null){
58 myViewHolder.item_ly.setOnClickListener(v -> clickListener.onClickListener(list.get(i),i)); 63 myViewHolder.item_ly.setOnClickListener(v -> clickListener.onClickListener(list.get(i),i));
@@ -72,6 +77,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView @@ -72,6 +77,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
72 FivePersonIconView join_person; 77 FivePersonIconView join_person;
73 RelativeLayout item_ly; 78 RelativeLayout item_ly;
74 RelativeLayout my_record_ry; 79 RelativeLayout my_record_ry;
  80 + ImageView has_report;
75 81
76 public MyViewHolder(@NonNull View itemView) { 82 public MyViewHolder(@NonNull View itemView) {
77 super(itemView); 83 super(itemView);
@@ -80,6 +86,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView @@ -80,6 +86,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
80 join_person = itemView.findViewById(R.id.join_person); 86 join_person = itemView.findViewById(R.id.join_person);
81 item_ly = itemView.findViewById(R.id.item_ly); 87 item_ly = itemView.findViewById(R.id.item_ly);
82 my_record_ry = itemView.findViewById(R.id.my_record_ry); 88 my_record_ry = itemView.findViewById(R.id.my_record_ry);
  89 + has_report = itemView.findViewById(R.id.has_report);
83 } 90 }
84 } 91 }
85 92
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/RaceRecordAdapter.java
  View file @c7e206f
@@ -46,23 +46,21 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My @@ -46,23 +46,21 @@ public class RaceRecordAdapter extends RecyclerView.Adapter&lt;RaceRecordAdapter.My
46 46
47 TextView record_time; 47 TextView record_time;
48 ImageView item_img; 48 ImageView item_img;
49 - TextView record_foot;  
50 TextView item_time; 49 TextView item_time;
51 TextView record_kli; 50 TextView record_kli;
52 TextView record_minit; 51 TextView record_minit;
53 TextView record_speed; 52 TextView record_speed;
54 - TextView record_get; 53 + TextView record_step;
55 54
56 public MyHolder(@NonNull View itemView) { 55 public MyHolder(@NonNull View itemView) {
57 super(itemView); 56 super(itemView);
58 record_time = itemView.findViewById(R.id.record_time); 57 record_time = itemView.findViewById(R.id.record_time);
59 item_img = itemView.findViewById(R.id.item_img); 58 item_img = itemView.findViewById(R.id.item_img);
60 - record_foot = itemView.findViewById(R.id.record_foot);  
61 item_time = itemView.findViewById(R.id.item_time); 59 item_time = itemView.findViewById(R.id.item_time);
62 - record_kli = itemView.findViewById(R.id.record_kli); 60 + record_kli = itemView.findViewById(R.id.kilometer_num);
63 record_minit = itemView.findViewById(R.id.record_minit); 61 record_minit = itemView.findViewById(R.id.record_minit);
64 record_speed = itemView.findViewById(R.id.record_speed); 62 record_speed = itemView.findViewById(R.id.record_speed);
65 - record_get = itemView.findViewById(R.id.record_get); 63 + record_step = itemView.findViewById(R.id.record_step);
66 } 64 }
67 } 65 }
68 } 66 }
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/SelfRecordFragment.java 0 → 100644
  View file @c7e206f
  1 +package com.cnlive.moudle.pedometer.ui.fragment;
  2 +
  3 +
  4 +import android.os.Bundle;
  5 +import android.support.annotation.Nullable;
  6 +import android.support.v4.app.Fragment;
  7 +import android.view.LayoutInflater;
  8 +import android.view.View;
  9 +import android.view.ViewGroup;
  10 +
  11 +import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
  12 +import com.cnlive.moudle.pedometer.frame.presenter.RaceRecorPresenter;
  13 +import com.cnlive.moudle.pedometer.frame.presenter.SelfRecordPresenter;
  14 +import com.cnlive.moudle.pedometer.frame.view.RaceRecorView;
  15 +import com.cnlive.moudle.pedometer.frame.view.SelfRecordView;
  16 +import com.example.moudle_pedometer.R;
  17 +import com.example.moudle_pedometer.databinding.FragmentSelfRecordBinding;
  18 +
  19 +/**
  20 + * Created by hanyayun 019/06/12.
  21 + */
  22 +public class SelfRecordFragment extends MvpBindingFragment<SelfRecordView, SelfRecordPresenter,Object, FragmentSelfRecordBinding> {
  23 +
  24 +
  25 + public SelfRecordFragment() {
  26 + // Required empty public constructor
  27 + }
  28 +
  29 +
  30 + @Override
  31 + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
  32 + super.onViewCreated(view, savedInstanceState);
  33 + if(getMvpView() != null) getMvpView().initView();
  34 + getPresenter().getData();
  35 + }
  36 +
  37 + @Override
  38 + protected int getLayoutId() {
  39 + return R.layout.fragment_self_record;
  40 + }
  41 +}
moudle_pedometer/src/main/res/drawable-hdpi/bmcg.png 0 → 100644
View file @c7e206f

14.1 KB
moudle_pedometer/src/main/res/drawable-hdpi/bmcg_has.png 0 → 100644
View file @c7e206f

14.5 KB
moudle_pedometer/src/main/res/drawable-hdpi/bmcg_no.png 0 → 100644
View file @c7e206f

14 KB
moudle_pedometer/src/main/res/drawable-hdpi/default_bg.webp deleted 100644 → 0
View file @0a92a0d
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/default_register.webp deleted 100644 → 0
View file @0a92a0d
No preview for this file type
moudle_pedometer/src/main/res/drawable-hdpi/more.png 0 → 100644
View file @c7e206f

489 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/share_background.png 0 → 100644
View file @c7e206f

222 KB
moudle_pedometer/src/main/res/drawable-hdpi/share_img.png 0 → 100644
View file @c7e206f

975 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/speed.png 0 → 100644
View file @c7e206f

818 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/step.png 0 → 100644
View file @c7e206f

1014 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/time_cost.png 0 → 100644
View file @c7e206f

863 Bytes
moudle_pedometer/src/main/res/drawable-hdpi/wdjl_backgroud.png 0 → 100644
View file @c7e206f

37.1 KB
moudle_pedometer/src/main/res/drawable-xhdpi/bmcg.png 0 → 100644
View file @c7e206f

15.7 KB
moudle_pedometer/src/main/res/drawable-xhdpi/bmcg_has.png 0 → 100644
View file @c7e206f

16.6 KB
moudle_pedometer/src/main/res/drawable-xhdpi/bmcg_no.png 0 → 100644
View file @c7e206f

15.8 KB
moudle_pedometer/src/main/res/drawable-xhdpi/more.png 0 → 100644
View file @c7e206f

541 Bytes
moudle_pedometer/src/main/res/drawable-xhdpi/share_background.png 0 → 100644
View file @c7e206f

286 KB
moudle_pedometer/src/main/res/drawable-xhdpi/share_img.png 0 → 100644
View file @c7e206f

1.07 KB
moudle_pedometer/src/main/res/drawable-xhdpi/speed.png 0 → 100644
View file @c7e206f

917 Bytes
moudle_pedometer/src/main/res/drawable-xhdpi/step.png 0 → 100644
View file @c7e206f

1.19 KB
moudle_pedometer/src/main/res/drawable-xhdpi/time_cost.png 0 → 100644
View file @c7e206f

979 Bytes
moudle_pedometer/src/main/res/drawable-xhdpi/wdjl_backgroud.png 0 → 100644
View file @c7e206f

119 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/bmcg.png 0 → 100644
View file @c7e206f

30.6 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/bmcg_hsa.png 0 → 100644
View file @c7e206f

31.9 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/bmcg_no.png 0 → 100644
View file @c7e206f

30.5 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/more.png 0 → 100644
View file @c7e206f

953 Bytes
moudle_pedometer/src/main/res/drawable-xxhdpi/share_background.png 0 → 100644
View file @c7e206f

675 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/share_img.png 0 → 100644
View file @c7e206f

2.04 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/speed.png 0 → 100644
View file @c7e206f

1.8 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/step.png 0 → 100644
View file @c7e206f

2.33 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/time_cost.png 0 → 100644
View file @c7e206f

1.85 KB
moudle_pedometer/src/main/res/drawable-xxhdpi/wdjl_backgroud.png 0 → 100644
View file @c7e206f

175 KB
moudle_pedometer/src/main/res/drawable/cc_bg_circle.xml 0 → 100644
  View file @c7e206f
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <solid android:color="#00FFFFFF" />
  4 + <corners android:radius="1dp" />
  5 + <stroke
  6 + android:width="1dp"
  7 + android:color="#CCCCCC" />
  8 +</shape>
0 \ No newline at end of file 9 \ No newline at end of file
moudle_pedometer/src/main/res/drawable/gray_bg_circle.xml 0 → 100644
  View file @c7e206f
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <solid android:color="#E6FFFFFF" />
  4 + <corners android:radius="10dp" />
  5 +</shape>
0 \ No newline at end of file 6 \ No newline at end of file
moudle_pedometer/src/main/res/drawable/green_bg_circle.xml 0 → 100644
  View file @c7e206f
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <solid android:color="#20C687" />
  4 + <corners android:radius="50dp" />
  5 +</shape>
0 \ No newline at end of file 6 \ No newline at end of file
moudle_pedometer/src/main/res/drawable/green_raduis_bg.xml 0 → 100644
  View file @c7e206f
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape xmlns:android="http://schemas.android.com/apk/res/android">
  3 + <solid android:color="@color/white" />
  4 + <corners android:radius="50dp" />
  5 + <stroke
  6 + android:width="1dp"
  7 + android:color="#36C28D" />
  8 +</shape>
0 \ No newline at end of file 9 \ No newline at end of file
moudle_pedometer/src/main/res/layout/activity_self_record.xml 0 → 100644
  View file @c7e206f
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + xmlns:app="http://schemas.android.com/apk/res-auto"
  4 + xmlns:tools="http://schemas.android.com/tools"
  5 + android:layout_width="match_parent"
  6 + android:layout_height="match_parent"
  7 + tools:context="com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity">
  8 +
  9 + <RelativeLayout
  10 + android:id="@+id/record_container"
  11 + android:layout_width="match_parent"
  12 + android:layout_height="match_parent" />
  13 +</RelativeLayout>
moudle_pedometer/src/main/res/layout/activity_share_record.xml
  View file @c7e206f
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 xmlns:tools="http://schemas.android.com/tools" 4 xmlns:tools="http://schemas.android.com/tools"
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 - android:background="#5BC4A4" 7 + android:background="@drawable/share_background"
8 tools:context="com.cnlive.moudle.pedometer.ui.activity.ShareRecordActivity"> 8 tools:context="com.cnlive.moudle.pedometer.ui.activity.ShareRecordActivity">
9 9
10 <RelativeLayout 10 <RelativeLayout
@@ -16,196 +16,236 @@ @@ -16,196 +16,236 @@
16 android:id="@+id/share_back" 16 android:id="@+id/share_back"
17 android:layout_width="wrap_content" 17 android:layout_width="wrap_content"
18 android:layout_height="wrap_content" 18 android:layout_height="wrap_content"
19 - android:padding="10dp"  
20 - android:layout_marginLeft="5dp"  
21 - android:src="@drawable/back"  
22 android:layout_centerVertical="true" 19 android:layout_centerVertical="true"
23 - /> 20 + android:layout_marginLeft="5dp"
  21 + android:padding="10dp"
  22 + android:src="@drawable/back" />
  23 +
24 <TextView 24 <TextView
25 android:layout_width="wrap_content" 25 android:layout_width="wrap_content"
26 android:layout_height="wrap_content" 26 android:layout_height="wrap_content"
  27 + android:layout_centerInParent="true"
27 android:text="@string/share" 28 android:text="@string/share"
28 android:textColor="@color/white" 29 android:textColor="@color/white"
29 - android:textSize="15sp"  
30 - android:layout_centerInParent="true"  
31 - /> 30 + android:textSize="15sp" />
32 31
33 <TextView 32 <TextView
34 android:id="@+id/share" 33 android:id="@+id/share"
35 android:layout_width="wrap_content" 34 android:layout_width="wrap_content"
36 android:layout_height="wrap_content" 35 android:layout_height="wrap_content"
37 - android:textColor="@color/white"  
38 - android:text="@string/containuue"  
39 - android:padding="10dp"  
40 - android:layout_marginRight="5dp"  
41 android:layout_alignParentRight="true" 36 android:layout_alignParentRight="true"
42 android:layout_centerVertical="true" 37 android:layout_centerVertical="true"
43 - /> 38 + android:layout_marginRight="5dp"
  39 + android:padding="10dp"
  40 + android:text="@string/containuue"
  41 + android:textColor="@color/white" />
44 </RelativeLayout> 42 </RelativeLayout>
  43 +
45 <RelativeLayout 44 <RelativeLayout
46 android:id="@+id/ry_cen" 45 android:id="@+id/ry_cen"
47 android:layout_width="match_parent" 46 android:layout_width="match_parent"
48 android:layout_height="wrap_content" 47 android:layout_height="wrap_content"
49 android:layout_below="@id/topbar" 48 android:layout_below="@id/topbar"
50 android:layout_centerInParent="true" 49 android:layout_centerInParent="true"
51 - android:layout_marginLeft="15dp"  
52 - android:layout_marginTop="50dp"  
53 - android:layout_marginRight="15dp"  
54 - android:background="#6CE0B6"> 50 + android:layout_marginLeft="20dp"
  51 + android:layout_marginTop="30dp"
  52 + android:layout_marginRight="20dp"
  53 + android:background="@drawable/gray_bg_circle">
55 54
56 <RelativeLayout 55 <RelativeLayout
57 android:id="@id/tv_pr" 56 android:id="@id/tv_pr"
58 android:layout_width="wrap_content" 57 android:layout_width="wrap_content"
59 - android:layout_height="wrap_content" 58 + android:layout_height="70dp"
  59 + android:layout_marginTop="5dp"
60 android:padding="10dp"> 60 android:padding="10dp">
61 61
62 <ImageView 62 <ImageView
63 android:id="@+id/record_icon" 63 android:id="@+id/record_icon"
64 android:layout_width="50dp" 64 android:layout_width="50dp"
65 android:layout_height="50dp" 65 android:layout_height="50dp"
66 - android:src="@drawable/tz_icon" /> 66 + android:src="@drawable/ic_icon" />
67 67
68 <TextView 68 <TextView
69 android:id="@+id/record_name" 69 android:id="@+id/record_name"
70 android:layout_width="wrap_content" 70 android:layout_width="wrap_content"
71 android:layout_height="wrap_content" 71 android:layout_height="wrap_content"
  72 + android:layout_centerVertical="true"
72 android:layout_marginLeft="20dp" 73 android:layout_marginLeft="20dp"
73 - android:textColor="@color/white"  
74 android:layout_toRightOf="@id/record_icon" 74 android:layout_toRightOf="@id/record_icon"
75 - android:text="用户昵称" /> 75 + android:text="用户昵称"
  76 + android:textColor="#333333"
  77 + android:textSize="12sp" />
76 78
77 - <TextView  
78 - android:id="@+id/record_line" 79 + <LinearLayout
79 android:layout_width="wrap_content" 80 android:layout_width="wrap_content"
80 android:layout_height="wrap_content" 81 android:layout_height="wrap_content"
81 - android:layout_below="@id/record_name"  
82 - android:textColor="@color/white"  
83 - android:layout_marginLeft="20dp"  
84 - android:layout_toRightOf="@id/record_icon"  
85 - android:text="我在奥森路线的最佳成绩" /> 82 + android:layout_alignParentRight="true"
  83 + android:layout_alignParentBottom="true"
  84 + android:layout_centerVertical="true"
  85 + android:layout_marginRight="20dp">
  86 +
  87 + <TextView
  88 + android:layout_width="wrap_content"
  89 + android:layout_height="wrap_content"
  90 + android:text="1.53"
  91 + android:textColor="#333333"
  92 + android:textSize="30sp" />
  93 +
  94 + <TextView
  95 + android:layout_width="wrap_content"
  96 + android:layout_height="wrap_content"
  97 + android:layout_marginLeft="5dp"
  98 + android:text="@string/kilometer"
  99 + android:textColor="#333333"
  100 + android:textSize="12sp" />
  101 + </LinearLayout>
86 </RelativeLayout> 102 </RelativeLayout>
87 103
88 - <LinearLayout  
89 - android:id="@+id/kilometer_ly"  
90 - android:layout_width="wrap_content"  
91 - android:layout_height="wrap_content"  
92 - android:layout_below="@id/tv_pr"  
93 - android:layout_marginLeft="10dp"  
94 - android:layout_marginTop="10dp"  
95 - android:orientation="vertical">  
96 -  
97 - <TextView  
98 - android:id="@+id/kilometer"  
99 - android:layout_width="wrap_content"  
100 - android:layout_height="wrap_content"  
101 - android:textColor="@color/white"  
102 - android:text="1.53" />  
103 -  
104 - <TextView  
105 - android:layout_width="wrap_content"  
106 - android:layout_height="wrap_content"  
107 - android:textColor="@color/white"  
108 - android:layout_below="@id/kilometer"  
109 - android:layout_marginTop="2dp"  
110 - android:text="@string/kilometer" />  
111 - </LinearLayout>  
112 -  
113 -  
114 - <LinearLayout  
115 - android:id="@+id/foot_ly"  
116 - android:layout_width="wrap_content" 104 + <RelativeLayout
  105 + android:id="@+id/kilometer_ry"
  106 + android:layout_width="match_parent"
117 android:layout_height="wrap_content" 107 android:layout_height="wrap_content"
118 android:layout_below="@id/tv_pr" 108 android:layout_below="@id/tv_pr"
119 android:layout_marginLeft="20dp" 109 android:layout_marginLeft="20dp"
120 - android:layout_marginTop="10dp"  
121 - android:layout_toRightOf="@id/kilometer_ly"  
122 - android:orientation="vertical"> 110 + android:layout_marginTop="20dp"
  111 + android:layout_marginRight="20dp">
123 112
124 - <TextView  
125 - android:id="@+id/foot" 113 + <LinearLayout
  114 + android:id="@+id/kilometer_ly"
126 android:layout_width="wrap_content" 115 android:layout_width="wrap_content"
127 android:layout_height="wrap_content" 116 android:layout_height="wrap_content"
128 - android:textColor="@color/white"  
129 - android:text="1234" />  
130 -  
131 - <TextView 117 + android:orientation="vertical">
  118 +
  119 + <TextView
  120 + android:id="@+id/kilometer"
  121 + android:layout_width="wrap_content"
  122 + android:layout_height="wrap_content"
  123 + android:layout_gravity="center"
  124 + android:text="@string/stepnum"
  125 + android:textColor="#333333"
  126 + android:textSize="12sp" />
  127 +
  128 + <TextView
  129 + android:layout_width="wrap_content"
  130 + android:layout_height="wrap_content"
  131 + android:layout_below="@id/kilometer"
  132 + android:layout_marginTop="5dp"
  133 + android:text="1234"
  134 + android:textColor="#333333"
  135 + android:textSize="23sp" />
  136 + </LinearLayout>
  137 +
  138 +
  139 + <LinearLayout
  140 + android:id="@+id/foot_ly"
132 android:layout_width="wrap_content" 141 android:layout_width="wrap_content"
133 android:layout_height="wrap_content" 142 android:layout_height="wrap_content"
134 - android:textColor="@color/white"  
135 - android:layout_gravity="center"  
136 - android:layout_marginTop="2dp"  
137 - android:text="@string/foot" />  
138 - </LinearLayout>  
139 -  
140 - <LinearLayout  
141 - android:layout_width="wrap_content"  
142 - android:layout_height="wrap_content"  
143 - android:layout_below="@id/tv_pr"  
144 - android:layout_marginLeft="20dp"  
145 - android:layout_marginTop="10dp"  
146 - android:layout_toRightOf="@id/foot_ly"  
147 - android:orientation="vertical">  
148 -  
149 - <TextView  
150 - android:id="@+id/kilometer_time" 143 + android:layout_centerInParent="true"
  144 + android:orientation="vertical">
  145 +
  146 + <TextView
  147 + android:id="@+id/foot"
  148 + android:layout_width="wrap_content"
  149 + android:layout_height="wrap_content"
  150 + android:layout_gravity="center"
  151 + android:text="@string/time_tast"
  152 + android:textColor="#333333"
  153 + android:textSize="12sp" />
  154 +
  155 + <TextView
  156 + android:layout_width="wrap_content"
  157 + android:layout_height="wrap_content"
  158 + android:layout_gravity="center"
  159 + android:layout_marginTop="5dp"
  160 + android:text="00:27:23"
  161 + android:textColor="#333333"
  162 + android:textSize="23sp" />
  163 + </LinearLayout>
  164 +
  165 + <LinearLayout
151 android:layout_width="wrap_content" 166 android:layout_width="wrap_content"
152 android:layout_height="wrap_content" 167 android:layout_height="wrap_content"
153 - android:textColor="@color/white"  
154 - android:text="00:27:23" /> 168 + android:layout_alignParentRight="true"
  169 + android:orientation="vertical">
  170 +
  171 + <TextView
  172 + android:id="@+id/kilometer_time"
  173 + android:layout_width="wrap_content"
  174 + android:layout_height="wrap_content"
  175 + android:layout_gravity="center"
  176 + android:text="@string/v"
  177 + android:textColor="#333333"
  178 + android:textSize="12sp" />
  179 +
  180 + <TextView
  181 + android:layout_width="wrap_content"
  182 + android:layout_height="wrap_content"
  183 + android:layout_gravity="center"
  184 + android:layout_marginTop="5dp"
  185 + android:text="22'22''"
  186 + android:textColor="#333333"
  187 + android:textSize="23sp" />
  188 + </LinearLayout>
  189 + </RelativeLayout>
155 190
156 - <TextView  
157 - android:layout_width="wrap_content"  
158 - android:layout_height="wrap_content"  
159 - android:textColor="@color/white"  
160 - android:layout_gravity="center"  
161 - android:layout_marginTop="2dp"  
162 - android:text="@string/kilometer" />  
163 - </LinearLayout> 191 + <View
  192 + android:layout_width="match_parent"
  193 + android:layout_height="1dp"
  194 + android:background="#CCCCCC"
  195 + android:layout_below="@id/kilometer_ry"
  196 + android:layout_marginRight="10dp"
  197 + android:layout_marginLeft="10dp"
  198 + android:layout_marginTop="15dp"/>
164 199
165 <RelativeLayout 200 <RelativeLayout
166 android:layout_width="match_parent" 201 android:layout_width="match_parent"
167 android:layout_height="wrap_content" 202 android:layout_height="wrap_content"
168 - android:layout_below="@id/kilometer_ly" 203 + android:layout_below="@id/kilometer_ry"
169 android:layout_marginTop="30dp" 204 android:layout_marginTop="30dp"
170 - android:background="@color/white"  
171 - android:padding="20dp"> 205 + android:padding="10dp">
172 206
173 <TextView 207 <TextView
174 android:id="@+id/cord_name" 208 android:id="@+id/cord_name"
175 android:layout_width="wrap_content" 209 android:layout_width="wrap_content"
176 android:layout_height="wrap_content" 210 android:layout_height="wrap_content"
  211 + android:textColor="#333333"
  212 + android:textSize="12sp"
177 android:gravity="left" 213 android:gravity="left"
178 - android:text="用户在奥森南苑路线中的  
179 -最佳个人成绩" /> 214 + android:text="用户在奥森南苑路线中的最佳成绩" />
180 215
181 - <TextView  
182 - android:id="@+id/tv_tv" 216 + <LinearLayout
183 android:layout_width="wrap_content" 217 android:layout_width="wrap_content"
184 android:layout_height="wrap_content" 218 android:layout_height="wrap_content"
185 android:layout_below="@id/cord_name" 219 android:layout_below="@id/cord_name"
186 - android:layout_marginTop="10dp"  
187 - android:text="#心情标签#" /> 220 + android:layout_marginTop="30dp"
  221 + android:background="@drawable/cc_bg_circle"
  222 + android:orientation="vertical"
  223 + android:padding="10dp"
  224 + >
  225 + <TextView
  226 + android:id="@+id/tv_tv"
  227 + android:layout_width="wrap_content"
  228 + android:layout_height="wrap_content"
  229 + android:textColor="#333333"
  230 + android:textSize="10sp"
  231 + android:text="#心情标签#" />
  232 +
  233 + <TextView
  234 + android:layout_width="wrap_content"
  235 + android:layout_height="wrap_content"
  236 + android:layout_below="@id/tv_tv"
  237 + android:layout_marginTop="7dp"
  238 + android:text="点击这里写下你的心情标签"
  239 + android:textSize="10sp"
  240 + android:textColor="#999999"/>
  241 + </LinearLayout>
188 242
189 - <TextView  
190 - android:layout_width="wrap_content"  
191 - android:layout_height="wrap_content"  
192 - android:layout_below="@id/tv_tv"  
193 - android:layout_marginTop="7dp"  
194 - android:text="点击这里写下你的心情标签" />  
195 243
196 <ImageView 244 <ImageView
197 - android:layout_width="wrap_content"  
198 - android:layout_height="wrap_content" 245 + android:layout_width="95dp"
  246 + android:layout_height="95dp"
199 android:layout_alignParentRight="true" 247 android:layout_alignParentRight="true"
200 android:src="@drawable/erwe" /> 248 android:src="@drawable/erwe" />
201 </RelativeLayout> 249 </RelativeLayout>
202 </RelativeLayout> 250 </RelativeLayout>
203 -  
204 - <ImageView  
205 - android:layout_width="wrap_content"  
206 - android:layout_height="wrap_content"  
207 - android:layout_below="@id/ry_cen"  
208 - android:layout_marginTop="20dp"  
209 - android:layout_centerHorizontal="true"  
210 - android:src="@drawable/default_bg" />  
211 </RelativeLayout> 251 </RelativeLayout>
moudle_pedometer/src/main/res/layout/fragment_my_record.xml
  View file @c7e206f
@@ -9,10 +9,33 @@ @@ -9,10 +9,33 @@
9 android:layout_width="match_parent" 9 android:layout_width="match_parent"
10 android:layout_height="match_parent"/> 10 android:layout_height="match_parent"/>
11 11
12 - <com.cnlive.strike.ui.widget.UIEmptyView 12 + <RelativeLayout
13 android:id="@+id/empty" 13 android:id="@+id/empty"
14 android:layout_width="match_parent" 14 android:layout_width="match_parent"
15 android:layout_height="match_parent" 15 android:layout_height="match_parent"
16 - android:visibility="gone" /> 16 + android:visibility="gone"
  17 + android:background="#F8F8F8">
  18 +
  19 + <LinearLayout
  20 + android:layout_width="wrap_content"
  21 + android:layout_height="wrap_content"
  22 + android:layout_centerInParent="true"
  23 + android:orientation="vertical">
  24 + <ImageView
  25 + android:layout_width="wrap_content"
  26 + android:layout_height="wrap_content"
  27 + android:src="@drawable/bmcg_no" />
  28 + <TextView
  29 + android:layout_width="wrap_content"
  30 + android:layout_height="wrap_content"
  31 + android:text="没有进行中的活动"
  32 + android:textColor="#333333"
  33 + android:textSize="15sp"
  34 + android:layout_marginTop="15dp"
  35 + android:layout_gravity="center"
  36 + />
  37 + </LinearLayout>
  38 +
  39 + </RelativeLayout>
17 </RelativeLayout> 40 </RelativeLayout>
18 </layout> 41 </layout>
19 \ No newline at end of file 42 \ No newline at end of file
moudle_pedometer/src/main/res/layout/fragment_race_recor.xml
  View file @c7e206f
@@ -14,115 +14,173 @@ @@ -14,115 +14,173 @@
14 <RelativeLayout 14 <RelativeLayout
15 android:layout_width="match_parent" 15 android:layout_width="match_parent"
16 android:layout_height="wrap_content" 16 android:layout_height="wrap_content"
17 - android:layout_marginTop="20dp"  
18 - android:layout_marginLeft="10dp"  
19 - android:layout_marginRight="10dp"  
20 - android:background="#6CE0B6"  
21 - android:padding="20dp"> 17 + android:layout_marginTop="10dp"
  18 + android:background="@drawable/wdjl_backgroud"
  19 + android:padding="25dp">
22 20
23 <TextView 21 <TextView
24 android:id="@+id/tv_pr" 22 android:id="@+id/tv_pr"
25 android:layout_width="wrap_content" 23 android:layout_width="wrap_content"
26 android:layout_height="wrap_content" 24 android:layout_height="wrap_content"
  25 + android:text="@string/self_best"
27 android:textColor="@color/white" 26 android:textColor="@color/white"
28 - android:text="个人最佳成绩" /> 27 + android:textSize="17sp" />
29 28
30 <LinearLayout 29 <LinearLayout
31 - android:id="@+id/kilometer_ly"  
32 android:layout_width="wrap_content" 30 android:layout_width="wrap_content"
33 android:layout_height="wrap_content" 31 android:layout_height="wrap_content"
34 - android:layout_below="@id/tv_pr"  
35 - android:layout_marginTop="10dp"  
36 - android:orientation="vertical"> 32 + android:layout_alignParentRight="true">
37 33
38 <TextView 34 <TextView
39 - android:id="@+id/kilometer"  
40 android:layout_width="wrap_content" 35 android:layout_width="wrap_content"
41 android:layout_height="wrap_content" 36 android:layout_height="wrap_content"
  37 + android:text="1.53"
42 android:textColor="@color/white" 38 android:textColor="@color/white"
43 - android:text="1.53" /> 39 + android:textSize="30sp" />
44 40
45 <TextView 41 <TextView
46 android:layout_width="wrap_content" 42 android:layout_width="wrap_content"
47 android:layout_height="wrap_content" 43 android:layout_height="wrap_content"
  44 + android:layout_marginLeft="5dp"
  45 + android:text="@string/kilometer"
48 android:textColor="@color/white" 46 android:textColor="@color/white"
49 - android:layout_below="@id/kilometer"  
50 - android:layout_marginTop="2dp"  
51 - android:text="@string/kilometer" /> 47 + android:textSize="12sp" />
52 </LinearLayout> 48 </LinearLayout>
53 49
54 -  
55 - <LinearLayout  
56 - android:id="@+id/foot_ly"  
57 - android:layout_width="wrap_content" 50 + <RelativeLayout
  51 + android:layout_width="match_parent"
58 android:layout_height="wrap_content" 52 android:layout_height="wrap_content"
59 android:layout_below="@id/tv_pr" 53 android:layout_below="@id/tv_pr"
  54 + android:layout_marginTop="30dp"
60 android:layout_marginLeft="20dp" 55 android:layout_marginLeft="20dp"
61 - android:layout_marginTop="10dp"  
62 - android:layout_toRightOf="@id/kilometer_ly"  
63 - android:orientation="vertical"> 56 + android:layout_marginRight="20dp">
64 57
65 - <TextView  
66 - android:id="@+id/foot" 58 + <LinearLayout
  59 + android:id="@+id/kilometer_ly"
67 android:layout_width="wrap_content" 60 android:layout_width="wrap_content"
68 android:layout_height="wrap_content" 61 android:layout_height="wrap_content"
69 - android:textColor="@color/white"  
70 - android:text="1234" />  
71 -  
72 - <TextView 62 + android:orientation="vertical">
  63 +
  64 + <TextView
  65 + android:id="@+id/kilometer"
  66 + android:layout_width="wrap_content"
  67 + android:layout_height="wrap_content"
  68 + android:text="@string/stepnum"
  69 + android:textSize="12sp"
  70 + android:layout_gravity="center"
  71 + android:textColor="@color/white" />
  72 +
  73 + <TextView
  74 + android:layout_width="wrap_content"
  75 + android:layout_height="wrap_content"
  76 + android:layout_below="@id/kilometer"
  77 + android:layout_marginTop="5dp"
  78 + android:textSize="23sp"
  79 + android:text="1234"
  80 + android:textColor="@color/white" />
  81 + </LinearLayout>
  82 +
  83 +
  84 + <LinearLayout
  85 + android:id="@+id/foot_ly"
73 android:layout_width="wrap_content" 86 android:layout_width="wrap_content"
74 android:layout_height="wrap_content" 87 android:layout_height="wrap_content"
75 - android:textColor="@color/white"  
76 - android:layout_gravity="center"  
77 - android:layout_marginTop="2dp"  
78 - android:text="@string/foot" />  
79 - </LinearLayout>  
80 -  
81 - <LinearLayout  
82 - android:layout_width="wrap_content"  
83 - android:layout_height="wrap_content"  
84 - android:layout_below="@id/tv_pr"  
85 - android:layout_marginLeft="20dp"  
86 - android:layout_marginTop="10dp"  
87 - android:layout_toRightOf="@id/foot_ly"  
88 - android:orientation="vertical">  
89 -  
90 - <TextView  
91 - android:id="@+id/kilometer_time" 88 + android:layout_centerInParent="true"
  89 + android:orientation="vertical">
  90 +
  91 + <TextView
  92 + android:id="@+id/foot"
  93 + android:layout_width="wrap_content"
  94 + android:layout_height="wrap_content"
  95 + android:textSize="12sp"
  96 + android:layout_gravity="center"
  97 + android:text="@string/time_tast"
  98 + android:textColor="@color/white" />
  99 +
  100 + <TextView
  101 + android:layout_width="wrap_content"
  102 + android:layout_height="wrap_content"
  103 + android:layout_gravity="center"
  104 + android:layout_marginTop="5dp"
  105 + android:textSize="23sp"
  106 + android:text="00:27:23"
  107 + android:textColor="@color/white" />
  108 + </LinearLayout>
  109 +
  110 + <LinearLayout
92 android:layout_width="wrap_content" 111 android:layout_width="wrap_content"
93 android:layout_height="wrap_content" 112 android:layout_height="wrap_content"
94 - android:textColor="@color/white"  
95 - android:text="00:27:23" /> 113 + android:layout_alignParentRight="true"
  114 + android:orientation="vertical">
  115 +
  116 + <TextView
  117 + android:id="@+id/kilometer_time"
  118 + android:layout_width="wrap_content"
  119 + android:layout_height="wrap_content"
  120 + android:textSize="12sp"
  121 + android:layout_gravity="center"
  122 + android:text="@string/v"
  123 + android:textColor="@color/white" />
  124 +
  125 + <TextView
  126 + android:layout_width="wrap_content"
  127 + android:layout_height="wrap_content"
  128 + android:layout_gravity="center"
  129 + android:layout_marginTop="5dp"
  130 + android:textSize="23sp"
  131 + android:text="22'22''"
  132 + android:textColor="@color/white" />
  133 + </LinearLayout>
  134 + </RelativeLayout>
96 135
97 - <TextView  
98 - android:layout_width="wrap_content"  
99 - android:layout_height="wrap_content"  
100 - android:textColor="@color/white"  
101 - android:layout_gravity="center"  
102 - android:layout_marginTop="2dp"  
103 - android:text="@string/kilometer" />  
104 - </LinearLayout>  
105 </RelativeLayout> 136 </RelativeLayout>
106 137
107 <TextView 138 <TextView
108 android:layout_width="wrap_content" 139 android:layout_width="wrap_content"
109 android:layout_height="wrap_content" 140 android:layout_height="wrap_content"
110 android:layout_marginLeft="10dp" 141 android:layout_marginLeft="10dp"
111 - android:layout_marginTop="20dp" 142 + android:layout_marginTop="10dp"
  143 + android:textSize="18sp"
  144 + android:textColor="#333333"
112 android:text="@string/all_line_record" /> 145 android:text="@string/all_line_record" />
113 146
114 <android.support.v7.widget.RecyclerView 147 <android.support.v7.widget.RecyclerView
115 android:id="@+id/record_recy" 148 android:id="@+id/record_recy"
116 android:layout_width="match_parent" 149 android:layout_width="match_parent"
117 android:layout_height="match_parent" 150 android:layout_height="match_parent"
118 - android:background="@color/white"  
119 - android:layout_marginTop="10dp"/> 151 + android:padding="10dp"
  152 + android:background="@color/white" />
120 153
121 - <com.cnlive.strike.ui.widget.UIEmptyView 154 + <RelativeLayout
122 android:id="@+id/empty" 155 android:id="@+id/empty"
123 android:layout_width="match_parent" 156 android:layout_width="match_parent"
124 android:layout_height="match_parent" 157 android:layout_height="match_parent"
125 - android:visibility="gone" /> 158 + android:visibility="gone"
  159 + android:background="#F8F8F8">
  160 +
  161 + <LinearLayout
  162 + android:layout_width="wrap_content"
  163 + android:layout_height="wrap_content"
  164 + android:layout_centerInParent="true"
  165 + android:orientation="vertical">
  166 +
  167 + <ImageView
  168 + android:layout_width="wrap_content"
  169 + android:layout_height="wrap_content"
  170 + android:src="@drawable/bmcg_has" />
  171 +
  172 + <TextView
  173 + android:layout_width="wrap_content"
  174 + android:layout_height="wrap_content"
  175 + android:text="您还没有该线路的成绩"
  176 + android:textColor="#333333"
  177 + android:textSize="15sp"
  178 + android:layout_marginTop="15dp"
  179 + android:layout_gravity="center"
  180 + />
  181 + </LinearLayout>
  182 +
  183 + </RelativeLayout>
126 </LinearLayout> 184 </LinearLayout>
127 </layout> 185 </layout>
128 186
moudle_pedometer/src/main/res/layout/fragment_registration_info.xml
  View file @c7e206f
@@ -7,8 +7,7 @@ @@ -7,8 +7,7 @@
7 <RelativeLayout 7 <RelativeLayout
8 android:layout_width="match_parent" 8 android:layout_width="match_parent"
9 android:layout_height="match_parent" 9 android:layout_height="match_parent"
10 - android:background="@color/white"  
11 - android:padding="10dp"> 10 + android:background="#F4F4F4">
12 11
13 <com.qmuiteam.qmui.widget.QMUITopBar 12 <com.qmuiteam.qmui.widget.QMUITopBar
14 android:id="@+id/topbar" 13 android:id="@+id/topbar"
@@ -18,38 +17,47 @@ @@ -18,38 +17,47 @@
18 <LinearLayout 17 <LinearLayout
19 android:id="@+id/register_ly" 18 android:id="@+id/register_ly"
20 android:layout_width="match_parent" 19 android:layout_width="match_parent"
21 - android:layout_height="match_parent" 20 + android:layout_height="wrap_content"
22 android:layout_below="@id/topbar" 21 android:layout_below="@id/topbar"
23 - android:layout_marginTop="20dp" 22 + android:background="@color/white"
24 android:orientation="vertical"> 23 android:orientation="vertical">
25 24
26 <LinearLayout 25 <LinearLayout
27 android:layout_width="match_parent" 26 android:layout_width="match_parent"
28 - android:layout_height="wrap_content"> 27 + android:layout_height="wrap_content"
  28 + android:padding="20dp">
29 29
30 <ImageView 30 <ImageView
31 - android:layout_width="50dp"  
32 - android:layout_height="50dp" 31 + android:layout_width="60dp"
  32 + android:layout_height="60dp"
33 android:src="@drawable/ic_icon"/> 33 android:src="@drawable/ic_icon"/>
34 34
35 <TextView 35 <TextView
36 android:layout_width="wrap_content" 36 android:layout_width="wrap_content"
37 android:layout_height="wrap_content" 37 android:layout_height="wrap_content"
  38 + android:textColor="#333333"
  39 + android:textSize="16sp"
38 android:text="用户昵称" 40 android:text="用户昵称"
39 android:layout_marginLeft="20dp" 41 android:layout_marginLeft="20dp"
40 android:layout_gravity="center_vertical" 42 android:layout_gravity="center_vertical"
41 /> 43 />
42 </LinearLayout> 44 </LinearLayout>
43 45
  46 + <View
  47 + android:layout_width="match_parent"
  48 + android:layout_height="1dp"
  49 + android:background="@color/line"/>
  50 +
44 <LinearLayout 51 <LinearLayout
45 android:layout_width="wrap_content" 52 android:layout_width="wrap_content"
46 android:layout_height="wrap_content" 53 android:layout_height="wrap_content"
47 - android:layout_marginTop="10dp"  
48 - android:padding="10dp"> 54 + android:padding="15dp">
49 55
50 <TextView 56 <TextView
51 android:layout_width="wrap_content" 57 android:layout_width="wrap_content"
52 android:layout_height="wrap_content" 58 android:layout_height="wrap_content"
  59 + android:textColor="#333333"
  60 + android:textSize="16sp"
53 android:text="联系电话" 61 android:text="联系电话"
54 /> 62 />
55 63
@@ -57,65 +65,109 @@ @@ -57,65 +65,109 @@
57 android:layout_width="wrap_content" 65 android:layout_width="wrap_content"
58 android:layout_height="wrap_content" 66 android:layout_height="wrap_content"
59 android:layout_marginLeft="20dp" 67 android:layout_marginLeft="20dp"
  68 + android:textSize="16sp"
  69 + android:textColor="#999999"
60 android:text="13611232987" 70 android:text="13611232987"
61 /> 71 />
62 </LinearLayout> 72 </LinearLayout>
63 73
64 - <LinearLayout 74 + <View
  75 + android:layout_width="match_parent"
  76 + android:layout_height="1dp"
  77 + android:background="@color/line"/>
  78 +
  79 + <RelativeLayout
65 android:id="@+id/choose_sex" 80 android:id="@+id/choose_sex"
66 android:layout_width="match_parent" 81 android:layout_width="match_parent"
67 android:layout_height="wrap_content" 82 android:layout_height="wrap_content"
68 - android:padding="10dp"> 83 + android:padding="15dp">
69 84
70 <TextView 85 <TextView
71 android:id="@+id/sex_text" 86 android:id="@+id/sex_text"
72 android:layout_width="wrap_content" 87 android:layout_width="wrap_content"
73 android:layout_height="wrap_content" 88 android:layout_height="wrap_content"
  89 + android:textColor="#333333"
  90 + android:textSize="16sp"
74 android:text="性别（非必填） 未选择" 91 android:text="性别（非必填） 未选择"
75 /> 92 />
76 - </LinearLayout>  
77 93
78 - <LinearLayout 94 + <ImageView
  95 + android:layout_width="8dp"
  96 + android:layout_height="13dp"
  97 + android:src="@drawable/more"
  98 + android:layout_alignParentRight="true"
  99 + />
  100 + </RelativeLayout>
  101 +
  102 + <View
  103 + android:layout_width="match_parent"
  104 + android:layout_height="1dp"
  105 + android:background="@color/line"/>
  106 +
  107 + <RelativeLayout
79 android:id="@+id/choose_birthday" 108 android:id="@+id/choose_birthday"
80 android:layout_width="match_parent" 109 android:layout_width="match_parent"
81 android:layout_height="wrap_content" 110 android:layout_height="wrap_content"
82 - android:padding="10dp"> 111 + android:padding="15dp">
83 112
84 <TextView 113 <TextView
85 android:id="@+id/birthday" 114 android:id="@+id/birthday"
86 android:layout_width="wrap_content" 115 android:layout_width="wrap_content"
87 android:layout_height="wrap_content" 116 android:layout_height="wrap_content"
  117 + android:textColor="#333333"
  118 + android:textSize="16sp"
88 android:text="生日（非必填） 未选择" 119 android:text="生日（非必填） 未选择"
89 /> 120 />
90 - </LinearLayout>  
91 121
92 - <Button  
93 - android:id="@+id/commit_info"  
94 - android:layout_width="wrap_content"  
95 - android:layout_height="wrap_content"  
96 - android:layout_gravity="center_horizontal"  
97 - android:layout_marginTop="20dp"  
98 - android:text="立即报名" /> 122 + <ImageView
  123 + android:layout_width="8dp"
  124 + android:layout_height="13dp"
  125 + android:src="@drawable/more"
  126 + android:layout_alignParentRight="true"
  127 + />
  128 + </RelativeLayout>
99 </LinearLayout> 129 </LinearLayout>
100 130
  131 +
  132 + <Button
  133 + android:id="@+id/commit_info"
  134 + android:layout_width="match_parent"
  135 + android:layout_height="45dp"
  136 + android:layout_below="@id/register_ly"
  137 + android:layout_centerHorizontal="true"
  138 + android:layout_marginTop="90dp"
  139 + android:layout_marginLeft="30dp"
  140 + android:layout_marginRight="30dp"
  141 + android:textSize="20sp"
  142 + android:textColor="@color/white"
  143 + android:text="@string/takpart"
  144 + android:background="@drawable/green_bg_circle"
  145 + />
  146 +
101 <LinearLayout 147 <LinearLayout
102 android:id="@+id/result_ly" 148 android:id="@+id/result_ly"
103 - android:layout_width="wrap_content"  
104 - android:layout_height="wrap_content" 149 + android:layout_width="match_parent"
  150 + android:layout_height="match_parent"
105 android:layout_centerInParent="true" 151 android:layout_centerInParent="true"
  152 + android:layout_below="@id/topbar"
  153 + android:background="@color/white"
106 android:visibility="gone" 154 android:visibility="gone"
107 android:orientation="vertical"> 155 android:orientation="vertical">
108 156
109 <ImageView 157 <ImageView
110 android:layout_width="wrap_content" 158 android:layout_width="wrap_content"
111 android:layout_height="wrap_content" 159 android:layout_height="wrap_content"
112 - android:src="@drawable/default_register" /> 160 + android:layout_marginTop="150dp"
  161 + android:layout_gravity="center_horizontal"
  162 + android:src="@drawable/bmcg" />
113 163
114 <TextView 164 <TextView
115 android:layout_width="wrap_content" 165 android:layout_width="wrap_content"
116 android:layout_height="wrap_content" 166 android:layout_height="wrap_content"
117 android:layout_gravity="center" 167 android:layout_gravity="center"
118 - android:layout_marginTop="10dp" 168 + android:layout_marginTop="20dp"
  169 + android:textColor="#333333"
  170 + android:textSize="20sp"
119 android:text="@string/commit_success" /> 171 android:text="@string/commit_success" />
120 172
121 <TextView 173 <TextView
@@ -123,6 +175,8 @@ @@ -123,6 +175,8 @@
123 android:layout_width="wrap_content" 175 android:layout_width="wrap_content"
124 android:layout_height="wrap_content" 176 android:layout_height="wrap_content"
125 android:layout_gravity="center" 177 android:layout_gravity="center"
  178 + android:textColor="#23D41E"
  179 + android:textSize="15sp"
126 android:padding="10dp" 180 android:padding="10dp"
127 android:text="@string/to_line_detail" /> 181 android:text="@string/to_line_detail" />
128 182
moudle_pedometer/src/main/res/layout/fragment_run_line.xml
  View file @c7e206f
@@ -7,7 +7,8 @@ @@ -7,7 +7,8 @@
7 7
8 <RelativeLayout 8 <RelativeLayout
9 android:layout_width="match_parent" 9 android:layout_width="match_parent"
10 - android:layout_height="48dp"> 10 + android:layout_height="48dp"
  11 + android:background="@color/white">
11 12
12 <ImageView 13 <ImageView
13 android:id="@+id/back_btn" 14 android:id="@+id/back_btn"
@@ -53,10 +54,6 @@ @@ -53,10 +54,6 @@
53 android:textColor="#333333" 54 android:textColor="#333333"
54 /> 55 />
55 </RelativeLayout> 56 </RelativeLayout>
56 - <com.qmuiteam.qmui.widget.QMUITopBar  
57 - android:id="@+id/topbar"  
58 - android:layout_width="match_parent"  
59 - android:layout_height="?attr/qmui_topbar_height" />  
60 57
61 <android.support.v7.widget.RecyclerView 58 <android.support.v7.widget.RecyclerView
62 android:id="@+id/run_line_recy" 59 android:id="@+id/run_line_recy"
moudle_pedometer/src/main/res/layout/fragment_self_record.xml 0 → 100644
  View file @c7e206f
  1 +<layout xmlns:android="http://schemas.android.com/apk/res/android">
  2 +
  3 + <LinearLayout
  4 + android:layout_width="match_parent"
  5 + android:layout_height="match_parent"
  6 + android:background="@color/white"
  7 + android:orientation="vertical">
  8 +
  9 + <com.qmuiteam.qmui.widget.QMUITopBar
  10 + android:id="@+id/topbar"
  11 + android:layout_width="match_parent"
  12 + android:layout_height="?attr/qmui_topbar_height" />
  13 +
  14 + <RelativeLayout
  15 + android:layout_width="match_parent"
  16 + android:layout_height="wrap_content"
  17 + android:layout_marginTop="10dp"
  18 + android:background="@drawable/wdjl_backgroud"
  19 + android:padding="25dp">
  20 +
  21 + <TextView
  22 + android:layout_width="wrap_content"
  23 + android:layout_height="wrap_content"
  24 + android:text="@string/has_balence"
  25 + android:textColor="@color/white"
  26 + android:textSize="13sp" />
  27 +
  28 + <TextView
  29 + android:layout_width="wrap_content"
  30 + android:layout_height="wrap_content"
  31 + android:layout_alignParentRight="true"
  32 + android:text="@string/Kilimanjaro"
  33 + android:textColor="@color/white"
  34 + android:textSize="13sp" />
  35 +
  36 + <TextView
  37 + android:id="@+id/kilometer_num"
  38 + android:layout_width="wrap_content"
  39 + android:layout_height="wrap_content"
  40 + android:layout_marginTop="20dp"
  41 + android:layout_centerHorizontal="true"
  42 + android:text="20.56"
  43 + android:textColor="@color/white"
  44 + android:textSize="50sp"
  45 + />
  46 +
  47 + <RelativeLayout
  48 + android:layout_width="match_parent"
  49 + android:layout_height="wrap_content"
  50 + android:layout_below="@id/kilometer_num"
  51 + android:layout_marginTop="10dp"
  52 + android:layout_marginLeft="20dp"
  53 + android:layout_marginRight="20dp">
  54 +
  55 + <LinearLayout
  56 + android:layout_width="wrap_content"
  57 + android:layout_height="wrap_content"
  58 + android:orientation="vertical">
  59 +
  60 + <TextView
  61 + android:layout_width="wrap_content"
  62 + android:layout_height="wrap_content"
  63 + android:text="@string/finish_num"
  64 + android:textSize="12sp"
  65 + android:layout_gravity="center"
  66 + android:textColor="@color/white" />
  67 +
  68 + <TextView
  69 + android:id="@+id/finish_num"
  70 + android:layout_width="wrap_content"
  71 + android:layout_height="wrap_content"
  72 + android:layout_gravity="center"
  73 + android:layout_marginTop="5dp"
  74 + android:textSize="20sp"
  75 + android:text="5"
  76 + android:textColor="@color/white" />
  77 + </LinearLayout>
  78 +
  79 +
  80 + <LinearLayout
  81 + android:layout_width="wrap_content"
  82 + android:layout_height="wrap_content"
  83 + android:layout_centerInParent="true"
  84 + android:orientation="vertical">
  85 +
  86 + <TextView
  87 + android:layout_width="wrap_content"
  88 + android:layout_height="wrap_content"
  89 + android:textSize="12sp"
  90 + android:layout_gravity="center"
  91 + android:text="@string/all_time"
  92 + android:textColor="@color/white" />
  93 +
  94 + <TextView
  95 + android:id="@+id/all_time"
  96 + android:layout_width="wrap_content"
  97 + android:layout_height="wrap_content"
  98 + android:layout_gravity="center"
  99 + android:layout_marginTop="5dp"
  100 + android:textSize="20sp"
  101 + android:text="00:27:23"
  102 + android:textColor="@color/white" />
  103 + </LinearLayout>
  104 +
  105 + <LinearLayout
  106 + android:layout_width="wrap_content"
  107 + android:layout_height="wrap_content"
  108 + android:layout_alignParentRight="true"
  109 + android:orientation="vertical">
  110 +
  111 + <TextView
  112 + android:layout_width="wrap_content"
  113 + android:layout_height="wrap_content"
  114 + android:textSize="12sp"
  115 + android:layout_gravity="center"
  116 + android:text="@string/stepnum"
  117 + android:textColor="@color/white" />
  118 +
  119 + <TextView
  120 + android:id="@+id/step_num"
  121 + android:layout_width="wrap_content"
  122 + android:layout_height="wrap_content"
  123 + android:layout_gravity="center"
  124 + android:layout_marginTop="5dp"
  125 + android:textSize="20sp"
  126 + android:text="1234"
  127 + android:textColor="@color/white" />
  128 + </LinearLayout>
  129 + </RelativeLayout>
  130 +
  131 + </RelativeLayout>
  132 +
  133 + <TextView
  134 + android:layout_width="wrap_content"
  135 + android:layout_height="wrap_content"
  136 + android:layout_marginLeft="10dp"
  137 + android:layout_marginTop="10dp"
  138 + android:textSize="18sp"
  139 + android:textColor="#333333"
  140 + android:text="@string/has_take_part_line" />
  141 +
  142 + <android.support.v7.widget.RecyclerView
  143 + android:id="@+id/record_recy"
  144 + android:layout_width="match_parent"
  145 + android:layout_height="match_parent"
  146 + android:padding="10dp"
  147 + android:background="@color/white" />
  148 +
  149 + <RelativeLayout
  150 + android:id="@+id/empty"
  151 + android:layout_width="match_parent"
  152 + android:layout_height="match_parent"
  153 + android:visibility="gone"
  154 + android:background="#F8F8F8">
  155 +
  156 + <LinearLayout
  157 + android:layout_width="wrap_content"
  158 + android:layout_height="wrap_content"
  159 + android:layout_centerInParent="true"
  160 + android:orientation="vertical">
  161 +
  162 + <ImageView
  163 + android:layout_width="wrap_content"
  164 + android:layout_height="wrap_content"
  165 + android:src="@drawable/bmcg_has" />
  166 +
  167 + <TextView
  168 + android:layout_width="wrap_content"
  169 + android:layout_height="wrap_content"
  170 + android:text="还没有跑过的线路"
  171 + android:textColor="#333333"
  172 + android:textSize="15sp"
  173 + android:layout_marginTop="15dp"
  174 + android:layout_gravity="center"
  175 + />
  176 +
  177 + <TextView
  178 + android:id="@+id/check_all_line"
  179 + android:layout_width="wrap_content"
  180 + android:layout_height="wrap_content"
  181 + android:layout_gravity="center"
  182 + android:text="@string/chek_all_line"
  183 + android:layout_marginTop="10dp"
  184 + android:textSize="12sp"
  185 + android:textColor="#36C28D"
  186 + android:background="@drawable/green_raduis_bg"
  187 + android:paddingTop="5dp"
  188 + android:paddingBottom="5dp"
  189 + android:paddingLeft="8dp"
  190 + android:paddingRight="8dp"
  191 + />
  192 + </LinearLayout>
  193 +
  194 + </RelativeLayout>
  195 + </LinearLayout>
  196 +</layout>
  197 +
moudle_pedometer/src/main/res/layout/item_my_record.xml
  View file @c7e206f
@@ -9,13 +9,6 @@ @@ -9,13 +9,6 @@
9 android:background="@color/white" 9 android:background="@color/white"
10 android:orientation="vertical"> 10 android:orientation="vertical">
11 11
12 - <ImageView  
13 - android:id="@+id/has_report"  
14 - android:layout_width="wrap_content"  
15 - android:layout_height="wrap_content"  
16 - android:layout_alignParentRight="true"  
17 - android:src="@drawable/yplx_registered" />  
18 -  
19 <LinearLayout 12 <LinearLayout
20 android:layout_width="match_parent" 13 android:layout_width="match_parent"
21 android:layout_height="wrap_content" 14 android:layout_height="wrap_content"
@@ -119,16 +112,23 @@ @@ -119,16 +112,23 @@
119 android:layout_width="wrap_content" 112 android:layout_width="wrap_content"
120 android:layout_height="wrap_content" 113 android:layout_height="wrap_content"
121 android:layout_centerVertical="true" 114 android:layout_centerVertical="true"
122 - android:text="3天后结束" /> 115 + android:text="3天后结束"
  116 + android:textColor="#333333"
  117 + android:textSize="12sp" />
123 118
124 <TextView 119 <TextView
125 android:id="@+id/check_raking" 120 android:id="@+id/check_raking"
126 android:layout_width="wrap_content" 121 android:layout_width="wrap_content"
127 android:layout_height="wrap_content" 122 android:layout_height="wrap_content"
128 android:layout_alignParentRight="true" 123 android:layout_alignParentRight="true"
129 - android:padding="10dp" 124 + android:background="@drawable/green_raduis_bg"
  125 + android:paddingLeft="10dp"
  126 + android:paddingTop="7dp"
  127 + android:paddingRight="10dp"
  128 + android:paddingBottom="7dp"
130 android:text="查看排行榜" 129 android:text="查看排行榜"
131 - android:textColor="#23D41E" /> 130 + android:textColor="#36C28D"
  131 + android:textSize="12sp" />
132 132
133 <TextView 133 <TextView
134 android:id="@+id/my_record" 134 android:id="@+id/my_record"
@@ -136,12 +136,23 @@ @@ -136,12 +136,23 @@
136 android:layout_height="wrap_content" 136 android:layout_height="wrap_content"
137 android:layout_marginRight="10dp" 137 android:layout_marginRight="10dp"
138 android:layout_toLeftOf="@id/check_raking" 138 android:layout_toLeftOf="@id/check_raking"
139 - android:padding="10dp" 139 + android:background="@drawable/green_raduis_bg"
  140 + android:paddingLeft="10dp"
  141 + android:paddingTop="7dp"
  142 + android:paddingRight="10dp"
  143 + android:paddingBottom="7dp"
140 android:text="我的成绩" 144 android:text="我的成绩"
141 - android:textColor="#23D41E" /> 145 + android:textColor="#36C28D"
  146 + android:textSize="12sp" />
142 147
143 </RelativeLayout> 148 </RelativeLayout>
144 149
145 </LinearLayout> 150 </LinearLayout>
146 151
  152 + <ImageView
  153 + android:id="@+id/has_report"
  154 + android:layout_width="wrap_content"
  155 + android:layout_height="wrap_content"
  156 + android:layout_alignParentRight="true"
  157 + android:src="@drawable/yplx_registered" />
147 </RelativeLayout> 158 </RelativeLayout>
148 \ No newline at end of file 159 \ No newline at end of file
moudle_pedometer/src/main/res/layout/item_race_record.xml
  View file @c7e206f
@@ -7,54 +7,78 @@ @@ -7,54 +7,78 @@
7 <RelativeLayout 7 <RelativeLayout
8 android:layout_width="match_parent" 8 android:layout_width="match_parent"
9 android:layout_height="wrap_content" 9 android:layout_height="wrap_content"
10 - android:padding="10dp"> 10 + android:padding="5dp">
11 11
12 <TextView 12 <TextView
13 - android:id="@+id/record_time" 13 + android:id="@+id/record_time_day"
14 android:layout_width="wrap_content" 14 android:layout_width="wrap_content"
15 android:layout_height="wrap_content" 15 android:layout_height="wrap_content"
  16 + android:textColor="#333333"
  17 + android:textSize="14sp"
16 android:text="5月1日" /> 18 android:text="5月1日" />
17 19
18 <TextView 20 <TextView
19 - android:id="@+id/record_foot" 21 + android:id="@+id/record_time"
20 android:layout_width="wrap_content" 22 android:layout_width="wrap_content"
21 android:layout_height="wrap_content" 23 android:layout_height="wrap_content"
22 - android:layout_alignParentRight="true"  
23 - android:drawableLeft="@drawable/icon_search"  
24 - android:drawablePadding="5dp"  
25 - android:text="1234" /> 24 + android:layout_toRightOf="@id/record_time_day"
  25 + android:layout_marginLeft="15dp"
  26 + android:textColor="#999999"
  27 + android:textSize="14sp"
  28 + android:text="15:30" />
26 29
27 <LinearLayout 30 <LinearLayout
28 android:layout_width="match_parent" 31 android:layout_width="match_parent"
29 android:layout_height="100dp" 32 android:layout_height="100dp"
30 android:layout_below="@id/record_time" 33 android:layout_below="@id/record_time"
31 - android:layout_marginTop="10dp"  
32 android:orientation="horizontal"> 34 android:orientation="horizontal">
33 35
34 <ImageView 36 <ImageView
35 android:id="@+id/item_img" 37 android:id="@+id/item_img"
36 - android:layout_width="100dp"  
37 - android:layout_height="100dp" 38 + android:layout_width="80dp"
  39 + android:layout_height="80dp"
  40 + android:layout_gravity="center_vertical"
38 android:src="@drawable/defaults" /> 41 android:src="@drawable/defaults" />
39 42
40 <RelativeLayout 43 <RelativeLayout
41 android:layout_width="match_parent" 44 android:layout_width="match_parent"
42 - android:layout_height="100dp" 45 + android:layout_height="80dp"
  46 + android:layout_gravity="center_vertical"
43 android:layout_marginLeft="15dp"> 47 android:layout_marginLeft="15dp">
44 48
45 <TextView 49 <TextView
46 android:id="@+id/item_time" 50 android:id="@+id/item_time"
47 android:layout_width="wrap_content" 51 android:layout_width="wrap_content"
48 android:layout_height="wrap_content" 52 android:layout_height="wrap_content"
49 - android:text="15:30" /> 53 + android:textSize="12sp"
  54 + android:textColor="#333333"
  55 + android:text="奥森南园跑道" />
50 56
51 - <TextView  
52 - android:id="@+id/record_kli" 57 + <LinearLayout
53 android:layout_width="wrap_content" 58 android:layout_width="wrap_content"
54 android:layout_height="wrap_content" 59 android:layout_height="wrap_content"
55 android:layout_centerVertical="true" 60 android:layout_centerVertical="true"
56 - android:text="1.23公里"  
57 - android:textSize="25sp" /> 61 + android:orientation="horizontal">
  62 + <TextView
  63 + android:id="@+id/kilometer_num"
  64 + android:layout_width="wrap_content"
  65 + android:layout_height="wrap_content"
  66 + android:text="1.23"
  67 + android:textColor="#333333"
  68 + android:textSize="30sp"
  69 + android:layout_centerVertical="true"
  70 + />
  71 +
  72 + <TextView
  73 + android:layout_width="wrap_content"
  74 + android:layout_height="wrap_content"
  75 + android:layout_centerVertical="true"
  76 + android:text="@string/kilometer"
  77 + android:textColor="#333333"
  78 + android:textSize="12sp"
  79 + android:layout_marginLeft="5dp"/>
  80 + </LinearLayout>
  81 +
58 82
59 <LinearLayout 83 <LinearLayout
60 android:layout_width="wrap_content" 84 android:layout_width="wrap_content"
@@ -65,8 +89,10 @@ @@ -65,8 +89,10 @@
65 android:id="@+id/record_minit" 89 android:id="@+id/record_minit"
66 android:layout_width="wrap_content" 90 android:layout_width="wrap_content"
67 android:layout_height="wrap_content" 91 android:layout_height="wrap_content"
68 - android:drawableRight="@drawable/icon_search" 92 + android:drawableRight="@drawable/time_cost"
69 android:drawablePadding="5dp" 93 android:drawablePadding="5dp"
  94 + android:textColor="#333333"
  95 + android:textSize="13sp"
70 android:text="00:27:23" /> 96 android:text="00:27:23" />
71 97
72 <TextView 98 <TextView
@@ -74,21 +100,28 @@ @@ -74,21 +100,28 @@
74 android:layout_width="wrap_content" 100 android:layout_width="wrap_content"
75 android:layout_height="wrap_content" 101 android:layout_height="wrap_content"
76 android:layout_marginLeft="20dp" 102 android:layout_marginLeft="20dp"
77 - android:drawableRight="@drawable/icon_search" 103 + android:drawableRight="@drawable/speed"
78 android:drawablePadding="5dp" 104 android:drawablePadding="5dp"
79 - android:text="2m/s" /> 105 + android:textColor="#333333"
  106 + android:textSize="13sp"
  107 + android:text="22'22''" />
80 108
81 <TextView 109 <TextView
82 - android:id="@+id/record_get" 110 + android:id="@+id/record_step"
83 android:layout_width="wrap_content" 111 android:layout_width="wrap_content"
84 android:layout_height="wrap_content" 112 android:layout_height="wrap_content"
85 android:layout_marginLeft="20dp" 113 android:layout_marginLeft="20dp"
86 - android:drawableRight="@drawable/icon_search" 114 + android:drawableRight="@drawable/step"
87 android:drawablePadding="5dp" 115 android:drawablePadding="5dp"
88 - android:text="30" /> 116 + android:text="1234" />
89 </LinearLayout> 117 </LinearLayout>
90 </RelativeLayout> 118 </RelativeLayout>
91 </LinearLayout> 119 </LinearLayout>
92 120
  121 + <View
  122 + android:layout_width="match_parent"
  123 + android:layout_height="1dp"
  124 + android:background="@color/line"
  125 + android:layout_alignParentBottom="true"/>
93 </RelativeLayout> 126 </RelativeLayout>
94 </layout> 127 </layout>
moudle_pedometer/src/main/res/layout/item_tabke_part.xml
  View file @c7e206f
@@ -7,8 +7,8 @@ @@ -7,8 +7,8 @@
7 7
8 <ImageView 8 <ImageView
9 android:id="@+id/icon_img" 9 android:id="@+id/icon_img"
10 - android:layout_width="50dp"  
11 - android:layout_height="50dp" 10 + android:layout_width="45dp"
  11 + android:layout_height="45dp"
12 android:layout_margin="15dp" 12 android:layout_margin="15dp"
13 android:src="@drawable/ic_icon" 13 android:src="@drawable/ic_icon"
14 /> 14 />
@@ -17,6 +17,8 @@ @@ -17,6 +17,8 @@
17 android:layout_width="wrap_content" 17 android:layout_width="wrap_content"
18 android:layout_height="wrap_content" 18 android:layout_height="wrap_content"
19 android:text="用户" 19 android:text="用户"
  20 + android:textSize="15sp"
  21 + android:textColor="#333333"
20 android:layout_toRightOf="@id/icon_img" 22 android:layout_toRightOf="@id/icon_img"
21 android:layout_centerVertical="true" 23 android:layout_centerVertical="true"
22 /> 24 />
moudle_pedometer/src/main/res/layout/share_dialog_item.xml 0 → 100644
  View file @c7e206f
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:layout_width="90dp"
  4 + android:layout_height="wrap_content"
  5 + android:gravity="center"
  6 + android:orientation="vertical"
  7 + android:paddingTop="10dp"
  8 + android:paddingBottom="10dp">
  9 +
  10 + <ImageView
  11 + android:id="@+id/icon"
  12 + android:layout_width="50dp"
  13 + android:layout_height="50dp" />
  14 +
  15 + <TextView
  16 + android:id="@+id/name"
  17 + android:layout_width="wrap_content"
  18 + android:layout_height="wrap_content"
  19 + android:layout_gravity="center_horizontal"
  20 + android:layout_marginLeft="5dp"
  21 + android:layout_marginTop="10.5dp"
  22 + android:layout_marginRight="5dp"
  23 + android:gravity="center"
  24 + android:maxLines="2"
  25 + android:textColor="#ff2c2c2d"
  26 + android:textSize="12sp" />
  27 +
  28 +</LinearLayout>
0 \ No newline at end of file 29 \ No newline at end of file
moudle_pedometer/src/main/res/values/colors.xml
  View file @c7e206f
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
24 <color name="green_50">#8023D026</color> 24 <color name="green_50">#8023D026</color>
25 25
26 <color name="red">#EF5544</color> 26 <color name="red">#EF5544</color>
  27 + <color name="bg">#012648</color>
27 28
28 29
29 <color name="bottom_sheet_dialog_race_location_text">#C3C3C3</color> 30 <color name="bottom_sheet_dialog_race_location_text">#C3C3C3</color>
moudle_pedometer/src/main/res/values/strings.xml
  View file @c7e206f
@@ -49,5 +49,16 @@ @@ -49,5 +49,16 @@
49 <string name="myactivity">我的活动</string> 49 <string name="myactivity">我的活动</string>
50 <string name="_123">123</string> 50 <string name="_123">123</string>
51 <string name="has_part">人已参与</string> 51 <string name="has_part">人已参与</string>
  52 + <string name="takpart">立即报名</string>
  53 + <string name="self_best">个人最佳成绩</string>
  54 + <string name="v">配速</string>
  55 + <string name="time_tast">用时</string>
  56 + <string name="stepnum">步数</string>
  57 + <string name="has_balence">累计步行距离</string>
  58 + <string name="Kilimanjaro">（公里）</string>
  59 + <string name="finish_num">完成（次）</string>
  60 + <string name="all_time">累计用时</string>
  61 + <string name="has_take_part_line">我跑过的线路</string>
  62 + <string name="chek_all_line">查看全部路线</string>
52 <!----> 63 <!---->
53 </resources> 64 </resources>