1 大众体育已结束的赛事详情页增加分享逻辑

2 修复首次进入已结束的活动详情页小概率显示异常问题

1 大众体育已结束的赛事详情页增加分享逻辑
2 修复首次进入已结束的活动详情页小概率显示异常问题
YangShuai
1 parent 670d7c94
Showing 4 changed files with 71 additions and 92 deletions
config.gradle
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/res/layout/fragment_run_race_detail.xml
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.1.4",
+            version: "1.1.5",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -17,6 +17,8 @@ import com.baidu.mapapi.model.LatLng;
 import com.baidu.trace.LBSTraceClient;
 import com.baidu.trace.model.SortType;
 import com.cnlive.libs.base.application.AppConfig;
+import com.cnlive.libs.base.arouter.share.CNLiveShareService;
+import com.cnlive.libs.base.util.OpenServiceHelpUtil;
 import com.cnlive.libs.base.util.StatusBarUtil2;
 import com.cnlive.moudle.pedometer.commonInfo.CommonInfo;
 import com.cnlive.moudle.pedometer.model.Constant;
@@ -45,6 +47,8 @@ public class OnGoingFragmentView implements MvpView {
     public RunRaceDetailInfo runRaceDetailInfo;
     private LBSTraceClient mClient = null;
     public WebView webView;
+    private final String SHARE_DEBUG_URL = "http://wjjh5test.cnlive.com/cnSportsDetail.html";
+    private final String SHARE_REL_URL = "http://wjjh5.cnlive.com/cnSportsDetail.html";
     public OnGoingFragmentView(OnGoingFragment fragment) {
         this.fragment = fragment;
@@ -77,10 +81,36 @@ public class OnGoingFragmentView implements MvpView {
         }
         WebViewUtil.setPtoHtmlData(fragment.getActivity(), html, webView, Constant.WEBVIEW_FONT_SIZE);
         fragment.binding.includeStreetIntroduce.llWebview.addView(webView);
+        //view加载完成时回调
+        fragment.binding.includeStreetIntroduce.llWebview.post(new Runnable() {
+            @Override
+            public void run() {
+                fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+                fragment.binding.scrollView.scrollTo(0, 0);
+            }
+        });
     }
-    public void initView(RunRaceDetailInfo runRaceDetailInfo) {
+    /**
+     * 分享赛事
+     */
+    public void shareCurrentRace() {
+        CNLiveShareService shareService = OpenServiceHelpUtil.getShareService(getContext());
+        if (null != shareService && null != runRaceDetailInfo) {
+            String subTitle = "我在网家家上报名了线上赛事 快来和我一起动起来";
+            String shareUrl = AppConfig.isDebug() ? SHARE_DEBUG_URL : SHARE_REL_URL;
+//            String shareImgUrl = "http://wjj.ys1.cnliveimg.com/download/app_icon/share/strike_logo_mass_sports.png";
+            String shareImgUrl = "http://wjj.ys1.cnliveimg.com/download/app_icon/share/strike_logo_mass_sports_rec.png";
+            boolean isShowWjjLife = true;
+            boolean isShowWjjFriend = true;
+            boolean isShowOther = true;
+            shareUrl += "?eventId=" + fragment.eventId + "&channelName=" + runRaceDetailInfo.getChannelName();
+            shareService.shareLink(getContext(), runRaceDetailInfo.getTitle(), subTitle, shareUrl, shareImgUrl, isShowWjjLife, isShowWjjFriend, false);
+        }
+    }
+
+    public void initView(RunRaceDetailInfo runRaceDetailInfo) {
         if (fragment.getActivity() == null) {
             return;
         }
@@ -236,11 +266,11 @@ public class OnGoingFragmentView implements MvpView {
             }
             //显示底部滑动卡片
             fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
-            if (!TextUtils.isEmpty(runRaceDetailInfo.getE_subtitle())) {
-                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 169));
-            } else {
-                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 140));
-            }
+//            if (!TextUtils.isEmpty(runRaceDetailInfo.getE_subtitle())) {
+//                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 169));
+//            } else {
+//                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 140));
+//            }
             //设置标题
             if (!TextUtils.isEmpty(runRaceDetailInfo.getTitle())) {
                 fragment.binding.includeStreet.tvRaceTitle.setText(runRaceDetailInfo.getTitle());
@@ -417,6 +447,21 @@ public class OnGoingFragmentView implements MvpView {
                 }
             });
         }
