1.对接运动赛事详情页接口

杨帅
1 parent 3765c74e
Showing 11 changed files with 220 additions and 61 deletions
library_baidumap/build.gradle
moudle_pedometer/build.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunRaceDetailFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.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/RunRaceDetailFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/QMUITipDialogUtil.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/utils/TimeUtil.java
moudle_pedometer/src/main/res/layout/fragment_run_race_detail.xml
moudle_pedometer/src/main/res/layout/layout_run_detail_street.xml
moudle_pedometer/src/main/res/values/strings.xml
@@ -51,3 +51,4 @@ dependencies {
 }
+
@@ -110,9 +110,11 @@ dependencies {
     implementation project(':library_baidumap')
     implementation project(':share')
     implementation project(':lib_network')
+    compile project(path: ':lib_network')
 }
+
 configurations {
     all*.exclude group: 'com.squareup.okhttp3', module: 'okhttp'
     all*.exclude group: 'com.squareup.okio'
 package com.cnlive.moudle.pedometer.frame.presenter;
 import android.content.Context;
+import android.view.View;
+import android.widget.Toast;
+import com.cnlive.libs.base.logic.Config;
 import com.cnlive.libs.base.logic.Logic;
+import com.cnlive.libs.base.logic.callback.DataCallback;
 import com.cnlive.libs.base.logic.callback.FailureCallback;
+import com.cnlive.libs.base.logic.callback.StateCallback;
+import com.cnlive.libs.base.logic.callback.SuccessCallback;
 import com.cnlive.libs.data.network.model.IBaseInfo;
 import com.cnlive.moudle.pedometer.frame.view.RunRaceDetailFragmentView;
 import com.cnlive.moudle.pedometer.frame.view.RunningMapFragmentView;
+import com.cnlive.moudle.pedometer.utils.QMUITipDialogUtil;
+import com.cnlive.strike.data.network.api.ApiRequest;
+import com.cnlive.strike.data.network.api.ApiServiceDaren;
+import com.cnlive.strike.data.network.model.BaseInfo;
+import com.cnlive.strike.data.network.model.runAbout.RunRaceDetailInfo;
 import com.hannesdorfmann.mosby3.mvp.MvpBasePresenter;
 import java.util.HashMap;
@@ -14,6 +25,9 @@ import java.util.Map;
 import io.reactivex.disposables.Disposable;
+import static com.cnlive.libs.base.logic.Config.STATE_IDLE;
+import static com.cnlive.libs.base.logic.Config.STATE_LOAD;
+
 public class RunRaceDetailFragmentPresenter extends MvpBasePresenter<RunRaceDetailFragmentView> {
     public void getRunRaceDetailInfo(Context context, String id, String userId) {
@@ -21,41 +35,87 @@ public class RunRaceDetailFragmentPresenter extends MvpBasePresenter&lt;RunRaceDeta
         Map<String, String> paramsMap = new HashMap<>();
         //赛事id
         paramsMap.put("id", id);
-        paramsMap.put("userId", userId);
+        paramsMap.put("sid", userId);
 //        Logic.create(paramsMap)
-//                .action(new Logic.Action<Map<String, String>, BaseInfo>() {
+//                .action(new Logic.Action<Map<String, String>, BaseInfo<RunRaceDetailInfo>>() {
 //                    @Override
-//                    public Disposable action(Map<String, String> paramsMap, DataCallback<SubscriptionBaseInfo> dataCallback) {
-//                        return SubscriptionRequest.service(ApiServiceInterest.class, api -> api.userFollowAddGroup(paramsMap)).subscribe(context, dataCallback);
+//                    public Disposable action(Map<String, String> paramsMap, DataCallback<BaseInfo<RunRaceDetailInfo>> dataCallback) {
+//                        return ApiRequest.service(ApiServiceDaren.class, api -> api.getRunRaceDetail(paramsMap)).subscribe(context, dataCallback);
 //                    }
-//                }).<SubscriptionBaseInfo>event()
-//                .setSuccessCallback(new SuccessCallback<SubscriptionBaseInfo>() {
+//                }).<BaseInfo<RunRaceDetailInfo>>event()
+//                .setStateCallback(new StateCallback() {
 //                    @Override
-//                    public void onSuccess(SubscriptionBaseInfo subscriptionBaseInfo) {
-//                        if (getView() != null) {
-//                            getView().hideQmuiDialog();
+//                    public void onState(int i) {
+//                        if (getView() == null) {
+//                            return;
+//                        }
+//                        if (i == STATE_LOAD) {
+//                            QMUITipDialogUtil.loadingDialog(context, "正在获取赛事详情", false);
+//                        } else if (i == STATE_IDLE) {
 //                        }
-//                        callBack.onSuccess();
-//                    }
 //
+//                    }
 //                })
-//                .setFailureCallback(new FailureCallback() {
+//                .setSuccessCallback(new SuccessCallback<BaseInfo<RunRaceDetailInfo>>() {
 //                    @Override
-//                    public void onFailure(int i, String s) {
-//                        if (getView() != null) {
-//                            getView().hideQmuiDialog();
-//                            getView().showFailDailog("网络请求失败,请稍后重试", 2);
-//                            if (!TextUtils.isEmpty(s)) {
-//                                callBack.onFailed(s);
-//                            } else {
-//                                callBack.onFailed("接口请求失败,请重试!");
-//                            }
+//                    public void onSuccess(BaseInfo<RunRaceDetailInfo> runRaceDetailInfoBaseInfo) {
+//                        if (getView() == null) {
+//                            return;
 //                        }
 //                    }
-//                })
-//
-//                .start();
+//                }).setFailureCallback(new FailureCallback() {
+//            @Override
+//            public void onFailure(int i, String s) {
+//                if (getView() == null) {
+//                    return;
+//                }
+//            }
+//        }).start();
+        Logic.create(paramsMap).action(new Logic.Action<Map<String, String>, BaseInfo<RunRaceDetailInfo>>() {
+            @Override
+            public Disposable action(Map<String, String> stringStringMap, DataCallback<BaseInfo<RunRaceDetailInfo>> dataCallback) {
+                return ApiRequest.observable(ApiServiceDaren.class, api -> api.getRunRaceDetail(stringStringMap)).subscribe(context, dataCallback);
+            }
+        }).<BaseInfo<RunRaceDetailInfo>>event()
+                .setStateCallback(new StateCallback() {
+                    @Override
+                    public void onState(int i) {
+                        if (getView() == null) {
+                            return;
+                        }
+                        if (i == STATE_LOAD) {
+                            getView().showLoadingView();
+                        } else if (i == STATE_IDLE) {
+                            getView().hideLoadingView();
+                        }
+                    }
+                })
+                .setFailureCallback(new FailureCallback() {
+                    @Override
+                    public void onFailure(int code, String message) {
+                        if (getView() == null) {
+                            return;
+                        }
+                        getView().hideLoadingView();
+                        getView().showRetryView(code, new View.OnClickListener() {
+                            @Override
+                            public void onClick(View view) {
+                                getRunRaceDetailInfo(context, id, userId);
+                            }
+                        });
+                    }
+                }).setSuccessCallback(new SuccessCallback<BaseInfo<RunRaceDetailInfo>>() {
+            @Override
+            public void onSuccess(BaseInfo<RunRaceDetailInfo> baseInfo) {
+                if (getView() == null) {
+                    return;
+                }
+                if (baseInfo.getData() != null) {
+                    getView().initView(baseInfo.getData());
+                }
+            }
+        }).start();
     }
 }
@@ -9,6 +9,7 @@ import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -63,6 +64,7 @@ import com.cnlive.moudle.pedometer.utils.BitmapUtil;
 import com.cnlive.moudle.pedometer.utils.GsonUtil;
 import com.cnlive.moudle.pedometer.utils.MyMapUtil;
 import com.cnlive.moudle.pedometer.utils.ScreenUtil;
+import com.cnlive.strike.data.network.model.runAbout.RunRaceDetailInfo;
 import com.example.moudle_pedometer.R;
 import com.hannesdorfmann.mosby3.mvp.MvpView;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
@@ -110,6 +112,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     private LinkedList<LatLng> importLatLngs;//关键点
     private LatLng startLatLng = new LatLng(39.934733, 116.308646);//起始点
     private List<LatLng> trackPoints;
+    private RunRaceDetailInfo runRaceDetailInfo;
     public RunRaceDetailFragmentView(RunRaceDetailFragment fragment) {
         this.fragment = fragment;
@@ -119,19 +122,25 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         return fragment == null ? null : fragment.getActivity();
     }
-    public void initView() {
+
+    public void initView(RunRaceDetailInfo runRaceDetailInfo) {
         if (fragment.getActivity() == null) {
             return;
         }
-        //初始化运营人员所选的关键点
-        trackPoints = GsonUtil.jsonToList(test, LatLng.class);
-        initMap();
-        MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
+        this.runRaceDetailInfo = runRaceDetailInfo;
+//        //初始化运营人员所选的关键点
+//        trackPoints = GsonUtil.jsonToList(test, LatLng.class);
+//        MyMapUtil.drawServerLineTrack(getContext(), baiduMap, trackPoints, SortType.asc, R.color.green_round, R.drawable.icon_start, R.drawable.icon_end);
+        //显示地图
+        fragment.binding.mapView.setVisibility(View.VISIBLE);
+        //隐藏底部滑动卡片
+        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+        //隐藏空视图
+        fragment.binding.emptyLayout.setVisibility(View.GONE);
+        //显示立即报名按钮
+        fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
         //设置底部卡片第一次可滑动的位置
         fragment.binding.slidingLayout.setAnchorPoint(0.6f);
-        //设置底部卡片初始位置
-//        fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(fragment.getActivity(), 140));
-        fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
         fragment.binding.slidingLayout.addPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() {
             @Override
             public void onPanelSlide(View panel, float slideOffset) {
@@ -176,6 +185,33 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             public void onPanelStateChanged(View panel, SlidingUpPanelLayout.PanelState previousState, SlidingUpPanelLayout.PanelState newState) {
             }
         });
+        /*************************设置相关页面数据***************************/
+        //设置标题
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getTitle())) {
+            fragment.binding.includeStreet.tvRaceTitle.setText(runRaceDetailInfo.getTitle());
+        }
+        //设置活动地点
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getAddress())) {
+            fragment.binding.includeStreet.tvAddress.setText(runRaceDetailInfo.getAddress());
+        }
+        //设置活动距离
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getMileage())) {
+            fragment.binding.includeStreet.tvMileage.setText(runRaceDetailInfo.getMileage());
+        }
+        //设置起点
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getStartLocation())) {
+            fragment.binding.includeStreet.tvStartAddr.setText(runRaceDetailInfo.getStartLocation());
+        }
+        //设置终点
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getEndLocation())) {
+            fragment.binding.includeStreet.tvEndAddr.setText(runRaceDetailInfo.getEndLocation());
+        }
+        //设置起始报名时间
+        if (!TextUtils.isEmpty(runRaceDetailInfo.getEndLocation())) {
+            fragment.binding.includeStreet.tvEndAddr.setText(runRaceDetailInfo.getEndLocation());
+        }
+
+        //设置
         //开始按钮点击事件(未滑动)
         fragment.binding.includeStreet.rlStartBtn.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -272,14 +308,15 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         });
     }
