CNLive Android Team / ModulePedometer · Commits

Commit a801055469c3cc410977f51b64f07518c901eede

Authored by 韩亚云
1 parent b2aba0c1

用户id修改

Inline Side-by-side
Showing 12 changed files with 27 additions and 21 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunRaceDetailFragment.java
  View file @a801055
... ... @@ -12,6 +12,7 @@ import com.cnlive.libs.base.ui.QMUIFragment;
12 12 import com.cnlive.moudle.collectionTrace.frame.presenter.CollRunRaceDetailFragmentPresenter;
13 13 import com.cnlive.moudle.collectionTrace.frame.view.CollRunRaceDetailFragmentView;
14 14 import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
  15 +import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
15 16 import com.cnlive.moudle.pedometer.model.Constant;
16 17 import com.cnlive.moudle.pedometer.model.MessageEvent;
17 18 import com.cnlive.moudle.pedometer.ui.activity.RunLineActivity;
... ... @@ -71,10 +72,9 @@ public class CollRunRaceDetailFragment extends QMUIFragment<CollRunRaceDetailFra
71 72 mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务
72 73 if (getMvpView() != null) {
73 74 getMvpView().initMap();
74   - ;
75 75 }
76 76 if (getPresenter() != null) {
77   - getPresenter().getRunRaceDetailInfo(getActivity(), "116", "10513196", "1");
  77 + getPresenter().getRunRaceDetailInfo(getActivity(), "116", CommonInfo.getUserId(getActivity()), "1");
78 78 }
79 79  
80 80 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/MyRecordView.java
  View file @a801055
... ... @@ -4,6 +4,7 @@ import android.support.v7.widget.LinearLayoutManager;
4 4 import android.view.View;
5 5  
6 6 import com.cnlive.libs.base.util.AlertUtil;
  7 +import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
7 8 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
8 9 import com.cnlive.moudle.pedometer.net.bean.MyRecordInfo;
9 10 import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity;
... ... @@ -93,7 +94,7 @@ public class MyRecordView implements MvpView {
93 94 @Override
94 95 public void onClick(View v) {
95 96 fragment.currentPage = 1;
96   - fragment.getPresenter().setData(fragment.getActivity(),"10514343",fragment.state,fragment.currentPage,fragment.pageSize);
  97 + fragment.getPresenter().setData(fragment.getActivity(), CommonInfo.getUserId(fragment.getActivity()),fragment.state,fragment.currentPage,fragment.pageSize);
97 98 }
98 99 });
99 100 fragment.binding.empty.setLoadingShowing(false);
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RaceRecorView.java
  View file @a801055
... ... @@ -132,7 +132,7 @@ public class RaceRecorView implements MvpView {
132 132 @Override
133 133 public void onClick(View v) {
134 134 fragment.currentPage = 1;
135   - fragment.getPresenter().getData(fragment.getActivity(), CommonInfo.getStreetId(fragment.getActivity()),"10514343",fragment.currentPage,fragment.pageSize);
  135 + fragment.getPresenter().getData(fragment.getActivity(), CommonInfo.getStreetId(fragment.getActivity()),CommonInfo.getUserId(fragment.getActivity()),fragment.currentPage,fragment.pageSize);
136 136 }
137 137 });
138 138 fragment.binding.emptyNet.setLoadingShowing(false);
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunLineView.java
  View file @a801055
... ... @@ -4,6 +4,7 @@ import android.support.v7.widget.LinearLayoutManager;
4 4 import android.view.View;
5 5  
6 6 import com.cnlive.libs.base.util.AlertUtil;
  7 +import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
7 8 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
8 9 import com.cnlive.moudle.pedometer.net.bean.RunLineInfo;
9 10 import com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity;
... ... @@ -97,7 +98,7 @@ public class RunLineView implements MvpView {
97 98 @Override
98 99 public void onClick(View v) {
99 100 fragment.currentPage = 1;
100   - fragment.getPresenter().setData(fragment.getActivity(),"10514343",fragment.currentPage,fragment.pageSize);
  101 + fragment.getPresenter().setData(fragment.getActivity(), CommonInfo.getUserId(fragment.getActivity()),fragment.currentPage,fragment.pageSize);
101 102 }
102 103 });
103 104 fragment.binding.empty.setLoadingShowing(false);
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/SelfRecordView.java
  View file @a801055
... ... @@ -7,6 +7,7 @@ import android.view.View;
7 7  
8 8 import com.cnlive.libs.base.util.AlertUtil;
9 9 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
  10 +import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