+
+        //地图模式黑色分享按钮
+        fragment.binding.ivBlackShare.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                shareCurrentRace();
+            }
+        });
+        //非地图模式
+        fragment.binding.llTopShare.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                shareCurrentRace();
+            }
+        });
     }
     public void initMap() {
@@ -180,8 +180,14 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         }
         WebViewUtil.setPtoHtmlData(fragment.getActivity(), html, webView, Constant.WEBVIEW_FONT_SIZE);
         fragment.binding.includeStreetIntroduce.llWebview.addView(webView);
-        fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
-
+        //view加载完成时回调
+        fragment.binding.includeStreetIntroduce.llWebview.post(new Runnable() {
+            @Override
+            public void run() {
+                fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
+                fragment.binding.scrollView.scrollTo(0, 0);
+            }
+        });
     }
     public void initView(RunRaceDetailInfo runRaceDetailInfo) {
@@ -235,9 +241,6 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         fragment.binding.mapView.setVisibility(View.VISIBLE);
         //隐藏空视图
         fragment.binding.emptyLayout.setVisibility(View.GONE);
-        //显示立即报名按钮
-//        fragment.binding.includeStreet.rlStartBtn.setVisibility(View.VISIBLE);
-
         //设置底部卡片第一次可滑动的位置
         fragment.binding.slidingLayout.setAnchorPoint(0.5f);
         LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
@@ -385,22 +388,14 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         //设置标题
         if (!TextUtils.isEmpty(runRaceDetailInfo.getTitle())) {
             fragment.binding.includeStreet.tvRaceTitle.setText(runRaceDetailInfo.getTitle());
-//            fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
-//                @Override
-//                public boolean onPreDraw() {
-//                    Log.e(TAG, "initView: " + fragment.binding.includeStreet.tvRaceTitle.getLineCount());
-//                    fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().removeOnPreDrawListener(this);
-//                    return false;
-//                }
-//            });
+//            if (!TextUtils.isEmpty(runRaceDetailInfo.getE_subtitle())) {
+//                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 210));
+//            } else {
+//            fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 181));
+//            }
+            fragment.binding.flTop.setVisibility(View.INVISIBLE);
             //显示底部滑动卡片
             fragment.binding.slidingLayout.setPanelState(SlidingUpPanelLayout.PanelState.COLLAPSED);
-            if (!TextUtils.isEmpty(runRaceDetailInfo.getE_subtitle())) {
-                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 210));
-            } else {
-                fragment.binding.slidingLayout.setPanelHeight(ScreenUtil.dip2px(getContext(), 181));
-            }
-            fragment.binding.flTop.setVisibility(View.GONE);
 //            //根据标题行数,自动调整卡片大小
 //            fragment.binding.includeStreet.tvRaceTitle.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
 //                @Override
