1 赛事详情页增加分享逻辑

2 修复赛事结束按钮可点击的问题

1 赛事详情页增加分享逻辑
2 修复赛事结束按钮可点击的问题
YangShuai
1 parent 302f48b0
Showing 12 changed files with 85 additions and 16 deletions
app/src/main/java/com/example/modulepedometer/MyApp.java
build.gradle
config.gradle
moudle_pedometer/src/main/java/com/cnlive/moudle/pedometer/frame/view/RunRaceDetailFragmentView.java
moudle_pedometer/src/main/res/drawable-hdpi/icon_pedometer_black_share.png
moudle_pedometer/src/main/res/drawable-hdpi/icon_pedometer_compass.webp
moudle_pedometer/src/main/res/drawable-hdpi/icon_pedometer_white_share.png
moudle_pedometer/src/main/res/drawable-xhdpi/icon_pedometer_black_share.png
moudle_pedometer/src/main/res/drawable-xhdpi/icon_pedometer_white_share.png
moudle_pedometer/src/main/res/drawable-xxhdpi/icon_pedometer_black_share.png
moudle_pedometer/src/main/res/drawable-xxhdpi/icon_pedometer_white_share.png
moudle_pedometer/src/main/res/layout/fragment_run_race_detail.xml
@@ -13,9 +13,16 @@ public class MyApp extends Application {
     public void onCreate() {
         super.onCreate();
         String userId = "358916";
-        AppConfig.init(getApplicationContext(), BuildConfig.APP_ID, BuildConfig.APP_KEY, BuildConfig.APP_SCERET,
-                0, BuildConfig.DEBUG, "", "",
-                userId, "", "", "", "", "", "", "", BuildConfig.BAIDU_MAP_APP_KEY);
+//        AppConfig.init(getApplicationContext(), BuildConfig.APP_ID, BuildConfig.APP_KEY, BuildConfig.APP_SCERET,
+//                0, BuildConfig.DEBUG, BuildConfig.BAIDU_MAP_APP_KEY, "",
+//                userId, "", "", "", "", "", "", "", BuildConfig.BAIDU_MAP_APP_KEY, "");
+        AppConfig.init(this, BuildConfig.APP_ID, BuildConfig.APP_KEY,
+                BuildConfig.APP_SCERET,0,
+                BuildConfig.DEBUG, BuildConfig.BAIDU_MAP_APP_KEY, "",
+                userId, "",
+               "","", "",
+               "", "", "",
+                BuildConfig.BAIDU_MAP_APP_KEY, "");
         if (AppConfig.isDebug()) {
             Constant.SERVICE_ID = 213511;
         } else {
@@ -68,7 +68,7 @@ ext {
     //qmui
     qmui = '1.1.5'
-    libBase = '1.3.6'
+    libBase = '1.9.1.4'
     libNetwork = '1.1.0'
     libLargeImage = '1.0.1'
     libEmoj = '1.9.8'
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.18",
+            version: "1.0.19",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.Point;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
@@ -42,6 +43,8 @@ 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.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;
@@ -125,6 +128,8 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
     private final String BTN_CONTINUE_RACE = "7";//继续运动
     public WebView webView;
     private boolean isLoadWeb = false;
+    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 RunRaceDetailFragmentView(RunRaceDetailFragment fragment) {
         this.fragment = fragment;
@@ -134,6 +139,22 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         return fragment == null ? null : fragment.getActivity();
     }
+    /**
+     * 分享赛事
+     */
+    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";
+            boolean isShowWjjLife = true;
+            boolean isShowWjjFriend = true;
+            boolean isShowOther = true;
+            shareService.shareLink(getContext(), runRaceDetailInfo.getTitle(), subTitle, shareUrl, shareImgUrl, isShowWjjLife, isShowOther, true);
+        }
+    }
+
     public void initWebView(String html) {
         if (null == webView) {
             webView = new WebView(getContext());
@@ -740,6 +761,20 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
                         .navigation(fragment.getActivity());
             }
         });
+        //地图模式黑色分享按钮
+        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();
+            }
+        });
     }
     /**
@@ -785,10 +820,10 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
         }
         //报名结束
         else if (BTN_END_RACE.equals(runRaceDetailInfo.getEventState())) {
-            fragment.binding.rlScrollViewStartBtn.setTag(BTN_START_RACE);
-            fragment.binding.tvRunNow.setText("赛事已结束");
+            fragment.binding.rlScrollViewStartBtn.setTag(BTN_END_RACE);
+            fragment.binding.tvRunNow.setText("赛事结束");
             fragment.binding.rlScrollViewStartBtn.setBackgroundColor(getContext().getResources().getColor(R.color.gray_round));
-            fragment.binding.tvGoTip.setVisibility(View.VISIBLE);
+            fragment.binding.tvGoTip.setVisibility(View.GONE);
         }
     }
@@ -832,7 +867,10 @@ public class RunRaceDetailFragmentView implements MvpView, SensorEventListener {
             baiduMap = mMapView.getMap();
         }
         //设置指南针位置
-        android.graphics.Point point = new android.graphics.Point(ScreenUtil.getScreenWidth(getContext()) - 80, 80);
+//        android.graphics.Point point = new android.graphics.Point(ScreenUtil.getScreenWidth(getContext()) - 80, 80);
+        int[] location = new int[2];
+        fragment.binding.ivBack.getLocationOnScreen(location);
+        android.graphics.Point point = new android.graphics.Point(location[0] + ScreenUtil.dip2px(getContext(), 27), location[1] + ScreenUtil.dip2px(getContext(), 80));
         baiduMap.setCompassPosition(point);
 //        if (routePlanSearch == null) {
 //            routePlanSearch = RoutePlanSearch.newInstance();
@@ -45,6 +45,14 @@
                     android:layout_margin="10dp"
                     android:background="@drawable/pedometer_xqy_return" />
+                <ImageView
+                    android:id="@+id/iv_black_share"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_gravity="right"
+                    android:layout_margin="10dp"
+                    android:background="@drawable/icon_pedometer_black_share" />
+
                 <ImageView
                     android:id="@+id/iv_share"
@@ -144,13 +152,13 @@
         </RelativeLayout>
-        <FrameLayout
+        <LinearLayout
             android:id="@+id/fl_top"
             android:layout_width="match_parent"
             android:layout_height="40dp"
             android:layout_gravity="top"
             android:background="@color/run_main_bg"
-            android:gravity="center"
+            android:gravity="center_vertical"
             android:visibility="invisible">
             <LinearLayout
@@ -159,22 +167,38 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center_vertical"
                 android:gravity="center"
-                android:padding="10dp">
+                android:padding="8dp">
                 <ImageView
-                    android:layout_width="9dp"
-                    android:layout_height="14dp"
+                    android:layout_width="11dp"
+                    android:layout_height="20dp"
                     android:background="@drawable/pedometer_icon_run_white_back" />
             </LinearLayout>
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:text="路线详情"
+                android:gravity="center"
+                android:layout_weight="1"
                 android:textColor="@color/white"
                 android:textSize="18sp" />
-        </FrameLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_top_share"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_vertical"
+                android:gravity="center"
+                android:paddingRight="10dp"
+               >
+                <ImageView
+                    android:layout_width="20dp"
+                    android:layout_height="19dp"
+                    android:background="@drawable/icon_pedometer_white_share" />
+            </LinearLayout>
+        </LinearLayout>
         <com.cnlive.strike.ui.widget.UIEmptyView
             android:id="@+id/empty_layout"