页面跳转用户信息保存

韩亚云
1 parent 48e6ef45
Showing 21 changed files with 147 additions and 90 deletions
app/src/main/java/com/example/modulepedometer/MainActivity.java
config.gradle
moudle_pedometer/src/main/AndroidManifest.xml
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/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/SelfRecordView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoMaster.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoSession.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/activity/ShareRecordActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
moudle_pedometer/src/main/res/layout/fragment_registration_info.xml
@@ -14,7 +14,7 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-//        Intent intent = new Intent(this, RunLineActivity.class);
+//        RunLineActivity.newInstance(this,null,null,null);
         Intent intent = new Intent(this, CollRunRaceDetailActivity.class);
         startActivity(intent);
 //        ARouter.getInstance()
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.1.7",
+            version: "0.1.9",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -52,7 +52,7 @@
         android:required="true" />
     <application android:persistent="true">
-        <activity android:name="com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity"></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" />
         <activity android:name="com.cnlive.moudle.pedometer.ui.activity.RunLineActivity" />
@@ -96,7 +96,6 @@
                 <action android:name="android.service.notification.NotificationListenerService" />
             </intent-filter>
         </service>
-
         <service
             android:name="com.cnlive.moudle.pedometer.service.KeepLiveService"
             android:enabled="true"
@@ -128,9 +127,7 @@
             android:process=":step" />
         <activity
             android:name="com.cnlive.moudle.pedometer.ui.activity.RunningFinishActivity"
-            android:process=":step" />
-
-        <!--路径工具-->
+            android:process=":step" /> <!-- 路径工具 -->
         <service
             android:name="com.cnlive.moudle.collectionTrace.service.CollKeepLiveService"
             android:enabled="true"
@@ -61,7 +61,7 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra
             public void onClick(View view) {
                 //todo 自己测试用
                 getActivity().finish();
-                getActivity().startActivity(new Intent(getActivity(), RunLineActivity.class));
+                RunLineActivity.newInstance(getActivity(),null,null,null);
             }
         });
     }
@@ -209,8 +209,29 @@ public class CommonInfo {
      *
      * @param context
      */
-    public static void getUserNickName(Context context) {
-        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserNickName", "");
+    public static String getUserNickName(Context context) {
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserNickName", "");
+
+    }
+
+    /**
+     * 设置用户头像
+     *
+     * @param context
+     * @param userIcon
+     */
+    public static void setUserIcon(Context context, String userIcon) {
+        MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("RunUserNickIcon", userIcon);
+
+    }
+
+    /**
+     * 获取用户昵称
+     *
+     * @param context
+     */
+    public static String getUserIcon(Context context) {
+        return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserNickIcon", "");
     }
@@ -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()+"");
+                        RunRaceDetailActivity.startActivity(fragment.getActivity(),bean.getId()+"",null,null,null);
                     }
                 });
             }else {
@@ -2,6 +2,11 @@ package com.cnlive.moudle.pedometer.frame.view;
 import android.view.View;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.CircleCrop;
+import com.bumptech.glide.request.RequestOptions;
+import com.cnlive.libs.base.util.AlertUtil;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
 import com.cnlive.moudle.pedometer.model.MessageEvent;
 import com.cnlive.moudle.pedometer.ui.fragment.RegistrationInfoFragment;
@@ -39,8 +44,16 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
             fragment.getActivity().finish();
         });
         fragment.binding.topbar.setTitle("填写报名信息");
+        if(CommonInfo.getUserNickName(fragment.getActivity()) != null && CommonInfo.getUserNickName(fragment.getActivity()).trim().length() > 0){
+            fragment.binding.userName.setText(CommonInfo.getUserNickName(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);
+        }
+
         fragment.binding.commitInfo.setOnClickListener(v -> fragment.commitInfo());
-        fragment.binding.toLineDetail.setOnClickListener(v -> fragment.getActivity().finish());
         sex = new BottomMenuDialog.Builder(fragment.getActivity())
                 .addMenu("男", new View.OnClickListener() {
                     @Override
@@ -93,10 +106,9 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
     }
     public void toResult() {
-        fragment.binding.registerLy.setVisibility(View.GONE);
-        fragment.binding.commitInfo.setVisibility(View.GONE);
-        fragment.binding.resultLy.setVisibility(View.VISIBLE);
         EventBus.getDefault().post(new MessageEvent(Constant.REGISTRATION_SUCCESS, ""));
+        AlertUtil.showLongToast(fragment.getActivity(),"恭喜你报名成功",3000);
+        fragment.getActivity().finish();
     }
@@ -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()));
+        fragment.binding.myActivity.setOnClickListener(v -> MyRecordActivity.newInstance(fragment.getActivity(),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()+"");
+                        RunRaceDetailActivity.startActivity(fragment.getActivity(),bean.getId()+"",null,null,null);
                     }
                 });
             }else {
@@ -15,6 +15,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.Toast;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.baidu.location.BDAbstractLocationListener;
 import com.baidu.location.BDLocation;
 import com.baidu.location.LocationClient;
@@ -400,7 +401,10 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         fragment.binding.includeRank.tvCatAllRank.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-
+                ARouter.getInstance().build("/web/WebViewColorActivity")
+                        .withString("url", "http://wjjh5test.cnlive.com/cnSportList.html")
+                        .withString("title",runRaceDetailInfo.getTitle()+"排行榜")
+                        .navigation(fragment.getActivity());
             }
         });
     }
