1、开通守护，im消息优化

2、游戏房安全区域优化
3、举报接口新增字段区分

common/src/main/java/com/yunbao/common/dialog/OrderLevelPopupWindow.java

@@ -19,6 +19,7 @@ import com.yunbao.common.http.base.HttpCallback;
 import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.interfaces.OnItemClickListener;
 import com.yunbao.common.manager.IMLoginManager;
+import com.yunbao.common.utils.StringUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.utils.WordUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
@@ -124,6 +125,10 @@ public class OrderLevelPopupWindow extends CenterPopupView {
         ViewClicksAntiShake.clicksAntiShake(findViewById(R.id.buying_experience), new ViewClicksAntiShake.ViewClicksCallBack() {
             @Override
             public void onViewClicks() {
+                if(StringUtil.isEmpty(orderLevel.getText().toString())||"0".equals(orderLevel.getText().toString())){
+                    ToastUtil.show(WordUtil.isNewZh()?"输入数字不可为0":"The input number cannot be 0");
+                    return;
+                }
                 if (Integer.parseInt(orderLevel.getText().toString()+"00") <= maxExp) {
                     LiveNetManager.get(getContext()).buyingExperiencePoint(buyExp + "00", new HttpCallback<ResponseModel<Object>>() {
                         @Override

common/src/main/java/com/yunbao/common/http/LiveHttpUtil.java

@@ -243,10 +243,11 @@ public class LiveHttpUtil {
     /**
      * 举报用户 + 图片
      */
-    public static void setReport(String touid, String content, File file1, File file2, File file3, String videoId, HttpCallback callback) {
+    public static void setReport(String touid,String report_argument, String content, File file1, File file2, File file3, String videoId, HttpCallback callback) {
         PostRequest<JsonBean> request = HttpClient.getInstance().post("Live.setReport", LiveHttpConsts.SET_REPORT)
                 .isMultipart(true)
                 .params("touid", touid)
+                .params("report_argument", report_argument)
                 .params("content", content);
         if (file1 != null) {
             request.params("file1", file1);

common/src/main/java/com/yunbao/common/views/LiveSudGamePopup.java

@@ -38,9 +38,11 @@ import com.yunbao.common.http.live.LiveNetManager;
 import com.yunbao.common.manager.IMLoginManager;
 import com.yunbao.common.sud.QuickStartGameViewModel;
 import com.yunbao.common.sud.model.GameConfigModel;
+import com.yunbao.common.sud.model.GameViewInfoModel;
 import com.yunbao.common.sud.state.SudMGPAPPState;
 import com.yunbao.common.sud.state.SudMGPMGState;
 import com.yunbao.common.utils.Bus;
+import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.ToastUtil;
 import com.yunbao.common.views.weight.ViewClicksAntiShake;
 
@@ -82,6 +84,15 @@ public class LiveSudGamePopup extends BottomPopupView {
         //第二次进入时，viewmodel数据丢失，所以初始化时直接获取
         gameViewModel.getScore(mCreateSudRoomModel.getSudGameRoomId(),getActivity());
         IMLoginManager.get(context).setSudGame("");
+
+        // 设置游戏安全操作区域
+        GameViewInfoModel.GameViewRectModel gameViewRectModel = new GameViewInfoModel.GameViewRectModel();
+        gameViewRectModel.left = 0;
+        gameViewRectModel.top = DpUtil.dp2px(50); //游戏安全区域
+        gameViewRectModel.right = 0;
+        gameViewRectModel.bottom = DpUtil.dp2px(30);
+        gameViewModel.gameViewRectModel = gameViewRectModel;
+
         //初始化结算弹窗
         sudGameDoubleDialog = new SudGameDoubleDialog(context);//双人游戏
         sudGameMultipleDialog = new SudGameMultipleDialog(context);//多人游戏

common/src/main/res/layout/dialog_live_sud_game.xml

@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="650dp"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@drawable/bg_live_sud_list"
     android:orientation="vertical">
 
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <FrameLayout
+            android:id="@+id/game_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </RelativeLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="40dp"
@@ -58,6 +69,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:maxLines="1"
+                        android:visibility="gone"
                         android:ellipsize="end"
                         android:text="@string/interactive_game_create_room_name"
                         android:textColor="@color/white"
@@ -128,17 +140,4 @@
             android:textSize="8sp" />
     </LinearLayout>
 
-    <RelativeLayout
+</FrameLayout>
-        android:layout_marginTop="10dp"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <FrameLayout
-            android:id="@+id/game_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-
-    </RelativeLayout>
-
-</LinearLayout>

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

@@ -133,7 +133,7 @@ public class LiveReportActivity extends AbsActivity implements LiveReportAdapter
             content += " " + text;
         }
         if (mIntoIndex == 0) {
-            LiveHttpUtil.setReport(mToUid, content, file1, file2, file3, mVideoId, new HttpCallback() {
+            LiveHttpUtil.setReport(mToUid, bean.getName(),text, file1, file2, file3, mVideoId, new HttpCallback() {
                 @Override
                 public void onSuccess(int code, String msg, String[] info) {
                     if (code == 0) {

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

@@ -458,7 +458,7 @@ public class SudRyGameActivity extends AbsActivity implements GameRyMicManager.M
         // 设置游戏安全操作区域
         GameViewInfoModel.GameViewRectModel gameViewRectModel = new GameViewInfoModel.GameViewRectModel();
         gameViewRectModel.left = 0;
-        gameViewRectModel.top = DpUtil.dp2px(180);
+        gameViewRectModel.top = DpUtil.dp2px(180);//游戏安全区域
         gameViewRectModel.right = 0;
         gameViewRectModel.bottom = DpUtil.dp2px(155);
         gameViewModel.gameViewRectModel = gameViewRectModel;

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

@@ -490,7 +490,9 @@ public class SocketRyClient {
                     } else if (action2 == 90) {
                         NewAllServerNotifyGuardEvent notifyGuardEvent = GsonUtils.fromJson(map.toString(), NewAllServerNotifyGuardEvent.class);
                         Bus.get().post(notifyGuardEvent);
+                        if(mLiveUid.equals(map.getString("liveuid"))){
                             buyGuardInSameRoom(map);
+                        }
                     } else if (action2 == 91) {//通用模板
                         AllServerNotifyFFGGGDJANEvent notifyFFGGGDJANEvent = GsonUtils.fromJson(map.toString(), AllServerNotifyFFGGGDJANEvent.class);
                         Bus.get().post(notifyFFGGGDJANEvent);

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

@@ -470,7 +470,9 @@ public class SocketSwClient {
                     } else if (action2 == 90) {
                         NewAllServerNotifyGuardEvent notifyGuardEvent = GsonUtils.fromJson(map.toString(), NewAllServerNotifyGuardEvent.class);
                         Bus.get().post(notifyGuardEvent);
+                        if(mLiveUid.equals(map.getString("liveuid"))){
                             buyGuardInSameRoom(map);
+                        }
                     } else if (action2 == 91) {
                         AllServerNotifyFFGGGDJANEvent notifyFFGGGDJANEvent = GsonUtils.fromJson(map.toString(), AllServerNotifyFFGGGDJANEvent.class);
                         Bus.get().post(notifyFFGGGDJANEvent);