-    private void initMap() {
+    public void initMap() {
         List<String> icons = new ArrayList<>();
         icons.add("http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557039035723_small.jpg");
         icons.add("http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557034319038_small.jpg");
         icons.add("http://yweb0.cnliveimg.com/images/headImg/2018/0902/1535858459612_small.jpg");
         icons.add("http://yweb0.cnliveimg.com/images/headImg/2019/0523/1558599016203_small.jpg");
         icons.add("http://yweb0.cnliveimg.com/images/headImg/2019/0505/1557039035723_small.jpg");
-
+        //隐藏底部滑动卡片
+        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
         fragment.binding.includeStreet.fiveJoinPerson.initIconData(icons);
         this.mMapView = fragment.binding.mapView;
         if (baiduMap == null) {
@@ -295,13 +332,6 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         mCurrentMode = MyLocationConfiguration.LocationMode.NORMAL;
         // 设置定位图标修改为自定义marker
         Bitmap pointBitmap = BitmapUtil.getBitmapFromDp(getContext(), BitmapFactory.decodeResource(getContext().getResources(), R.drawable.rt_ic_location), 50, 50);
-//        View view = LayoutInflater.from(getContext()).inflate(R.layout.layout_anim, null);
-//        ImageView image = (ImageView) view.findViewById(R.id.iv_anim);
-////        image.setBackgroundResource(R.drawable.fat_po);
-//        image.setImageResource(R.drawable.fat_po);
-//        AnimationDrawable anim = (AnimationDrawable) image.getDrawable();
-//        anim.start();
-//        BitmapDescriptorFactory.fromView(view);
         mCurrentMarker = BitmapDescriptorFactory.fromBitmap(pointBitmap);
         //设置定位蓝点精度圆圈的填充颜色为透明色
         accuracyCircleFillColor = getContext().getResources().getColor(R.color.transparent);
@@ -346,11 +376,11 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         baiduMap.setOnMapLoadedCallback(new BaiduMap.OnMapLoadedCallback() {
             @Override
             public void onMapLoaded() {
-                //自动计算地图缩放
-                MapStatus.Builder builder = new MapStatus.Builder();
-                builder.target(MyMapUtil.getCenterZoomPosition(trackPoints));
-                builder.zoom(MyMapUtil.getZoom(trackPoints));
-                baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
+//                //自动计算地图缩放
+//                MapStatus.Builder builder = new MapStatus.Builder();
+//                builder.target(MyMapUtil.getCenterZoomPosition(trackPoints));
+//                builder.zoom(MyMapUtil.getZoom(trackPoints));
+//                baiduMap.animateMapStatus(MapStatusUpdateFactory.newMapStatus(builder.build()));
             }
         });
@@ -689,4 +719,54 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
 //            }
         }
     }
+
+    /**
+     * 显示loading
+     */
+    public void showLoadingView() {
+        if (fragment.binding.emptyLayout == null) {
+            return;
+        }
+        fragment.binding.emptyLayout.show(true);
+    }
+
+    /**
+     * 隐藏loading
+     */
+    public void hideLoadingView() {
+        if (fragment.binding.emptyLayout == null) {
+            return;
+        }
+        fragment.binding.emptyLayout.hide();
+    }
+
+    /**
+     * 显示重试页面
+     *
+     * @param errorCode
+     * @param listener
+     */
+    public void showRetryView(int errorCode, View.OnClickListener listener) {
+        if (getContext() == null) {
+            return;
+        }
+        //隐藏地图
+        fragment.binding.mapView.setVisibility(View.GONE);
+        //显示空视图
+        fragment.binding.emptyLayout.setVisibility(View.VISIBLE);
+        //隐藏底部卡片
+        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.HIDDEN);
+        if (fragment.binding.emptyLayout == null) return;
+        String titleText = "";
+        String detailText = "";
+        if (errorCode == -3) {
+            titleText = getContext().getString(R.string.msg_failed_network_title);
+            detailText = getContext().getString(R.string.msg_failed_network_detail);
+        } else {
+            titleText = getContext().getString(R.string.msg_failed_other_title);
+            detailText = getContext().getString(R.string.msg_failed_other_detail);
+        }
+        fragment.binding.emptyLayout.show(false, titleText, detailText, getContext().getString(R.string.retry), R.drawable.wufalianjie, listener);
+    }
+
 }
