CNLive Android Team / ModulePedometer · Commits

Commit 6a826fe1a1ebfe2b958315be8be1c6c2a6edf082

Authored by 韩亚云
1 parent 48e6ef45

页面跳转用户信息保存

Inline Side-by-side
Showing 21 changed files with 147 additions and 90 deletions
app/src/main/java/com/example/modulepedometer/MainActivity.java
  View file @6a826fe
... ... @@ -14,7 +14,7 @@ public class MainActivity extends AppCompatActivity {
14 14 protected void onCreate(Bundle savedInstanceState) {
15 15 super.onCreate(savedInstanceState);
16 16 setContentView(R.layout.activity_main);
17   -// Intent intent = new Intent(this, RunLineActivity.class);
  17 +// RunLineActivity.newInstance(this,null,null,null);
18 18 Intent intent = new Intent(this, CollRunRaceDetailActivity.class);
19 19 startActivity(intent);
20 20 // ARouter.getInstance()
... ...
config.gradle
  View file @6a826fe
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "0.1.7",
  24 + version: "0.1.9",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
moudle_pedometer/src/main/AndroidManifest.xml
  View file @6a826fe
... ... @@ -52,7 +52,7 @@
52 52 android:required="true" />
53 53  
54 54 <application android:persistent="true">
55   - <activity android:name="com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity"></activity>
  55 + <activity android:name="com.cnlive.moudle.pedometer.ui.activity.LineUpAgainActivity" />
56 56 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity" />
57 57 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.TakePartActivity" />
58 58 <activity android:name="com.cnlive.moudle.pedometer.ui.activity.RunLineActivity" />
... ... @@ -96,7 +96,6 @@
96 96 <action android:name="android.service.notification.NotificationListenerService" />
97 97 </intent-filter>
98 98 </service>
99   -
100 99 <service
101 100 android:name="com.cnlive.moudle.pedometer.service.KeepLiveService"
102 101 android:enabled="true"
... ... @@ -128,9 +127,7 @@
128 127 android:process=":step" />
129 128 <activity
130 129 android:name="com.cnlive.moudle.pedometer.ui.activity.RunningFinishActivity"
131   - android:process=":step" />
132   -
133   - <!--路径工具-->
  130 + android:process=":step" /> <!-- 路径工具 -->
134 131 <service
135 132 android:name="com.cnlive.moudle.collectionTrace.service.CollKeepLiveService"
136 133 android:enabled="true"
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunRaceDetailFragment.java
  View file @6a826fe
... ... @@ -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   - getActivity().startActivity(new Intent(getActivity(), RunLineActivity.class));
  64 + RunLineActivity.newInstance(getActivity(),null,null,null);
65 65 }
66 66 });
67 67 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/commonInfo/CommonInfo.java
  View file @6a826fe
