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

合并原 PD6.8.2分支代码

Browse Source
This commit is contained in:
老皮 2024-10-30 15:07:54 +08:00
parent ccf6b55119
commit 7746111b83
4 changed files with 3 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
common/src/main/java/com/yunbao/common/utils/MicStatusManager.java
View File

@ -96,71 +96,6 @@ public class MicStatusManager {
'}';
}
/**
* 断开连麦
*/
public void downMic() {
HttpClient.getInstance().get("tuichuduorenlianmai", "tuichuduorenlianmai")
.params("roomid", micLiveId)
.params("uid", CommonAppConfig.getInstance().getUid())
.execute(new HttpCallback() {
@Override
public void onSuccess(int code, String msg, String[] info) {
Log.e("ry", code + "退出多人");
RCRTCEngine.getInstance().getRoom().getLocalUser().switchToAudience(new IRCRTCSwitchRoleCallback() {
/**
* 当切换失败且SDK处于无法回退状态时回调，该角色已经无法使用当前角色继续进行音视频。
* SDK内部会退出房间并清理所有资源，该用户只能重新加入房间才能继续音视频。
*/
@Override
public void onKicked() {
}
@Override
public void onSuccess() {
Log.e("ry", "下麦成功");
// 该用户切换为观众成功，可以以观众身份进行音视频
//退出rtc播放
RCRTCEngine.getInstance().leaveRoom(new IRCRTCResultCallback() {
@Override
public void onSuccess() {
Log.e("ry", "退出多人房间成功");
new Handler(Looper.getMainLooper()).post(new Runnable() {
public void run() {
MicStatusManager.getInstance().clear();
if(WordUtil.isNewZh()) {
ToastUtil.show("已成功退出語音連麥");
}else{
ToastUtil.show("You have successfully exited the voice connection");
}
}
});
}
@Override
public void onFailed(RTCErrorCode errorCode) {
Log.e("ry", errorCode + "退出多人房间成功");
}
});
}
/**
* 当切换失败且不影响当前角色继续音视频时回调
* @param errorCode 失败错误码
*/
@Override
public void onFailed(RTCErrorCode errorCode) {
Log.e("ry", "下麦失败" + errorCode);
}
});
}
});
}
/**
* 主播关闭连麦权限

4
config.gradle
View File

@ -4,8 +4,8 @@ ext {
buildToolsVersion: "29.0.2",
minSdkVersion : 23,
targetSdkVersion : 34,
versionCode : 902,
versionName : "6.8.2"
versionCode : 904,
versionName : "6.8.3"
]
manifestPlaceholders = [
//正式、

4
live/src/main/java/com/yunbao/live/http/ImHttpUtil.java
View File

@ -20,9 +20,7 @@ public class ImHttpUtil {
* 私信聊天页面用于获取用户信息
*/
public static void getImUserInfo(String uids, HttpCallback callback) {
HttpClient.getInstance().get("huoquxitongxiaoxiliebiaov2", ImHttpConsts.GET_IM_USER_INFO)
HttpClient.getInstance().get("Message.getLists", ImHttpConsts.GET_IM_USER_INFO)
.params("app_type", "1")
HttpClient.getInstance().get("huoquxitongxiaoxiliebiaov2", ImHttpConsts.GET_IM_USER_INFO).params("app_type", "1")
.execute(callback);
}

3
main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
View File

@ -46,7 +46,6 @@ import com.yunbao.common.utils.WordUtil;
import com.yunbao.common.views.weight.ViewClicksAntiShake;
import com.yunbao.live.LiveConfig;
import com.yunbao.live.activity.LiveAnchorActivity;
import com.yunbao.live.activity.LiveRyAnchorActivity;
import com.yunbao.live.activity.LiveSwAnchorActivity;
import com.yunbao.live.bean.LiveKsyConfigBean;
import com.yunbao.live.dialog.LivePrankDialogFragment;
@ -157,8 +156,6 @@ public class MainHomeViewHolder extends AbsMainHomeParentViewHolder {
try {
if(code==201){ //声网
LiveSwAnchorActivity.forward(mContext, Constants.LIVE_SDK_SW, JSON.parseObject(obj.getString("android"), LiveKsyConfigBean.class));
}else if(code==200){//融云
LiveRyAnchorActivity.forward(mContext, obj.getIntValue("live_sdk"), JSON.parseObject(obj.getString("android"), LiveKsyConfigBean.class));
}
} catch (Exception e) {