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

修复测试反馈内容

Browse Source
This commit is contained in:
zlzw
2024-07-25 15:00:05 +08:00
parent 96a6b05d03
commit c20a9804e9
43 changed files with 555 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
live/src/main/java/com/yunbao/live/activity/LiveSwAnchorActivity.java
View File

@@ -25,6 +25,7 @@ import android.widget.ImageView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.blankj.utilcode.util.GsonUtils;
@@ -946,27 +947,7 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
* 结束直播
*/
public void endLive() {
RCRTCEngine.getInstance().getDefaultVideoStream().stopCamera(new IRCRTCResultCallback() {
@Override
public void onSuccess() {
}
@Override
public void onFailed(RTCErrorCode errorCode) {
}
});
RCRTCEngine.getInstance().leaveRoom(new IRCRTCResultCallback() {
@Override
public void onSuccess() {
Log.i("ry", "退出成功");
}
@Override
public void onFailed(RTCErrorCode errorCode) {
Log.i("ry", "退出失败" + errorCode);
}
});
SWManager.get().exitChannelAll();
//请求关播的接口
LiveHttpUtil.stopLive(mStream, new HttpCallback() {
@Override

5
live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
View File

@@ -858,7 +858,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
.append(" ")
.append(mContext.getText(com.yunbao.live.R.string.the_title_financier))
.append(" ")
.append(liveGiftModel.getNamingUserName());
.append(liveGiftModel.getNaming_user_gift_hall_rank_hide()==0?liveGiftModel.getNamingUserName():WordUtil.getNewString(R.string.mystery_man));
namingName.setText(namingNameText.toString());
} else {
namingLayout.setVisibility(View.GONE);
@@ -934,6 +934,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
!TextUtils.isEmpty(liveGiftModel.getNamingUid()) &&
!TextUtils.equals(liveGiftModel.getNamingLiveuid(), "0") &&
!TextUtils.equals(liveGiftModel.getNamingUid(), "0")) {
ToastUtil.show("显示");
namingLayout.setVisibility(View.VISIBLE);
ImgLoader.display(mContext, liveGiftModel.getNamingLiveAvatar(), namingAvatar);
StringBuffer namingNameText = new StringBuffer();
@@ -949,7 +950,7 @@ public class LiveGiftPopup extends AbsDialogFragment {
.append(liveGiftModel.getNamingLiveName())
.append(" ")
.append(mContext.getText(com.yunbao.live.R.string.the_title_financier))
.append(liveGiftModel.getNamingUserName());
.append(liveGiftModel.getNaming_user_gift_hall_rank_hide()==0?liveGiftModel.getNamingUserName():WordUtil.getNewString(R.string.mystery_man));
namingName.setText(namingNameText.toString());
} else {
namingLayout.setVisibility(View.GONE);

2
live/src/main/java/com/yunbao/live/dialog/LiveUserDialogFragment.java
View File

@@ -288,7 +288,7 @@ public class LiveUserDialogFragment extends AbsDialogFragment implements View.On
.setVoicePress(isAnchor)
.setUname(mToName)
.setAvatar(mAvatarUrl));*/
new com.yunbao.common.dialog.GiftWallDialog(mContext, mToUid + "",mToName, mToUid.equals(mLiveUid)).setFullWindows(false).showDialog();
new com.yunbao.common.dialog.GiftWallDialog(mContext, mToUid + "",mToName,mLiveUid, isAnchor).setFullWindows(false).showDialog();
dismiss();
}
});

14
live/src/main/java/com/yunbao/live/socket/SocketClient.java
View File

