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

杨帅
2 parents 4eba6fce 1e826156
Showing 2 changed files with 4 additions and 5 deletions
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/ui/adapter/MyRecordAdapter.java
@@ -38,10 +38,10 @@ import com.baidu.mapapi.search.route.RoutePlanSearch;
 import com.baidu.mapapi.utils.DistanceUtil;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.model.SortType;
+import com.cnlive.libs.base.application.AppConfig;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
-import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
 import com.cnlive.moudle.pedometer.net.bean.RunRaceDetailInfo;
 import com.cnlive.moudle.pedometer.service.KeepLiveService;
 import com.cnlive.moudle.pedometer.service.StepService;
@@ -625,7 +625,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             @Override
             public void onClick(View view) {
                 ARouter.getInstance().build("/web/WebViewColorActivity")
-                        .withString("url", SubscriptionRequest.baseEndpoint() + "cnSportList.html" + "?sid=" + CommonInfo.getUserId(fragment.getActivity()) + "&eventId=" + CommonInfo.getStreetId(fragment.getActivity()))
+                        .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()))
                         .withString("title", "排行榜")
                         .navigation(fragment.getActivity());
             }
@@ -12,11 +12,10 @@ import android.widget.TextView;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.cnlive.libs.base.application.AppConfig;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
-import com.cnlive.moudle.pedometer.net.SubscriptionRequest;
 import com.cnlive.moudle.pedometer.net.bean.MyRecordInfo;
 import com.cnlive.moudle.pedometer.ui.activity.RaceRecordActivity;
-import com.cnlive.moudle.pedometer.ui.activity.SelfRecordActivity;
 import com.cnlive.moudle.pedometer.ui.widget.FivePersonIconView;
 import com.cnlive.moudle.pedometer.utils.TimeUtil;
 import com.example.moudle_pedometer.R;
@@ -58,7 +57,7 @@ public class MyRecordAdapter extends RecyclerView.Adapter&lt;MyRecordAdapter.MyView
         myViewHolder.my_record.setOnClickListener(v -> startAc(list.get(i)));
         myViewHolder.check_raking.setOnClickListener(v ->
                 ARouter.getInstance().build("/web/WebViewColorActivity")
-                        .withString("url", SubscriptionRequest.baseEndpoint()+"cnSportListOver.html"+"?sid="+CommonInfo.getUserId(context)+"&eventId="+list.get(i).getId())
+                        .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())
                         .withString("title","总排行榜")
                         .navigation(context));
         if (clickListener != null) {