CNLive Android Team / ModulePedometer · Commits

Commit 6cf2d6091176df1b6fd58ed5a122ea7fd82742a9

Authored by 杨帅
2 parents 791fe8b4 4614a359

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
Inline Side-by-side
Showing 15 changed files with 89 additions and 30 deletions
moudle_pedometer/src/main/AndroidManifest.xml
  View file @6cf2d60
... ... @@ -52,6 +52,7 @@
52 52 android:required="true" />
53 53  
54 54 <application android:persistent="true">
  55 + <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity"></activity>
55 56 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity" />
56 57 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity" />
57 58 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.TakePartActivity" />
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/RaceListActivity.java 0 → 100644
  View file @6cf2d60
  1 +package com.cnlive.moudle.collectionTrace.ui.activity;
  2 +
  3 +import android.support.v7.app.AppCompatActivity;
  4 +import android.os.Bundle;
  5 +
  6 +import com.example.moudle_pedometer.R;
  7 +
  8 +/**
  9 + * Created by hanyayun 019/06/24.
  10 + */
  11 +public class RaceListActivity extends AppCompatActivity {
  12 +
  13 + @Override
  14 + protected void onCreate(Bundle savedInstanceState) {
  15 + super.onCreate(savedInstanceState);
  16 + setContentView(R.layout.activity_race_list);
  17 + }
  18 +}
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunRaceDetailFragment.java
  View file @6cf2d60
... ... @@ -61,7 +61,7 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra
61 61 public void onClick(View view) {
62 62 //todo 自己测试用
63 63 getActivity().finish();
64   - RunLineActivity.newInstance(getActivity(),null,null,null);
  64 + RunLineActivity.newInstance(getActivity(),null,null,null,null);
65 65 }
66 66 });
67 67 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/commonInfo/CommonInfo.java
  View file @6cf2d60
