tmp

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

@@ -386,6 +386,9 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
      * 主播展示离开直播间
      */
     private void leaveLive() {
+        if (PKing || isDRPK == 1) {
+            return;
+        }
         RCRTCRect rect = new RCRTCRect(0f, 0f, 1.0f);
         if (leave == 0) {
             leave = 1;
@@ -1293,6 +1296,11 @@ public class LiveRyAnchorActivity extends LiveActivity implements LiveFunctionCl
                     fragment4Audience.show(((LiveRyAnchorActivity) mContext).getSupportFragmentManager(), "LiveWishListDialogFragment4Audience");
                 }
                 break;
+            case UN_LEAVELIVE:
+                if (leave == 1) {
+                    leaveLive();
+                }
+                break;
         }
     }
 }

live/src/main/java/com/yunbao/live/dialog/LiveLinkMicListDialogFragment.java

@@ -25,6 +25,7 @@ import com.yunbao.common.custom.CommonRefreshView;
 import com.yunbao.common.dialog.AbsDialogFragment;
 import com.yunbao.common.http.HttpCallback;
 import com.yunbao.common.interfaces.OnItemClickListener;
+import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.live.R;
@@ -32,6 +33,7 @@ import com.yunbao.live.activity.LiveAnchorActivity;
 import com.yunbao.live.activity.LiveRyAnchorActivity;
 import com.yunbao.live.adapter.LivePkAdapter;
 import com.yunbao.live.bean.LivePkBean;
+import com.yunbao.live.event.LiveAudienceEvent;
 import com.yunbao.live.http.LiveHttpConsts;
 import com.yunbao.live.http.LiveHttpUtil;
 
@@ -345,7 +347,8 @@ public class LiveLinkMicListDialogFragment extends AbsDialogFragment implements
         Bundle bundle = getArguments();
 
         if(bundle!=null){
-
+            Bus.get().post(new LiveAudienceEvent()
+                    .setType(LiveAudienceEvent.LiveAudienceType.UN_LEAVELIVE));
             if(bundle.getBoolean("isDRPK", false) == true) {
 //                ToastUtil.show("多人");
 

live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java

@@ -173,7 +173,8 @@ public class LiveAudienceEvent extends BaseModel {
         VOICE_PRESS(30, "长按展示图片"),
         LUCKY_ANGEL(31, "幸运天使"),
         WE_CHEAT(32, "整蛊"),
-        WISH_LIST_UPDATE(33, "心愿单更新推送")
+        WISH_LIST_UPDATE(33, "心愿单更新推送"),
+        UN_LEAVELIVE(34, "取消暂时离开")
         ;
 
         private int type;

live/src/main/java/com/yunbao/live/socket/SocketRyClient.java

@@ -980,7 +980,7 @@ public class SocketRyClient {
          */
         private static void processAnchorLinkMicPk(JSONObject map) {
             int action = map.getIntValue("action");
-            Log.e("action", action + "");
+            Log.i("Socket", "action = "+action+" json = "+map.toString());
 
             switch (action) {
                 case 1://收到对方主播PK回调