@@ -14,7 +14,7 @@ import com.example.moudle_pedometer.databinding.FragmentRaceRecorBinding;
 /**
  * Created by hanyayun 019/05/30.
  */
-public class RaceRecorFragment extends MvpBindingFragment<RaceRecorView, RaceRecorPresenter,Object, FragmentRaceRecorBinding> {
+public class RaceRecorFragment extends MvpBindingFragment<RaceRecorView, RaceRecorPresenter, Object, FragmentRaceRecorBinding> {
     public RaceRecorFragment() {
@@ -25,8 +25,7 @@ public class RaceRecorFragment extends MvpBindingFragment&lt;RaceRecorView, RaceRec
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        if(getMvpView() != null) getMvpView().initView();
-        getPresenter().getData();
+        if (getMvpView() != null) getMvpView().initView();
     }
     @Override
@@ -61,7 +61,10 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
         mSensorManager = (SensorManager) getActivity().getSystemService(SENSOR_SERVICE);//获取传感器管理服务
         if (getMvpView() != null) {
-            getMvpView().initView();
+            getMvpView().initMap();;
+        }
+        if (getPresenter()!=null){
+            getPresenter().getRunRaceDetailInfo(getActivity(),"116","10513196");
         }
     }
@@ -141,7 +141,9 @@ public class QMUITipDialogUtil {
     public static void dismessDialog() {
         if (tipDialog != null) {
-            tipDialog.dismiss();
+            if (tipDialog.isShowing()) {
+                tipDialog.dismiss();
+            }
         }
     }
 }
@@ -69,6 +69,7 @@ public class TimeUtil {
     /**
      * 取得指定时间的格式化的时间戳（精确到秒）
+     * yyyy-MM-dd HH:mm:ss
      *
      * @return 格式化后的日期
      */
@@ -17,6 +17,7 @@
         <!-- MAIN CONTENT -->
         <FrameLayout
+            android:id="@+id/fl_root"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -50,7 +51,14 @@
                 android:layout_margin="10dp"
                 android:background="@drawable/xqt_share" />
             <!---->
-
+            <com.cnlive.strike.ui.widget.UIEmptyView
+                android:id="@+id/empty_layout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:background="@color/color_fff"
+                android:visibility="gone" />
         </FrameLayout>
@@ -66,15 +66,9 @@
                         android:layout_marginTop="10dp"
                         android:layout_marginBottom="10dp">
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginLeft="25dp"
-                            android:text="北京"
-                            android:textColor="@color/text_black"
-                            android:textSize="15sp" />
                         <TextView
+                            android:id="@+id/tv_address"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="25dp"
@@ -83,6 +77,7 @@
                             android:textSize="15sp" />
                         <TextView
+                            android:id="@+id/tv_mileage"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="25dp"
@@ -154,6 +149,7 @@
                         android:textSize="14sp" />
                     <TextView
+                        android:id="@+id/tv_start_addr"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
@@ -185,6 +181,7 @@
                         android:textSize="14sp" />
                     <TextView
+                        android:id="@+id/tv_end_addr"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="10dp"
@@ -223,6 +220,7 @@
                     android:layout_marginTop="10dp">
                     <TextView
+                        android:id="@+id/tv_sign_up_start_time"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="25dp"
@@ -239,6 +237,7 @@
                         android:textSize="15sp" />
                     <TextView
+                        android:id="@+id/tv_sign_up_end_time"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="5dp"
@@ -348,8 +347,8 @@
                         android:layout_marginLeft="25dp"
                         android:text="徒步"
                         android:textColor="@color/text_black"
-                        android:textStyle="bold"
-                        android:textSize="15sp" />
+                        android:textSize="15sp"
+                        android:textStyle="bold" />
                 </LinearLayout>
                 <!--参与人数-->
@@ -70,4 +70,8 @@
     <string name="layout_street_active_type">活动类型</string>
     <string name="open_gps_tip">您尚未开启GPS,为确保定位准确性,请您打开后使用!</string>
     <!---->
+    <!--网络请求-->
+    <string name="retry">重试</string>
+
+
 </resources>