Merge remote-tracking branch 'origin/master'

# Conflicts: # moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java

Merge remote-tracking branch 'origin/master'
# Conflicts: # moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
杨帅
2 parents 791fe8b4 4614a359
Showing 15 changed files with 89 additions and 30 deletions
moudle_pedometer/src/main/AndroidManifest.xml
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/activity/RaceListActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunRaceDetailFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/commonInfo/CommonInfo.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/MyRecordView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RegistrationInfoView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunLineView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/SelfRecordView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/MyRecordActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunLineActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/SelfRecordActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
moudle_pedometer/src/main/res/layout/activity_race_list.xml
moudle_pedometer/src/main/res/layout/fragment_registration_info.xml
@@ -52,6 +52,7 @@
         android:required="true" />
     <application android:persistent="true">
+        <activity android:name="com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity"></activity>
         <activity android:name="com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity" />
         <activity android:name="com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity" />
         <activity android:name="com.cnlive.moudle.pedometer.ui.activity.TakePartActivity" />
+package com.cnlive.moudle.collectionTrace.ui.activity;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+import com.example.moudle_pedometer.R;
+
+/**
+ * Created by hanyayun 019/06/24.
+ */
+public class RaceListActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_race_list);
+    }
+}
@@ -61,7 +61,7 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra
             public void onClick(View view) {
                 //todo 自己测试用
                 getActivity().finish();
-                RunLineActivity.newInstance(getActivity(),null,null,null);
+                RunLineActivity.newInstance(getActivity(),null,null,null,null);
             }
         });
     }
@@ -226,7 +226,7 @@ public class CommonInfo {
     }
     /**
-     * 获取用户昵称
+     * 获取用户头像
      *
      * @param context
      */