@@ -120,8 +120,7 @@ public class SelfRecordView implements MvpView {
         fragment.binding.finishNum.setText("0");
         fragment.binding.allTime.setText("00:00:00");
         fragment.binding.checkAllLine.setOnClickListener(v -> {
-            Intent intent = new Intent(fragment.getActivity(), RunLineActivity.class);
-            fragment.getActivity().startActivity(intent);
+            RunLineActivity.newInstance(fragment.getActivity(),null,null,null);
         });
     }
@@ -21,14 +21,14 @@ public class DaoMaster extends AbstractDaoMaster {
     /** Creates underlying database table using DAOs. */
     public static void createAllTables(Database db, boolean ifNotExists) {
-        CollUserStepEntityDao.createTable(db, ifNotExists);
         UserStepEntityDao.createTable(db, ifNotExists);
+        CollUserStepEntityDao.createTable(db, ifNotExists);
     }
     /** Drops underlying database table using DAOs. */
     public static void dropAllTables(Database db, boolean ifExists) {
-        CollUserStepEntityDao.dropTable(db, ifExists);
         UserStepEntityDao.dropTable(db, ifExists);
+        CollUserStepEntityDao.dropTable(db, ifExists);
     }
     /**
@@ -47,8 +47,8 @@ public class DaoMaster extends AbstractDaoMaster {
     public DaoMaster(Database db) {
         super(db, SCHEMA_VERSION);
-        registerDaoClass(CollUserStepEntityDao.class);
         registerDaoClass(UserStepEntityDao.class);
+        registerDaoClass(CollUserStepEntityDao.class);
     }
     public DaoSession newSession() {
@@ -8,11 +8,11 @@ import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.identityscope.IdentityScopeType;
 import org.greenrobot.greendao.internal.DaoConfig;
-import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
+import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
-import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
 import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
+import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
@@ -23,40 +23,40 @@ import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
  */
 public class DaoSession extends AbstractDaoSession {
-    private final DaoConfig collUserStepEntityDaoConfig;
     private final DaoConfig userStepEntityDaoConfig;
+    private final DaoConfig collUserStepEntityDaoConfig;
-    private final CollUserStepEntityDao collUserStepEntityDao;
     private final UserStepEntityDao userStepEntityDao;
+    private final CollUserStepEntityDao collUserStepEntityDao;
     public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
             daoConfigMap) {
         super(db);
-        collUserStepEntityDaoConfig = daoConfigMap.get(CollUserStepEntityDao.class).clone();
-        collUserStepEntityDaoConfig.initIdentityScope(type);
-
         userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
         userStepEntityDaoConfig.initIdentityScope(type);
-        collUserStepEntityDao = new CollUserStepEntityDao(collUserStepEntityDaoConfig, this);
+        collUserStepEntityDaoConfig = daoConfigMap.get(CollUserStepEntityDao.class).clone();
+        collUserStepEntityDaoConfig.initIdentityScope(type);
+
         userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
+        collUserStepEntityDao = new CollUserStepEntityDao(collUserStepEntityDaoConfig, this);
-        registerDao(CollUserStepEntity.class, collUserStepEntityDao);
         registerDao(UserStepEntity.class, userStepEntityDao);
+        registerDao(CollUserStepEntity.class, collUserStepEntityDao);
     }
     public void clear() {
-        collUserStepEntityDaoConfig.clearIdentityScope();
         userStepEntityDaoConfig.clearIdentityScope();
-    }
-
-    public CollUserStepEntityDao getCollUserStepEntityDao() {
-        return collUserStepEntityDao;
+        collUserStepEntityDaoConfig.clearIdentityScope();
     }
     public UserStepEntityDao getUserStepEntityDao() {
         return userStepEntityDao;
     }
+    public CollUserStepEntityDao getCollUserStepEntityDao() {
+        return collUserStepEntityDao;
+    }
+
 }
