修复PK显示问题：【是用户先进 主播后挂断会显示对方信息角标】

调整直播间游戏半屏UI
调整战令UI

common/src/main/java/com/yunbao/common/bean/LiveBattlePassRewardsBean.java

@@ -97,6 +97,15 @@ public class LiveBattlePassRewardsBean extends BaseModel{
         private String rewardName;
         @SerializedName("image_url")
         private String imageUrl;
+        @SerializedName("send_reward_type")
+        private int sendRewardType;
+        @SerializedName("send_gift_type")
+        private int sendGiftType;
+        @SerializedName("send_reward_needcoin")
+        private String sendRewardNeedcoin;
+        @SerializedName("send_reward_restrict_time")
+        private String  sendRewardRestrictTime;
+
         private int lock;
         private int received;
 
@@ -159,6 +168,38 @@ public class LiveBattlePassRewardsBean extends BaseModel{
             this.received = received;
         }
 
+        public int getSendRewardType() {
+            return sendRewardType;
+        }
+
+        public void setSendRewardType(int sendRewardType) {
+            this.sendRewardType = sendRewardType;
+        }
+
+        public int getSendGiftType() {
+            return sendGiftType;
+        }
+
+        public void setSendGiftType(int sendGiftType) {
+            this.sendGiftType = sendGiftType;
+        }
+
+        public String getSendRewardNeedcoin() {
+            return sendRewardNeedcoin;
+        }
+
+        public void setSendRewardNeedcoin(String sendRewardNeedcoin) {
+            this.sendRewardNeedcoin = sendRewardNeedcoin;
+        }
+
+        public String getSendRewardRestrictTime() {
+            return sendRewardRestrictTime;
+        }
+
+        public void setSendRewardRestrictTime(String sendRewardRestrictTime) {
+            this.sendRewardRestrictTime = sendRewardRestrictTime;
+        }
+
         @Override
         public String toString() {
             return "LiveBattlePassReward{" +

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

@@ -2,6 +2,7 @@ package com.yunbao.common.dialog;
 
 import android.animation.ObjectAnimator;
 import android.content.Context;
+import android.graphics.Color;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.animation.LinearInterpolator;
@@ -275,6 +276,29 @@ public class SudGameListPopup extends BottomPopupView {
                         .asCustom(new LiveSudGameHistoryPopup(getContext(), customSidebarChildModels)).show();
             }
         });
+        if (interactionID == 0) {
+            gameTitle.setTextColor(getYellowColor());
+        } else {
+            gameTitle.setTextColor(getDefColor());
+        }
+        if (mSill.equals("0,0,0")) {
+            sillTitle.setTextColor(getYellowColor());
+        } else {
+            sillTitle.setTextColor(getDefColor());
+        }
+        if ("0".equals(roomHolderType)) {
+            houseOwnerTitle.setTextColor(getYellowColor());
+        } else {
+            houseOwnerTitle.setTextColor(getDefColor());
+        }
+    }
+
+    private int getDefColor() {
+        return Color.WHITE;
+    }
+
+    private int getYellowColor() {
+        return Color.YELLOW;
     }
 
     @Override
@@ -293,6 +317,11 @@ public class SudGameListPopup extends BottomPopupView {
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onSudGameListEvent(SudGameListEvent event) {
         interactionID = event.getInteractionID();
+        if (interactionID == 0) {
+            gameTitle.setTextColor(getYellowColor());
+        } else {
+            gameTitle.setTextColor(getDefColor());
+        }
         if (IMLoginManager.get(getContext()).getLocaleLanguage() == Locale.SIMPLIFIED_CHINESE) {
             gameTitle.setText(event.getTitle());
         } else {
@@ -325,7 +354,11 @@ public class SudGameListPopup extends BottomPopupView {
         } else {
             sillTitle.setText(mSillName.substring(0, mSillName.length() - 2));
         }
-
+        if (mSill.equals("0,0,0")) {
+            sillTitle.setTextColor(getYellowColor());
+        } else {
+            sillTitle.setTextColor(getDefColor());
+        }
 
         ObjectAnimator animator = ObjectAnimator.ofFloat(roomSillArrow, "rotation", 90f, 0f);
         animator.setDuration(500);
@@ -344,6 +377,11 @@ public class SudGameListPopup extends BottomPopupView {
         animator.setInterpolator(new LinearInterpolator());
         animator.start();
         mRefreshView.initData();
+        if ("0".equals(roomHolderType)) {
+            houseOwnerTitle.setTextColor(getYellowColor());
+        } else {
+            houseOwnerTitle.setTextColor(getDefColor());
+        }
     }
 
 

common/src/main/res/drawable/background_order_dialog.xml

@@ -1,9 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- <item>
+         <bitmap
+             android:gravity="fill_vertical|fill_horizontal"
+             android:src="@drawable/background_order_dialog_out_layout" />
+     </item>-->
     <item>
-        <bitmap
-            android:gravity="fill_vertical|fill_horizontal"
-            android:src="@drawable/background_order_dialog_out_layout" />
+        <shape>
+            <stroke
+                android:width="10dp"
+                android:color="#CCBEF3" />
+            <corners android:radius="10dp" />
+        </shape>
     </item>
     <item
         android:bottom="3dp"
@@ -11,12 +19,15 @@
         android:right="4dp"
         android:top="4dp">
         <shape>
+
             <solid android:color="#F5F5FF" />
 
             <corners android:radius="10dp" />
+
             <stroke
                 android:width="3dp"
                 android:color="#657FE4" />
+
         </shape>
     </item>
 </layer-list>

common/src/main/res/drawable/bg_live_sud_game_back_new2.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="90dp" />
+    <gradient
+        android:endColor="#4B4B4B"
+        android:startColor="#4B4B4B" />
+</shape>

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

@@ -32,21 +32,21 @@
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:layout_marginEnd="14dp"
-            android:src="@mipmap/icon_sud_history_live" />
+            android:src="@mipmap/icon_sud_history_live_new" />
 
         <ImageView
             android:id="@+id/min_game"
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:layout_marginEnd="16dp"
-            android:src="@mipmap/icon_min_game"
+            android:src="@mipmap/icon_min_game_new"
             android:visibility="visible" />
 
         <TextView
             android:id="@+id/exit"
             android:layout_width="30dp"
             android:layout_height="30dp"
-            android:background="@drawable/bg_live_sud_game_back"
+            android:background="@drawable/bg_live_sud_game_back_new2"
             android:gravity="center"
             android:text="@string/video_exit"
             android:textColor="#FFFFFF"