@@ -236,6 +236,28 @@ public class CommonInfo {
     }
     /**
+     * 设置用户号码
+     *
+     * @param context
+     * @param userIcon
+     */
+    public static void setUserPhone(Context context, String userIcon) {
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("RunUserPhone", userIcon);
+
+    }
+
+    /**
+     * 获取用户号码
+     *
+     * @param context
+     */
+    public static String getUserPhone(Context context) {
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserPhone", "");
+
+    }
+
+
+    /**
      * 是否第一次显示倒计时动画
      *
      * @param context
@@ -48,7 +48,7 @@ public class MyRecordView implements MvpView {
                 adapter.setClickListener(new MyRecordAdapter.OnClickListener() {
                     @Override
                     public void onClickListener(MyRecordInfo.ListBean bean, int position) {
-                        RunRaceDetailActivity.startActivity(fragment.getActivity(),bean.getId()+"",null,null,null);
+                        RunRaceDetailActivity.startActivity(fragment.getActivity(),bean.getId()+"",null,null,null,null);
                     }
                 });
             }else {
@@ -48,6 +48,10 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
             fragment.binding.userName.setText(CommonInfo.getUserNickName(fragment.getActivity()));
         }
+        if(CommonInfo.getUserPhone(fragment.getActivity()) != null && CommonInfo.getUserPhone(fragment.getActivity()).trim().length() > 0){
+            fragment.binding.phoneNum.setText(CommonInfo.getUserPhone(fragment.getActivity()));
+        }
+
         if(CommonInfo.getUserIcon(fragment.getActivity()) != null && CommonInfo.getUserIcon(fragment.getActivity()).trim().length() > 0){
             Glide.with(fragment.getActivity()).load(CommonInfo.getUserIcon(fragment.getActivity()))
                     .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into( fragment.binding.userIcon);
@@ -59,13 +63,13 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
                     @Override
                     public void onClick(View v) {
                         sex.dismiss();
-                        fragment.binding.sexText.setText("性别（非必填） 男");
+                        fragment.binding.sexText.setText("男");
                     }
                 }).addMenu("女", new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
                         sex.dismiss();
-                        fragment.binding.sexText.setText("性别（非必填） 女");
+                        fragment.binding.sexText.setText("女");
                     }
                 }).create(fragment.getActivity());
@@ -115,6 +119,6 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
     @Override
     public void onDateSet(TimePickerDialog timePickerView, long millseconds) {
 //        生日（非必填） 未选择
-        fragment.binding.birthday.setText("生日（非必填） " + DateTimeUtil.formatDateTime(millseconds, "yyyy年MM月dd日"));
+        fragment.binding.birthday.setText(DateTimeUtil.formatDateTime(millseconds, "yyyy年MM月dd日"));
     }
 }
@@ -42,7 +42,7 @@ public class RunLineView implements MvpView {
         fragment.binding.refreshLayout.setRefreshHeader(new ClassicsHeader(fragment.getActivity()));
         fragment.binding.refreshLayout.setRefreshFooter(new ClassicsFooter(fragment.getActivity()));
         fragment.binding.backBtn.setOnClickListener(v -> fragment.getActivity().finish());
-        fragment.binding.myActivity.setOnClickListener(v -> MyRecordActivity.newInstance(fragment.getActivity(),null,null,null));
+        fragment.binding.myActivity.setOnClickListener(v -> MyRecordActivity.newInstance(fragment.getActivity(),null,null,null,null));
         fragment.binding.runLineRecy.setLayoutManager(new LinearLayoutManager(fragment.getActivity()));
     }
@@ -58,7 +58,7 @@ public class RunLineView implements MvpView {
                 adapter.setClickListener(new RunLineAdapter.OnClickListener() {
                     @Override
                     public void onClickListener(RunLineInfo.ListBean bean, int position) {
-                        RunRaceDetailActivity.startActivity(fragment.getActivity(),bean.getId()+"",null,null,null);
+                        RunRaceDetailActivity.startActivity(fragment.getActivity(),bean.getId()+"",null,null,null,null);
                     }
                 });
             }else {
@@ -120,7 +120,7 @@ public class SelfRecordView implements MvpView {
         fragment.binding.finishNum.setText("0");
         fragment.binding.allTime.setText("00:00:00");
         fragment.binding.checkAllLine.setOnClickListener(v -> {
-            RunLineActivity.newInstance(fragment.getActivity(),null,null,null);
+            RunLineActivity.newInstance(fragment.getActivity(),null,null,null,null);
         });
     }
@@ -32,11 +32,12 @@ public class MyRecordActivity extends AppCompatActivity {
     private TabLayout tabs;
     private ViewPager viewPager;
-    public static void newInstance(Activity context,String userId,String userIcon,String userName){
+    public static void newInstance(Activity context,String userId,String userIcon,String userName,String userPhone){
         Intent intent = new Intent(context,MyRecordActivity.class);
         intent.putExtra("userId",userId);
         intent.putExtra("userIcon",userIcon);
         intent.putExtra("userName",userName);
+        intent.putExtra("userPhone",userPhone);
         context.startActivity(intent);
     }
@@ -51,6 +52,7 @@ public class MyRecordActivity extends AppCompatActivity {
             CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
             CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
             CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
+            CommonInfo.setUserPhone(this,getIntent().getStringExtra("userPhone"));
         }
         topBar = findViewById(R.id.topbar);
@@ -18,11 +18,12 @@ import com.example.moudle_pedometer.R;
  */
 public class RunLineActivity extends AppCompatActivity {
-    public static void newInstance(Activity context, String userId, String userIcon, String userName){
+    public static void newInstance(Activity context, String userId, String userIcon, String userName,String userPhone){
         Intent intent = new Intent(context,RunLineActivity.class);
         intent.putExtra("userId",userId);
         intent.putExtra("userIcon",userIcon);
         intent.putExtra("userName",userName);
+        intent.putExtra("userPhone",userPhone);
         context.startActivity(intent);
     }
@@ -37,6 +38,7 @@ public class RunLineActivity extends AppCompatActivity {
             CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
             CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
             CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
+            CommonInfo.setUserPhone(this,getIntent().getStringExtra("userPhone"));
         }else {
             CommonInfo.setUserId(this, "10513196");
         }
@@ -38,19 +38,14 @@ import java.util.List;
 public class RunRaceDetailActivity extends QMUIFragmentActivity {
     private QMUIFragment fragment;
-    public static void startActivity(Activity activity, String eventId, String userId, String userIcon, String userName) {
+    public static void startActivity(Activity activity, String eventId,String userId,String userIcon,String userName,String userPhone) {
         Intent intent = new Intent(activity, RunRaceDetailActivity.class);
         intent.putExtra("eventId", eventId);
-        intent.putExtra("userId", userId);
-        intent.putExtra("userIcon", userIcon);
-        intent.putExtra("userName", userName);
-        //设置赛事ID
+        intent.putExtra("userId",userId);
+        intent.putExtra("userIcon",userIcon);
+        intent.putExtra("userName",userName);
+        intent.putExtra("userPhone",userPhone);
         CommonInfo.setStreetId(activity, eventId);
-        //设置用户昵称
-        CommonInfo.setUserNickName(activity, userName);
-        //设置用户头像
-        CommonInfo.setUserIcon(activity, userIcon);
-
         activity.startActivity(intent);
     }
@@ -63,16 +58,17 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (getIntent().getStringExtra("userId") != null) {
-            CommonInfo.setUserId(this, getIntent().getStringExtra("userId"));
-            CommonInfo.setUserNickName(this, getIntent().getStringExtra("userName"));
-            CommonInfo.setUserIcon(this, getIntent().getStringExtra("userIcon"));
+        if(getIntent().getStringExtra("userId") != null){
+            CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
+            CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
+            CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
+            CommonInfo.setUserPhone(this,getIntent().getStringExtra("userPhone"));
         }
         //判断用户是否结束运动
 //        boolean isRunStep = CommonInfo.getIsRunStepService(this);
 //        //没有找到相关记录
 //        if (!isRunStep) {
-        fragment = new RunRaceDetailFragment();
+            fragment = new RunRaceDetailFragment();
 //        }
 //        //找到记录
 //        else {
@@ -93,7 +89,7 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     @Override
     public void onBackPressed() {
         super.onBackPressed();
-        if (getCurrentFragment() != null) {
+        if (getCurrentFragment()!=null) {
             if (getCurrentFragment() instanceof RunMainFragment) {
                 return;
             }
@@ -17,11 +17,12 @@ import com.example.moudle_pedometer.R;
  */
 public class SelfRecordActivity extends AppCompatActivity {
-    public static void newInstance(Activity context,String userId,String userIcon,String userName){
+    public static void newInstance(Activity context,String userId,String userIcon,String userName,String userPhone){
         Intent intent = new Intent(context,SelfRecordActivity.class);
         intent.putExtra("userId",userId);
         intent.putExtra("userIcon",userIcon);
         intent.putExtra("userName",userName);
+        intent.putExtra("userPhone",userPhone);
         context.startActivity(intent);
     }
@@ -36,6 +37,7 @@ public class SelfRecordActivity extends AppCompatActivity {
             CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
             CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
             CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
+            CommonInfo.setUserPhone(this,getIntent().getStringExtra("userPhone"));
         }
         getSupportFragmentManager().beginTransaction().replace(R.id.record_container, new SelfRecordFragment()).commit();
     }
@@ -82,7 +82,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
     private void startAc(MyRecordInfo.ListBean listBean){
         CommonInfo.setStreetId(context,listBean.getId()+"");
 //        RaceRecordActivity.newInstance(context,listBean.getTitle());
-        SelfRecordActivity.newInstance(context,null,null,null);
+        SelfRecordActivity.newInstance(context,null,null,null,null);
     }
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.cnlive.moudle.collectionTrace.ui.activity.RaceListActivity">
+    <RelativeLayout
+        android:id="@+id/race_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</RelativeLayout>
@@ -64,12 +64,12 @@
                     />
                 <TextView
+                    android:id="@+id/phone_num"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="20dp"
                     android:textSize="16sp"
                     android:textColor="#999999"
-                    android:text="13611232987"
                     />
             </LinearLayout>