zby-live-sdk 1.0.49-beta1123 → 1.0.49-beta1213
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.vs/ProjectSettings.json +3 -0
- package/.vs/VSWorkspaceState.json +6 -0
- package/.vs/slnx.sqlite +0 -0
- package/CHANGELOG.md +21 -0
- package/dist/zby-live-sdk.cjs.js +3 -3
- package/dist/zby-live-sdk.esm.js +3 -3
- package/dist/zby-live-sdk.umd.js +4 -4
- package/package.json +1 -1
- package/src/config/config.js +1 -1
- package/src/zby-av-sdk/zego-sdk.js +10 -6
- package/dist - zby/zby-live-sdk.cjs.js +0 -6
- package/dist - zby/zby-live-sdk.esm.js +0 -6
- package/dist - zby/zby-live-sdk.umd.js +0 -7
package/package.json
CHANGED
package/src/config/config.js
CHANGED
|
@@ -56,6 +56,8 @@ let hasNetWrong = false;
|
|
|
56
56
|
const classType = 0;
|
|
57
57
|
// 监听id
|
|
58
58
|
let EMListenerId = 0;
|
|
59
|
+
// 缓存上层传入的AppId
|
|
60
|
+
let cacheAppId = 0;
|
|
59
61
|
|
|
60
62
|
//静音推流时,音量值是否上抛上层标志 false=没有声音不往上层通知/true=有声音有上层通知
|
|
61
63
|
let isNoticeMicVolumeZego = false;
|
|
@@ -604,6 +606,7 @@ export const startEngine = (appId, appSignature, businessType) => {
|
|
|
604
606
|
if (typeof businessType === 'undefined') {
|
|
605
607
|
businessType = 0;
|
|
606
608
|
}
|
|
609
|
+
cacheAppId = appId;
|
|
607
610
|
defaultApi.writeLog('avsdk ZEGO::StartEngine');
|
|
608
611
|
return callMethod('StartEngine', {
|
|
609
612
|
appId,
|
|
@@ -2094,7 +2097,8 @@ export const mixStream = (type, args, seq) => {
|
|
|
2094
2097
|
*/
|
|
2095
2098
|
export const startmixStreams = async (mixTaskId, mixType, srcStreamIds, targetRtcStreamId, targetUrls, backgroundImageId = 0, extraStreamIds=[], coursewareWidth = 1280) => {
|
|
2096
2099
|
let srcStreamInfos = [];
|
|
2097
|
-
let bkImage='preset-id://
|
|
2100
|
+
let bkImage='preset-id://'+cacheAppId+'_live_closeCamera.png';
|
|
2101
|
+
defaultApi.writeLog(`avsdk ZEGO::startmixStreams default bkImage: ${bkImage}`);
|
|
2098
2102
|
if (mixType === 0 || mixType === 1) {
|
|
2099
2103
|
for (let i = 0, len = srcStreamIds.length; i < len; i++) {
|
|
2100
2104
|
if (srcStreamIds[i].contentControl === 1) {
|
|
@@ -2155,16 +2159,16 @@ export const startmixStreams = async (mixTaskId, mixType, srcStreamIds, targetRt
|
|
|
2155
2159
|
case 0:
|
|
2156
2160
|
break;
|
|
2157
2161
|
case 1:
|
|
2158
|
-
bkImage = 'preset-id://
|
|
2162
|
+
bkImage = 'preset-id://'+cacheAppId+'_live_TeacherOnStage.png';
|
|
2159
2163
|
break;
|
|
2160
2164
|
case 2:
|
|
2161
|
-
bkImage = 'preset-id://
|
|
2165
|
+
bkImage = 'preset-id://'+cacheAppId+'_live_closeCamera.png';
|
|
2162
2166
|
break;
|
|
2163
2167
|
case 3:
|
|
2164
|
-
bkImage = 'preset-id://
|
|
2168
|
+
bkImage = 'preset-id://'+cacheAppId+'_live_2022112202.png';
|
|
2165
2169
|
break;
|
|
2166
2170
|
case 4:
|
|
2167
|
-
bkImage = 'preset-id://
|
|
2171
|
+
bkImage = 'preset-id://'+cacheAppId+'_live_2022112201.png';
|
|
2168
2172
|
break;
|
|
2169
2173
|
default:
|
|
2170
2174
|
break;
|
|
@@ -2180,7 +2184,7 @@ export const startmixStreams = async (mixTaskId, mixType, srcStreamIds, targetRt
|
|
|
2180
2184
|
rtcStreamId: targetRtcStreamId,
|
|
2181
2185
|
pushUrls: targetUrls, //数组
|
|
2182
2186
|
backgroundImage: bkImage,
|
|
2183
|
-
streamOutPut:{width:1600,height:720,videoBitrate:
|
|
2187
|
+
streamOutPut:{width:1600,height:720,videoBitrate:1500000,fps:20}
|
|
2184
2188
|
};
|
|
2185
2189
|
|
|
2186
2190
|
defaultApi.writeLog(`startMixStreams params:${JSON.stringify(param)}`);
|