10 11 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
11 12 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
12 13 import com.cnlive.moudle.pedometer.net.bean.EventRouteRecordBeanVoListBean;
... ... @@ -139,7 +140,7 @@ public class SelfRecordView implements MvpView {
139 140 @Override
140 141 public void onClick(View v) {
141 142 fragment.currentPage = 1;
142   - fragment.getPresenter().getData(fragment.getActivity(), "10514343", fragment.completeStatus, fragment.currentPage, fragment.pageSize);
  143 + fragment.getPresenter().getData(fragment.getActivity(), CommonInfo.getUserId(fragment.getActivity()), fragment.completeStatus, fragment.currentPage, fragment.pageSize);
143 144 }
144 145 });
145 146 fragment.binding.emptyNet.setLoadingShowing(false);
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/activity/RunLineActivity.java
  View file @a801055
... ... @@ -5,6 +5,7 @@ import android.os.Bundle;
5 5  
6 6 import com.cnlive.libs.base.util.StatusBarUtil;
7 7 import com.cnlive.libs.base.util.StatusBarUtil2;
  8 +import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
8 9 import com.cnlive.moudle.pedometer.ui.fragment.RunLineFragment;
9 10 import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
10 11 import com.example.moudle_pedometer.R;
... ... @@ -22,6 +23,7 @@ public class RunLineActivity extends AppCompatActivity {
22 23 StatusBarUtil2.setColor(this, getResources().getColor(R.color.color_fff), 0);
23 24 setContentView(R.layout.activity_run_line);
24 25  
  26 + CommonInfo.setUserId(this, "10513196");
25 27 getSupportFragmentManager().beginTransaction().replace(R.id.run_line_container, new RunLineFragment()).commit();
26 28 }
27 29 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/MyRecordFragment.java
  View file @a801055
... ... @@ -7,6 +7,7 @@ import android.support.annotation.Nullable;
7 7 import android.view.View;
8 8  
9 9 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
  10 +import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
10 11 import com.cnlive.moudle.pedometer.frame.presenter.MyRecordPresenter;
11 12 import com.cnlive.moudle.pedometer.frame.view.MyRecordView;
12 13 import com.example.moudle_pedometer.R;
... ... @@ -43,19 +44,19 @@ public class MyRecordFragment extends MvpBindingFragment<MyRecordView, MyRecord
43 44 super.onViewCreated(view, savedInstanceState);
44 45 state = getArguments().getString("state");
45 46 if(getMvpView() != null) getMvpView().initView();
46   - getPresenter().setData(getActivity(),"10514343",state,currentPage,pageSize);
  47 + getPresenter().setData(getActivity(), CommonInfo.getUserId(getActivity()),state,currentPage,pageSize);
47 48 binding.refreshLayout.setOnRefreshListener(new OnRefreshListener() {
48 49 @Override
49 50 public void onRefresh(@NonNull RefreshLayout refreshLayout) {
50 51 currentPage = 1;
51   - getPresenter().setData(getActivity(),"10514343",state,currentPage,pageSize);
  52 + getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),state,currentPage,pageSize);
52 53 }
53 54 });
54 55 binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
55 56 @Override
56 57 public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
57 58 currentPage++;
58   - getPresenter().setData(getActivity(),"10514343",state,currentPage,pageSize);
  59 + getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),state,currentPage,pageSize);
59 60 }
60 61 });
61 62 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RaceRecorFragment.java
  View file @a801055
