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

Merge branch 'dev_6.5.3_红包' into 6.5.3

Browse Source
This commit is contained in:
zlzw
2023-06-28 16:49:23 +08:00
parent e0312eedd1 da7ebb2663
commit 710cddd3a7
48 changed files with 2181 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,6 +159,7 @@ public class LiveAudienceActivity extends LiveActivity {
private View titleLine;
private boolean liveIndex = true;
private boolean isPk = false;
private boolean isRadPacetModle = false;
@Override
public <T extends View> T findViewById(@IdRes int id) {
@@ -183,6 +184,7 @@ public class LiveAudienceActivity extends LiveActivity {
L.e(TAG, "直播sdk----->" + (mLiveSDK == Constants.LIVE_SDK_KSY ? "金山云" : "腾讯云"));
mLiveType = intent.getIntExtra(Constants.LIVE_TYPE, Constants.LIVE_TYPE_NORMAL);
mLiveTypeVal = intent.getIntExtra(Constants.LIVE_TYPE_VAL, 0);
isRadPacetModle = !StringUtil.isEmpty(intent.getStringExtra("redPacket")) && intent.getStringExtra("redPacket").equals("true");
initView();
setVolumeControlStream(AudioManager.STREAM_MUSIC);
manager = new PortraitLiveManager(this, intent);
@@ -267,21 +269,40 @@ public class LiveAudienceActivity extends LiveActivity {
manager.resetLight();
Log.e(TAG, "mCurrentItem:" + mCurrentItem);
if (mCurrentItem == itemModelList.size() - 1) {
MainNetManager.get(mContext)
.anchorRecommendType("30", new com.yunbao.common.http.base.HttpCallback<AnchorRecommendModel>() {
@Override
public void onSuccess(AnchorRecommendModel data) {
if (TextUtils.equals(data.getList().get(0).getUid(), mLiveBean.getUid())) {
data.getList().remove(0);
if (isRadPacetModle) {//从红包专区进去的走红包专区列表
MainNetManager.get(mContext)
.getRedPacket(new com.yunbao.common.http.base.HttpCallback<List<AnchorRecommendItemModel>>() {
@Override
public void onSuccess(List<AnchorRecommendItemModel> data) {
if (TextUtils.equals(data.get(0).getUid(), mLiveBean.getUid())) {
data.remove(0);
}
itemModelList.addAll(data);
mPagerAdapter.notifyDataSetChanged();
}
itemModelList.addAll(data.getList());
mPagerAdapter.notifyDataSetChanged();
}
@Override
public void onError(String error) {
}
});
@Override
public void onError(String error) {
}
});
} else {
MainNetManager.get(mContext)
.anchorRecommendType("30", new com.yunbao.common.http.base.HttpCallback<AnchorRecommendModel>() {
@Override
public void onSuccess(AnchorRecommendModel data) {
if (TextUtils.equals(data.getList().get(0).getUid(), mLiveBean.getUid())) {
data.getList().remove(0);
}
itemModelList.addAll(data.getList());
mPagerAdapter.notifyDataSetChanged();
}
@Override
public void onError(String error) {
}
});
}
}
}
@@ -861,7 +882,7 @@ public class LiveAudienceActivity extends LiveActivity {
if (TextUtils.equals(htmlUrl, "recharge")) {
RouteUtil.forwardMyCoin(mContext);
} else if (TextUtils.equals(htmlUrl, "to_me_information")) {
RouteUtil.forwardEditProfileActivity();
RouteUtil.forwardEditProfileActivity();
} else {
if (!screen) {
ZhuangBanActivity.forward(mContext, htmlUrl, false);

2
live/src/main/java/com/yunbao/live/socket/SocketRyClient.java
View File

@@ -825,7 +825,7 @@ public class SocketRyClient {
chatBean.setContentColor(map.getString("contentColor"));//文字内容颜色
chatBean.setAtUserName(map.getString("atUserName"));//@名字
chatBean.setAtUserID(map.getString("atUserID"));//@ID
if (!map.getString("guard_type").equals("undefined")) {
if (map.containsKey("guard_type")&&!map.getString("guard_type").equals("undefined")) {
chatBean.setGuardType(map.getIntValue("guard_type"));
}
try {

15
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@@ -257,7 +257,14 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
public void run() {
loading.setVisibility(View.GONE);
enterRoomLeaveHandler.post(enterRoomLeaveRunnable);
ToastUtil.show(mContext.getString(R.string.net_error) + " :500" );//异常下播，等待加载时间过了后弹出
}
};
final Runnable loadTimeoutRunnableGone = new Runnable() {
@Override
public void run() {
loading.setVisibility(View.GONE);
enterRoomLeaveHandler.post(enterRoomLeaveRunnable);
ToastUtil.show(mContext.getString(R.string.net_error) + " :500");//异常下播，等待加载时间过了后弹出
}
};
@@ -297,6 +304,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
AnimationDrawable frameAnimation = (AnimationDrawable) ivLoading.getBackground();
frameAnimation.start();
liveHandler.removeCallbacks(loadRunnableGone);
liveHandler.removeCallbacks(loadTimeoutRunnableGone);
if (mLivePlayViewHolder == null) {
mLivePlayViewHolder = new LivePlayRyViewHolder(mContext, playContainer, 1);
mLiveRoomViewHolder = new LiveRoomViewHolder(false, 1, mContext, mContainer, mSecondPage.findViewById(R.id.gift_gif), mSecondPage.findViewById(R.id.gift_svga), mContainerWrap, mContext.getWindowManager());
@@ -310,6 +318,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
@Override
public void onPlayer() {
liveHandler.postDelayed(loadRunnableGone, 350);
liveHandler.removeCallbacks(loadTimeoutRunnableGone);
}
});
mLiveRoomViewHolder.subscribeActivityLifeCycle();
@@ -595,7 +604,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
} else if (!pkInfo.getString("end_pk_time").equals("0")) {
if (mLiveRoomViewHolder != null) {
mLiveRoomViewHolder.pkHandler = true;
mLiveRoomViewHolder.pkUid=pkUid;
mLiveRoomViewHolder.pkUid = pkUid;
mLiveRoomViewHolder.initPkRank(null);
}
if (mLivePlayViewHolder != null) {
@@ -660,7 +669,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder.showPrizePoolLevel(String.valueOf(giftPrizePoolLevel));
}
}
liveHandler.postDelayed(loadRunnableGone, 15_000);
liveHandler.postDelayed(loadTimeoutRunnableGone, 15_000);
if (TextUtils.equals(data.getEnterRoomInfo().getIsconnection(), "1")) {
//通知心愿单位置换地方
EventBus.getDefault().post(new LiveAudienceEvent()