修复：直播间内遮盖问题

config.gradle

@@ -10,9 +10,9 @@ ext {
     manifestPlaceholders = [
             //正式
 
-            serverHost       : "https://napi.yaoulive.com",
+//            serverHost       : "https://napi.yaoulive.com",
 //            測試
-//            serverHost       : "https://ceshi.yaoulive.com",
+            serverHost       : "https://ceshi.yaoulive.com",
 
             //腾讯地图
             txMapAppKey      : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",
@@ -25,8 +25,8 @@ ext {
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 
 //            true表示谷歌支付 false
-            isGooglePlay     :  false,
+            isGooglePlay     :  true,
             //是否上报异常日志
-            isUploadLog      :  true
+            isUploadLog      :  false
     ]
 }

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

@@ -254,7 +254,8 @@ public class LiveAudienceEvent extends BaseModel {
         PK_TIME_COUNT(48, "多人PK结束"),
         DISCONNEXT_PK_TIME(50, "单人Pk结束"),
         UP_PK_TWO(51, "PK头像信息"),
-        CUSTOM_FULL_SERVICE_NOTIFY(51, "全服通知");
+        CUSTOM_FULL_SERVICE_NOTIFY(51, "全服通知"),
+        CHANGE_VIEW(52, "更改连胜位置");
 
         private int type;
         private String name;

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

@@ -20,7 +20,6 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.yunbao.common.CommonAppConfig;
-import com.yunbao.common.utils.Bus;
 import com.yunbao.common.utils.DpUtil;
 import com.yunbao.common.utils.ScreenDimenUtil;
 import com.yunbao.common.utils.WordUtil;
@@ -381,7 +380,7 @@ public class LiveLinkMicPkViewHolder extends AbsViewHolder {
      * @param result -1自己的主播输 0平  1自己的主播赢
      */
     public void end(final int result) {
-        Log.e("ry1",result+"result");
+        Log.e("ry1", result + "result");
         if (mResultImageView == null) {
             return;
         }
@@ -417,6 +416,7 @@ public class LiveLinkMicPkViewHolder extends AbsViewHolder {
                         img_pk_show_r.setBackgroundResource(R.mipmap.icon_pk_win);
                     }
                     LiveRoomViewHolder.pkEndList(result);
+                    EventBus.getDefault().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.CHANGE_VIEW));
                 }
             }
         });

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

@@ -1878,9 +1878,27 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
             img_pk_fist_l.setBackgroundResource(R.mipmap.icon_red_smvp);
             img_pk_fist_r.setBackgroundResource(R.mipmap.icon_blue_mvp);
         }
+
+
 //        pkEndIndex = 1;
     }
 
+    /**
+     * 修改连胜位置
+     */
+    private void changeView() {
+        if (mRedVal.getVisibility() == View.VISIBLE) {
+            RelativeLayout.LayoutParams redValLayoutParams = (RelativeLayout.LayoutParams) mRedVal.getLayoutParams();
+            redValLayoutParams.bottomMargin = DpUtil.dp2px(60);
+            mRedVal.setLayoutParams(redValLayoutParams);
+        }
+        if (mBlueVal.getVisibility() == View.VISIBLE) {
+            RelativeLayout.LayoutParams blueValLayoutParams = (RelativeLayout.LayoutParams) mBlueVal.getLayoutParams();
+            blueValLayoutParams.bottomMargin = DpUtil.dp2px(60);
+            mBlueVal.setLayoutParams(blueValLayoutParams);
+        }
+    }
+
     //头像显示
     public void setHeadData(LivePKUserListBean bean) {
         if (bean == null) return;
@@ -3822,6 +3840,9 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
                 ToastUtil.show("对方UID=" + pkUid);
                 UpPkTwo();
                 break;
+            case CHANGE_VIEW:
+                changeView();
+                break;
         }
 
     }

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

@@ -9,11 +9,6 @@
 
     android:paddingTop="15dp">
 
-    <com.yunbao.common.views.weight.NobleNoticeView
-        android:id="@+id/noble"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="60dp" />
 
     <LinearLayout
         android:id="@+id/lin"
@@ -2308,4 +2303,10 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="110dp"
         android:visibility="gone" />
+
+    <com.yunbao.common.views.weight.NobleNoticeView
+        android:id="@+id/noble"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="60dp" />
 </RelativeLayout>