用户id修改

韩亚云
1 parent b2aba0c1
Showing 12 changed files with 27 additions and 21 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunRaceDetailFragment.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/RaceRecorView.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/RunLineActivity.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/MyRecordFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RaceRecorFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RegistrationInfoFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunLineFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/RunRaceDetailFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/fragment/SelfRecordFragment.java
@@ -12,6 +12,7 @@ import com.cnlive.libs.base.ui.QMUIFragment;
 import com.cnlive.moudle.collectionTrace.frame.presenter.CollRunRaceDetailFragmentPresenter;
 import com.cnlive.moudle.collectionTrace.frame.view.CollRunRaceDetailFragmentView;
 import com.cnlive.moudle.collectionTrace.ui.activity.StartCollectTraceActivity;
+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.activity.RunLineActivity;
@@ -71,10 +72,9 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra
         mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务
         if (getMvpView() != null) {
             getMvpView().initMap();
-            ;
         }
         if (getPresenter() != null) {
-            getPresenter().getRunRaceDetailInfo(getActivity(), "116", "10513196", "1");
+            getPresenter().getRunRaceDetailInfo(getActivity(), "116", CommonInfo.getUserId(getActivity()), "1");
         }
     }
@@ -4,6 +4,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 import com.cnlive.libs.base.util.AlertUtil;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
 import com.cnlive.moudle.pedometer.net.bean.MyRecordInfo;
 import com.cnlive.moudle.pedometer.ui.activity.RunRaceDetailActivity;
@@ -93,7 +94,7 @@ public class MyRecordView implements MvpView {
                 @Override
                 public void onClick(View v) {
                     fragment.currentPage = 1;
-                    fragment.getPresenter().setData(fragment.getActivity(),"10514343",fragment.state,fragment.currentPage,fragment.pageSize);
+                    fragment.getPresenter().setData(fragment.getActivity(), CommonInfo.getUserId(fragment.getActivity()),fragment.state,fragment.currentPage,fragment.pageSize);
                 }
             });
             fragment.binding.empty.setLoadingShowing(false);
@@ -132,7 +132,7 @@ public class RaceRecorView implements MvpView {
                 @Override
                 public void onClick(View v) {
                     fragment.currentPage = 1;
-                    fragment.getPresenter().getData(fragment.getActivity(), CommonInfo.getStreetId(fragment.getActivity()),"10514343",fragment.currentPage,fragment.pageSize);
+                    fragment.getPresenter().getData(fragment.getActivity(), CommonInfo.getStreetId(fragment.getActivity()),CommonInfo.getUserId(fragment.getActivity()),fragment.currentPage,fragment.pageSize);
                 }
             });
             fragment.binding.emptyNet.setLoadingShowing(false);
@@ -4,6 +4,7 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
 import com.cnlive.libs.base.util.AlertUtil;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
 import com.cnlive.moudle.pedometer.net.bean.RunLineInfo;
 import com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity;
@@ -97,7 +98,7 @@ public class RunLineView implements MvpView {
                 @Override
                 public void onClick(View v) {
                     fragment.currentPage = 1;
-                    fragment.getPresenter().setData(fragment.getActivity(),"10514343",fragment.currentPage,fragment.pageSize);
+                    fragment.getPresenter().setData(fragment.getActivity(), CommonInfo.getUserId(fragment.getActivity()),fragment.currentPage,fragment.pageSize);
                 }
             });
             fragment.binding.empty.setLoadingShowing(false);
@@ -7,6 +7,7 @@ import android.view.View;
 import com.cnlive.libs.base.util.AlertUtil;
 import com.cnlive.moudle.collectionTrace.ui.activity.CollRunningFinishActivity;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.RunningFinishBean;
 import com.cnlive.moudle.pedometer.net.bean.BaseInfo;
 import com.cnlive.moudle.pedometer.net.bean.EventRouteRecordBeanVoListBean;
@@ -139,7 +140,7 @@ public class SelfRecordView implements MvpView {
                 @Override
                 public void onClick(View v) {
                     fragment.currentPage = 1;
-                    fragment.getPresenter().getData(fragment.getActivity(), "10514343", fragment.completeStatus, fragment.currentPage, fragment.pageSize);
+                    fragment.getPresenter().getData(fragment.getActivity(), CommonInfo.getUserId(fragment.getActivity()), fragment.completeStatus, fragment.currentPage, fragment.pageSize);
                 }
             });
             fragment.binding.emptyNet.setLoadingShowing(false);
@@ -5,6 +5,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.RunLineFragment;
 import com.cnlive.moudle.pedometer.ui.fragment.RunningFinishFragment;
 import com.example.moudle_pedometer.R;
@@ -22,6 +23,7 @@ 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");
         getSupportFragmentManager().beginTransaction().replace(R.id.run_line_container, new RunLineFragment()).commit();
     }
 }
@@ -7,6 +7,7 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.MyRecordPresenter;
 import com.cnlive.moudle.pedometer.frame.view.MyRecordView;
 import com.example.moudle_pedometer.R;
@@ -43,19 +44,19 @@ public class MyRecordFragment  extends MvpBindingFragment&lt;MyRecordView, MyRecord
         super.onViewCreated(view, savedInstanceState);
         state = getArguments().getString("state");
         if(getMvpView() != null) getMvpView().initView();