@@ -12,6 +12,7 @@ import android.os.Bundle;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.ui.fragment.MyRecordFragment;
 import com.example.moudle_pedometer.R;
 import com.qmuiteam.qmui.widget.QMUITopBar;
@@ -31,8 +32,11 @@ public class MyRecordActivity extends AppCompatActivity {
     private TabLayout tabs;
     private ViewPager viewPager;
-    public static void newInstance(Activity context){
+    public static void newInstance(Activity context,String userId,String userIcon,String userName){
         Intent intent = new Intent(context,MyRecordActivity.class);
+        intent.putExtra("userId",userId);
+        intent.putExtra("userIcon",userIcon);
+        intent.putExtra("userName",userName);
         context.startActivity(intent);
     }
@@ -43,6 +47,12 @@ public class MyRecordActivity extends AppCompatActivity {
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.color_fff), 0);
         setContentView(R.layout.activity_my_record);
+        if(getIntent().getStringExtra("userId") != null){
+            CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
+            CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
+            CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
+        }
+
         topBar = findViewById(R.id.topbar);
         tabs = findViewById(R.id.tabs);
         viewPager = findViewById(R.id.viewpager);
 package com.cnlive.moudle.pedometer.ui.activity;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
@@ -16,6 +19,14 @@ import com.example.moudle_pedometer.R;
  */
 public class RunLineActivity extends AppCompatActivity {
+    public static void newInstance(Activity context, String userId, String userIcon, String userName){
+        Intent intent = new Intent(context,RunLineActivity.class);
+        intent.putExtra("userId",userId);
+        intent.putExtra("userIcon",userIcon);
+        intent.putExtra("userName",userName);
+        context.startActivity(intent);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -23,7 +34,13 @@ public class RunLineActivity extends AppCompatActivity {
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.color_fff), 0);
         setContentView(R.layout.activity_run_line);
-        CommonInfo.setUserId(this, "10513196");
+        if(getIntent().getStringExtra("userId") != null){
+            CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
+            CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
+            CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
+        }else {
+            CommonInfo.setUserId(this, "10513196");
+        }
         getSupportFragmentManager().beginTransaction().replace(R.id.run_line_container, new RunLineFragment()).commit();
     }
 }