@@ -122,7 +122,7 @@ public class SocketClient {
Log.i("tag", "1" + "礼物");
JSONObject map = received.getMsg().getJSONObject(0);
String ct="";
switch (map.getString("_method_")) {
case Constants.UP_USER_LIST:
mListener.onUpUserList(map.getJSONObject("ct"));
@@ -131,17 +131,21 @@ public class SocketClient {
break;
case Constants.SOCKET_SYSTEM://系统消息
UserBean us = CommonAppConfig.getInstance().getUserBean();
ct=map.getString("ct");
if(map.containsKey("ct_en")&&!WordUtil.isNewZh()){
ct=map.getString("ct_en");
}
if (map.getString("uid") != null && map.getString("uid").equals(us.getId())) {
LiveAudienceActivity.is_fans = "1";
int num = LiveAudienceActivity.fansNum + 1;
LiveRoomViewHolder.setFansNum(num);
}
systemChatMessage(map.getString("ct"));
systemChatMessage(ct);
int action21 = map.getIntValue("action");
//主播離開
if (action21 == 13 && map.getString("ct").contains("離開")) {
if (action21 == 13 && ct.contains("離開")) {
LivePlayKsyViewHolder.leave.setVisibility(View.VISIBLE);
} else if (action21 == 13 && map.getString("ct").contains("回來")) {
} else if (action21 == 13 && ct.contains("回來")) {
LivePlayKsyViewHolder.leave.setVisibility(View.GONE);
}
break;
@@ -150,7 +154,7 @@ public class SocketClient {
mListener.onKick(map.getString("touid"));
break;
case Constants.SOCKET_SHUT_UP://禁言
String ct = map.getString("ct");
ct = map.getString("ct");
systemChatMessage(ct);
mListener.onShutUp(map.getString("touid"), ct);
break;

25
live/src/main/java/com/yunbao/live/socket/SocketSwClient.java
View File

@@ -200,7 +200,7 @@ public class SocketSwClient {
SocketReceiveBean received = JSON.parseObject(socketMsg, SocketReceiveBean.class);
JSONObject map = received.getMsg().getJSONObject(0);
String ct="";
switch (map.getString("_method_")) {
//用户连麦
case Constants.LIAN_MAI:
@@ -248,7 +248,11 @@ public class SocketSwClient {
// LiveLinkMicPresenter.setHD(map.getString("ct"));
break;
case Constants.SOCKET_SYSTEM://系统消息
if (map.getString("ct").contains("甜蜜不停")) {
ct=map.getString("ct");
if(map.containsKey("ct_en")&&!WordUtil.isNewZh()){
ct=map.getString("ct_en");
}
if (ct.contains("甜蜜不停")) {
break;
}
UserBean us = CommonAppConfig.getInstance().getUserBean();
@@ -256,27 +260,26 @@ public class SocketSwClient {
int num = LiveAudienceActivity.fansNum + 1;
LiveRoomViewHolder.setFansNum(num);
}
if (map.getString("ct").contains("堅決維護青少年群體精神文明健康") || map.getString("ct").contains("click to register if you like. pdlive conducts")) {
systemChatMessage(map.getString("ct"));
if (ct.contains("堅決維護青少年群體精神文明健康") ||ct.contains("click to register if you like. pdlive conducts")) {
systemChatMessage(ct);
} else {
if (!WordUtil.isNewZh() && map.getString("ct").contains("退出比賽") && map.getString("ct").contains("獲得勝利")) {
if (!WordUtil.isNewZh() && ct.contains("退出比賽") && ct.contains("獲得勝利")) {
String ctTmp = map.getString("ct");
ctTmp = ctTmp.replace("由於", "Due to").replace("退出比賽", "withdrawing from the competition").replace("獲得勝利", "won");
map.put("ct", ctTmp);
ct = ctTmp.replace("由於", "Due to").replace("退出比賽", "withdrawing from the competition").replace("獲得勝利", "won");
}
systemChatMessage2(map.getString("ct"));
systemChatMessage2(ct);
}
int action21 = map.getIntValue("action");
//主播離開
if (action21 == 13 && map.getString("ct").contains("離開")) {
if (action21 == 13 && ct.contains("離開")) {
if (LivePlayKsyViewHolder.leave != null) {
LivePlayKsyViewHolder.leave.setVisibility(View.VISIBLE);
}
if (LivePlaySwViewHolder.leave != null) {
LivePlaySwViewHolder.leave.setVisibility(View.VISIBLE);
}
} else if (action21 == 13 && map.getString("ct").contains("回來")) {
} else if (action21 == 13 && ct.contains("回來")) {
if (LivePlayKsyViewHolder.leave != null) {
LivePlayKsyViewHolder.leave.setVisibility(View.GONE);
}
@@ -328,7 +331,7 @@ public class SocketSwClient {
mListener.onKick(map.getString("touid"));
break;
case Constants.SOCKET_SHUT_UP://禁言
String ct = map.getString("ct");
ct = map.getString("ct");
systemChatMessage2(ct);
mListener.onShutUp(map.getString("touid"), ct);
break;

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

@@ -30,6 +30,7 @@ import com.yunbao.common.utils.Bus;
import com.yunbao.common.utils.GiftCacheUtil;
import com.yunbao.common.utils.StringUtil;
import com.yunbao.common.utils.ToastUtil;
import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.MarqueeTextView;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.R;
@@ -100,8 +101,14 @@ public class FrameGiftViewHolder extends RecyclerView.ViewHolder {
// } else {
giftName.setText(model.getName());
// }
naming_name.setText(model.getNamingUserName());
ImgLoader.display(mContext,model.getNamingUserAvatar(),avatar);
if (model.getNaming_user_gift_hall_rank_hide() == 1) {
avatar.setImageResource(com.yunbao.common.R.mipmap.hide);
naming_name.setText(WordUtil.getNewString(com.yunbao.common.R.string.mystery_man));
} else {
ImgLoader.display(mContext, model.getNamingUserAvatar(), avatar);
naming_name.setText(model.getNamingUserName());
}
//特殊礼物红包
if (model.getType() == 9999999) {
mPayIco.setVisibility(View.GONE);
@@ -126,9 +133,9 @@ public class FrameGiftViewHolder extends RecyclerView.ViewHolder {
} else {
mLoadingLayout.setVisibility(GiftCacheUtil.checkGiftIsDownload(model.getId()) ? View.GONE : View.VISIBLE);
}
if(model.isChecked()&& !StringUtil.isEmpty(model.getNamingUserName())){
if (model.isChecked() && !StringUtil.isEmpty(model.getNamingUserName())) {
namingLayout.setVisibility(View.VISIBLE);
}else{
} else {
namingLayout.setVisibility(View.GONE);
}

2
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@@ -3722,7 +3722,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
@Override
public void onViewClicks() {
//Bus.get().post(new LiveAudienceEvent().setType(LiveAudienceEvent.LiveAudienceType.GIFT_WALL).setUid(mLiveUid).setVoicePress(true).setAvatar(mAvatarUrl).setUname(mAnchorName));
new com.yunbao.common.dialog.GiftWallDialog(mContext, mLiveUid, mAnchorName, true).setFullWindows(false).showDialog();
new com.yunbao.common.dialog.GiftWallDialog(mContext, mLiveUid, mAnchorName, mLiveUid,true).setFullWindows(false).showDialog();
}
});
}