yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zlzw 2023-02-28 15:50:33 +08:00
commit 07f0f39978
7 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
View File

@ -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);

8
common/src/main/java/com/yunbao/common/views/LiveAnchorMessageCustomPopup.java
View File

@ -55,8 +55,16 @@ public class LiveAnchorMessageCustomPopup extends BottomPopupView {
@Override
public void onSuccess(List<ListInfoMessageModel> data) {
size = data.size();
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
public void onError(String error) {

11
common/src/main/res/layout/dialog_live_anchor_message.xml
View File

@ -17,5 +17,14 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/live_message"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"
android:visibility="gone" />
<ImageView
android:id="@+id/img_no_new"
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_gravity="center"
android:layout_marginTop="50dp"
android:src="@mipmap/img_no_new" />
</LinearLayout>

1
common/src/main/res/values-en/strings.xml
View File

@ -1019,4 +1019,5 @@ Limited ride And limited avatar frame</string>
<string name="live_data_fan_group">New fan group</string>
<string name="live_data_fan_group_rate">Fan group conversion rate</string>
<string name="live_data_loading">loading…</string>
<string name="yoursystemisolder">Gift and seat effects have been turned off and can be turned on manually in "Settings".</string>
</resources>

1
common/src/main/res/values/strings.xml
View File

@ -1040,4 +1040,5 @@
<string name="live_data_fan_group">新增粉絲團</string>
<string name="live_data_fan_group_rate">粉絲團轉化率</string>
<string name="live_data_loading">加载中…</string>
<string name="yoursystemisolder">由於您的系統較老，我們自動為您屏蔽了禮物及座駕特效，可在「設置中心」手動打開。</string>
</resources>

4
config.gradle
View File

@ -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",

5
live/src/main/java/com/yunbao/live/activity/LiveAudienceActivity.java
View File

@ -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() {