... ... @@ -36,15 +36,15 @@ public class RaceRecorFragment extends MvpBindingFragment<RaceRecorView, RaceRec
36 36 raceTitle = getArguments().getString("raceTitle");
37 37 if(getMvpView() != null) getMvpView().initView();
38 38  
39   - getPresenter().getData(getActivity(), CommonInfo.getStreetId(getActivity()),"10514343",currentPage,pageSize);
  39 + getPresenter().getData(getActivity(), CommonInfo.getStreetId(getActivity()),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
40 40  
41 41 binding.refreshLayout.setOnRefreshListener(v ->{
42 42 currentPage = 1;
43   - getPresenter().getData(getActivity(), CommonInfo.getStreetId(getActivity()),"10514343",currentPage,pageSize);
  43 + getPresenter().getData(getActivity(), CommonInfo.getStreetId(getActivity()),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
44 44 });
45 45 binding.refreshLayout.setOnLoadMoreListener(v ->{
46 46 currentPage++;
47   - getPresenter().getData(getActivity(), CommonInfo.getStreetId(getActivity()),"10514343",currentPage,pageSize);
  47 + getPresenter().getData(getActivity(), CommonInfo.getStreetId(getActivity()),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
48 48 });
49 49 }
50 50  
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
  View file @a801055
... ... @@ -130,7 +130,7 @@ public class RegistrationInfoFragment extends MvpBindingFragment<RegistrationInf
130 130 }
131 131 } else if (addMonitoredPersonResponse.getStatus() == 0) {
132 132 QMUITipDialogUtil.dismessDialog();
133   - getPresenter().commitInfo(getActivity(), CommonInfo.getStreetId(getActivity()), "10514343", "15210479774",
  133 + getPresenter().commitInfo(getActivity(), CommonInfo.getStreetId(getActivity()), CommonInfo.getUserId(getActivity()), "15210479774",
134 134 binding.sexText.getText().toString().trim().equals("未选择") ? "" : binding.sexText.getText().toString().trim(),
135 135 binding.birthday.getText().toString().trim().equals("未选择") ? "" : binding.birthday.getText().toString().trim());
136 136 } else {
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunLineFragment.java
  View file @a801055
... ... @@ -13,6 +13,7 @@ import android.view.View;
13 13 import android.view.ViewGroup;
14 14  
15 15 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
  16 +import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
16 17 import com.cnlive.moudle.pedometer.frame.presenter.RunLinePresenter;
17 18 import com.cnlive.moudle.pedometer.frame.view.RunLineView;
18 19 import com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity;
... ... @@ -47,15 +48,15 @@ public class RunLineFragment extends MvpBindingFragment<RunLineView, RunLinePres
47 48 public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
48 49 super.onViewCreated(view, savedInstanceState);
49 50 if(getMvpView() != null)getMvpView().initView();
50   - getPresenter().setData(getActivity(),"10514343",currentPage,pageSize);
  51 + getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
51 52  
52 53 binding.refreshLayout.setOnRefreshListener(v ->{
53 54 currentPage = 1;
54   - getPresenter().setData(getActivity(),"10514343",currentPage,pageSize);
  55 + getPresenter().setData(getActivity(), CommonInfo.getUserId(getActivity()),currentPage,pageSize);
55 56 });
56 57 binding.refreshLayout.setOnLoadMoreListener(v ->{
57 58 currentPage++;
58   - getPresenter().setData(getActivity(),"10514343",currentPage,pageSize);
  59 + getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
59 60 });
60 61 }
61 62 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunRaceDetailFragment.java
  View file @a801055
... ... @@ -73,14 +73,12 @@ public class RunRaceDetailFragment extends QMUIFragment<RunRaceDetailFragmentVie
73 73 StatusBarUtil2.setColor(getActivity(), getResources().getColor(R.color.white), 0);
74 74 EventBus.getDefault().register(this);
75 75 mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务
76   - CommonInfo.setUserId(getContext(), "yangshuai");
77 76 if (getMvpView() != null) {
78 77 getMvpView().initMap();
79   - ;
80 78 }
81 79 if (getPresenter() != null) {
82 80 if (!TextUtils.isEmpty(CommonInfo.getStreetId(getActivity())))
83   - getPresenter().getRunRaceDetailInfo(getActivity(), CommonInfo.getStreetId(getActivity()), "10513196", "0");
  81 + getPresenter().getRunRaceDetailInfo(getActivity(), CommonInfo.getStreetId(getActivity()), CommonInfo.getUserId(getActivity()), "0");
84 82 }
85 83  
86 84 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/SelfRecordFragment.java
  View file @a801055
... ... @@ -7,6 +7,7 @@ import android.support.annotation.Nullable;
7 7 import android.view.View;
8 8  
9 9 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
  10 +import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
10 11 import com.cnlive.moudle.pedometer.frame.presenter.SelfRecordPresenter;
11 12 import com.cnlive.moudle.pedometer.frame.view.SelfRecordView;
12 13 import com.example.moudle_pedometer.R;
... ... @@ -55,10 +56,10 @@ public class SelfRecordFragment extends MvpBindingFragment<SelfRecordView, SelfR
55 56  
56 57 private void getData(int completeStatus){
57 58 if(completeStatus == -1){
58   - getPresenter().getData(getActivity(),"10514343",completeStatus,currentPage,pageSize);
  59 + getPresenter().getData(getActivity(),CommonInfo.getUserId(getActivity()),completeStatus,currentPage,pageSize);
59 60 }else {
60 61 this.completeStatus = currentPage;
61   - getPresenter().getData(getActivity(),"10514343",completeStatus,currentPage,pageSize);
  62 + getPresenter().getData(getActivity(), CommonInfo.getUserId(getActivity()),completeStatus,currentPage,pageSize);
62 63 if(completeStatus == 0){
63 64 binding.hasFinish.setTextColor(getActivity().getResources().getColor(R.color.green_tx));
64 65 binding.hasFinish.setTextSize(18);
... ...