@@ -38,9 +38,12 @@ import java.util.List;
 public class RunRaceDetailActivity extends QMUIFragmentActivity {
     private QMUIFragment fragment;
-    public static void startActivity(Activity activity, String eventId) {
+    public static void startActivity(Activity activity, String eventId,String userId,String userIcon,String userName) {
         Intent intent = new Intent(activity, RunRaceDetailActivity.class);
         intent.putExtra("eventId", eventId);
+        intent.putExtra("userId",userId);
+        intent.putExtra("userIcon",userIcon);
+        intent.putExtra("userName",userName);
         CommonInfo.setStreetId(activity, eventId);
         activity.startActivity(intent);
     }
@@ -53,6 +56,12 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
     @Override
     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"));
+        }
         //判断用户是否结束运动
 //        boolean isRunStep = CommonInfo.getIsRunStepService(this);
 //        //没有找到相关记录
@@ -7,6 +7,7 @@ import android.os.Bundle;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.ui.fragment.SelfRecordFragment;
 import com.example.moudle_pedometer.R;
@@ -16,8 +17,11 @@ import com.example.moudle_pedometer.R;
  */
 public class SelfRecordActivity extends AppCompatActivity {
-    public static void newInstance(Activity context){
+    public static void newInstance(Activity context,String userId,String userIcon,String userName){
         Intent intent = new Intent(context,SelfRecordActivity.class);
+        intent.putExtra("userId",userId);
+        intent.putExtra("userIcon",userIcon);
+        intent.putExtra("userName",userName);
         context.startActivity(intent);
     }
@@ -28,6 +32,11 @@ public class SelfRecordActivity extends AppCompatActivity {
         StatusBarUtil2.setColor(this, getResources().getColor(R.color.color_fff), 0);
         setContentView(R.layout.activity_self_record);
+        if(getIntent().getStringExtra("userId") != null){
+            CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
+            CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
+            CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
+        }
         getSupportFragmentManager().beginTransaction().replace(R.id.record_container, new SelfRecordFragment()).commit();
     }
 }
@@ -14,9 +14,13 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.CircleCrop;
+import com.bumptech.glide.request.RequestOptions;
 import com.cnlive.libs.base.arouter.QrService;
 import com.cnlive.libs.base.util.StatusBarUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsListener;
 import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsUtils;
 import com.example.moudle_pedometer.R;
@@ -35,6 +39,8 @@ public class ShareRecordActivity extends AppCompatActivity {
     private RelativeLayout ry_cen;
     private EditText editText;
     private PermissionsUtils mPermissionsUtils = new PermissionsUtils();
+    private ImageView record_icon;
+    private TextView record_name;
     public static void newInstance(Activity context,String title,String kilo,String step,String time,String speed){
         Intent intent = new Intent(context,ShareRecordActivity.class);
@@ -62,6 +68,18 @@ public class ShareRecordActivity extends AppCompatActivity {
         share_back = findViewById(R.id.share_back);
         share = findViewById(R.id.share);
         ry_cen = findViewById(R.id.ry_cen);
+        record_icon = findViewById(R.id.record_icon);
+        record_name = findViewById(R.id.record_name);
+
+        if(CommonInfo.getUserNickName(this) != null && CommonInfo.getUserNickName(this).trim().length() > 0){
+            record_name.setText(CommonInfo.getUserNickName(this));
+        }
+
+        if(CommonInfo.getUserIcon(this) != null && CommonInfo.getUserIcon(this).trim().length() > 0){
+            Glide.with(this).load(CommonInfo.getUserIcon(this))
+                    .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into(record_icon);
+        }
+
         share_back.setOnClickListener(v -> finish());
         share.setOnClickListener(v -> getPermissionsWithTip());
@@ -11,6 +11,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.net.bean.MyRecordInfo;
 import com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity;
@@ -53,7 +54,11 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
         myViewHolder.my_record_ry.setVisibility(View.VISIBLE);
         myViewHolder.has_report.setVisibility(View.GONE);
         myViewHolder.my_record.setOnClickListener(v -> startAc(list.get(i)));
-//        myViewHolder.check_raking.setOnClickListener(v -> );
+        myViewHolder.check_raking.setOnClickListener(v ->
+                ARouter.getInstance().build("/web/WebViewColorActivity")
+                        .withString("url", "http://wjjh5test.cnlive.com/cnSportListOver.html")
+                        .withString("title",list.get(i).getTitle()+"总排行榜")
+                        .navigation(context));
         if (clickListener != null) {
             myViewHolder.item_ly.setOnClickListener(v -> clickListener.onClickListener(list.get(i), i));
         }
@@ -77,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);
+        SelfRecordActivity.newInstance(context,null,null,null);
     }
@@ -4,12 +4,7 @@ package com.cnlive.moudle.pedometer.ui.fragment;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Toast;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.api.fence.AddMonitoredPersonRequest;
@@ -18,12 +13,9 @@ import com.baidu.trace.api.fence.CreateFenceResponse;
 import com.baidu.trace.api.fence.DeleteFenceResponse;
 import com.baidu.trace.api.fence.DeleteMonitoredPersonResponse;
 import com.baidu.trace.api.fence.FenceListResponse;
-import com.baidu.trace.api.fence.FenceType;
 import com.baidu.trace.api.fence.HistoryAlarmResponse;
 import com.baidu.trace.api.fence.ListMonitoredPersonResponse;
-import com.baidu.trace.api.fence.MonitoredStatus;
 import com.baidu.trace.api.fence.MonitoredStatusByLocationResponse;
-import com.baidu.trace.api.fence.MonitoredStatusInfo;
 import com.baidu.trace.api.fence.MonitoredStatusResponse;
 import com.baidu.trace.api.fence.OnFenceListener;
 import com.baidu.trace.api.fence.UpdateFenceResponse;
@@ -28,11 +28,13 @@
                 android:padding="20dp">
                 <ImageView
+                    android:id="@+id/user_icon"
                     android:layout_width="60dp"
                     android:layout_height="60dp"
                     android:src="@drawable/ic_icon"/>
                 <TextView
+                    android:id="@+id/userName"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="#333333"
@@ -163,44 +165,5 @@
             android:background="@drawable/green_bg_circle"
             />
-        <LinearLayout
-            android:id="@+id/result_ly"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_centerInParent="true"
-            android:layout_below="@id/topbar"
-            android:background="@color/white"
-            android:visibility="gone"
-            android:orientation="vertical">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="150dp"
-                android:layout_gravity="center_horizontal"
-                android:src="@drawable/bmcg" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginTop="20dp"
-                android:textColor="#333333"
-                android:textSize="20sp"
-                android:text="@string/commit_success" />
-
-            <TextView
-                android:id="@+id/to_line_detail"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:textColor="#23D41E"
-                android:textSize="15sp"
-                android:padding="10dp"
-                android:text="@string/to_line_detail" />
-
-        </LinearLayout>
-
-
     </RelativeLayout>
 </layout>
@@ -29,6 +29,7 @@
     <color name="red">#EF5544</color>
     <color name="bg">#012648</color>
+    <color name="orang">#f96e53</color>
     <color name="text_black">#333333</color>
     <color name="bottom_sheet_dialog_race_location_text">#999999</color>