@polyvharmony/live-scenes-sdk 1.3.0-rc.1 → 1.3.0-rc.2

package/src/main/ets/modules/linkmic/viewmodel/usecase/roles/guest/LinkMicGuestEncodeParamUseCase.js

@@ -4,8 +4,8 @@ import { PLVLinkMicBitRate } from '../../../../model/vo/PLVLinkMicBitRate';
 import { DEFAULT_BITRATE_ENCODE_PARAM_TABLE, PLVLinkMicBitRateEncodeParam } from '../../../../model/vo/PLVLinkMicBitRateEncodeParam';
 import { PLVLinkMicPushResolutionRatio } from '../../../../model/vo/PLVLinkMicPushResolutionRatio';
 export class LinkMicGuestEncodeParamUseCase {
-    constructor(s118) {
-        this.repo = s118;
+    constructor(r118) {
+        this.repo = r118;
     }
     init() {
         this.parseChannelBitRateSetting();
@@ -15,50 +15,50 @@ export class LinkMicGuestEncodeParamUseCase {
         this.repo.mediator.currentBitRate.setValue(bitRate);
         this.updateEncodeParam();
     }
-    setPushResolutionRatio(r118) {
-        this.repo.mediator.currentPushResolutionRatio.setValue(r118);
+    setPushResolutionRatio(q118) {
+        this.repo.mediator.currentPushResolutionRatio.setValue(q118);
         if (!this.isChannelUsePushStreamTemplate()) {
             this.parseChannelBitRateSetting();
         }
         this.updateEncodeParam();
     }
-    setPushOrientation(q118) {
-        this.repo.mediator.currentPushOrientation.setValue(q118);
+    setPushOrientation(p118) {
+        this.repo.mediator.currentPushOrientation.setValue(p118);
         this.updateEncodeParam();
     }
-    setPushMirror(p118) {
-        this.repo.mediator.currentPushMirror.setValue(p118);
+    setPushMirror(o118) {
+        this.repo.mediator.currentPushMirror.setValue(o118);
         this.updateEncodeParam();
     }
-    setPushDowngradePreference(o118) {
-        this.repo.mediator.currentPushDowngradePreference.setValue(o118);
+    setPushDowngradePreference(n118) {
+        this.repo.mediator.currentPushDowngradePreference.setValue(n118);
         this.updateEncodeParam();
     }
     updateEncodeParam() {
-        const i118 = this.repo.mediator.currentBitRate.value;
-        const j118 = this.repo.mediator.channelSupportBitRates.value ?? [PLVLinkMicBitRate.STANDARD];
-        let k118 = i118;
-        if (k118 === undefined || !j118.includes(k118)) {
-            k118 = j118[0];
+        const h118 = this.repo.mediator.currentBitRate.value;
+        const i118 = this.repo.mediator.channelSupportBitRates.value ?? [PLVLinkMicBitRate.STANDARD];
+        let j118 = h118;
+        if (j118 === undefined || !i118.includes(j118)) {
+            j118 = i118[0];
         }
-        if (i118 !== k118) {
-            this.setBitRate(k118);
+        if (h118 !== j118) {
+            this.setBitRate(j118);
             return;
         }
-        const l118 = this.repo.mediator.channelSupportBitRateEncodeParams.value?.find(n118 => n118.bitRate === k118);
-        if (l118 === undefined) {
+        const k118 = this.repo.mediator.channelSupportBitRateEncodeParams.value?.find(m118 => m118.bitRate === j118);
+        if (k118 === undefined) {
             return;
         }
-        this.repo.mediator.currentBitRateEncodeParam.setValue(l118);
-        const m118 = new PLVRTCVideoEncodeParam();
-        m118.width = l118.videoWidth;
-        m118.height = l118.videoHeight;
-        m118.frameRate = l118.videoFps;
-        m118.targetBitRate = l118.videoBitrate;
-        m118.pushOrientation = this.repo.mediator.currentPushOrientation.value ?? PLVPushOrientation.AUTO;
-        m118.pushMirror = this.repo.mediator.currentPushMirror.value ?? false;
-        m118.pushDowngradePreference = this.repo.mediator.currentPushDowngradePreference.value ?? PLVPushDowngradePreference.PREFER_BETTER_QUALITY;
-        this.repo.setLocalVideoEncodeParam(m118);
+        this.repo.mediator.currentBitRateEncodeParam.setValue(k118);
+        const l118 = new PLVRTCVideoEncodeParam();
+        l118.width = k118.videoWidth;
+        l118.height = k118.videoHeight;
+        l118.frameRate = k118.videoFps;
+        l118.targetBitRate = k118.videoBitrate;
+        l118.pushOrientation = this.repo.mediator.currentPushOrientation.value ?? PLVPushOrientation.AUTO;
+        l118.pushMirror = this.repo.mediator.currentPushMirror.value ?? false;
+        l118.pushDowngradePreference = this.repo.mediator.currentPushDowngradePreference.value ?? PLVPushDowngradePreference.PREFER_BETTER_QUALITY;
+        this.repo.setLocalVideoEncodeParam(l118);
     }
     parseChannelBitRateSetting() {
         if (this.isChannelUsePushStreamTemplate()) {
@@ -69,85 +69,85 @@ export class LinkMicGuestEncodeParamUseCase {
         }
     }
     parsePushStreamTemplate() {
-        const c118 = requireNotNull(this.repo.mediator.channelData?.streamerData?.pushStreamTemplateJson);
-        const d118 = extendArray(c118.VideoParams ?? [])
-            .map((g118, index) => {
-            const h118 = runCatching(() => {
-                const bitRate = new PLVLinkMicBitRate(index, requireNotNull(g118.QualityName));
-                return new PLVLinkMicBitRateEncodeParam(bitRate, requireNotNull(g118.VideoFps), requireNotNull(g118.VideoGop), requireNotNull(g118.VideoWidth), requireNotNull(g118.VideoHeight), requireNotNull(g118.VideoBitrate), requireNotNull(g118.ScreenFps), requireNotNull(g118.ScreenGop), requireNotNull(g118.ScreenWidth), requireNotNull(g118.ScreenHeight), requireNotNull(g118.ScreenBitrate));
+        const b118 = requireNotNull(this.repo.mediator.channelData?.streamerData?.pushStreamTemplateJson);
+        const c118 = extendArray(b118.VideoParams ?? [])
+            .map((f118, index) => {
+            const g118 = runCatching(() => {
+                const bitRate = new PLVLinkMicBitRate(index, requireNotNull(f118.QualityName));
+                return new PLVLinkMicBitRateEncodeParam(bitRate, requireNotNull(f118.VideoFps), requireNotNull(f118.VideoGop), requireNotNull(f118.VideoWidth), requireNotNull(f118.VideoHeight), requireNotNull(f118.VideoBitrate), requireNotNull(f118.ScreenFps), requireNotNull(f118.ScreenGop), requireNotNull(f118.ScreenWidth), requireNotNull(f118.ScreenHeight), requireNotNull(f118.ScreenBitrate));
             });
-            return h118.success ? h118.data : null;
+            return g118.success ? g118.data : null;
         })
             .filterNotNull_ext();
-        this.repo.mediator.channelSupportBitRateEncodeParams.setValue(d118);
-        const e118 = d118.map(f118 => f118.bitRate);
-        this.repo.mediator.channelSupportBitRates.setValue(e118);
+        this.repo.mediator.channelSupportBitRateEncodeParams.setValue(c118);
+        const d118 = c118.map(e118 => e118.bitRate);
+        this.repo.mediator.channelSupportBitRates.setValue(d118);
     }
     parseBuiltinBitRateSetting() {
-        const q117 = requireNotNull(this.repo.mediator.channelData?.streamerData);
-        const maxResolution = q117.rtcMaxResolution ?? 0;
-        let r117;
-        if (isLiteralTrue(q117.appPushResolution1080Enabled) || maxResolution >= 1080) {
-            r117 = [PLVLinkMicBitRate.STANDARD, PLVLinkMicBitRate.HIGH, PLVLinkMicBitRate.SUPER, PLVLinkMicBitRate.SUPER_HIGH];
+        const p117 = requireNotNull(this.repo.mediator.channelData?.streamerData);
+        const maxResolution = p117.rtcMaxResolution ?? 0;
+        let q117;
+        if (isLiteralTrue(p117.appPushResolution1080Enabled) || maxResolution >= 1080) {
+            q117 = [PLVLinkMicBitRate.STANDARD, PLVLinkMicBitRate.HIGH, PLVLinkMicBitRate.SUPER, PLVLinkMicBitRate.SUPER_HIGH];
         }
         else if (maxResolution >= 720) {
-            r117 = [PLVLinkMicBitRate.STANDARD, PLVLinkMicBitRate.HIGH, PLVLinkMicBitRate.SUPER];
+            q117 = [PLVLinkMicBitRate.STANDARD, PLVLinkMicBitRate.HIGH, PLVLinkMicBitRate.SUPER];
         }
         else if (maxResolution >= 360) {
-            r117 = [PLVLinkMicBitRate.STANDARD, PLVLinkMicBitRate.HIGH];
+            q117 = [PLVLinkMicBitRate.STANDARD, PLVLinkMicBitRate.HIGH];
         }
         else {
-            r117 = [PLVLinkMicBitRate.STANDARD];
+            q117 = [PLVLinkMicBitRate.STANDARD];
         }
-        const s117 = q117.clientParams?.fps ?? 15;
-        const t117 = this.repo.mediator.currentPushResolutionRatio.value ?? PLVLinkMicPushResolutionRatio.RATIO_16_9;
-        const u117 = extendArray(DEFAULT_BITRATE_ENCODE_PARAM_TABLE)
-            .filter(b118 => r117.includes(b118.bitRate))
-            .groupBy_ext(a118 => a118.bitRate)
-            .filter_ext(z117 => z117[1].length > 0)
-            .mapValues_ext(y117 => this.reduceEncodeParams(y117[1], s117, t117))
-            .toArray_ext(x117 => x117[1]);
-        this.repo.mediator.channelSupportBitRateEncodeParams.setValue(u117);
-        const v117 = u117.map(w117 => w117.bitRate);
-        this.repo.mediator.channelSupportBitRates.setValue(v117);
+        const r117 = p117.clientParams?.fps ?? 15;
+        const s117 = this.repo.mediator.currentPushResolutionRatio.value ?? PLVLinkMicPushResolutionRatio.RATIO_16_9;
+        const t117 = extendArray(DEFAULT_BITRATE_ENCODE_PARAM_TABLE)
+            .filter(a118 => q117.includes(a118.bitRate))
+            .groupBy_ext(z117 => z117.bitRate)
+            .filter_ext(y117 => y117[1].length > 0)
+            .mapValues_ext(x117 => this.reduceEncodeParams(x117[1], r117, s117))
+            .toArray_ext(w117 => w117[1]);
+        this.repo.mediator.channelSupportBitRateEncodeParams.setValue(t117);
+        const u117 = t117.map(v117 => v117.bitRate);
+        this.repo.mediator.channelSupportBitRates.setValue(u117);
     }
-    reduceEncodeParams(f117, g117, ratio) {
-        const h117 = (a, b) => Math.abs(a - b) < 1e-6;
-        const i117 = f117.filter(p117 => p117.videoFps >= g117 && h117(p117.videoWidth / p117.videoHeight, ratio.ratio));
-        if (i117.length > 0) {
-            if (i117.length === 1) {
-                return i117[0];
+    reduceEncodeParams(e117, f117, ratio) {
+        const g117 = (a, b) => Math.abs(a - b) < 1e-6;
+        const h117 = e117.filter(o117 => o117.videoFps >= f117 && g117(o117.videoWidth / o117.videoHeight, ratio.ratio));
+        if (h117.length > 0) {
+            if (h117.length === 1) {
+                return h117[0];
             }
             else {
-                return i117.reduce((n117, o117) => n117.videoFps > o117.videoFps ? o117 : n117);
+                return h117.reduce((m117, n117) => m117.videoFps > n117.videoFps ? n117 : m117);
             }
         }
-        const j117 = f117.filter(m117 => h117(m117.videoWidth / m117.videoHeight, ratio.ratio));
-        if (j117.length > 0) {
-            if (j117.length === 1) {
-                return j117[0];
+        const i117 = e117.filter(l117 => g117(l117.videoWidth / l117.videoHeight, ratio.ratio));
+        if (i117.length > 0) {
+            if (i117.length === 1) {
+                return i117[0];
             }
             else {
-                return i117.reduce((k117, l117) => k117.videoFps > l117.videoFps ? l117 : k117);
+                return h117.reduce((j117, k117) => j117.videoFps > k117.videoFps ? k117 : j117);
             }
         }
-        return f117[0];
+        return e117[0];
     }
     setupDefaultBitRate() {
         if (this.isChannelUsePushStreamTemplate()) {
-            const a117 = requireNotNull(this.repo.mediator.channelData?.streamerData?.pushStreamTemplateJson);
-            const b117 = a117.VideoParams?.findIndex(e117 => e117.QualityLevel === a117.teacherDefaultQualityLevel);
-            const c117 = (this.repo.mediator.channelSupportBitRates.value ?? []).find(d117 => d117.index === b117) ?? PLVLinkMicBitRate.STANDARD;
-            this.setBitRate(c117);
+            const z116 = requireNotNull(this.repo.mediator.channelData?.streamerData?.pushStreamTemplateJson);
+            const a117 = z116.VideoParams?.findIndex(d117 => d117.QualityLevel === z116.teacherDefaultQualityLevel);
+            const b117 = (this.repo.mediator.channelSupportBitRates.value ?? []).find(c117 => c117.index === a117) ?? PLVLinkMicBitRate.STANDARD;
+            this.setBitRate(b117);
         }
         else {
-            const z116 = extendArray(this.repo.mediator.channelSupportBitRates.value ?? [])
+            const y116 = extendArray(this.repo.mediator.channelSupportBitRates.value ?? [])
                 .lastOrNull_ext() ?? PLVLinkMicBitRate.STANDARD;
-            this.setBitRate(z116);
+            this.setBitRate(y116);
         }
     }
     isChannelUsePushStreamTemplate() {
-        const y116 = this.repo.mediator.channelData?.streamerData;
-        return isLiteralTrue(y116?.clientPushStreamTemplateEnabled) && y116?.pushStreamTemplateJson !== undefined;
+        const x116 = this.repo.mediator.channelData?.streamerData;
+        return isLiteralTrue(x116?.clientPushStreamTemplateEnabled) && x116?.pushStreamTemplateJson !== undefined;
     }
 }

package/src/main/ets/modules/linkmic/viewmodel/usecase/roles/guest/LinkMicGuestHandleRTCUseCase.d.ets

@@ -5,7 +5,7 @@ import { ILinkMicHandleRTCUseCase } from '../base/ILinkMicHandleRTCUseCase';
 export declare class LinkMicGuestHandleRTCUseCase implements ILinkMicHandleRTCUseCase {
     private readonly repo;
     private observers;
-    constructor(d119: PLVLinkMicRepo);
+    constructor(c119: PLVLinkMicRepo);
     init(): void;
     joinChannel(): void;
     leaveChannel(): void;
@@ -14,9 +14,9 @@ export declare class LinkMicGuestHandleRTCUseCase implements ILinkMicHandleRTCUs
     enableMicrophone(enable: boolean): void;
     enableCameraMicrophoneToLastState(): void;
     switchCamera(): void;
-    setLocalRenderMirror(z118: boolean): void;
-    setupVideoRender(x118: PLVLinkMicVideoRenderParam): void;
-    removeVideoRender(v118: PLVLinkMicVideoRenderParam): void;
+    setLocalRenderMirror(y118: boolean): void;
+    setupVideoRender(w118: PLVLinkMicVideoRenderParam): void;
+    removeVideoRender(u118: PLVLinkMicVideoRenderParam): void;
     onDestroy(): void;
     private getVideoRenderParam;
 }

package/src/main/ets/modules/linkmic/viewmodel/usecase/roles/guest/LinkMicGuestHandleRTCUseCase.js

@@ -4,13 +4,13 @@ import { PLVLinkMicCameraFacing } from '../../../../model/vo/PLVLinkMicCameraFac
 import { PLVLinkMicState } from '../../../../model/vo/PLVLinkMicState';
 import { PLVLinkMicVideoRenderParam } from '../../../../model/vo/PLVLinkMicVideoRenderParam';
 export class LinkMicGuestHandleRTCUseCase {
-    constructor(d119) {
+    constructor(c119) {
         this.observers = [];
-        this.repo = d119;
+        this.repo = c119;
     }
     init() {
-        this.repo.mediator.linkmicState.observe(c119 => {
-            if (c119 === PLVLinkMicState.Joined) {
+        this.repo.mediator.linkmicState.observe(b119 => {
+            if (b119 === PLVLinkMicState.Joined) {
                 this.switchRole(PLVRTCClientRole.BROADCASTER);
             }
             else {
@@ -42,44 +42,44 @@ export class LinkMicGuestHandleRTCUseCase {
         this.repo.mediator.cameraFacing.value = (this.repo.mediator.cameraFacing.value ?? PLVLinkMicCameraFacing.FRONT).switchNext();
         this.repo.switchCamera();
     }
-    setLocalRenderMirror(z118) {
-        const a119 = this.repo.mediator.linkmicId;
-        if (a119 === undefined) {
+    setLocalRenderMirror(y118) {
+        const z118 = this.repo.mediator.linkmicId;
+        if (z118 === undefined) {
             return;
         }
-        this.repo.mediator.localRenderMirror.setValue(z118);
-        const b119 = this.getVideoRenderParam(a119);
-        this.setupVideoRender(new PLVLinkMicVideoRenderParam(a119, b119.viewId));
+        this.repo.mediator.localRenderMirror.setValue(y118);
+        const a119 = this.getVideoRenderParam(z118);
+        this.setupVideoRender(new PLVLinkMicVideoRenderParam(z118, a119.viewId));
     }
-    setupVideoRender(x118) {
-        const y118 = this.getVideoRenderParam(x118.linkmicId);
-        y118.viewId = x118.xcomponentId;
-        if (this.repo.mediator.isMySocketLinkMicId(x118.linkmicId)) {
-            y118.renderMirror = this.repo.mediator.localRenderMirror.value ?? false;
+    setupVideoRender(w118) {
+        const x118 = this.getVideoRenderParam(w118.linkmicId);
+        x118.viewId = w118.xcomponentId;
+        if (this.repo.mediator.isMySocketLinkMicId(w118.linkmicId)) {
+            x118.renderMirror = this.repo.mediator.localRenderMirror.value ?? false;
         }
-        this.repo.setVideoRender(y118);
+        this.repo.setVideoRender(x118);
     }
-    removeVideoRender(v118) {
-        const w118 = this.getVideoRenderParam(v118.linkmicId);
-        if (v118.xcomponentId === null || w118.viewId === v118.xcomponentId) {
-            w118.viewId = null;
-            this.repo.setVideoRender(w118);
+    removeVideoRender(u118) {
+        const v118 = this.getVideoRenderParam(u118.linkmicId);
+        if (u118.xcomponentId === null || v118.viewId === u118.xcomponentId) {
+            v118.viewId = null;
+            this.repo.setVideoRender(v118);
         }
     }
     onDestroy() {
         MutableObserver.disposeAll(this.observers);
         this.observers = [];
     }
-    getVideoRenderParam(t118) {
-        let param = this.repo.getVideoRenderParam(t118);
+    getVideoRenderParam(s118) {
+        let param = this.repo.getVideoRenderParam(s118);
         if (param !== null) {
             return param;
         }
-        const u118 = t118 === this.repo.mediator.channelData?.loginChannelId;
+        const t118 = s118 === this.repo.mediator.channelData?.loginChannelId;
         param = new PLVRTCVideoRenderParam();
-        param.linkmicId = t118;
+        param.linkmicId = s118;
         param.viewId = null;
-        if (u118) {
+        if (t118) {
             param.renderFitMode = PLVVideoRenderFitMode.FIT;
         }
         else {

package/src/main/ets/modules/linkmic/viewmodel/usecase/roles/guest/LinkMicGuestHandleStateUseCase.d.ets

@@ -11,7 +11,7 @@ export declare class LinkMicGuestHandleStateUseCase implements ILinkMicHandleSta
     private readonly updateChannelViewerUseCase;
     private disposables;
     private observers;
-    constructor(d121: PLVLinkMicRepo, e121: LinkMicHandleQueueOrderUseCase, f121: LinkMicHandleRTCUseCase, g121: LinkMicUpdateChannelViewerUseCase);
+    constructor(c121: PLVLinkMicRepo, d121: LinkMicHandleQueueOrderUseCase, e121: LinkMicHandleRTCUseCase, f121: LinkMicUpdateChannelViewerUseCase);
     init(): void;
     requestJoinLinkMic(): Promise<void>;
     acceptInvitation(): Promise<void>;
@@ -19,18 +19,18 @@ export declare class LinkMicGuestHandleStateUseCase implements ILinkMicHandleSta
     leaveLinkMic(): void;
     onStreamerStart(): void;
     onLiveStreamStart(): void;
-    setLinkMicMode(z120: PLVLinkMicMode): Promise<boolean>;
+    setLinkMicMode(y120: PLVLinkMicMode): Promise<boolean>;
     openLinkMic(): Promise<boolean>;
     closeLinkMic(): Promise<boolean>;
-    acceptViewerLinkMicRequest(y120: string): void;
-    inviteViewerLinkMic(w120: string, x120: boolean): void;
-    hangupViewerLinkMic(v120: string): void;
+    acceptViewerLinkMicRequest(x120: string): void;
+    inviteViewerLinkMic(v120: string, w120: boolean): void;
+    hangupViewerLinkMic(u120: string): void;
     hangupAllViewersLinkMic(): void;
-    setViewerEnableCamera(u120: string, enable: boolean): void;
-    setViewerEnableMicrophone(t120: string, enable: boolean): void;
-    grantSpeaker(s120: string): void;
-    revokeSpeaker(q120: string): void;
-    setMainView(n120: string): void;
+    setViewerEnableCamera(t120: string, enable: boolean): void;
+    setViewerEnableMicrophone(s120: string, enable: boolean): void;
+    grantSpeaker(r120: string): void;
+    revokeSpeaker(p120: string): void;
+    setMainView(m120: string): void;
     private isMyselfSpeaker;
     private moveSpeaker;
     onLiveStreamStop(): void;