游戏房入口对接

live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java

@@ -65,6 +65,7 @@ import com.yunbao.common.event.GiftWallIlluminateEvent;
 import com.yunbao.common.event.JavascriptInterfaceEvent;
 import com.yunbao.common.event.LiveErrorEvent;
 import com.yunbao.common.event.LiveRoomChangeEvent;
+import com.yunbao.common.event.NewRoleCustomDrawerPopupEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.CommonHttpConsts;
 import com.yunbao.common.http.CommonHttpUtil;
@@ -89,6 +90,7 @@ import com.yunbao.common.utils.RouteUtil;
 import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.CustomDrawerPopupView;
+import com.yunbao.common.views.LiveSudGamePopup;
 import com.yunbao.common.views.floatingview.APPEasyFloat;
 import com.yunbao.common.views.weight.VerticalViewPager;
 import com.yunbao.live.R;
@@ -121,10 +123,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import io.rong.imlib.IRongCoreCallback;
-import io.rong.imlib.IRongCoreEnum;
-import io.rong.imlib.chatroom.base.RongChatRoomClient;
-
 /**
  * Created by cxf on 2018/10/10.
  * 看直播
@@ -983,6 +981,18 @@ public class LiveAudienceActivity extends LiveActivity {
                                     .setBean(mLiveBean)
                                     .setType(LiveAudienceEvent.LiveAudienceType.FONT_SIZE));
                         }
+
+                        @Override
+                        public void interaction(long interactionID) {
+                            new XPopup.Builder(mContext)
+                                    .enableDrag(false)
+                                    .hasBlurBg(true)
+                                    .dismissOnTouchOutside(false)
+                                    .dismissOnBackPressed(false)
+                                    .asCustom(new LiveSudGamePopup(mContext, interactionID, mLiveUid))
+
+                                    .show();
+                        }
                     });
                     new XPopup.Builder(mContext)
                             .hasShadowBg(false)
@@ -1078,6 +1088,7 @@ public class LiveAudienceActivity extends LiveActivity {
                 fragment.setActivityId(6);
                 fragment.setRoomId(mLiveUid);
                 fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGameDialogFragment");
+
                 break;
             case FAN_CLUB:
 
@@ -1622,6 +1633,51 @@ public class LiveAudienceActivity extends LiveActivity {
         });
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onNewRoleCustomDrawerPopupEvent(NewRoleCustomDrawerPopupEvent event) {
+        //是否关闭弹窗
+
+        if (!TextUtils.isEmpty(event.getHtmlUrl())) {
+            if (TextUtils.equals(event.getHtmlUrl(), "recharge")) {
+                RouteUtil.forwardMyCoin(mContext);
+            } else if (TextUtils.equals(event.getHtmlUrl(), "to_me_information")) {
+                RouteUtil.forwardEditProfileActivity();
+            } else {
+                if (!event.isScreen()) {
+                    ZhuangBanActivity.forward(mContext, event.getHtmlUrl(), false, 1);
+                } else {
+                    Bundle bundle = new Bundle();
+                    bundle.putString("url", event.getHtmlUrl());
+                    LiveHDDialogFragment fragment = new LiveHDDialogFragment();
+                    fragment.setArguments(bundle);
+                    fragment.show(getSupportFragmentManager(), "LiveHDDialogFragment");
+                }
+            }
+        }
+        if (event.getActivityId() != 0) {
+            LiveGameDialogFragment fragment = new LiveGameDialogFragment();
+            fragment.setActivityId(event.getActivityId());
+            fragment.setRoomId(mLiveUid);
+            fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveGameDialogFragment");
+        }
+        if (!TextUtils.isEmpty(event.getRightsInterests())) {
+            //跳转贵族
+            if (TextUtils.equals(event.getRightsInterests(), getString(com.yunbao.common.R.string.noble))) {
+                Bus.get().post(new LiveAudienceEvent()
+                        .setType(LiveAudienceEvent.LiveAudienceType.NOBLE));
+                //跳转守护
+            } else if (TextUtils.equals(event.getRightsInterests(), getString(com.yunbao.common.R.string.guard_guard))) {
+                Bus.get().post(new LiveAudienceEvent()
+                        .setType(LiveAudienceEvent.LiveAudienceType.GUARD));
+                //跳转粉丝团
+            } else if (TextUtils.equals(event.getRightsInterests(), getString(com.yunbao.common.R.string.fan_club))) {
+                Bus.get().post(new LiveAudienceEvent()
+                        .setType(LiveAudienceEvent.LiveAudienceType.FAN_CLUB));
+            }
+        }
+
+    }
+
     @SuppressLint("SetTextI18n")
     public void showMsgRed(int num) {
         if (manager == null || manager.mLiveAudienceViewHolder == null || manager.mLiveAudienceViewHolder.mRedPoint == null) {

live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java

@@ -29,6 +29,7 @@ import com.umeng.analytics.MobclickAgent;
 import com.yunbao.common.CommonAppConfig;
 import com.yunbao.common.Constants;
 import com.yunbao.common.bean.NewPeopleInfo;
+import com.yunbao.common.dialog.LiveNewRolePopup;
 import com.yunbao.common.event.MessageIMEvent;
 import com.yunbao.common.glide.ImgLoader;
 import com.yunbao.common.http.API;
@@ -38,7 +39,6 @@ import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.ProcessResultUtil;
 import com.yunbao.common.utils.SpUtil;
 import com.yunbao.common.utils.ToastUtil;
-import com.yunbao.live.dialog.LiveGiftPopup;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 import com.yunbao.live.R;
 import com.yunbao.live.activity.LiveActivity;
@@ -47,7 +47,6 @@ import com.yunbao.live.bean.LiveChatBean;
 import com.yunbao.live.dialog.LiveHDDialogFragment;
 import com.yunbao.live.dialog.LiveMicUserDialogFragment;
 import com.yunbao.live.dialog.LivePromotionDialogFragment;
-import com.yunbao.live.dialog.LiveRoleDialogFragment;
 import com.yunbao.live.dialog.TextHintDialog;
 import com.yunbao.live.dialog.VoiceDialog;
 import com.yunbao.live.event.LiveAudienceEvent;
@@ -461,11 +460,16 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
      * 身份特权
      */
     public void openRoleDialog() {
-        LiveRoleDialogFragment fragment = new LiveRoleDialogFragment();
-        Bundle bundle = new Bundle();
-        bundle.putBoolean("showRed", mRedPointPrivilege.getVisibility() == View.VISIBLE);
-        fragment.setArguments(bundle);
-        fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveRoleDialogFragment");
+//        LiveRoleDialogFragment fragment = new LiveRoleDialogFragment();
+//        Bundle bundle = new Bundle();
+//        bundle.putBoolean("showRed", mRedPointPrivilege.getVisibility() == View.VISIBLE);
+//        fragment.setArguments(bundle);
+//        fragment.show(((LiveAudienceActivity) mContext).getSupportFragmentManager(), "LiveRoleDialogFragment");
+        new XPopup.Builder(mContext)
+                .enableDrag(false)
+                .hasBlurBg(true)
+                .asCustom(new LiveNewRolePopup(mContext))
+                .show();
     }
 
 

live/src/main/res/layout/dialog_live_role.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="171dp"
-    android:background="@mipmap/img_pop_bg">
+    android:layout_height="354dp"
+    android:background="@drawable/bg_live_tota">
 
     <TextView
         android:id="@+id/title"
@@ -120,4 +120,4 @@
         </LinearLayout>
 
     </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>

live/src/main/res/layout/view_live_audience.xml

@@ -345,6 +345,7 @@
             <!--整蛊-->
             <ImageView
                 android:id="@+id/live_cheat"
+                android:visibility="gone"
                 android:layout_width="35dp"
                 android:layout_height="35dp"
                 android:layout_marginEnd="8dp"