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

fix[声望升级-修复BUG]

Browse Source
This commit is contained in:
Martin 2024-05-22 18:29:11 +08:00
parent b6d0ea1fba
commit 26a71ff825
4 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib_faceunity/src/main/java/io/agora/beautyapi/faceunity/agora/SWManager.java
View File

@ -127,7 +127,6 @@ public class SWManager extends BaseCacheManager {
anchorContainer.addView(surfaceView); anchorContainer.addView(surfaceView);
Config config = new Config(mContext, mRtcEngine, FURenderer.INSTANCE.mFURenderKit, null, CaptureMode.Agora, 0, false, new CameraConfig(MirrorMode.MIRROR_NONE, MirrorMode.MIRROR_NONE)); Config config = new Config(mContext, mRtcEngine, FURenderer.INSTANCE.mFURenderKit, null, CaptureMode.Agora, 0, false, new CameraConfig(MirrorMode.MIRROR_NONE, MirrorMode.MIRROR_NONE));
faceUnityBeautyAPI.initialize(config); faceUnityBeautyAPI.initialize(config);
faceUnityBeautyAPI.enable(false);
faceUnityBeautyAPI.setBeautyPreset(BeautyPreset.CUSTOM); faceUnityBeautyAPI.setBeautyPreset(BeautyPreset.CUSTOM);
//FaceUnityBeautyManage.getInstance().mFURenderKit.setFaceBeauty(); //FaceUnityBeautyManage.getInstance().mFURenderKit.setFaceBeauty();

48
live/src/main/java/com/yunbao/live/socket/SocketSwChatUtil.java
View File

@ -64,8 +64,8 @@ public class SocketSwChatUtil {
@Override @Override
public void onSuccess(Message message) { public void onSuccess(Message message) {
Log.i("tx", "发送成功"); Log.i("tx", "发送成功");
if (SocketRyClient.mSocketHandler != null) if (SocketSwClient.mSocketHandler != null)
SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + ""); SocketSwClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
} }
@Override @Override
@ -128,8 +128,8 @@ public class SocketSwChatUtil {
@Override @Override
public void onSuccess(Message message) { public void onSuccess(Message message) {
if (SocketRyClient.mSocketHandler != null) { if (SocketSwClient.mSocketHandler != null) {
SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + ""); SocketSwClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
} }
LiveNetManager.get(CommonAppContext.sInstance) LiveNetManager.get(CommonAppContext.sInstance)
.addChatCount(LiveActivity.mStream, new com.yunbao.common.http.base.HttpCallback<HttpCallbackModel>() { .addChatCount(LiveActivity.mStream, new com.yunbao.common.http.base.HttpCallback<HttpCallbackModel>() {
@ -214,8 +214,8 @@ public class SocketSwChatUtil {
} }
} }
}); });
if (SocketRyClient.mSocketHandler != null) if (SocketSwClient.mSocketHandler != null)
SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + ""); SocketSwClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
} }
@Override @Override
@ -263,8 +263,8 @@ public class SocketSwChatUtil {
@Override @Override
public void onSuccess(Message message) { public void onSuccess(Message message) {
Log.i("tx", "发送成功"); Log.i("tx", "发送成功");
if (SocketRyClient.mSocketHandler != null) { if (SocketSwClient.mSocketHandler != null) {
SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + ""); SocketSwClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
} }
} }
@ -400,8 +400,8 @@ public class SocketSwChatUtil {
@Override @Override
public void onSuccess(Message message) { public void onSuccess(Message message) {
Log.i("tx", "发送成功"); Log.i("tx", "发送成功");
if (SocketRyClient.mSocketHandler != null) { if (SocketSwClient.mSocketHandler != null) {
SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + ""); SocketSwClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
} }
} }
@ -470,8 +470,8 @@ public class SocketSwChatUtil {
@Override @Override
public void onSuccess(Message message) { public void onSuccess(Message message) {
Log.i("tx", "发送成功"); Log.i("tx", "发送成功");
if (SocketRyClient.mSocketHandler != null) { if (SocketSwClient.mSocketHandler != null) {
SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + ""); SocketSwClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
} }
} }
@ -517,8 +517,8 @@ public class SocketSwChatUtil {
@Override @Override
public void onSuccess(Message message) { public void onSuccess(Message message) {
Log.i("tx", "发送成功"); Log.i("tx", "发送成功");
if (SocketRyClient.mSocketHandler != null) { if (SocketSwClient.mSocketHandler != null) {
SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + ""); SocketSwClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
} }
} }
@ -554,8 +554,8 @@ public class SocketSwChatUtil {
@Override @Override
public void onSuccess(Message message) { public void onSuccess(Message message) {
Log.i("tx", "发送成功"); Log.i("tx", "发送成功");
if (SocketRyClient.mSocketHandler != null) { if (SocketSwClient.mSocketHandler != null) {
SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + ""); SocketSwClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
} }
} }
@ -597,8 +597,8 @@ public class SocketSwChatUtil {
@Override @Override
public void onSuccess(Message message) { public void onSuccess(Message message) {
Log.i("tx", "发送成功"); Log.i("tx", "发送成功");
if (SocketRyClient.mSocketHandler != null) if (SocketSwClient.mSocketHandler != null)
SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + ""); SocketSwClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
} }
@Override @Override
@ -634,8 +634,8 @@ public class SocketSwChatUtil {
@Override @Override
public void onSuccess(Message message) { public void onSuccess(Message message) {
Log.i("tx", "发送成功"); Log.i("tx", "发送成功");
if (SocketRyClient.mSocketHandler != null) { if (SocketSwClient.mSocketHandler != null) {
SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + ""); SocketSwClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
} }
} }
@ -674,8 +674,8 @@ public class SocketSwChatUtil {
@Override @Override
public void onSuccess(Message message) { public void onSuccess(Message message) {
Log.i("tx", "发送成功"); Log.i("tx", "发送成功");
if (SocketRyClient.mSocketHandler != null) { if (SocketSwClient.mSocketHandler != null) {
SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + ""); SocketSwClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
} }
} }
@ -778,8 +778,8 @@ public class SocketSwChatUtil {
@Override @Override
public void onSuccess(Message message) { public void onSuccess(Message message) {
Log.i("tx", "发送成功"); Log.i("tx", "发送成功");
if (SocketRyClient.mSocketHandler != null) { if (SocketSwClient.mSocketHandler != null) {
SocketRyClient.mSocketHandler.processBroadcast(msg.mResult.toString() + ""); SocketSwClient.mSocketHandler.processBroadcast(msg.mResult.toString() + "");
} }
} }

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

@ -1348,6 +1348,7 @@ public class SocketSwClient {
.param("msgtype", 2) .param("msgtype", 2)
.param("uid", CommonAppConfig.getInstance().getUid()) .param("uid", CommonAppConfig.getInstance().getUid())
.param("uhead", CommonAppConfig.getInstance().getUserBean().getAvatar()) .param("uhead", CommonAppConfig.getInstance().getUserBean().getAvatar())
.param("random_pk", "1")
.param("pkhead", CommonAppConfig.getInstance().getUserBean().getAvatar()) .param("pkhead", CommonAppConfig.getInstance().getUserBean().getAvatar())
.param("pkname", CommonAppConfig.getInstance().getUserBean().getUserNiceName()); .param("pkname", CommonAppConfig.getInstance().getUserBean().getUserNiceName());
msg1.create(); msg1.create();

4
live/src/main/java/com/yunbao/live/views/LivePlaySwViewHolder.java
View File

@ -1086,11 +1086,7 @@ public class LivePlaySwViewHolder extends LiveRoomPlayViewHolder {
public void UsertoRY() { public void UsertoRY() {
userinputStreamList.clear(); userinputStreamList.clear();
Log.e("ry", "主播同意了UsertoRY"); Log.e("ry", "主播同意了UsertoRY");
if (userJoinLinkMic) {//已经在房间内，不再joinRoom直接去连麦
//subscribeMic(rcrtcRoom);
joinLiveMic(); joinLiveMic();
return;
}
/*RCRTCRoomConfig roomConfig = RCRTCRoomConfig.Builder.create() /*RCRTCRoomConfig roomConfig = RCRTCRoomConfig.Builder.create()
// 根据实际场景，选择音视频直播：LIVE_AUDIO_VIDEO 或音频直播：LIVE_AUDIO // 根据实际场景，选择音视频直播：LIVE_AUDIO_VIDEO 或音频直播：LIVE_AUDIO
.setRoomType(RCRTCRoomType.LIVE_AUDIO_VIDEO).setLiveRole(RCRTCLiveRole.AUDIENCE).build(); .setRoomType(RCRTCRoomType.LIVE_AUDIO_VIDEO).setLiveRole(RCRTCLiveRole.AUDIENCE).build();