@@ -480,10 +475,6 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         if (runRaceDetailInfo.isIndividualAchievement()) {
             //显示
             fragment.binding.includePersonScore.llPersonScoreRoot.setVisibility(View.VISIBLE);
-//            //设置完成人数
-//            if (!TextUtils.isEmpty(runRaceDetailInfo.getFinishNum())) {
-//                fragment.binding.includeRank.tvFinishPerson.setText(runRaceDetailInfo.getFinishNum());
-//            }
             //设置个人行走距离
             if (!TextUtils.isEmpty(runRaceDetailInfo.getUserMileage())) {
                 fragment.binding.includePersonScore.tvUserDistance.setText(runRaceDetailInfo.getUserMileage());
@@ -555,65 +546,7 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         //判断按钮状态
         initStartBtnState(runRaceDetailInfo);
         checkStartBtnState();
-//        //判断用户是否报名
-//        if (runRaceDetailInfo.isSignResult()) {
-//            fragment.binding.rlScrollViewStartBtn.setTag(BTN_START_RACE);
-//            fragment.binding.tvRunNow.setText("现在开始");
-//            fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
-//            checkStartBtnState();
-//        } else {
-//            fragment.binding.rlScrollViewStartBtn.setTag(BTN_REGIST_RACE);
-//            fragment.binding.tvRunNow.setText("立即报名");
-//            fragment.binding.tvGoTip.setVisibility(View.GONE);
-//        }
-//        //开始按钮点击事件(未滑动)
-//        fragment.binding.includeStreet.rlStartBtn.setOnClickListener(new View.OnClickListener() {
-//            @Override
-//            public void onClick(View view) {
-//                if (fragment.getActivity() == null) {
-//                    return;
-//                }
-//                //立即报名
-//                if ("0".equals(fragment.binding.includeStreet.rlStartBtn.getTag())) {
-//                    fragment.binding.includeStreet.rlStartBtn.setTag("1");
-//                    fragment.binding.includeStreet.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_start_now));
-//                    fragment.binding.includeStreet.tvGoTip.setVisibility(View.VISIBLE);
-//
-//                    //设置滑动
-//                    fragment.binding.rlScrollViewStartBtn.setTag("1");
-//                    fragment.binding.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_start_now));
-//                    fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
-//                    RegistrationInfoActivity.newInstance(fragment.getActivity(), 1001);
-//                } else {
-//                    //计算当前位置与起点坐标距离
-//                    if (userCurrentLatLng != null && trackPoints != null && trackPoints.size() > 0) {
-//                        double distance = DistanceUtil.getDistance(userCurrentLatLng, trackPoints.get(0));
-//                        if (distance < 20) {
-//                            //开始运动
-//                            fragment.binding.includeStreet.rlStartBtn.setTag("0");
-//                            fragment.binding.includeStreet.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_sign_up));
-//                            fragment.binding.includeStreet.tvGoTip.setVisibility(View.GONE);
-//                            fragment.getActivity().startActivity(new Intent(getContext(), PedometerMainActivity.class));
-//                            //设置滑动
-//                            fragment.binding.rlScrollViewStartBtn.setTag("0");
-//                            fragment.binding.tvRunNow.setText(getContext().getResources().getString(R.string.run_race_btn_sign_up));
-//                            fragment.binding.tvGoTip.setVisibility(View.GONE);
-//                        } else {
-//                            TipDialog tipDialog = new TipDialog(getContext(), getContext().getResources().getString(R.string.run_race_far_tip), "我知道了", R.color.green_round, new TipDialog.DialogInterface() {
-//                                @Override
-//                                public void onClick(TipDialog dialog) {
-//                                    dialog.dismiss();
-//                                }
-//                            });
-//                            tipDialog.show();
-//                            tipDialog.setCancelable(false);
-//                            tipDialog.setCanceledOnTouchOutside(false);
-//                        }
-//                    }
-//                }
-//            }
-//        });
         //开始按钮点击事件(用户进行滑动滑动)
         fragment.binding.rlScrollViewStartBtn.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -14,6 +14,7 @@
             sothree:umanoDragView="@+id/scrollView"
             sothree:umanoFadeColor="@color/black_20"
             sothree:umanoOverlay="true"
+            sothree:umanoPanelHeight="181dp"
             sothree:umanoParallaxOffset="400dp"
             sothree:umanoScrollableView="@+id/scrollView"
             sothree:umanoShadowHeight="0dp">
@@ -179,9 +180,9 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:text="路线详情"
-                android:gravity="center"
                 android:layout_weight="1"
+                android:gravity="center"
+                android:text="路线详情"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
@@ -191,8 +192,8 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
                 android:gravity="center"
-                android:paddingRight="10dp"
-               >
+                android:paddingRight="10dp">
+
                 <ImageView
                     android:layout_width="20dp"
                     android:layout_height="19dp"