-        getPresenter().setData(getActivity(),"10514343",state,currentPage,pageSize);
+        getPresenter().setData(getActivity(), CommonInfo.getUserId(getActivity()),state,currentPage,pageSize);
         binding.refreshLayout.setOnRefreshListener(new OnRefreshListener() {
             @Override
             public void onRefresh(@NonNull RefreshLayout refreshLayout) {
                 currentPage = 1;
-                getPresenter().setData(getActivity(),"10514343",state,currentPage,pageSize);
+                getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),state,currentPage,pageSize);
             }
         });
         binding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
             @Override
             public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
                 currentPage++;
-                getPresenter().setData(getActivity(),"10514343",state,currentPage,pageSize);
+                getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),state,currentPage,pageSize);
             }
         });
     }
@@ -36,15 +36,15 @@ public class RaceRecorFragment extends MvpBindingFragment&lt;RaceRecorView, RaceRec
         raceTitle = getArguments().getString("raceTitle");
         if(getMvpView() != null) getMvpView().initView();
-        getPresenter().getData(getActivity(), CommonInfo.getStreetId(getActivity()),"10514343",currentPage,pageSize);
+        getPresenter().getData(getActivity(), CommonInfo.getStreetId(getActivity()),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
         binding.refreshLayout.setOnRefreshListener(v ->{
             currentPage = 1;
-            getPresenter().getData(getActivity(), CommonInfo.getStreetId(getActivity()),"10514343",currentPage,pageSize);
+            getPresenter().getData(getActivity(), CommonInfo.getStreetId(getActivity()),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
         });
         binding.refreshLayout.setOnLoadMoreListener(v ->{
             currentPage++;
-            getPresenter().getData(getActivity(), CommonInfo.getStreetId(getActivity()),"10514343",currentPage,pageSize);
+            getPresenter().getData(getActivity(), CommonInfo.getStreetId(getActivity()),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
         });
     }
@@ -130,7 +130,7 @@ public class RegistrationInfoFragment extends MvpBindingFragment&lt;RegistrationInf
                     }
                 } else if (addMonitoredPersonResponse.getStatus() == 0) {
                     QMUITipDialogUtil.dismessDialog();
-                    getPresenter().commitInfo(getActivity(), CommonInfo.getStreetId(getActivity()), "10514343", "15210479774",
+                    getPresenter().commitInfo(getActivity(), CommonInfo.getStreetId(getActivity()), CommonInfo.getUserId(getActivity()), "15210479774",
                             binding.sexText.getText().toString().trim().equals("未选择") ? "" : binding.sexText.getText().toString().trim(),
                             binding.birthday.getText().toString().trim().equals("未选择") ? "" : binding.birthday.getText().toString().trim());
                 } else {
@@ -13,6 +13,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.RunLinePresenter;
 import com.cnlive.moudle.pedometer.frame.view.RunLineView;
 import com.cnlive.moudle.pedometer.ui.activity.MyRecordActivity;
@@ -47,15 +48,15 @@ public class RunLineFragment extends MvpBindingFragment&lt;RunLineView, RunLinePres
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
         if(getMvpView() != null)getMvpView().initView();
-        getPresenter().setData(getActivity(),"10514343",currentPage,pageSize);
+        getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
         binding.refreshLayout.setOnRefreshListener(v ->{
             currentPage = 1;
-            getPresenter().setData(getActivity(),"10514343",currentPage,pageSize);
+            getPresenter().setData(getActivity(), CommonInfo.getUserId(getActivity()),currentPage,pageSize);
         });
         binding.refreshLayout.setOnLoadMoreListener(v ->{
             currentPage++;
-            getPresenter().setData(getActivity(),"10514343",currentPage,pageSize);
+            getPresenter().setData(getActivity(),CommonInfo.getUserId(getActivity()),currentPage,pageSize);
         });
     }
 }
@@ -73,14 +73,12 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
         StatusBarUtil2.setColor(getActivity(), getResources().getColor(R.color.white), 0);
         EventBus.getDefault().register(this);
         mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务
-        CommonInfo.setUserId(getContext(), "yangshuai");
         if (getMvpView() != null) {
             getMvpView().initMap();
-            ;
         }
         if (getPresenter() != null) {
             if (!TextUtils.isEmpty(CommonInfo.getStreetId(getActivity())))
-                getPresenter().getRunRaceDetailInfo(getActivity(), CommonInfo.getStreetId(getActivity()), "10513196", "0");
+                getPresenter().getRunRaceDetailInfo(getActivity(), CommonInfo.getStreetId(getActivity()), CommonInfo.getUserId(getActivity()), "0");
         }
     }
@@ -7,6 +7,7 @@ import android.support.annotation.Nullable;
 import android.view.View;
 import com.cnlive.libs.base.frame.fragment.MvpBindingFragment;
+import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.frame.presenter.SelfRecordPresenter;
 import com.cnlive.moudle.pedometer.frame.view.SelfRecordView;
 import com.example.moudle_pedometer.R;
@@ -55,10 +56,10 @@ public class SelfRecordFragment extends MvpBindingFragment&lt;SelfRecordView, SelfR
     private void getData(int completeStatus){
         if(completeStatus == -1){
-            getPresenter().getData(getActivity(),"10514343",completeStatus,currentPage,pageSize);
+            getPresenter().getData(getActivity(),CommonInfo.getUserId(getActivity()),completeStatus,currentPage,pageSize);
         }else {
             this.completeStatus = currentPage;
-            getPresenter().getData(getActivity(),"10514343",completeStatus,currentPage,pageSize);
+            getPresenter().getData(getActivity(), CommonInfo.getUserId(getActivity()),completeStatus,currentPage,pageSize);
             if(completeStatus == 0){
                 binding.hasFinish.setTextColor(getActivity().getResources().getColor(R.color.green_tx));
                 binding.hasFinish.setTextSize(18);