CNLive Android Team / ModulePedometer · Commits

Commit 830c2dae88b3885609a17019a87e42a7a30da421

Authored by 杨帅
2 parents 4eba6fce 1e826156

Merge branch 'master' of http://bj.gitlab.cnlive.com/cnlive-team/ModulePedometer

Inline Side-by-side
Showing 2 changed files with 4 additions and 5 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
  View file @830c2da
... ... @@ -38,10 +38,10 @@ import com.baidu.mapapi.search.route.RoutePlanSearch;
38 38 import com.baidu.mapapi.utils.DistanceUtil;
39 39 import com.baidu.trace.LBSTraceClient;
40 40 import com.baidu.trace.model.SortType;
  41 +import com.cnlive.libs.base.application.AppConfig;
41 42 import com.cnlive.libs.base.util.StatusBarUtil2;
42 43 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
43 44 import com.cnlive.moudle.pedometer.model.Constant;
44   -import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
45 45 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
46 46 import com.cnlive.moudle.pedometer.service.KeepLiveService;
47 47 import com.cnlive.moudle.pedometer.service.StepService;
... ... @@ -625,7 +625,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
625 625 @Override
626 626 public void onClick(View view) {
627 627 ARouter.getInstance().build("/web/WebViewColorActivity")
628   - .withString("url", SubscriptionRequest.baseEndpoint() + "cnSportList.html" + "?sid=" + CommonInfo.getUserId(fragment.getActivity()) + "&eventId=" + CommonInfo.getStreetId(fragment.getActivity()))
  628 + .withString("url", AppConfig.isDebug() ? "http://wjjh5test.cnlive.com/cnSportList.html" : "http://wjjh5.cnlive.com/cnSportList.html" + "?sid=" + CommonInfo.getUserId(fragment.getActivity()) + "&eventId=" + CommonInfo.getStreetId(fragment.getActivity()))
629 629 .withString("title", "排行榜")
630 630 .navigation(fragment.getActivity());
631 631 }
... ...
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
  View file @830c2da
... ... @@ -12,11 +12,10 @@ import android.widget.TextView;
12 12  
13 13  
14 14 import com.alibaba.android.arouter.launcher.ARouter;
  15 +import com.cnlive.libs.base.application.AppConfig;
15 16 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
16   -import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
17 17 import com.cnlive.moudle.pedometer.net.bean.MyRecordInfo;
18 18 import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity;
19   -import com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity;
20 19 import com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView;
21 20 import com.cnlive.moudle.pedometer.utils.TimeUtil;
22 21 import com.example.moudle_pedometer.R;
... ... @@ -58,7 +57,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter<MyRecordAdapter.MyView
58 57 myViewHolder.my_record.setOnClickListener(v -> startAc(list.get(i)));
59 58 myViewHolder.check_raking.setOnClickListener(v ->
60 59 ARouter.getInstance().build("/web/WebViewColorActivity")
61   - .withString("url", SubscriptionRequest.baseEndpoint()+"cnSportListOver.html"+"?sid="+CommonInfo.getUserId(context)+"&eventId="+list.get(i).getId())
  60 + .withString("url", AppConfig.isDebug() ? "http://wjjh5test.cnlive.com/cnSportListOver.html" : "http://wjjh5.cnlive.com/cnSportListOver.html"+"?sid="+CommonInfo.getUserId(context)+"&eventId="+list.get(i).getId())
62 61 .withString("title","总排行榜")
63 62 .navigation(context));
64 63 if (clickListener != null) {
... ...