1 赛事详情页新增路线地图点击事件

杨帅
1 parent 2d5de40a
Showing 9 changed files with 83 additions and 29 deletions
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/presenter/CollRunRaceDetailFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/frame/view/CollRunRaceDetailFragmentView.java
moudle_pedometer/src/main/java/com/cnlive/moudle/collectionTrace/ui/fragment/CollRunRaceDetailFragment.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/OnGoingFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/presenter/RunRaceDetailFragmentPresenter.java
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/OnGoingFragmentView.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/RunRaceDetailFragment.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.8.2",
+            version: "0.8.3",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -2,6 +2,7 @@ package com.cnlive.moudle.collectionTrace.frame.presenter;
 import android.content.Context;
 import android.view.View;
+import android.view.ViewGroup;
 import com.cnlive.libs.base.logic.Logic;
 import com.cnlive.libs.base.logic.callback.DataCallback;
@@ -26,6 +27,18 @@ import static com.cnlive.libs.base.logic.Config.STATE_LOAD;
 public class CollRunRaceDetailFragmentPresenter extends MvpBasePresenter<CollRunRaceDetailFragmentView> {
     public void getRunRaceDetailInfo(Context context, String id, String userId, String state) {
+        if (null != getView()) {
+            try {
+                if (null != getView().webView) {
+                    if (getView().webView.getParent() != null) {
+                        ((ViewGroup) getView().webView.getParent()).removeView(getView().webView);
+                    }
+                    getView().webView.destroy();
+                    getView().webView = null;
+                }
+            } catch (Exception e) {
+            }
+        }
         //设置请求参数
         Map<String, String> paramsMap = new HashMap<>();
         //赛事id
@@ -146,11 +146,12 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         if (null == mClient) {
             mClient = new LBSTraceClient(getContext());
         }
+
         if (null != runRaceDetailInfo) {
             if (null != runRaceDetailInfo.getNewDescription() && !TextUtils.isEmpty(runRaceDetailInfo.getNewDescription())) {
                 initWebView(runRaceDetailInfo.getNewDescription());
             } else if (null != runRaceDetailInfo.getDescription() && !TextUtils.isEmpty(runRaceDetailInfo.getDescription())) {
-                initWebView(runRaceDetailInfo.getDescription());
+                initWebView(runRaceDetailInfo.getDescription().replaceAll("\n","<br>"));
             }
         }
         CollCommonInfo.setUserId(getContext(), uid);
@@ -343,7 +344,19 @@ public class CollRunRaceDetailFragmentView implements MvpView, SensorEventListen
         if (!TextUtils.isEmpty(runRaceDetailInfo.getRoadmap())) {
             //设置路线图
             GlideApp.with(getContext()).load(runRaceDetailInfo.getRoadmap()).into(fragment.binding.includeStreetIntroduce.ivRoadMao);
+            //路线图片设置点击事件
+            fragment.binding.includeStreetIntroduce.ivRoadMao.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    ArrayList<String> imgs = new ArrayList<>();
+                    imgs.add(runRaceDetailInfo.getRoadmap());
+                    if (null != imgs && imgs.size() > 0) {
+                        WebViewUtil.previewImg(fragment.getActivity(), runRaceDetailInfo.getRoadmap(), imgs);
+
+                    }
+                }
+            });
         }
         //设置路线介绍
 //        if (!TextUtils.isEmpty(runRaceDetailInfo.getDescription())) {
@@ -198,18 +198,6 @@ public class CollRunRaceDetailFragment extends QMUIFragment&lt;CollRunRaceDetailFra
         if (messageEvent.getMessageType() == Constant.UPDATA_COLL_BIND_TRACE_LIST) {
             if (getMvpView() != null) {
                 getMvpView().resetMap();
-                if (null != getMvpView()) {
-                    try {
-                        if (null != getMvpView().webView) {
-                            if (getMvpView().webView.getParent() != null) {
-                                ((ViewGroup) getMvpView().webView.getParent()).removeView(getMvpView().webView);
-                            }
-                            getMvpView().webView.destroy();
-                            getMvpView().webView = null;
-                        }
-                    } catch (Exception e) {
-                    }
-                }
                 getPresenter().getRunRaceDetailInfo(getActivity(), CollCommonInfo.getStreetId(getActivity()), CommonInfo.getUserId(getActivity()), "1");
             }
         }
@@ -2,6 +2,7 @@ package com.cnlive.moudle.pedometer.frame.presenter;
 import android.content.Context;
 import android.view.View;
+import android.view.ViewGroup;
 import com.cnlive.libs.base.logic.Logic;
 import com.cnlive.libs.base.logic.callback.DataCallback;
