From 824d431a63d1de706a48e18e8f1598ff6f951643 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Tue, 28 Feb 2023 13:06:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=BB=E6=92=AD?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=A9=BA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/views/LiveAnchorMessageCustomPopup.java | 10 +++++++++- .../main/res/layout/dialog_live_anchor_message.xml | 11 ++++++++++- config.gradle | 4 ++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/com/yunbao/common/views/LiveAnchorMessageCustomPopup.java b/common/src/main/java/com/yunbao/common/views/LiveAnchorMessageCustomPopup.java index 4f574524e..0898040ab 100644 --- a/common/src/main/java/com/yunbao/common/views/LiveAnchorMessageCustomPopup.java +++ b/common/src/main/java/com/yunbao/common/views/LiveAnchorMessageCustomPopup.java @@ -55,7 +55,15 @@ public class LiveAnchorMessageCustomPopup extends BottomPopupView { @Override public void onSuccess(List data) { size = data.size(); - adapter.addData(data); + + if (page == 1 && size == 0) { + liveMessage.setVisibility(GONE); + findViewById(R.id.img_no_new).setVisibility(VISIBLE); + } else { + findViewById(R.id.img_no_new).setVisibility(GONE); + liveMessage.setVisibility(VISIBLE); + adapter.addData(data); + } } @Override diff --git a/common/src/main/res/layout/dialog_live_anchor_message.xml b/common/src/main/res/layout/dialog_live_anchor_message.xml index 1c017ccf9..a2c1db4bb 100644 --- a/common/src/main/res/layout/dialog_live_anchor_message.xml +++ b/common/src/main/res/layout/dialog_live_anchor_message.xml @@ -17,5 +17,14 @@ + android:layout_height="match_parent" + android:visibility="gone" /> + + \ No newline at end of file diff --git a/config.gradle b/config.gradle index dcec2a45f..1c9c810b7 100644 --- a/config.gradle +++ b/config.gradle @@ -9,9 +9,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", From 34c855fc8f40d71180c8154f5ac1d14f73ec1e49 Mon Sep 17 00:00:00 2001 From: 18401019693 Date: Tue, 28 Feb 2023 15:19:22 +0800 Subject: [PATCH 2/2] di ban ben --- .../java/com/yunbao/common/manager/IMLoginManager.java | 8 ++++++++ common/src/main/res/values-en/strings.xml | 1 + common/src/main/res/values/strings.xml | 1 + .../com/yunbao/live/activity/LiveAudienceActivity.java | 5 +++++ 4 files changed, 15 insertions(+) diff --git a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java index 905b299ab..bede5737f 100644 --- a/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java +++ b/common/src/main/java/com/yunbao/common/manager/IMLoginManager.java @@ -41,7 +41,15 @@ public class IMLoginManager extends BaseCacheManager { private final String IS_HINT2 = "is_hint2"; private final String SELECT_CLARITY = "selectClarity"; private final String CLARITY = "clarity"; + private final String xiaJBG = "xiaJBG"; + public void setXiaJBG(boolean xjbg) { + put(xiaJBG, xjbg); + } + + public boolean IsXiaJBG() { + return getBoolean(xiaJBG, false); + } public void setClarity(String clarity) { put(CLARITY, clarity); diff --git a/common/src/main/res/values-en/strings.xml b/common/src/main/res/values-en/strings.xml index e92aa3e9f..83e7f5f19 100644 --- a/common/src/main/res/values-en/strings.xml +++ b/common/src/main/res/values-en/strings.xml @@ -1019,4 +1019,5 @@ Limited ride And limited avatar frame New fan group Fan group conversion rate loading… + Gift and seat effects have been turned off and can be turned on manually in "Settings". diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 795f8a9eb..32093aa8b 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1040,4 +1040,5 @@ 新增粉絲團 粉絲團轉化率 加载中… + 由於您的系統較老，我們自動為您屏蔽了禮物及座駕特效，可在「設置中心」手動打開。 diff --git a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java index 5ff617e85..5b2cf5822 100644 --- a/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java +++ b/live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java @@ -5,6 +5,7 @@ import android.app.Dialog; import android.content.Intent; import android.content.res.Configuration; import android.media.AudioManager; +import android.os.Build; import android.os.Bundle; import android.os.CountDownTimer; import android.os.Handler; @@ -183,6 +184,10 @@ public class LiveAudienceActivity extends LiveActivity { mStream = mLiveBean.getStream(); initData(); MicStatusManager.getInstance().addOnMicListener(onMicStatusListener); + if (!IMLoginManager.get(mContext).IsXiaJBG() && (Build.VERSION.SDK_INT < Build.VERSION_CODES.O)) { + ToastUtil.show(R.string.yoursystemisolder); + IMLoginManager.get(mContext).setXiaJBG(true); + } } private final MicStatusManager.OnMicStatusListener onMicStatusListener = new MicStatusManager.OnMicStatusListener() {