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

修复：

Browse Source 
修复测试问题
This commit is contained in:
18401019693 2022-08-26 17:31:45 +08:00
parent a11312411a
commit 2ae166a426
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/yunbao/common/manager/imrongcloud/RongcloudIMManager.java
View File

@ -32,9 +32,9 @@ import static com.yunbao.common.CommonAppContext.isReady;
*/ */
public class RongcloudIMManager { public class RongcloudIMManager {
//融云开发者平台注册app唯一识别符 //融云开发者平台注册app唯一识别符
// public static final String RONG_IM_KEY = "uwd1c0sxu1p71"; public static final String RONG_IM_KEY = "uwd1c0sxu1p71";
//测试环境 //测试环境
public static final String RONG_IM_KEY = "pvxdm17jpd3hr"; // public static final String RONG_IM_KEY = "pvxdm17jpd3hr";
private static final String CLASSNAME = "RongcloudIMManager"; private static final String CLASSNAME = "RongcloudIMManager";

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

@ -212,7 +212,7 @@ public class LiveMicUserDialogFragment extends AbsDialogFragment implements View
public void onError(io.rong.imlib.model.Message message, RongIMClient.ErrorCode errorCode) { public void onError(io.rong.imlib.model.Message message, RongIMClient.ErrorCode errorCode) {
Log.e("ry", "发送失敗" + errorCode.toString()); Log.e("ry", "发送失敗" + errorCode.toString());
liveImDeletUtil.deleteMessages(message.getTargetId(), message.getMessageId()); liveImDeletUtil.deleteMessages(message.getTargetId(), message.getMessageId());
} }//BIZ_ERROR_DATABASE_ERROR
}); });
} else { } else {
ToastUtil.show(msg); ToastUtil.show(msg);

1
live/src/main/java/com/yunbao/live/views/LivePlayRyViewHolder.java
View File

@ -415,7 +415,6 @@ public class LivePlayRyViewHolder extends LiveRoomPlayViewHolder {
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
public void onUpdata(String str) { public void onUpdata(String str) {
ToastUtil.show("121212");
if ("UsertoRY".equals(str)) { if ("UsertoRY".equals(str)) {
DialogUitl.showSimpleDialog(mContext, WordUtil.getString(R.string.mic_tag), new DialogUitl.SimpleCallback() { DialogUitl.showSimpleDialog(mContext, WordUtil.getString(R.string.mic_tag), new DialogUitl.SimpleCallback() {
@Override @Override

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

@ -81,6 +81,7 @@ import com.yunbao.live.utils.LiveImDeletUtil;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import cn.rongcloud.rtc.api.RCRTCEngine; import cn.rongcloud.rtc.api.RCRTCEngine;
@ -163,7 +164,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
private boolean mFirstConnectSocket;//是否是第一次连接成功socket private boolean mFirstConnectSocket;//是否是第一次连接成功socket
private int liveBg; private int liveBg;
private LiveImDeletUtil liveImDeletUtil; private LiveImDeletUtil liveImDeletUtil;
private List<String> greetings = new ArrayList<>();
public PortraitLiveManager(Activity context, Intent intent) { public PortraitLiveManager(Activity context, Intent intent) {
this.mContext = context; this.mContext = context;
@ -954,7 +955,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
LiveHttpUtil.enterRoom(mLiveBean.getUid(), mLiveBean.getStream(), new HttpCallback() { LiveHttpUtil.enterRoom(mLiveBean.getUid(), mLiveBean.getStream(), new HttpCallback() {
@Override @Override
public void onSuccess(int code, String msg, String[] info) { public void onSuccess(int code, String msg, String[] info) {
List<String> greetings;
if (code == 0 && info.length > 0) { if (code == 0 && info.length > 0) {
JSONObject obj = JSON.parseObject(info[0]); JSONObject obj = JSON.parseObject(info[0]);
mDanmuPrice = obj.getString("barrage_fee"); mDanmuPrice = obj.getString("barrage_fee");
@ -962,7 +963,10 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mChatLevel = obj.getIntValue("speak_limit"); mChatLevel = obj.getIntValue("speak_limit");
mDanMuLevel = obj.getIntValue("barrage_limit"); mDanMuLevel = obj.getIntValue("barrage_limit");
liveBg = obj.getIntValue("live_bg"); liveBg = obj.getIntValue("live_bg");
greetings = JSONArray.parseArray(obj.getJSONArray("greetings").toJSONString(), String.class); if (obj.containsKey("greetings")) {
greetings = JSONArray.parseArray(obj.getJSONArray("greetings").toJSONString(), String.class);
}
if (liveBg == 1) { if (liveBg == 1) {
//直播间背景 //直播间背景
ImgLoader.displayBlurLive(mContext, mLiveBean.getAvatar(), liveBack); ImgLoader.displayBlurLive(mContext, mLiveBean.getAvatar(), liveBack);