@@ -25,6 +26,18 @@ import static com.cnlive.libs.base.logic.Config.STATE_LOAD;
 public class OnGoingFragmentPresenter extends MvpBasePresenter<OnGoingFragmentView> {
     public void getRunRaceDetailInfo(Context context, String id, String userId, String state) {
+        if (null != getView()) {
+            try {
+                if (null != getView().webView) {
+                    if (getView().webView.getParent() != null) {
+                        ((ViewGroup) getView().webView.getParent()).removeView(getView().webView);
+                    }
+                    getView().webView.destroy();
+                    getView().webView = null;
+                }
+            } catch (Exception e) {
+            }
+        }
         //设置请求参数
         Map<String, String> paramsMap = new HashMap<>();
         //赛事id
@@ -2,6 +2,7 @@ package com.cnlive.moudle.pedometer.frame.presenter;
 import android.content.Context;
 import android.view.View;
+import android.view.ViewGroup;
 import com.cnlive.libs.base.logic.Logic;
 import com.cnlive.libs.base.logic.callback.DataCallback;
@@ -26,6 +27,18 @@ 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, String state) {
+        if (null != getView()) {
+            try {
+                if (null != getView().webView) {
+                    if (getView().webView.getParent() != null) {
+                        ((ViewGroup) getView().webView.getParent()).removeView(getView().webView);
+                    }
+                    getView().webView.destroy();
+                    getView().webView = null;
+                }
+            } catch (Exception e) {
+            }
+        }
         //设置请求参数
         Map<String, String> paramsMap = new HashMap<>();
         //赛事id
@@ -52,6 +52,7 @@ import com.hannesdorfmann.mosby3.mvp.MvpView;
 import com.qmuiteam.qmui.util.QMUIStatusBarHelper;
 import com.sothree.slidinguppanel.SlidingUpPanelLayout;
+import java.util.ArrayList;
 import java.util.List;
 public class OnGoingFragmentView implements MvpView {
@@ -61,7 +62,7 @@ public class OnGoingFragmentView implements MvpView {
     private UiSettings mUiSettings;
     public RunRaceDetailInfo runRaceDetailInfo;
     private LBSTraceClient mClient = null;
-    private WebView webView;
+    public WebView webView;
     public OnGoingFragmentView(OnGoingFragment fragment) {
         this.fragment = fragment;
@@ -101,12 +102,13 @@ public class OnGoingFragmentView implements MvpView {
         if (fragment.getActivity() == null) {
             return;
         }
+        fragment.binding.flTop.setVisibility(View.VISIBLE);
         this.runRaceDetailInfo = runRaceDetailInfo;
         if (null != runRaceDetailInfo) {
             if (null != runRaceDetailInfo.getNewDescription() && !TextUtils.isEmpty(runRaceDetailInfo.getNewDescription())) {
                 initWebView(runRaceDetailInfo.getNewDescription());
             } else if (null != runRaceDetailInfo.getDescription() && !TextUtils.isEmpty(runRaceDetailInfo.getDescription())) {
-                initWebView(runRaceDetailInfo.getDescription());
+                initWebView(runRaceDetailInfo.getDescription().replaceAll("\n", "<br>"));
             }
         }
         //轨迹开始时间
@@ -387,7 +389,18 @@ public class OnGoingFragmentView implements MvpView {
             if (!TextUtils.isEmpty(runRaceDetailInfo.getRoadmap())) {
                 //设置路线图
                 GlideApp.with(getContext()).load(runRaceDetailInfo.getRoadmap()).into(fragment.binding.includeStreetIntroduce.ivRoadMao);
+                //路线图片设置点击事件
+                fragment.binding.includeStreetIntroduce.ivRoadMao.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        ArrayList<String> imgs = new ArrayList<>();
+                        imgs.add(runRaceDetailInfo.getRoadmap());
+                        if (null != imgs && imgs.size() > 0) {
+                            WebViewUtil.previewImg(fragment.getActivity(), runRaceDetailInfo.getRoadmap(), imgs);
+                        }
+                    }
+                });
             }
             //开始按钮点击事件(用户进行滑动滑动)
@@ -168,11 +168,12 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         if (fragment.getActivity() == null) {
             return;
         }
+        fragment.binding.flTop.setVisibility(View.VISIBLE);
         if (null != runRaceDetailInfo) {
             if (null != runRaceDetailInfo.getNewDescription() && !TextUtils.isEmpty(runRaceDetailInfo.getNewDescription())) {
                 initWebView(runRaceDetailInfo.getNewDescription());
             } else if (null != runRaceDetailInfo.getDescription() && !TextUtils.isEmpty(runRaceDetailInfo.getDescription())) {
-                initWebView(runRaceDetailInfo.getDescription());
+                initWebView(runRaceDetailInfo.getDescription().replaceAll("\n", "<br>"));
             }
         }
         queryResultPoints = new ArrayList<>();
@@ -518,8 +519,20 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         if (!TextUtils.isEmpty(runRaceDetailInfo.getRoadmap())) {
             //设置路线图
             GlideApp.with(getContext()).load(runRaceDetailInfo.getRoadmap()).into(fragment.binding.includeStreetIntroduce.ivRoadMao);
+            //路线图片设置点击事件
+            fragment.binding.includeStreetIntroduce.ivRoadMao.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    ArrayList<String> imgs = new ArrayList<>();
+                    imgs.add(runRaceDetailInfo.getRoadmap());
+                    if (null != imgs && imgs.size() > 0) {
+                        WebViewUtil.previewImg(fragment.getActivity(), runRaceDetailInfo.getRoadmap(), imgs);
+                    }
+                }
+            });
         }
+
         //判断按钮状态
         initStartBtnState(runRaceDetailInfo);
         checkStartBtnState();
@@ -210,18 +210,6 @@ public class RunRaceDetailFragment extends QMUIFragment&lt;RunRaceDetailFragmentVie
             }
             if (getMvpView() != null && null != getPresenter()) {
                 if (!TextUtils.isEmpty(CommonInfo.getStreetId(getActivity()))) {
-                    if (null != getMvpView()) {
-                        try {
-                            if (null != getMvpView().webView) {
-                                if (getMvpView().webView.getParent() != null) {
-                                    ((ViewGroup) getMvpView().webView.getParent()).removeView(getMvpView().webView);
-                                }
-                                getMvpView().webView.destroy();
-                                getMvpView().webView = null;
-                            }
-                        } catch (Exception e) {
-                        }
-                    }
                     getPresenter().getRunRaceDetailInfo(getActivity(), CommonInfo.getStreetId(getActivity()), CommonInfo.getUserId(getActivity()), "0");
                 }
             }