心愿单逻辑修改，ui修改

config.gradle

@@ -4,7 +4,7 @@ ext {
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
             targetSdkVersion : 31,
-            versionCode      : 417,
+            versionCode      : 418,
             versionName      : "6.5.0"
     ]
     manifestPlaceholders = [
@@ -23,7 +23,7 @@ ext {
             baiduAppKey      : "zgCgFhUKEOV7I3ZXDFpTfnRB",
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 //            true表示谷歌支付 false
-            isGooglePlay     :  false,
+            isGooglePlay     :  true,
             //是否上报异常日志
             isUploadLog      :  true
     ]

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

@@ -4727,7 +4727,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
 
     public void hideAnchorSayAndCallAnchor() {
         mAnchorSay.setVisibility(View.GONE);
-        topBanner1.setVisibility(View.GONE);
+//        topBanner1.setVisibility(View.GONE);
     }
 
     public void showAnchorSayAndCallAnchor() {

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

@@ -191,7 +191,6 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
     private int landscape;
     private String leaveStream = "", leaveGroupId = "";
     public static PortraitLiveManager portraitLiveManager;
-    private WishModel wishListProgress;
     private static int waitShowTopBannerTime = 6000;
 
     public PortraitLiveManager setQuitF(boolean quitF) {
@@ -256,45 +255,11 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
         public void run() {
             loading.setVisibility(View.GONE);
             enterRoomLeaveHandler.post(enterRoomLeaveRunnable);
-            if (topBannerRunnable == null || topBannerHandler == null) {
-                initTopBannerHandler();
-            }
-            topBannerHandler.postDelayed(topBannerRunnable, waitShowTopBannerTime);
         }
     };
-    private Runnable topBannerRunnable = new Runnable() {
-        @Override
-        public void run() {
-            if (mLiveRoomViewHolder != null) {
-                //初始化顶部banner
-                mLiveRoomViewHolder.initTopBanner();
-                mLiveRoomViewHolder.updateTopBanner();
-                topBannerHandler.removeCallbacks(topBannerRunnable);
-                topBannerRunnable = null;
-                topBannerHandler = null;
-            }
 
-        }
-    };
-    private Handler topBannerHandler = new Handler();
 
-    private void initTopBannerHandler() {
-        topBannerHandler = new Handler();
-        topBannerRunnable = new Runnable() {
-            @Override
-            public void run() {
-                if (mLiveRoomViewHolder != null) {
-                    //初始化顶部banner
-                    mLiveRoomViewHolder.initTopBanner();
-                    mLiveRoomViewHolder.updateTopBanner();
-                    topBannerHandler.removeCallbacks(topBannerRunnable);
-                    topBannerRunnable = null;
-                    topBannerHandler = null;
-                }
 
-            }
-        };
-    }
 
     @Override
     public synchronized void onAdd(LiveBean data, int liveType, int liveTypeVal, int liveSdk) {
@@ -387,9 +352,6 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                 mLiveRoomViewHolder.resetView();
                 enterRoomModel.clear();
                 enterRoomLeaveHandler.removeCallbacks(enterRoomLeaveRunnable);
-                if (topBannerHandler != null && topBannerRunnable != null) {
-                    topBannerHandler.removeCallbacks(topBannerRunnable);
-                }
                 mLiveRoomViewHolder.setAvatar(data.getAvatar());
                 mLiveRoomViewHolder.setAnchorLevel(data.getLevelAnchor());
                 mLiveRoomViewHolder.setName(data.getUserNiceName());
@@ -533,11 +495,11 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
                             mLiveRoomViewHolder.setMedaRankNum(data.getEnterRoomInfo().getMedalRankNum());
                             //初始化女神说
                             mLiveRoomViewHolder.initAnchorSay();
-
-                            wishListProgress = data.getWishListProgress();
                             //心愿单顶部bannner
-
+                            mLiveRoomViewHolder.setWishListProgress(data.getWishListProgress());
-                            mLiveRoomViewHolder.setWishListProgress(wishListProgress);
+                            //初始化顶部banner
+                            mLiveRoomViewHolder.initTopBanner();
+                            mLiveRoomViewHolder.updateTopBanner();
 
                             isattention = Integer.parseInt(data.getEnterRoomInfo().getIsattention());
                             if (isattention == 0) {

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

@@ -662,7 +662,7 @@
         android:layout_below="@id/open_sidebar"
         android:layout_alignParentRight="true"
         android:layout_marginTop="16dp"
-        android:layout_marginRight="9dp"
+        android:layout_marginRight="5dp"
         android:background="@drawable/bg_live_other_ico"
         android:gravity="center">
 
@@ -702,7 +702,7 @@
         android:layout_height="76dp"
         android:layout_below="@+id/live_rank_pk"
         android:layout_alignParentRight="true"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="50dp"
         android:layout_marginRight="5dp"
         app:delay_time="5000"
         app:indicator_height="8dp"
@@ -2063,8 +2063,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
-        android:layout_marginTop="120dp"
+        android:layout_marginTop="230dp"
-        android:layout_marginRight="19dp"
+        android:layout_marginRight="7dp"
         android:orientation="vertical">
 
         <RelativeLayout