Commit b37503ff27930d900e2de01f9e60ef3c98e5671e

Authored by 韩亚云
1 parent 849e84f5

赛事列表,保存用户号码

moudle_pedometer/src/main/AndroidManifest.xml
@@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@
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.collectionTrace.ui.activity.RaceListActivity"></activity>
55 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity" /> 56 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity" />
56 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity" /> 57 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity" />
57 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.TakePartActivity" /> 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
  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
@@ -61,7 +61,7 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra @@ -61,7 +61,7 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra
61 public void onClick(View view) { 61 public void onClick(View view) {
62 //todo 自己测试用 62 //todo 自己测试用
63 getActivity().finish(); 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
@@ -226,32 +226,33 @@ public class CommonInfo { @@ -226,32 +226,33 @@ public class CommonInfo {
226 } 226 }
227 227
228 /** 228 /**
229 - * 获取用户昵称 229 + * 获取用户头像
230 * 230 *
231 * @param context 231 * @param context
232 */ 232 */
233 public static String getUserIcon(Context context) { 233 public static String getUserIcon(Context context) {
234 return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserNickIcon", ""); 234 return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserNickIcon", "");
235 -  
236 } 235 }
237 236
  237 +
238 /** 238 /**
239 - * 设置用户头像 239 + * 设置用户号码
240 * 240 *
241 * @param context 241 * @param context
  242 + * @param userIcon
242 */ 243 */
243 - public static void setUserFaceUrl(Context context, String faceUrl) {  
244 - MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("RunUserFaceUrl", faceUrl); 244 + public static void setUserPhone(Context context, String userIcon) {
  245 + MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("RunUserPhone", userIcon);
245 246
246 } 247 }
247 248
248 /** 249 /**
249 - * 获取用户头像 250 + * 获取用户号码
250 * 251 *
251 * @param context 252 * @param context
252 */ 253 */
253 - public static void getUserFaceUrl(Context context) {  
254 - MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserFaceUrl", ""); 254 + public static String getUserPhone(Context context) {
  255 + return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserPhone", "");
255 256
256 } 257 }
257 258
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/MyRecordView.java
@@ -48,7 +48,7 @@ public class MyRecordView implements MvpView { @@ -48,7 +48,7 @@ public class MyRecordView implements MvpView {
48 adapter.setClickListener(new MyRecordAdapter.OnClickListener() { 48 adapter.setClickListener(new MyRecordAdapter.OnClickListener() {
49 @Override 49 @Override
50 public void onClickListener(MyRecordInfo.ListBean bean, int position) { 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 }else { 54 }else {
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RegistrationInfoView.java
@@ -48,6 +48,10 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener { @@ -48,6 +48,10 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
48 fragment.binding.userName.setText(CommonInfo.getUserNickName(fragment.getActivity())); 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 if(CommonInfo.getUserIcon(fragment.getActivity()) != null && CommonInfo.getUserIcon(fragment.getActivity()).trim().length() > 0){ 55 if(CommonInfo.getUserIcon(fragment.getActivity()) != null && CommonInfo.getUserIcon(fragment.getActivity()).trim().length() > 0){
52 Glide.with(fragment.getActivity()).load(CommonInfo.getUserIcon(fragment.getActivity())) 56 Glide.with(fragment.getActivity()).load(CommonInfo.getUserIcon(fragment.getActivity()))
53 .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into( fragment.binding.userIcon); 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,13 +63,13 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
59 @Override 63 @Override
60 public void onClick(View v) { 64 public void onClick(View v) {
61 sex.dismiss(); 65 sex.dismiss();
62 - fragment.binding.sexText.setText("性别(非必填) 男"); 66 + fragment.binding.sexText.setText("男");
63 } 67 }
64 }).addMenu("女", new View.OnClickListener() { 68 }).addMenu("女", new View.OnClickListener() {
65 @Override 69 @Override
66 public void onClick(View v) { 70 public void onClick(View v) {
67 sex.dismiss(); 71 sex.dismiss();
68 - fragment.binding.sexText.setText("性别(非必填) 女"); 72 + fragment.binding.sexText.setText("女");
69 } 73 }
70 74
71 }).create(fragment.getActivity()); 75 }).create(fragment.getActivity());
@@ -115,6 +119,6 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener { @@ -115,6 +119,6 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
115 @Override 119 @Override
116 public void onDateSet(TimePickerDialog timePickerView, long millseconds) { 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
@@ -42,7 +42,7 @@ public class RunLineView implements MvpView { @@ -42,7 +42,7 @@ public class RunLineView implements MvpView {
42 fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity())); 42 fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
43 fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity())); 43 fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
44 fragment.binding.backBtn.setOnClickListener(v -> fragment.getActivity().finish()); 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 fragment.binding.runLineRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity())); 47 fragment.binding.runLineRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
48 } 48 }
@@ -58,7 +58,7 @@ public class RunLineView implements MvpView { @@ -58,7 +58,7 @@ public class RunLineView implements MvpView {
58 adapter.setClickListener(new RunLineAdapter.OnClickListener() { 58 adapter.setClickListener(new RunLineAdapter.OnClickListener() {
59 @Override 59 @Override
60 public void onClickListener(RunLineInfo.ListBean bean, int position) { 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 }else { 64 }else {
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/SelfRecordView.java
@@ -120,7 +120,7 @@ public class SelfRecordView implements MvpView { @@ -120,7 +120,7 @@ public class SelfRecordView implements MvpView {
120 fragment.binding.finishNum.setText("0"); 120 fragment.binding.finishNum.setText("0");
121 fragment.binding.allTime.setText("00:00:00"); 121 fragment.binding.allTime.setText("00:00:00");
122 fragment.binding.checkAllLine.setOnClickListener(v -> { 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
@@ -32,11 +32,12 @@ public class MyRecordActivity extends AppCompatActivity { @@ -32,11 +32,12 @@ public class MyRecordActivity extends AppCompatActivity {
32 private TabLayout tabs; 32 private TabLayout tabs;
33 private ViewPager viewPager; 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 Intent intent = new Intent(context,MyRecordActivity.class); 36 Intent intent = new Intent(context,MyRecordActivity.class);
37 intent.putExtra("userId",userId); 37 intent.putExtra("userId",userId);
38 intent.putExtra("userIcon",userIcon); 38 intent.putExtra("userIcon",userIcon);
39 intent.putExtra("userName",userName); 39 intent.putExtra("userName",userName);
  40 + intent.putExtra("userPhone",userPhone);
40 context.startActivity(intent); 41 context.startActivity(intent);
41 } 42 }
42 43
@@ -51,6 +52,7 @@ public class MyRecordActivity extends AppCompatActivity { @@ -51,6 +52,7 @@ public class MyRecordActivity extends AppCompatActivity {
51 CommonInfo.setUserId(this,getIntent().getStringExtra("userId")); 52 CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
52 CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName")); 53 CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
53 CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon")); 54 CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
  55 + CommonInfo.setUserPhone(this,getIntent().getStringExtra("userPhone"));
54 } 56 }
55 57
56 topBar = findViewById(R.id.topbar); 58 topBar = findViewById(R.id.topbar);
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunLineActivity.java
@@ -19,11 +19,12 @@ import com.example.moudle_pedometer.R; @@ -19,11 +19,12 @@ import com.example.moudle_pedometer.R;
19 */ 19 */
20 public class RunLineActivity extends AppCompatActivity { 20 public class RunLineActivity extends AppCompatActivity {
21 21
22 - public static void newInstance(Activity context, String userId, String userIcon, String userName){ 22 + public static void newInstance(Activity context, String userId, String userIcon, String userName,String userPhone){
23 Intent intent = new Intent(context,RunLineActivity.class); 23 Intent intent = new Intent(context,RunLineActivity.class);
24 intent.putExtra("userId",userId); 24 intent.putExtra("userId",userId);
25 intent.putExtra("userIcon",userIcon); 25 intent.putExtra("userIcon",userIcon);
26 intent.putExtra("userName",userName); 26 intent.putExtra("userName",userName);
  27 + intent.putExtra("userPhone",userPhone);
27 context.startActivity(intent); 28 context.startActivity(intent);
28 } 29 }
29 30
@@ -38,6 +39,7 @@ public class RunLineActivity extends AppCompatActivity { @@ -38,6 +39,7 @@ public class RunLineActivity extends AppCompatActivity {
38 CommonInfo.setUserId(this,getIntent().getStringExtra("userId")); 39 CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
39 CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName")); 40 CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
40 CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon")); 41 CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
  42 + CommonInfo.setUserPhone(this,getIntent().getStringExtra("userPhone"));
41 }else { 43 }else {
42 CommonInfo.setUserId(this, "10513196"); 44 CommonInfo.setUserId(this, "10513196");
43 } 45 }
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
@@ -38,12 +38,13 @@ import java.util.List; @@ -38,12 +38,13 @@ import java.util.List;
38 public class RunRaceDetailActivity extends QMUIFragmentActivity { 38 public class RunRaceDetailActivity extends QMUIFragmentActivity {
39 private QMUIFragment fragment; 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 Intent intent = new Intent(activity, RunRaceDetailActivity.class); 42 Intent intent = new Intent(activity, RunRaceDetailActivity.class);
43 intent.putExtra("eventId", eventId); 43 intent.putExtra("eventId", eventId);
44 intent.putExtra("userId",userId); 44 intent.putExtra("userId",userId);
45 intent.putExtra("userIcon",userIcon); 45 intent.putExtra("userIcon",userIcon);
46 intent.putExtra("userName",userName); 46 intent.putExtra("userName",userName);
  47 + intent.putExtra("userPhone",userPhone);
47 CommonInfo.setStreetId(activity, eventId); 48 CommonInfo.setStreetId(activity, eventId);
48 activity.startActivity(intent); 49 activity.startActivity(intent);
49 } 50 }
@@ -61,6 +62,7 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity { @@ -61,6 +62,7 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
61 CommonInfo.setUserId(this,getIntent().getStringExtra("userId")); 62 CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
62 CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName")); 63 CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
63 CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon")); 64 CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
  65 + CommonInfo.setUserPhone(this,getIntent().getStringExtra("userPhone"));
64 } 66 }
65 //判断用户是否结束运动 67 //判断用户是否结束运动
66 // boolean isRunStep = CommonInfo.getIsRunStepService(this); 68 // boolean isRunStep = CommonInfo.getIsRunStepService(this);
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/SelfRecordActivity.java
@@ -17,11 +17,12 @@ import com.example.moudle_pedometer.R; @@ -17,11 +17,12 @@ import com.example.moudle_pedometer.R;
17 */ 17 */
18 public class SelfRecordActivity extends AppCompatActivity { 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 Intent intent = new Intent(context,SelfRecordActivity.class); 21 Intent intent = new Intent(context,SelfRecordActivity.class);
22 intent.putExtra("userId",userId); 22 intent.putExtra("userId",userId);
23 intent.putExtra("userIcon",userIcon); 23 intent.putExtra("userIcon",userIcon);
24 intent.putExtra("userName",userName); 24 intent.putExtra("userName",userName);
  25 + intent.putExtra("userPhone",userPhone);
25 context.startActivity(intent); 26 context.startActivity(intent);
26 } 27 }
27 28
@@ -36,6 +37,7 @@ public class SelfRecordActivity extends AppCompatActivity { @@ -36,6 +37,7 @@ public class SelfRecordActivity extends AppCompatActivity {
36 CommonInfo.setUserId(this,getIntent().getStringExtra("userId")); 37 CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
37 CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName")); 38 CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
38 CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon")); 39 CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
  40 + CommonInfo.setUserPhone(this,getIntent().getStringExtra("userPhone"));
39 } 41 }
40 getSupportFragmentManager().beginTransaction().replace(R.id.record_container, new SelfRecordFragment()).commit(); 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
@@ -82,7 +82,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView @@ -82,7 +82,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
82 private void startAc(MyRecordInfo.ListBean listBean){ 82 private void startAc(MyRecordInfo.ListBean listBean){
83 CommonInfo.setStreetId(context,listBean.getId()+""); 83 CommonInfo.setStreetId(context,listBean.getId()+"");
84 // RaceRecordActivity.newInstance(context,listBean.getTitle()); 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
  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
@@ -64,12 +64,12 @@ @@ -64,12 +64,12 @@
64 /> 64 />
65 65
66 <TextView 66 <TextView
  67 + android:id="@+id/phone_num"
67 android:layout_width="wrap_content" 68 android:layout_width="wrap_content"
68 android:layout_height="wrap_content" 69 android:layout_height="wrap_content"
69 android:layout_marginLeft="20dp" 70 android:layout_marginLeft="20dp"
70 android:textSize="16sp" 71 android:textSize="16sp"
71 android:textColor="#999999" 72 android:textColor="#999999"
72 - android:text="13611232987"  
73 /> 73 />
74 </LinearLayout> 74 </LinearLayout>
75 75