... ... @@ -209,8 +209,29 @@ public class CommonInfo {
209 209 *
210 210 * @param context
211 211 */
212   - public static void getUserNickName(Context context) {
213   - MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserNickName", "");
  212 + public static String getUserNickName(Context context) {
  213 + return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserNickName", "");
  214 +
  215 + }
  216 +
  217 + /**
  218 + * 设置用户头像
  219 + *
  220 + * @param context
  221 + * @param userIcon
  222 + */
  223 + public static void setUserIcon(Context context, String userIcon) {
  224 + MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).putString("RunUserNickIcon", userIcon);
  225 +
  226 + }
  227 +
  228 + /**
  229 + * 获取用户昵称
  230 + *
  231 + * @param context
  232 + */
  233 + public static String getUserIcon(Context context) {
  234 + return MySpHelper.getInstance(context, Context.MODE_MULTI_PROCESS).getString("RunUserNickIcon", "");
214 235  
215 236 }
216 237  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/MyRecordView.java
  View file @6a826fe
... ... @@ -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()+"");
  51 + RunRaceDetailActivity.startActivity(fragment.getActivity(),bean.getId()+"",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 @6a826fe
... ... @@ -2,6 +2,11 @@ package com.cnlive.moudle.pedometer.frame.view;
2 2  
3 3 import android.view.View;
4 4  
  5 +import com.bumptech.glide.Glide;
  6 +import com.bumptech.glide.load.resource.bitmap.CircleCrop;
  7 +import com.bumptech.glide.request.RequestOptions;
  8 +import com.cnlive.libs.base.util.AlertUtil;
  9 +import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
5 10 import com.cnlive.moudle.pedometer.model.Constant;
6 11 import com.cnlive.moudle.pedometer.model.MessageEvent;
7 12 import com.cnlive.moudle.pedometer.ui.fragment.RegistrationInfoFragment;
... ... @@ -39,8 +44,16 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
39 44 fragment.getActivity().finish();
40 45 });
41 46 fragment.binding.topbar.setTitle("填写报名信息");
  47 + if(CommonInfo.getUserNickName(fragment.getActivity()) != null && CommonInfo.getUserNickName(fragment.getActivity()).trim().length() > 0){
  48 + fragment.binding.userName.setText(CommonInfo.getUserNickName(fragment.getActivity()));
  49 + }
  50 +
  51 + if(CommonInfo.getUserIcon(fragment.getActivity()) != null && CommonInfo.getUserIcon(fragment.getActivity()).trim().length() > 0){
  52 + Glide.with(fragment.getActivity()).load(CommonInfo.getUserIcon(fragment.getActivity()))
  53 + .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into( fragment.binding.userIcon);
  54 + }
  55 +
42 56 fragment.binding.commitInfo.setOnClickListener(v -> fragment.commitInfo());
43   - fragment.binding.toLineDetail.setOnClickListener(v -> fragment.getActivity().finish());
44 57 sex = new BottomMenuDialog.Builder(fragment.getActivity())
45 58 .addMenu("男", new View.OnClickListener() {
46 59 @Override
... ... @@ -93,10 +106,9 @@ public class RegistrationInfoView implements MvpView, OnDateSetListener {
93 106 }
94 107  
95 108 public void toResult() {
96   - fragment.binding.registerLy.setVisibility(View.GONE);
97   - fragment.binding.commitInfo.setVisibility(View.GONE);
98   - fragment.binding.resultLy.setVisibility(View.VISIBLE);
99 109 EventBus.getDefault().post(new MessageEvent(Constant.REGISTRATION_SUCCESS, ""));
  110 + AlertUtil.showLongToast(fragment.getActivity(),"恭喜你报名成功",3000);
  111 + fragment.getActivity().finish();
100 112 }
101 113  
102 114  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunLineView.java
  View file @6a826fe
... ... @@ -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()));
  45 + fragment.binding.myActivity.setOnClickListener(v -> MyRecordActivity.newInstance(fragment.getActivity(),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()+"");
  61 + RunRaceDetailActivity.startActivity(fragment.getActivity(),bean.getId()+"",null,null,null);
62 62 }
63 63 });
64 64 }else {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
  View file @6a826fe
... ... @@ -15,6 +15,7 @@ import android.view.View;
15 15 import android.widget.LinearLayout;
16 16 import android.widget.Toast;
17 17  
  18 +import com.alibaba.android.arouter.launcher.ARouter;
18 19 import com.baidu.location.BDAbstractLocationListener;
19 20 import com.baidu.location.BDLocation;
20 21 import com.baidu.location.LocationClient;
... ... @@ -400,7 +401,10 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
400 401 fragment.binding.includeRank.tvCatAllRank.setOnClickListener(new View.OnClickListener() {
401 402 @Override
402 403 public void onClick(View view) {
403   -
  404 + ARouter.getInstance().build("/web/WebViewColorActivity")
  405 + .withString("url", "http://wjjh5test.cnlive.com/cnSportList.html")
  406 + .withString("title",runRaceDetailInfo.getTitle()+"排行榜")
  407 + .navigation(fragment.getActivity());
404 408 }
405 409 });
406 410 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/SelfRecordView.java
  View file @6a826fe
... ... @@ -120,8 +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   - Intent intent = new Intent(fragment.getActivity(), RunLineActivity.class);
124   - fragment.getActivity().startActivity(intent);
  123 + RunLineActivity.newInstance(fragment.getActivity(),null,null,null);
125 124 });
126 125 }
127 126  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoMaster.java
  View file @6a826fe