... ... @@ -226,7 +226,7 @@ public class CommonInfo {
226 226 }
227 227  
228 228 /**
229   - * 获取用户昵称
  229 + * 获取用户头像
230 230 *
231 231 * @param context
232 232 */
... ... @@ -236,6 +236,28 @@ public class CommonInfo {
236 236 }
237 237  
238 238 /**
  239 + * 设置用户号码
  240 + *
  241 + * @param context
  242 + * @param userIcon
  243 + */
  244 + public static void setUserPhone(Context context, String userIcon) {
  245 + MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("RunUserPhone", userIcon);
  246 +
  247 + }
  248 +
  249 + /**
  250 + * 获取用户号码
  251 + *
  252 + * @param context
  253 + */
  254 + public static String getUserPhone(Context context) {
  255 + return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserPhone", "");
  256 +
  257 + }
  258 +
  259 +
  260 + /**
239 261 * 是否第一次显示倒计时动画
240 262 *
241 263 * @param context
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/MyRecordView.java
  View file @6cf2d60
... ... @@ -48,7 +48,7 @@ public class MyRecordView implements MvpView {
48 48 adapter.setClickListener(new MyRecordAdapter.OnClickListener() {
49 49 @Override
50 50 public void onClickListener(MyRecordInfo.ListBean bean, int position) {
51   - RunRaceDetailActivity.startActivity(fragment.getActivity(),bean.getId()+"",null,null,null);
  51 + RunRaceDetailActivity.startActivity(fragment.getActivity(),bean.getId()+"",null,null,null,null);
52 52 }
53 53 });
54 54 }else {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RegistrationInfoView.java
  View file @6cf2d60
... ... @@ -48,6 +48,10 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
48 48 fragment.binding.userName.setText(CommonInfo.getUserNickName(fragment.getActivity()));
49 49 }
50 50  
  51 + if(CommonInfo.getUserPhone(fragment.getActivity()) != null && CommonInfo.getUserPhone(fragment.getActivity()).trim().length() > 0){
  52 + fragment.binding.phoneNum.setText(CommonInfo.getUserPhone(fragment.getActivity()));
  53 + }
  54 +
51 55 if(CommonInfo.getUserIcon(fragment.getActivity()) != null && CommonInfo.getUserIcon(fragment.getActivity()).trim().length() > 0){
52 56 Glide.with(fragment.getActivity()).load(CommonInfo.getUserIcon(fragment.getActivity()))
53 57 .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into( fragment.binding.userIcon);
... ... @@ -59,13 +63,13 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
59 63 @Override
60 64 public void onClick(View v) {
61 65 sex.dismiss();
62   - fragment.binding.sexText.setText("性别（非必填） 男");
  66 + fragment.binding.sexText.setText("男");
63 67 }
64 68 }).addMenu("女", new View.OnClickListener() {
65 69 @Override
66 70 public void onClick(View v) {
67 71 sex.dismiss();
68   - fragment.binding.sexText.setText("性别（非必填） 女");
  72 + fragment.binding.sexText.setText("女");
69 73 }
70 74  
71 75 }).create(fragment.getActivity());
... ... @@ -115,6 +119,6 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
115 119 @Override
116 120 public void onDateSet(TimePickerDialog timePickerView, long millseconds) {
117 121 // 生日（非必填） 未选择
118   - fragment.binding.birthday.setText("生日（非必填） " + DateTimeUtil.formatDateTime(millseconds, "yyyy年MM月dd日"));
  122 + fragment.binding.birthday.setText(DateTimeUtil.formatDateTime(millseconds, "yyyy年MM月dd日"));
119 123 }
120 124 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunLineView.java
  View file @6cf2d60
... ... @@ -42,7 +42,7 @@ public class RunLineView implements MvpView {
42 42 fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
43 43 fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
44 44 fragment.binding.backBtn.setOnClickListener(v -> fragment.getActivity().finish());
45   - fragment.binding.myActivity.setOnClickListener(v -> MyRecordActivity.newInstance(fragment.getActivity(),null,null,null));
  45 + fragment.binding.myActivity.setOnClickListener(v -> MyRecordActivity.newInstance(fragment.getActivity(),null,null,null,null));
46 46  
47 47 fragment.binding.runLineRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
48 48 }
... ... @@ -58,7 +58,7 @@ public class RunLineView implements MvpView {
58 58 adapter.setClickListener(new RunLineAdapter.OnClickListener() {
59 59 @Override
60 60 public void onClickListener(RunLineInfo.ListBean bean, int position) {
61   - RunRaceDetailActivity.startActivity(fragment.getActivity(),bean.getId()+"",null,null,null);
  61 + RunRaceDetailActivity.startActivity(fragment.getActivity(),bean.getId()+"",null,null,null,null);
62 62 }
63 63 });
64 64 }else {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/SelfRecordView.java
  View file @6cf2d60
... ... @@ -120,7 +120,7 @@ public class SelfRecordView implements MvpView {
120 120 fragment.binding.finishNum.setText("0");
121 121 fragment.binding.allTime.setText("00:00:00");
122 122 fragment.binding.checkAllLine.setOnClickListener(v -> {
123   - RunLineActivity.newInstance(fragment.getActivity(),null,null,null);
  123 + RunLineActivity.newInstance(fragment.getActivity(),null,null,null,null);
124 124 });
125 125 }
126 126  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/MyRecordActivity.java
  View file @6cf2d60
... ... @@ -32,11 +32,12 @@ public class MyRecordActivity extends AppCompatActivity {
32 32 private TabLayout tabs;
33 33 private ViewPager viewPager;
34 34  
35   - public static void newInstance(Activity context,String userId,String userIcon,String userName){
  35 + public static void newInstance(Activity context,String userId,String userIcon,String userName,String userPhone){
36 36 Intent intent = new Intent(context,MyRecordActivity.class);
37 37 intent.putExtra("userId",userId);
38 38 intent.putExtra("userIcon",userIcon);
39 39 intent.putExtra("userName",userName);
  40 + intent.putExtra("userPhone",userPhone);
40 41 context.startActivity(intent);
41 42 }
42 43  
... ... @@ -51,6 +52,7 @@ public class MyRecordActivity extends AppCompatActivity {
51 52 CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
52 53 CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
53 54 CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
  55 + CommonInfo.setUserPhone(this,getIntent().getStringExtra("userPhone"));
54 56 }
55 57  
56 58 topBar = findViewById(R.id.topbar);
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunLineActivity.java
  View file @6cf2d60
... ... @@ -18,11 +18,12 @@ import com.example.moudle_pedometer.R;
18 18 */
19 19 public class RunLineActivity extends AppCompatActivity {
20 20  
21   - public static void newInstance(Activity context, String userId, String userIcon, String userName){
  21 + public static void newInstance(Activity context, String userId, String userIcon, String userName,String userPhone){
22 22 Intent intent = new Intent(context,RunLineActivity.class);
23 23 intent.putExtra("userId",userId);
24 24 intent.putExtra("userIcon",userIcon);
25 25 intent.putExtra("userName",userName);
  26 + intent.putExtra("userPhone",userPhone);
26 27 context.startActivity(intent);
27 28 }
28 29  
... ... @@ -37,6 +38,7 @@ public class RunLineActivity extends AppCompatActivity {
37 38 CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
38 39 CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
39 40 CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
  41 + CommonInfo.setUserPhone(this,getIntent().getStringExtra("userPhone"));
40 42 }else {
41 43 CommonInfo.setUserId(this, "10513196");
42 44 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
  View file @6cf2d60
... ... @@ -38,19 +38,14 @@ import java.util.List;
38 38 public class RunRaceDetailActivity extends QMUIFragmentActivity {
39 39 private QMUIFragment fragment;
40 40  
41   - public static void startActivity(Activity activity, String eventId, String userId, String userIcon, String userName) {
  41 + public static void startActivity(Activity activity, String eventId,String userId,String userIcon,String userName,String userPhone) {
42 42 Intent intent = new Intent(activity, RunRaceDetailActivity.class);
43 43 intent.putExtra("eventId", eventId);
44   - intent.putExtra("userId", userId);
45   - intent.putExtra("userIcon", userIcon);
46   - intent.putExtra("userName", userName);
47   - //设置赛事ID
  44 + intent.putExtra("userId",userId);
  45 + intent.putExtra("userIcon",userIcon);
  46 + intent.putExtra("userName",userName);
  47 + intent.putExtra("userPhone",userPhone);
48 48 CommonInfo.setStreetId(activity, eventId);
49   - //设置用户昵称
50   - CommonInfo.setUserNickName(activity, userName);
51   - //设置用户头像
52   - CommonInfo.setUserIcon(activity, userIcon);
53   -
54 49 activity.startActivity(intent);
55 50 }
56 51  
... ... @@ -63,16 +58,17 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
63 58 protected void onCreate(Bundle savedInstanceState) {
64 59 super.onCreate(savedInstanceState);
65 60  
66   - if (getIntent().getStringExtra("userId") != null) {
67   - CommonInfo.setUserId(this, getIntent().getStringExtra("userId"));
68   - CommonInfo.setUserNickName(this, getIntent().getStringExtra("userName"));
69   - CommonInfo.setUserIcon(this, getIntent().getStringExtra("userIcon"));
  61 + if(getIntent().getStringExtra("userId") != null){
  62 + CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
  63 + CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
  64 + CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
  65 + CommonInfo.setUserPhone(this,getIntent().getStringExtra("userPhone"));
70 66 }
71 67 //判断用户是否结束运动
72 68 // boolean isRunStep = CommonInfo.getIsRunStepService(this);
73 69 // //没有找到相关记录
74 70 // if (!isRunStep) {
75   - fragment = new RunRaceDetailFragment();
  71 + fragment = new RunRaceDetailFragment();
76 72 // }
77 73 // //找到记录
78 74 // else {
... ... @@ -93,7 +89,7 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
93 89 @Override
94 90 public void onBackPressed() {
95 91 super.onBackPressed();
96   - if (getCurrentFragment() != null) {
  92 + if (getCurrentFragment()!=null) {
97 93 if (getCurrentFragment() instanceof RunMainFragment) {
98 94 return;
99 95 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/SelfRecordActivity.java
  View file @6cf2d60
... ... @@ -17,11 +17,12 @@ import com.example.moudle_pedometer.R;
17 17 */
18 18 public class SelfRecordActivity extends AppCompatActivity {
19 19  
20   - public static void newInstance(Activity context,String userId,String userIcon,String userName){
  20 + public static void newInstance(Activity context,String userId,String userIcon,String userName,String userPhone){
21 21 Intent intent = new Intent(context,SelfRecordActivity.class);
22 22 intent.putExtra("userId",userId);
23 23 intent.putExtra("userIcon",userIcon);
24 24 intent.putExtra("userName",userName);
  25 + intent.putExtra("userPhone",userPhone);
25 26 context.startActivity(intent);
26 27 }
27 28  
... ... @@ -36,6 +37,7 @@ public class SelfRecordActivity extends AppCompatActivity {
36 37 CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
37 38 CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
38 39 CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
  40 + CommonInfo.setUserPhone(this,getIntent().getStringExtra("userPhone"));
39 41 }
40 42 getSupportFragmentManager().beginTransaction().replace(R.id.record_container, new SelfRecordFragment()).commit();
41 43 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
  View file @6cf2d60
... ... @@ -82,7 +82,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
82 82 private void startAc(MyRecordInfo.ListBean listBean){
83 83 CommonInfo.setStreetId(context,listBean.getId()+"");
84 84 // RaceRecordActivity.newInstance(context,listBean.getTitle());
85   - SelfRecordActivity.newInstance(context,null,null,null);
  85 + SelfRecordActivity.newInstance(context,null,null,null,null);
86 86 }
87 87  
88 88  
... ...
moudle_pedometer/src/main/res/layout/activity_race_list.xml 0 → 100644
  View file @6cf2d60
  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.collectionTrace.ui.activity.RaceListActivity">
  8 + <RelativeLayout
  9 + android:id="@+id/race_container"
  10 + android:layout_width="match_parent"
  11 + android:layout_height="match_parent"/>
  12 +</RelativeLayout>
... ...
moudle_pedometer/src/main/res/layout/fragment_registration_info.xml
  View file @6cf2d60
... ... @@ -64,12 +64,12 @@
64 64 />
65 65  
66 66 <TextView
  67 + android:id="@+id/phone_num"
67 68 android:layout_width="wrap_content"
68 69 android:layout_height="wrap_content"
69 70 android:layout_marginLeft="20dp"
70 71 android:textSize="16sp"
71 72 android:textColor="#999999"
72   - android:text="13611232987"
73 73 />
74 74 </LinearLayout>
75 75  
... ...