CNLive Android Team / ModulePedometer · Commits

Commit a7cac7d99479cfa66f1a35cdcdc386fc8e3e9d22

Authored by 杨帅
2 parents 48fec4a7 ec0a0460

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	moudle_pedometer/src/main/res/layout/line_up__item_view.xml
Inline Side-by-side
Showing 18 changed files with 123 additions and 99 deletions
app/src/main/java/com/example/modulepedometer/MainActivity.java
  View file @a7cac7d
... ... @@ -3,10 +3,12 @@ package com.example.modulepedometer;
3 3 import android.content.Intent;
4 4 import android.os.Bundle;
5 5 import android.support.v7.app.AppCompatActivity;
  6 +import android.view.View;
6 7  
7 8 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity;
8 9 import com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity;
9 10 import com.cnlive.moudle.collectionTrace.ui.activity.RaceNameListActivity;
  11 +import com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity;
10 12 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
11 13  
12 14  
... ... @@ -16,14 +18,30 @@ public class MainActivity extends AppCompatActivity {
16 18 protected void onCreate(Bundle savedInstanceState) {
17 19 super.onCreate(savedInstanceState);
18 20 setContentView(R.layout.activity_main);
  21 +
  22 + findViewById(R.id.recordd).setOnClickListener(new View.OnClickListener() {
  23 + @Override
  24 + public void onClick(View v) {
  25 + Intent intent = new Intent(MainActivity.this, RunLineActivity.class);
  26 + startActivity(intent);
  27 + }
  28 + });
  29 + findViewById(R.id.tooll).setOnClickListener(new View.OnClickListener() {
  30 + @Override
  31 + public void onClick(View v) {
  32 + Intent intent = new Intent(MainActivity.this, RaceListActivity.class);
  33 + startActivity(intent);
  34 + }
  35 + });
  36 +
19 37 // RunLineActivity.newInstance(this,null,null,null);
20   - Intent intent = new Intent(this, CollRunRaceDetailActivity.class);
21   - startActivity(intent);
  38 +// Intent intent = new Intent(this, CollRunRaceDetailActivity.class);
  39 +// startActivity(intent);
22 40 // ARouter.getInstance()
23 41 //// .build("/moudle_pedometer/InterestActivity")
24 42 // .build("/moudle_pedometer/CollRunRaceDetailActivity")
25 43 // .navigation(this);
26   - finish();
  44 +// finish();
27 45 // BottomSheetDialog bottomSheetDialog=new BottomSheetDialog(this);
28 46 // View view=getLayoutInflater().inflate(R.layout.dialog_start_tip_bottomsheet,null);
29 47 // bottomSheetDialog.setContentView(view);
... ...
app/src/main/res/layout/activity_main.xml
  View file @a7cac7d
1 1 <?xml version="1.0" encoding="utf-8"?>
2   -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
  2 +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3 xmlns:app="http://schemas.android.com/apk/res-auto"
4 4 xmlns:tools="http://schemas.android.com/tools"
5 5 android:layout_width="match_parent"
6 6 android:layout_height="match_parent"
  7 + android:orientation="vertical"
7 8 tools:context=".MainActivity">
8 9  
9   - <TextView
10   - android:layout_width="wrap_content"
  10 + <Button
  11 + android:id="@+id/recordd"
  12 + android:layout_width="match_parent"
11 13 android:layout_height="wrap_content"
12   - android:text="Hello World!"
13   - app:layout_constraintBottom_toBottomOf="parent"
14   - app:layout_constraintLeft_toLeftOf="parent"
15   - app:layout_constraintRight_toRightOf="parent"
16   - app:layout_constraintTop_toTopOf="parent" />
  14 + android:layout_margin="10dp"
  15 + android:text="体育活动"
  16 + />
17 17  
18   -</android.support.constraint.ConstraintLayout>
19 18 \ No newline at end of file
  19 + <Button
  20 + android:id="@+id/tooll"
  21 + android:layout_width="match_parent"
  22 + android:layout_height="wrap_content"
  23 + android:layout_margin="10dp"
  24 + android:text="路径工具"
  25 + />
  26 +
  27 +</LinearLayout>
20 28 \ No newline at end of file
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/RaceNameListView.java
  View file @a7cac7d
... ... @@ -5,6 +5,7 @@ import android.view.View;
5 5  
6 6 import com.cnlive.libs.base.util.AlertUtil;
7 7 import com.cnlive.moudle.collectionTrace.model.RaceNameListInfo;
  8 +import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
8 9 import com.cnlive.moudle.collectionTrace.ui.adapter.RaceNameListAdapter;
9 10 import com.cnlive.moudle.collectionTrace.ui.fragment.RaceNameListFragment;
10 11 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
... ... @@ -38,7 +39,7 @@ public class RaceNameListView implements MvpView {
38 39  
39 40 public void initView(){
40 41 fragment.binding.raceBack.setOnClickListener(v -> fragment.getActivity().finish());
41   -// fragment.binding.intoPath.setOnClickListener(v -> );
  42 + fragment.binding.intoPath.setOnClickListener(v -> StartCollectTraceActivity.newInstance(fragment.getActivity(),fragment.eventId));
42 43 fragment.binding.raceTittle.setText("赛事轨迹列表");
43 44 fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
44 45 fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/CollRunRaceDetailActivity.java
  View file @a7cac7d
1 1 package com.cnlive.moudle.collectionTrace.ui.activity;
2 2  
3 3 import android.app.Activity;
  4 +import android.content.Context;
4 5 import android.content.Intent;
5 6 import android.os.Bundle;
6 7 import android.support.annotation.Nullable;
7   -import android.util.Log;
8 8  
9 9 import com.alibaba.android.arouter.facade.annotation.Route;
10 10 import com.cnlive.libs.base.ui.QMUIFragment;
... ... @@ -13,7 +13,6 @@ import com.cnlive.libs.base.util.StatusBarUtil;
13 13 import com.cnlive.libs.base.util.StatusBarUtil2;
14 14 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunMainFragment;
15 15 import com.cnlive.moudle.collectionTrace.ui.fragment.CollRunRaceDetailFragment;
16   -import com.cnlive.moudle.pedometer.commonInfo.CollCommonInfo;
17 16 import com.cnlive.moudle.pedometer.utils.CheckUtil;
18 17 import com.example.moudle_pedometer.R;
19 18  
... ... @@ -27,6 +26,12 @@ public class CollRunRaceDetailActivity extends QMUIFragmentActivity {
27 26 private final String TAG = "CollRunRaceDetail";
28 27 private QMUIFragment fragment;
29 28  
  29 + public static void newInstance(Context context,String eventId){
  30 + Intent intent = new Intent(context,CollRunRaceDetailActivity.class);
  31 + intent.putExtra("eventId",eventId);
  32 + context.startActivity(intent);
  33 + }
  34 +
30 35 @Override
31 36 protected int getContextViewId() {
32 37 return R.id.fragment_finish_run_map;
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/StartCollectTraceActivity.java
  View file @a7cac7d
1 1 package com.cnlive.moudle.collectionTrace.ui.activity;
2 2  
3 3 import android.app.Activity;
  4 +import android.content.Context;
4 5 import android.content.Intent;
5 6 import android.os.Bundle;
6 7  
... ... @@ -12,6 +13,14 @@ import com.cnlive.moudle.collectionTrace.ui.fragment.StartTraceFragment;
12 13 import com.example.moudle_pedometer.R;
13 14  
14 15 public class StartCollectTraceActivity extends QMUIFragmentActivity {
  16 +
  17 +
  18 + public static void newInstance(Context context,String eventId){
  19 + Intent intent = new Intent(context,StartCollectTraceActivity.class);
  20 + intent.putExtra("eventId",eventId);
  21 + context.startActivity(intent);
  22 + }
  23 +
15 24 @Override
16 25 protected int getContextViewId() {
17 26 return R.id.fragment_start_collect_trace;
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/adapter/RunListAdapter.java
  View file @a7cac7d
... ... @@ -6,9 +6,12 @@ import android.support.v7.widget.RecyclerView;
6 6 import android.view.LayoutInflater;
7 7 import android.view.View;
8 8 import android.view.ViewGroup;
  9 +import android.widget.RelativeLayout;
9 10 import android.widget.TextView;
10 11  
  12 +import com.cnlive.moudle.collectionTrace.ui.activity.CollRunRaceDetailActivity;
11 13 import com.cnlive.moudle.collectionTrace.ui.activity.RaceNameListActivity;
  14 +import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
12 15 import com.cnlive.moudle.pedometer.net.bean.RunLineInfo;
13 16 import com.cnlive.moudle.pedometer.utils.TimeUtil;
14 17 import com.example.moudle_pedometer.R;
... ... @@ -42,8 +45,9 @@ public class RunListAdapter extends RecyclerView.Adapter&lt;RunListAdapter.MyViewHo
42 45 myViewHolder.activity_time.setText(TimeUtil.getStampToTime(list.get(i).getStart_time(), "yyyy.MM.dd") + "——" + TimeUtil.getStampToTime(list.get(i).getEnd_time(), "yyyy.MM.dd"));
43 46 myViewHolder.line_address.setText(list.get(i).getAddress() + " " + list.get(i).getMileage());
44 47 //添加轨迹
45   -// myViewHolder.add_path.setOnClickListener(v -> );
  48 + myViewHolder.add_path.setOnClickListener(v -> StartCollectTraceActivity.newInstance(context,list.get(i).getId()+""));
46 49 myViewHolder.path_list.setOnClickListener(v -> RaceNameListActivity.newInstance(context,list.get(i).getId()+""));
  50 + myViewHolder.item_ly.setOnClickListener(v -> CollRunRaceDetailActivity.newInstance(context,list.get(i).getId()+""));
47 51 }
48 52  
49 53 @Override
... ... @@ -58,6 +62,7 @@ public class RunListAdapter extends RecyclerView.Adapter&lt;RunListAdapter.MyViewHo
58 62 TextView line_address;
59 63 TextView add_path;
60 64 TextView path_list;
  65 + RelativeLayout item_ly;
61 66  
62 67 public MyViewHolder(@NonNull View itemView) {
63 68 super(itemView);
... ... @@ -66,6 +71,7 @@ public class RunListAdapter extends RecyclerView.Adapter&lt;RunListAdapter.MyViewHo
66 71 line_address = itemView.findViewById(R.id.line_address);
67 72 add_path = itemView.findViewById(R.id.add_path);
68 73 path_list = itemView.findViewById(R.id.path_list);
  74 + item_ly = itemView.findViewById(R.id.item_ly);
69 75 }
70 76 }
71 77 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/RaceNameListFragment.java
  View file @a7cac7d
... ... @@ -19,7 +19,7 @@ public class RaceNameListFragment extends MvpBindingFragment&lt;RaceNameListView, R
19 19  
20 20 public int currentPage = 1;
21 21 public int pageSize = 10;
22   - private String eventId;
  22 + public String eventId;
23 23  
24 24 public static RaceNameListFragment newInstance(String eventId){
25 25 RaceNameListFragment fragment = new RaceNameListFragment();
... ... @@ -38,14 +38,14 @@ public class RaceNameListFragment extends MvpBindingFragment&lt;RaceNameListView, R
38 38 super.onViewCreated(view, savedInstanceState);
39 39 if(getMvpView() != null) getMvpView().initView();
40 40 eventId = getArguments().getString("eventId");
41   - getPresenter().setData(getActivity(),"117",currentPage,pageSize);
  41 + getPresenter().setData(getActivity(),eventId,currentPage,pageSize);
42 42 binding.refreshLayout.setOnRefreshListener(v ->{
43 43 currentPage = 1;
44   - getPresenter().setData(getActivity(),"117",currentPage,pageSize);
  44 + getPresenter().setData(getActivity(),eventId,currentPage,pageSize);
45 45 });
46 46 binding.refreshLayout.setOnLoadMoreListener(v ->{
47 47 currentPage++;
48   - getPresenter().setData(getActivity(),"117",currentPage,pageSize);
  48 + getPresenter().setData(getActivity(),eventId,currentPage,pageSize);
49 49 });
50 50 }
51 51  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RaceRecorPresenter.java
  View file @a7cac7d
... ... @@ -50,32 +50,6 @@ public class RaceRecorPresenter extends MvpBasePresenter&lt;RaceRecorView&gt; {
50 50 @Override
51 51 public void onSuccess(BaseInfo<RaceRecordInfo> registerInfo) {
52 52 if (getView() != null){
53   - RaceRecordInfo raceRecordInfo = new RaceRecordInfo();
54   - RaceRecordInfo.BestResultBean resultBean = new RaceRecordInfo.BestResultBean();
55   - resultBean.setEmployTime("88");
56   - resultBean.setEventTitle("2018国际网络徒步大赛黄金海岸站");
57   - resultBean.setPace("22.33");
58   - resultBean.setRecordId(32);
59   - resultBean.setRoadmap("http://wjjtest.ys2.cnliveimg.com/802/img/2018/1205/ff80808166c2a45201677ce7aff652e9/000001.jpg");
60   - resultBean.setStep(10000+"");
61   - resultBean.setMileage(5+"");
62   - resultBean.setLatLongitude("[{\"latitude\":88.88,\"longitude\":88.88}]");
63   - raceRecordInfo.setBestResult(resultBean);
64   -
65   - List<EventRouteRecordBeanVoListBean> listBeans = new ArrayList<>();
66   - EventRouteRecordBeanVoListBean eventRouteRecordBeanVoListBean = new EventRouteRecordBeanVoListBean();
67   - eventRouteRecordBeanVoListBean.setCreateTime(1559722832);
68   - eventRouteRecordBeanVoListBean.setEmployTime("00:88");
69   - eventRouteRecordBeanVoListBean.setLatLongitude("[\"39.74788,116.14294\",\"39.74888,116.14394\"]");
70   - eventRouteRecordBeanVoListBean.setMileage(5.4+"");
71   - eventRouteRecordBeanVoListBean.setPace("22.33");
72   - eventRouteRecordBeanVoListBean.setRecordId(4);
73   - eventRouteRecordBeanVoListBean.setRoadmap("http://wjjtest.ys2.cnliveimg.com/802/img/2018/1205/ff80808166c2a45201677ce7aff652e9/000001.jpg");
74   - eventRouteRecordBeanVoListBean.setStep(10000+"");
75   - eventRouteRecordBeanVoListBean.setEventTitle("2018国际网络徒步大赛黄金海岸站");
76   - listBeans.add(eventRouteRecordBeanVoListBean);
77   - raceRecordInfo.setEventRouteRecordBeanVoList(listBeans);
78   - registerInfo.setData(raceRecordInfo);
79 53 getView().setData(registerInfo);
80 54 }
81 55 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
  View file @a7cac7d
... ... @@ -560,7 +560,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
560 560 public void onClick(View view) {
561 561 ARouter.getInstance().build("/web/WebViewColorActivity")
562 562 .withString("url", "http://wjjh5test.cnlive.com/cnSportList.html")
563   - .withString("title", runRaceDetailInfo.getTitle() + "排行榜")
  563 + .withString("title", "排行榜")
564 564 .navigation(fragment.getActivity());
565 565 }
566 566 });
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
  View file @a7cac7d
... ... @@ -14,6 +14,7 @@ import android.widget.TextView;
14 14 import com.alibaba.android.arouter.launcher.ARouter;
15 15 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
16 16 import com.cnlive.moudle.pedometer.net.bean.MyRecordInfo;
  17 +import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity;
17 18 import com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity;
18 19 import com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView;
19 20 import com.cnlive.moudle.pedometer.utils.TimeUtil;
... ... @@ -57,7 +58,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
57 58 myViewHolder.check_raking.setOnClickListener(v ->
58 59 ARouter.getInstance().build("/web/WebViewColorActivity")
59 60 .withString("url", "http://wjjh5test.cnlive.com/cnSportListOver.html")
60   - .withString("title",list.get(i).getTitle()+"总排行榜")
  61 + .withString("title","总排行榜")
61 62 .navigation(context));
62 63 if (clickListener != null) {
63 64 myViewHolder.item_ly.setOnClickListener(v -> clickListener.onClickListener(list.get(i), i));
... ... @@ -81,8 +82,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
81 82  
82 83 private void startAc(MyRecordInfo.ListBean listBean){
83 84 CommonInfo.setStreetId(context,listBean.getId()+"");
84   -// RaceRecordActivity.newInstance(context,listBean.getTitle());
85   - SelfRecordActivity.newInstance(context,null,null,null,null);
  85 + RaceRecordActivity.newInstance(context,listBean.getTitle());
86 86 }
87 87  
88 88  
... ...
moudle_pedometer/src/main/res/layout/fragment_collect_running_map.xml
  View file @a7cac7d
... ... @@ -50,6 +50,7 @@
50 50 android:layout_width="80dp"
51 51 android:layout_height="35dp"
52 52 android:layout_gravity="right"
  53 + android:scaleType="fitXY"
53 54 android:background="@drawable/gps_white_shadow"
54 55 android:gravity="center">
55 56  
... ...
moudle_pedometer/src/main/res/layout/fragment_race_name_list.xml
  View file @a7cac7d
... ... @@ -19,6 +19,7 @@
19 19 android:src="@drawable/top_back_black"
20 20 android:layout_centerVertical="true"
21 21 android:padding="10dp"
  22 + android:layout_marginLeft="10dp"
22 23 />
23 24  
24 25 <TextView
... ... @@ -26,7 +27,7 @@
26 27 android:layout_width="wrap_content"
27 28 android:layout_height="wrap_content"
28 29 android:layout_centerInParent="true"
29   - android:textSize="16sp"
  30 + android:textSize="18sp"
30 31 android:textColor="#333333"
31 32 />
32 33  
... ... @@ -34,7 +35,7 @@
34 35 android:id="@+id/into_path"
35 36 android:layout_width="wrap_content"
36 37 android:layout_height="wrap_content"
37   - android:textSize="13sp"
  38 + android:textSize="15sp"
38 39 android:textColor="#333333"
39 40 android:layout_alignParentRight="true"
40 41 android:layout_centerVertical="true"
... ...
moudle_pedometer/src/main/res/layout/fragment_run_line.xml
  View file @a7cac7d
... ... @@ -16,6 +16,7 @@
16 16 android:layout_height="wrap_content"
17 17 android:layout_centerVertical="true"
18 18 android:padding="10dp"
  19 + android:layout_marginLeft="10dp"
19 20 android:src="@drawable/top_back_black" />
20 21  
21 22 <TextView
... ...
moudle_pedometer/src/main/res/layout/item_my_record.xml
  View file @a7cac7d
... ... @@ -20,6 +20,7 @@
20 20 android:layout_width="wrap_content"
21 21 android:layout_height="wrap_content"
22 22 android:textColor="#333333"
  23 + android:singleLine="true"
23 24 android:layout_marginRight="30dp"
24 25 android:textSize="18sp" />
25 26  
... ... @@ -42,6 +43,7 @@
42 43 android:layout_width="wrap_content"
43 44 android:layout_height="wrap_content"
44 45 android:layout_marginLeft="10dp"
  46 + android:singleLine="true"
45 47 android:textColor="#999999"
46 48 android:textSize="12sp" />
47 49 </LinearLayout>
... ... @@ -65,6 +67,7 @@
65 67 android:layout_width="wrap_content"
66 68 android:layout_height="wrap_content"
67 69 android:layout_marginLeft="10dp"
  70 + android:singleLine="true"
68 71 android:textColor="#999999"
69 72 android:textSize="12sp" />
70 73 </LinearLayout>
... ...
moudle_pedometer/src/main/res/layout/item_race_name_list.xml
  View file @a7cac7d
... ... @@ -43,13 +43,14 @@
43 43 android:id="@+id/ry_re"
44 44 android:layout_width="match_parent"
45 45 android:layout_height="wrap_content"
46   - android:layout_marginTop="5dp"
  46 + android:layout_marginTop="10dp"
47 47 android:orientation="horizontal">
48 48  
49 49 <ImageView
50 50 android:id="@+id/item_img"
51 51 android:layout_width="80dp"
52 52 android:layout_height="80dp"
  53 + android:scaleType="fitXY"
53 54 android:src="@drawable/defaults" />
54 55  
55 56 <LinearLayout
... ... @@ -62,7 +63,7 @@
62 63 android:id="@+id/kilometer_num"
63 64 android:layout_width="wrap_content"
64 65 android:layout_height="wrap_content"
65   - android:text="4.42 公里"
  66 + android:singleLine="true"
66 67 android:textColor="#333333"
67 68 android:textSize="16sp" />
68 69  
... ... @@ -90,7 +91,7 @@
90 91 android:layout_width="wrap_content"
91 92 android:layout_height="wrap_content"
92 93 android:layout_marginLeft="10dp"
93   - android:text="首都师范大学操场东门"
  94 + android:singleLine="true"
94 95 android:textColor="@color/text_black"
95 96 android:textSize="12sp" />
96 97 </LinearLayout>
... ... @@ -119,7 +120,7 @@
119 120 android:layout_width="wrap_content"
120 121 android:layout_height="wrap_content"
121 122 android:layout_marginLeft="10dp"
122   - android:text="首都师范大学操场西门"
  123 + android:singleLine="true"
123 124 android:textColor="@color/text_black"
124 125 android:textSize="12sp" />
125 126 </LinearLayout>
... ...
moudle_pedometer/src/main/res/layout/item_race_record.xml
  View file @a7cac7d
... ... @@ -39,6 +39,7 @@
39 39 android:layout_width="80dp"
40 40 android:layout_height="80dp"
41 41 android:layout_gravity="center_vertical"
  42 + android:scaleType="fitXY"
42 43 android:src="@drawable/defaults" />
43 44  
44 45 <RelativeLayout
... ... @@ -51,9 +52,9 @@
51 52 android:id="@+id/item_title"
52 53 android:layout_width="wrap_content"
53 54 android:layout_height="wrap_content"
  55 + android:singleLine="true"
54 56 android:textSize="12sp"
55   - android:textColor="#333333"
56   - android:text="奥森南园跑道" />
  57 + android:textColor="#333333"/>
57 58  
58 59 <LinearLayout
59 60 android:layout_width="wrap_content"
... ... @@ -64,7 +65,6 @@
64 65 android:id="@+id/kilometer_num"
65 66 android:layout_width="wrap_content"
66 67 android:layout_height="wrap_content"
67   - android:text="1.23"
68 68 android:textColor="#333333"
69 69 android:textSize="30sp"
70 70 android:layout_centerVertical="true"
... ... @@ -93,8 +93,7 @@
93 93 android:drawableRight="@drawable/time_cost"
94 94 android:drawablePadding="5dp"
95 95 android:textColor="#333333"
96   - android:textSize="13sp"
97   - android:text="00:27:23" />
  96 + android:textSize="13sp" />
98 97  
99 98 <TextView
100 99 android:id="@+id/record_speed"
... ... @@ -104,8 +103,7 @@
104 103 android:drawableRight="@drawable/speed"
105 104 android:drawablePadding="5dp"
106 105 android:textColor="#333333"
107   - android:textSize="13sp"
108   - android:text="22'22''" />
  106 + android:textSize="13sp" />
109 107  
110 108 <TextView
111 109 android:id="@+id/record_step"
... ... @@ -113,8 +111,7 @@
113 111 android:layout_height="wrap_content"
114 112 android:layout_marginLeft="20dp"
115 113 android:drawableRight="@drawable/step"
116   - android:drawablePadding="5dp"
117   - android:text="1234" />
  114 + android:drawablePadding="5dp" />
118 115 </LinearLayout>
119 116 </RelativeLayout>
120 117 </LinearLayout>
... ...
moudle_pedometer/src/main/res/layout/item_record.xml
  View file @a7cac7d
... ... @@ -17,6 +17,7 @@
17 17 android:id="@+id/line_name"
18 18 android:layout_width="wrap_content"
19 19 android:layout_height="wrap_content"
  20 + android:singleLine="true"
20 21 android:textColor="#333333"
21 22 android:textSize="18sp" />
22 23  
... ... @@ -38,6 +39,7 @@
38 39 android:id="@+id/activity_time"
39 40 android:layout_width="wrap_content"
40 41 android:layout_height="wrap_content"
  42 + android:singleLine="true"
41 43 android:layout_marginLeft="10dp"
42 44 android:textColor="#999999"
43 45 android:textSize="12sp" />
... ...
moudle_pedometer/src/main/res/layout/line_up__item_view.xml
  View file @a7cac7d
... ... @@ -4,43 +4,42 @@
4 4 <data>
5 5  
6 6 </data>
7   -
8 7 <RelativeLayout
9 8 android:id="@+id/ry_re"
10 9 android:layout_width="match_parent"
11 10 android:layout_height="wrap_content"
12   - android:layout_marginLeft="10dp"
  11 + android:background="@color/white"
13 12 android:layout_marginTop="10dp"
  13 + android:layout_marginLeft="10dp"
14 14 android:layout_marginRight="10dp"
15   - android:background="@color/white"
16 15 android:padding="10dp">
17 16  
18 17 <TextView
19 18 android:id="@+id/up_day"
20 19 android:layout_width="wrap_content"
21 20 android:layout_height="wrap_content"
22   - android:text="5月1日"
23 21 android:textColor="#333333"
24   - android:textSize="14sp" />
  22 + android:textSize="14sp"
  23 + android:text="5月1日" />
25 24  
26 25 <TextView
27 26 android:id="@+id/up_record_time"
28 27 android:layout_width="wrap_content"
29 28 android:layout_height="wrap_content"
30   - android:layout_marginLeft="15dp"
31 29 android:layout_toRightOf="@id/up_day"
32   - android:text="15:30"
  30 + android:layout_marginLeft="15dp"
33 31 android:textColor="#999999"
34   - android:textSize="14sp" />
  32 + android:textSize="14sp"
  33 + android:text="15:30" />
35 34  
36 35 <TextView
37 36 android:layout_width="wrap_content"
38 37 android:layout_height="wrap_content"
39   - android:layout_alignParentRight="true"
40 38 android:layout_marginRight="10dp"
41   - android:text="@string/up_fail"
42 39 android:textColor="#FE4E4E"
43   - android:textSize="12sp" />
  40 + android:textSize="12sp"
  41 + android:text="@string/up_fail"
  42 + android:layout_alignParentRight="true"/>
44 43  
45 44 <LinearLayout
46 45 android:id="@+id/ly"
... ... @@ -53,6 +52,7 @@
53 52 android:id="@+id/up_item_img"
54 53 android:layout_width="80dp"
55 54 android:layout_height="80dp"
  55 + android:scaleType="fitXY"
56 56 android:layout_gravity="center_vertical"
57 57 android:src="@drawable/defaults" />
58 58  
... ... @@ -66,34 +66,32 @@
66 66 android:id="@+id/up_item_title"
67 67 android:layout_width="wrap_content"
68 68 android:layout_height="wrap_content"
69   - android:text="奥森南园跑道"
70   - android:textColor="#333333"
71   - android:textSize="12sp" />
  69 + android:singleLine="true"
  70 + android:textSize="12sp"
  71 + android:textColor="#333333"/>
72 72  
73 73 <LinearLayout
74 74 android:layout_width="wrap_content"
75 75 android:layout_height="wrap_content"
76 76 android:layout_centerVertical="true"
77 77 android:orientation="horizontal">
78   -
79 78 <TextView
80 79 android:id="@+id/up_kilometer_num"
81 80 android:layout_width="wrap_content"
82 81 android:layout_height="wrap_content"
83   - android:layout_centerVertical="true"
84   - android:layout_marginTop="5dp"
85   - android:text="1.23"
86 82 android:textColor="#333333"
87   - android:textSize="30sp" />
  83 + android:textSize="30sp"
  84 + android:layout_centerVertical="true"
  85 + />
88 86  
89 87 <TextView
90 88 android:layout_width="wrap_content"
91 89 android:layout_height="wrap_content"
92 90 android:layout_centerVertical="true"
93   - android:layout_marginLeft="5dp"
94 91 android:text="@string/kilometer"
95 92 android:textColor="#333333"
96   - android:textSize="12sp" />
  93 + android:textSize="12sp"
  94 + android:layout_marginLeft="5dp"/>
97 95 </LinearLayout>
98 96  
99 97  
... ... @@ -108,9 +106,8 @@
108 106 android:layout_height="wrap_content"
109 107 android:drawableRight="@drawable/time_cost"
110 108 android:drawablePadding="5dp"
111   - android:text="00:27:23"
112 109 android:textColor="#333333"
113   - android:textSize="13sp" />
  110 + android:textSize="13sp"/>
114 111  
115 112 <TextView
116 113 android:id="@+id/up_record_speed"
... ... @@ -119,9 +116,8 @@
119 116 android:layout_marginLeft="20dp"
120 117 android:drawableRight="@drawable/speed"
121 118 android:drawablePadding="5dp"
122   - android:text="22'22''"
123 119 android:textColor="#333333"
124   - android:textSize="13sp" />
  120 + android:textSize="13sp"/>
125 121  
126 122 <TextView
127 123 android:id="@+id/up_record_step"
... ... @@ -129,8 +125,7 @@
129 125 android:layout_height="wrap_content"
130 126 android:layout_marginLeft="20dp"
131 127 android:drawableRight="@drawable/step"
132   - android:drawablePadding="5dp"
133   - android:text="1234" />
  128 + android:drawablePadding="5dp"/>
134 129 </LinearLayout>
135 130 </RelativeLayout>
136 131 </LinearLayout>
... ... @@ -139,24 +134,26 @@
139 134 android:id="@+id/view"
140 135 android:layout_width="match_parent"
141 136 android:layout_height="1dp"
  137 + android:background="@color/line"
142 138 android:layout_below="@id/ly"
143   - android:background="@color/line" />
  139 + />
144 140  
145 141 <TextView
146 142 android:id="@+id/again_up"
147 143 android:layout_width="wrap_content"
148 144 android:layout_height="wrap_content"
149   - android:layout_below="@id/view"
150 145 android:layout_alignParentRight="true"
  146 + android:layout_below="@id/view"
151 147 android:layout_marginTop="10dp"
152 148 android:layout_marginRight="10dp"
153 149 android:background="@drawable/green_raduis_bg"
154   - android:paddingLeft="10dp"
155   - android:paddingTop="7dp"
156   - android:paddingRight="10dp"
157   - android:paddingBottom="7dp"
158 150 android:text="@string/again_up"
159 151 android:textColor="#36C28D"
160   - android:textSize="12sp" />
  152 + android:textSize="12sp"
  153 + android:paddingTop="7dp"
  154 + android:paddingBottom="7dp"
  155 + android:paddingRight="10dp"
  156 + android:paddingLeft="10dp"
  157 + />
161 158 </RelativeLayout>
162 159 </layout>
... ...