Compare commits

...

2 Commits

Author SHA1 Message Date
89b7e960b6 修复声网没有同步融云开播弹窗问题 2024-07-17 10:30:38 +08:00
Martin
f88295077c 6.7.1版本 2024-07-09 18:09:29 +08:00
4 changed files with 21 additions and 9 deletions

View File

@@ -4,16 +4,14 @@ ext {
buildToolsVersion: "29.0.2", buildToolsVersion: "29.0.2",
minSdkVersion : 21, minSdkVersion : 21,
targetSdkVersion : 33, targetSdkVersion : 33,
versionCode : 678, versionCode : 683,
versionName : "6.7.0" versionName : "6.7.1"
] ]
manifestPlaceholders = [ manifestPlaceholders = [
//正式、 //正式、
// serverHost : "https://napi.yaoulive.com", serverHost : "https://napi.yaoulive.com",
// 测试 // 测试
serverHost : "https://ceshi.yaoulive.com", //serverHost : "https://ceshi.yaoulive.com",
buildTime : new Date().format("MM-dd HH:mm", TimeZone.getTimeZone("GMT+8")),
buildTime : new Date().format("MM-dd HH:mm", TimeZone.getTimeZone("GMT+8")), buildTime : new Date().format("MM-dd HH:mm", TimeZone.getTimeZone("GMT+8")),
@@ -27,7 +25,7 @@ ext {
baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S", baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
// true表示谷歌支付 false 0 链接包(isPluginModel-> true) 1 谷歌包 2华为包 3 samsung包 // true表示谷歌支付 false 0 链接包(isPluginModel-> true) 1 谷歌包 2华为包 3 samsung包
isGooglePlay : 0, isGooglePlay : 1,
//是否上报异常日志 //是否上报异常日志
isUploadLog : true, isUploadLog : true,
//是否打包成插件包模式 //是否打包成插件包模式

View File

@@ -243,7 +243,7 @@ public class SWManager extends BaseCacheManager {
// 功能模块的类型为视频截图上传 // 功能模块的类型为视频截图上传
config.modules[0].type = ContentInspectConfig.CONTENT_INSPECT_TYPE_SUPERVISE; config.modules[0].type = ContentInspectConfig.CONTENT_INSPECT_TYPE_SUPERVISE;
// 视频截图上传的频率为 2 秒一次 // 视频截图上传的频率为 2 秒一次
config.modules[0].interval = 2; config.modules[0].interval = 20;
mRtcEngine.enableContentInspect(true, config); mRtcEngine.enableContentInspect(true, config);
} }

View File

@@ -1759,6 +1759,15 @@ public class LiveSwAnchorActivity extends LiveActivity implements LiveFunctionCl
liveInputDialogFragment.setArguments(liveInputBundle); liveInputDialogFragment.setArguments(liveInputBundle);
liveInputDialogFragment.show(getSupportFragmentManager(), "LiveInputDialogFragment"); liveInputDialogFragment.show(getSupportFragmentManager(), "LiveInputDialogFragment");
break; break;
case LIVE_DIALOG_ANCHOR_TIPS:
new DialogUitl.Builder(mContext)
.setContent(event.getObject().toString())
.setConfirmString(WordUtil.isNewZh() ? "確定" : "confirm")
.setCancelable(true)
.setShowCancelButton(false)
.build()
.show();
break;
} }
} }

View File

@@ -778,7 +778,12 @@ public class SocketSwClient {
case "SendMoneyLongEnd": case "SendMoneyLongEnd":
Bus.get().post(new SendMoneyLongEndEvent()); Bus.get().post(new SendMoneyLongEndEvent());
break; break;
case Constants.SOCKET_LIVE_ANCHOR_PK_DIALOG:
item = map.getJSONObject("ct");
//DialogUitl.showSimpleDialog(mContext,WordUtil.isNewZh()?item.getString("text"):item.getString("text_en"),null);
Bus.get().post(new LiveAudienceEvent()
.setType(LiveAudienceEvent.LiveAudienceType.LIVE_DIALOG_ANCHOR_TIPS)
.setObject(WordUtil.isNewZh() ? item.getString("text") : item.getString("text_en")));
} }
} }