From 32fa77be39ea6dfa43fc87c4137e2456cf7146e9 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Thu, 13 Apr 2023 13:04:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E6=84=BF=E5=8D=95=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8Cui=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.gradle | 6 +-- .../yunbao/live/views/LiveRoomViewHolder.java | 2 +- .../live/views/PortraitLiveManager.java | 46 ++----------------- live/src/main/res/layout/view_live_room.xml | 8 ++-- 4 files changed, 12 insertions(+), 50 deletions(-) diff --git a/config.gradle b/config.gradle index fd1b383b9..95a3f25a3 100644 --- a/config.gradle +++ b/config.gradle @@ -4,14 +4,14 @@ ext { buildToolsVersion: "29.0.2", minSdkVersion : 21, targetSdkVersion : 31, - versionCode : 417, + versionCode : 418, versionName : "6.5.0" ] manifestPlaceholders = [ //正式、 serverHost : "https://napi.yaoulive.com", //测试 -// serverHost : "https://ceshi.yaoulive.com", +// serverHost : "https ://ceshi.yaoulive.com", //腾讯地图 txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", @@ -23,7 +23,7 @@ ext { baiduAppKey : "zgCgFhUKEOV7I3ZXDFpTfnRB", baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", // true表示谷歌支付 false - isGooglePlay : false, + isGooglePlay : true, //是否上报异常日志 isUploadLog : true ] diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 4b8bf6f34..c27cf7de2 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/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() { diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index f7816103b..7910576e2 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/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(wishListProgress); + mLiveRoomViewHolder.setWishListProgress(data.getWishListProgress()); + //初始化顶部banner + mLiveRoomViewHolder.initTopBanner(); + mLiveRoomViewHolder.updateTopBanner(); isattention = Integer.parseInt(data.getEnterRoomInfo().getIsattention()); if (isattention == 0) { diff --git a/live/src/main/res/layout/view_live_room.xml b/live/src/main/res/layout/view_live_room.xml index 3c5c7d43c..9984147f0 100644 --- a/live/src/main/res/layout/view_live_room.xml +++ b/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_marginRight="19dp" + android:layout_marginTop="230dp" + android:layout_marginRight="7dp" android:orientation="vertical">