... ... @@ -21,14 +21,14 @@ public class DaoMaster extends AbstractDaoMaster {
21 21  
22 22 /** Creates underlying database table using DAOs. */
23 23 public static void createAllTables(Database db, boolean ifNotExists) {
24   - CollUserStepEntityDao.createTable(db, ifNotExists);
25 24 UserStepEntityDao.createTable(db, ifNotExists);
  25 + CollUserStepEntityDao.createTable(db, ifNotExists);
26 26 }
27 27  
28 28 /** Drops underlying database table using DAOs. */
29 29 public static void dropAllTables(Database db, boolean ifExists) {
30   - CollUserStepEntityDao.dropTable(db, ifExists);
31 30 UserStepEntityDao.dropTable(db, ifExists);
  31 + CollUserStepEntityDao.dropTable(db, ifExists);
32 32 }
33 33  
34 34 /**
... ... @@ -47,8 +47,8 @@ public class DaoMaster extends AbstractDaoMaster {
47 47  
48 48 public DaoMaster(Database db) {
49 49 super(db, SCHEMA_VERSION);
50   - registerDaoClass(CollUserStepEntityDao.class);
51 50 registerDaoClass(UserStepEntityDao.class);
  51 + registerDaoClass(CollUserStepEntityDao.class);
52 52 }
53 53  
54 54 public DaoSession newSession() {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/sql/dao/DaoSession.java
  View file @6a826fe
... ... @@ -8,11 +8,11 @@ import org.greenrobot.greendao.database.Database;
8 8 import org.greenrobot.greendao.identityscope.IdentityScopeType;
9 9 import org.greenrobot.greendao.internal.DaoConfig;
10 10  
11   -import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
12 11 import com.cnlive.moudle.pedometer.sql.entity.UserStepEntity;
  12 +import com.cnlive.moudle.pedometer.sql.entity.CollUserStepEntity;
13 13  
14   -import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
15 14 import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
  15 +import com.cnlive.moudle.pedometer.sql.dao.CollUserStepEntityDao;
16 16  
17 17 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
18 18  
... ... @@ -23,40 +23,40 @@ import com.cnlive.moudle.pedometer.sql.dao.UserStepEntityDao;
23 23 */
24 24 public class DaoSession extends AbstractDaoSession {
25 25  
26   - private final DaoConfig collUserStepEntityDaoConfig;
27 26 private final DaoConfig userStepEntityDaoConfig;
  27 + private final DaoConfig collUserStepEntityDaoConfig;
28 28  
29   - private final CollUserStepEntityDao collUserStepEntityDao;
30 29 private final UserStepEntityDao userStepEntityDao;
  30 + private final CollUserStepEntityDao collUserStepEntityDao;
31 31  
32 32 public DaoSession(Database db, IdentityScopeType type, Map<Class<? extends AbstractDao<?, ?>>, DaoConfig>
33 33 daoConfigMap) {
34 34 super(db);
35 35  
36   - collUserStepEntityDaoConfig = daoConfigMap.get(CollUserStepEntityDao.class).clone();
37   - collUserStepEntityDaoConfig.initIdentityScope(type);
38   -
39 36 userStepEntityDaoConfig = daoConfigMap.get(UserStepEntityDao.class).clone();
40 37 userStepEntityDaoConfig.initIdentityScope(type);
41 38  
42   - collUserStepEntityDao = new CollUserStepEntityDao(collUserStepEntityDaoConfig, this);
  39 + collUserStepEntityDaoConfig = daoConfigMap.get(CollUserStepEntityDao.class).clone();
  40 + collUserStepEntityDaoConfig.initIdentityScope(type);
  41 +
43 42 userStepEntityDao = new UserStepEntityDao(userStepEntityDaoConfig, this);
  43 + collUserStepEntityDao = new CollUserStepEntityDao(collUserStepEntityDaoConfig, this);
44 44  
45   - registerDao(CollUserStepEntity.class, collUserStepEntityDao);
46 45 registerDao(UserStepEntity.class, userStepEntityDao);
  46 + registerDao(CollUserStepEntity.class, collUserStepEntityDao);
47 47 }
48 48  
49 49 public void clear() {
50   - collUserStepEntityDaoConfig.clearIdentityScope();
51 50 userStepEntityDaoConfig.clearIdentityScope();
52   - }
53   -
54   - public CollUserStepEntityDao getCollUserStepEntityDao() {
55   - return collUserStepEntityDao;
  51 + collUserStepEntityDaoConfig.clearIdentityScope();
56 52 }
57 53  
58 54 public UserStepEntityDao getUserStepEntityDao() {
59 55 return userStepEntityDao;
60 56 }
61 57  
  58 + public CollUserStepEntityDao getCollUserStepEntityDao() {
  59 + return collUserStepEntityDao;
  60 + }
  61 +
62 62 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/MyRecordActivity.java
  View file @6a826fe
... ... @@ -12,6 +12,7 @@ import android.os.Bundle;
12 12  
13 13 import com.cnlive.libs.base.util.StatusBarUtil;
14 14 import com.cnlive.libs.base.util.StatusBarUtil2;
  15 +import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
15 16 import com.cnlive.moudle.pedometer.ui.fragment.MyRecordFragment;
16 17 import com.example.moudle_pedometer.R;
17 18 import com.qmuiteam.qmui.widget.QMUITopBar;
... ... @@ -31,8 +32,11 @@ public class MyRecordActivity extends AppCompatActivity {
31 32 private TabLayout tabs;
32 33 private ViewPager viewPager;
33 34  
34   - public static void newInstance(Activity context){
  35 + public static void newInstance(Activity context,String userId,String userIcon,String userName){
35 36 Intent intent = new Intent(context,MyRecordActivity.class);
  37 + intent.putExtra("userId",userId);
  38 + intent.putExtra("userIcon",userIcon);
  39 + intent.putExtra("userName",userName);
36 40 context.startActivity(intent);
37 41 }
38 42  
... ... @@ -43,6 +47,12 @@ public class MyRecordActivity extends AppCompatActivity {
43 47 StatusBarUtil2.setColor(this, getResources().getColor(R.color.color_fff), 0);
44 48 setContentView(R.layout.activity_my_record);
45 49  
  50 + if(getIntent().getStringExtra("userId") != null){
  51 + CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
  52 + CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
  53 + CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
  54 + }
  55 +
46 56 topBar = findViewById(R.id.topbar);
47 57 tabs = findViewById(R.id.tabs);
48 58 viewPager = findViewById(R.id.viewpager);
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunLineActivity.java
  View file @6a826fe
1 1 package com.cnlive.moudle.pedometer.ui.activity;
2 2  
  3 +import android.app.Activity;
  4 +import android.content.Context;
  5 +import android.content.Intent;
3 6 import android.support.v7.app.AppCompatActivity;
4 7 import android.os.Bundle;
5 8  
... ... @@ -16,6 +19,14 @@ import com.example.moudle_pedometer.R;
16 19 */
17 20 public class RunLineActivity extends AppCompatActivity {
18 21  
  22 + public static void newInstance(Activity context, String userId, String userIcon, String userName){
  23 + Intent intent = new Intent(context,RunLineActivity.class);
  24 + intent.putExtra("userId",userId);
  25 + intent.putExtra("userIcon",userIcon);
  26 + intent.putExtra("userName",userName);
  27 + context.startActivity(intent);
  28 + }
  29 +
19 30 @Override
20 31 protected void onCreate(Bundle savedInstanceState) {
21 32 super.onCreate(savedInstanceState);
... ... @@ -23,7 +34,13 @@ public class RunLineActivity extends AppCompatActivity {
23 34 StatusBarUtil2.setColor(this, getResources().getColor(R.color.color_fff), 0);
24 35 setContentView(R.layout.activity_run_line);
25 36  
26   - CommonInfo.setUserId(this, "10513196");
  37 + if(getIntent().getStringExtra("userId") != null){
  38 + CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
  39 + CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
  40 + CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
  41 + }else {
  42 + CommonInfo.setUserId(this, "10513196");
  43 + }
27 44 getSupportFragmentManager().beginTransaction().replace(R.id.run_line_container, new RunLineFragment()).commit();
28 45 }
29 46 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunRaceDetailActivity.java
  View file @6a826fe
... ... @@ -38,9 +38,12 @@ 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) {
  41 + public static void startActivity(Activity activity, String eventId,String userId,String userIcon,String userName) {
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);
44 47 CommonInfo.setStreetId(activity, eventId);
45 48 activity.startActivity(intent);
46 49 }
... ... @@ -53,6 +56,12 @@ public class RunRaceDetailActivity extends QMUIFragmentActivity {
53 56 @Override
54 57 protected void onCreate(Bundle savedInstanceState) {
55 58 super.onCreate(savedInstanceState);
  59 +
  60 + if(getIntent().getStringExtra("userId") != null){
  61 + CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
  62 + CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
  63 + CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
  64 + }
56 65 //判断用户是否结束运动
57 66 // boolean isRunStep = CommonInfo.getIsRunStepService(this);
58 67 // //没有找到相关记录
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/SelfRecordActivity.java
  View file @6a826fe
... ... @@ -7,6 +7,7 @@ import android.os.Bundle;
7 7  
8 8 import com.cnlive.libs.base.util.StatusBarUtil;
9 9 import com.cnlive.libs.base.util.StatusBarUtil2;
  10 +import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
10 11 import com.cnlive.moudle.pedometer.ui.fragment.SelfRecordFragment;
11 12 import com.example.moudle_pedometer.R;
12 13  
... ... @@ -16,8 +17,11 @@ import com.example.moudle_pedometer.R;
16 17 */
17 18 public class SelfRecordActivity extends AppCompatActivity {
18 19  
19   - public static void newInstance(Activity context){
  20 + public static void newInstance(Activity context,String userId,String userIcon,String userName){
20 21 Intent intent = new Intent(context,SelfRecordActivity.class);
  22 + intent.putExtra("userId",userId);
  23 + intent.putExtra("userIcon",userIcon);
  24 + intent.putExtra("userName",userName);
21 25 context.startActivity(intent);
22 26 }
23 27  
... ... @@ -28,6 +32,11 @@ public class SelfRecordActivity extends AppCompatActivity {
28 32 StatusBarUtil2.setColor(this, getResources().getColor(R.color.color_fff), 0);
29 33 setContentView(R.layout.activity_self_record);
30 34  
  35 + if(getIntent().getStringExtra("userId") != null){
  36 + CommonInfo.setUserId(this,getIntent().getStringExtra("userId"));
  37 + CommonInfo.setUserNickName(this,getIntent().getStringExtra("userName"));
  38 + CommonInfo.setUserIcon(this,getIntent().getStringExtra("userIcon"));
  39 + }
31 40 getSupportFragmentManager().beginTransaction().replace(R.id.record_container, new SelfRecordFragment()).commit();
32 41 }
33 42 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/ShareRecordActivity.java
  View file @6a826fe
... ... @@ -14,9 +14,13 @@ import android.widget.RelativeLayout;
14 14 import android.widget.TextView;
15 15  
16 16 import com.alibaba.android.arouter.launcher.ARouter;
  17 +import com.bumptech.glide.Glide;
  18 +import com.bumptech.glide.load.resource.bitmap.CircleCrop;
  19 +import com.bumptech.glide.request.RequestOptions;
17 20 import com.cnlive.libs.base.arouter.QrService;
18 21 import com.cnlive.libs.base.util.StatusBarUtil;
19 22 import com.cnlive.libs.base.util.StatusBarUtil2;
  23 +import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
20 24 import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsListener;
21 25 import com.cnlive.moudle.pedometer.utils.lib_permisshelper.PermissionsUtils;
22 26 import com.example.moudle_pedometer.R;
... ... @@ -35,6 +39,8 @@ public class ShareRecordActivity extends AppCompatActivity {
35 39 private RelativeLayout ry_cen;
36 40 private EditText editText;
37 41 private PermissionsUtils mPermissionsUtils = new PermissionsUtils();
  42 + private ImageView record_icon;
  43 + private TextView record_name;
38 44  
39 45 public static void newInstance(Activity context,String title,String kilo,String step,String time,String speed){
40 46 Intent intent = new Intent(context,ShareRecordActivity.class);
... ... @@ -62,6 +68,18 @@ public class ShareRecordActivity extends AppCompatActivity {
62 68 share_back = findViewById(R.id.share_back);
63 69 share = findViewById(R.id.share);
64 70 ry_cen = findViewById(R.id.ry_cen);
  71 + record_icon = findViewById(R.id.record_icon);
  72 + record_name = findViewById(R.id.record_name);
  73 +
  74 + if(CommonInfo.getUserNickName(this) != null && CommonInfo.getUserNickName(this).trim().length() > 0){
  75 + record_name.setText(CommonInfo.getUserNickName(this));
  76 + }
  77 +
  78 + if(CommonInfo.getUserIcon(this) != null && CommonInfo.getUserIcon(this).trim().length() > 0){
  79 + Glide.with(this).load(CommonInfo.getUserIcon(this))
  80 + .apply(RequestOptions.bitmapTransform(new CircleCrop()).placeholder(R.drawable.ic_icon)).into(record_icon);
  81 + }
  82 +
65 83 share_back.setOnClickListener(v -> finish());
66 84 share.setOnClickListener(v -> getPermissionsWithTip());
67 85  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
  View file @6a826fe
... ... @@ -11,6 +11,7 @@ import android.widget.RelativeLayout;
11 11 import android.widget.TextView;
12 12  
13 13  
  14 +import com.alibaba.android.arouter.launcher.ARouter;
14 15 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
15 16 import com.cnlive.moudle.pedometer.net.bean.MyRecordInfo;
16 17 import com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity;
... ... @@ -53,7 +54,11 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
53 54 myViewHolder.my_record_ry.setVisibility(View.VISIBLE);
54 55 myViewHolder.has_report.setVisibility(View.GONE);
55 56 myViewHolder.my_record.setOnClickListener(v -> startAc(list.get(i)));
56   -// myViewHolder.check_raking.setOnClickListener(v -> );
  57 + myViewHolder.check_raking.setOnClickListener(v ->
  58 + ARouter.getInstance().build("/web/WebViewColorActivity")
  59 + .withString("url", "http://wjjh5test.cnlive.com/cnSportListOver.html")
  60 + .withString("title",list.get(i).getTitle()+"总排行榜")
  61 + .navigation(context));
57 62 if (clickListener != null) {
58 63 myViewHolder.item_ly.setOnClickListener(v -> clickListener.onClickListener(list.get(i), i));
59 64 }
... ... @@ -77,7 +82,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
77 82 private void startAc(MyRecordInfo.ListBean listBean){
78 83 CommonInfo.setStreetId(context,listBean.getId()+"");
79 84 // RaceRecordActivity.newInstance(context,listBean.getTitle());
80   - SelfRecordActivity.newInstance(context);
  85 + SelfRecordActivity.newInstance(context,null,null,null);
81 86 }
82 87  
83 88  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
  View file @6a826fe
... ... @@ -4,12 +4,7 @@ package com.cnlive.moudle.pedometer.ui.fragment;
4 4 import android.os.Bundle;
5 5 import android.support.annotation.NonNull;
6 6 import android.support.annotation.Nullable;
7   -import android.support.v4.app.Fragment;
8   -import android.util.Log;
9   -import android.view.LayoutInflater;
10 7 import android.view.View;
11   -import android.view.ViewGroup;
12   -import android.widget.Toast;
13 8  
14 9 import com.baidu.trace.LBSTraceClient;
15 10 import com.baidu.trace.api.fence.AddMonitoredPersonRequest;
... ... @@ -18,12 +13,9 @@ import com.baidu.trace.api.fence.CreateFenceResponse;
18 13 import com.baidu.trace.api.fence.DeleteFenceResponse;
19 14 import com.baidu.trace.api.fence.DeleteMonitoredPersonResponse;
20 15 import com.baidu.trace.api.fence.FenceListResponse;
21   -import com.baidu.trace.api.fence.FenceType;
22 16 import com.baidu.trace.api.fence.HistoryAlarmResponse;
23 17 import com.baidu.trace.api.fence.ListMonitoredPersonResponse;
24   -import com.baidu.trace.api.fence.MonitoredStatus;
25 18 import com.baidu.trace.api.fence.MonitoredStatusByLocationResponse;
26   -import com.baidu.trace.api.fence.MonitoredStatusInfo;
27 19 import com.baidu.trace.api.fence.MonitoredStatusResponse;
28 20 import com.baidu.trace.api.fence.OnFenceListener;
29 21 import com.baidu.trace.api.fence.UpdateFenceResponse;
... ...
moudle_pedometer/src/main/res/layout/fragment_registration_info.xml
  View file @6a826fe
... ... @@ -28,11 +28,13 @@
28 28 android:padding="20dp">
29 29  
30 30 <ImageView
  31 + android:id="@+id/user_icon"
31 32 android:layout_width="60dp"
32 33 android:layout_height="60dp"
33 34 android:src="@drawable/ic_icon"/>
34 35  
35 36 <TextView
  37 + android:id="@+id/userName"
36 38 android:layout_width="wrap_content"
37 39 android:layout_height="wrap_content"
38 40 android:textColor="#333333"
... ... @@ -163,44 +165,5 @@
163 165 android:background="@drawable/green_bg_circle"
164 166 />
165 167  
166   - <LinearLayout
167   - android:id="@+id/result_ly"
168   - android:layout_width="match_parent"
169   - android:layout_height="match_parent"
170   - android:layout_centerInParent="true"
171   - android:layout_below="@id/topbar"
172   - android:background="@color/white"
173   - android:visibility="gone"
174   - android:orientation="vertical">
175   -
176   - <ImageView
177   - android:layout_width="wrap_content"
178   - android:layout_height="wrap_content"
179   - android:layout_marginTop="150dp"
180   - android:layout_gravity="center_horizontal"
181   - android:src="@drawable/bmcg" />
182   -
183   - <TextView
184   - android:layout_width="wrap_content"
185   - android:layout_height="wrap_content"
186   - android:layout_gravity="center"
187   - android:layout_marginTop="20dp"
188   - android:textColor="#333333"
189   - android:textSize="20sp"
190   - android:text="@string/commit_success" />
191   -
192   - <TextView
193   - android:id="@+id/to_line_detail"
194   - android:layout_width="wrap_content"
195   - android:layout_height="wrap_content"
196   - android:layout_gravity="center"
197   - android:textColor="#23D41E"
198   - android:textSize="15sp"
199   - android:padding="10dp"
200   - android:text="@string/to_line_detail" />
201   -
202   - </LinearLayout>
203   -
204   -
205 168 </RelativeLayout>
206 169 </layout>
... ...
moudle_pedometer/src/main/res/values/colors.xml
  View file @6a826fe
... ... @@ -29,6 +29,7 @@
29 29  
30 30 <color name="red">#EF5544</color>
31 31 <color name="bg">#012648</color>
  32 + <color name="orang">#f96e53</color>
32 33  
33 34 <color name="text_black">#333333</color>
34 35 <color name="bottom_sheet_dialog_race_location_text">#999999</color>
... ...