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

package/src/main/ets/modules/linkmic/viewmodel/usecase/roles/teacher/LinkMicTeacherEncodeParamUseCase.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 LinkMicTeacherEncodeParamUseCase {
-    constructor(b123) {
-        this.repo = b123;
+    constructor(a123) {
+        this.repo = a123;
     }
     init() {
         this.parseChannelBitRateSetting();
@@ -15,50 +15,50 @@ export class LinkMicTeacherEncodeParamUseCase {
         this.repo.mediator.currentBitRate.setValue(bitRate);
         this.updateEncodeParam();
     }
-    setPushResolutionRatio(a123) {
-        this.repo.mediator.currentPushResolutionRatio.setValue(a123);
+    setPushResolutionRatio(z122) {
+        this.repo.mediator.currentPushResolutionRatio.setValue(z122);
         if (!this.isChannelUsePushStreamTemplate()) {
             this.parseChannelBitRateSetting();
         }
         this.updateEncodeParam();
     }
-    setPushOrientation(z122) {
-        this.repo.mediator.currentPushOrientation.setValue(z122);
+    setPushOrientation(y122) {
+        this.repo.mediator.currentPushOrientation.setValue(y122);
         this.updateEncodeParam();
     }
-    setPushMirror(y122) {
-        this.repo.mediator.currentPushMirror.setValue(y122);
+    setPushMirror(x122) {
+        this.repo.mediator.currentPushMirror.setValue(x122);
         this.updateEncodeParam();
     }
-    setPushDowngradePreference(x122) {
-        this.repo.mediator.currentPushDowngradePreference.setValue(x122);
+    setPushDowngradePreference(w122) {
+        this.repo.mediator.currentPushDowngradePreference.setValue(w122);
         this.updateEncodeParam();
     }
     updateEncodeParam() {
-        const r122 = this.repo.mediator.currentBitRate.value;
-        const s122 = this.repo.mediator.channelSupportBitRates.value ?? [PLVLinkMicBitRate.STANDARD];
-        let t122 = r122;
-        if (t122 === undefined || !s122.includes(t122)) {
-            t122 = s122[0];
+        const q122 = this.repo.mediator.currentBitRate.value;
+        const r122 = this.repo.mediator.channelSupportBitRates.value ?? [PLVLinkMicBitRate.STANDARD];
+        let s122 = q122;
+        if (s122 === undefined || !r122.includes(s122)) {
+            s122 = r122[0];
         }
-        if (r122 !== t122) {
-            this.setBitRate(t122);
+        if (q122 !== s122) {
+            this.setBitRate(s122);
             return;
         }
-        const u122 = this.repo.mediator.channelSupportBitRateEncodeParams.value?.find(w122 => w122.bitRate === t122);
-        if (u122 === undefined) {
+        const t122 = this.repo.mediator.channelSupportBitRateEncodeParams.value?.find(v122 => v122.bitRate === s122);
+        if (t122 === undefined) {
             return;
         }
-        this.repo.mediator.currentBitRateEncodeParam.setValue(u122);
-        const v122 = new PLVRTCVideoEncodeParam();
-        v122.width = u122.videoWidth;
-        v122.height = u122.videoHeight;
-        v122.frameRate = u122.videoFps;
-        v122.targetBitRate = u122.videoBitrate;
-        v122.pushOrientation = this.repo.mediator.currentPushOrientation.value ?? PLVPushOrientation.AUTO;
-        v122.pushMirror = this.repo.mediator.currentPushMirror.value ?? false;
-        v122.pushDowngradePreference = this.repo.mediator.currentPushDowngradePreference.value ?? PLVPushDowngradePreference.PREFER_BETTER_QUALITY;
-        this.repo.setLocalVideoEncodeParam(v122);
+        this.repo.mediator.currentBitRateEncodeParam.setValue(t122);
+        const u122 = new PLVRTCVideoEncodeParam();
+        u122.width = t122.videoWidth;
+        u122.height = t122.videoHeight;
+        u122.frameRate = t122.videoFps;
+        u122.targetBitRate = t122.videoBitrate;
+        u122.pushOrientation = this.repo.mediator.currentPushOrientation.value ?? PLVPushOrientation.AUTO;
+        u122.pushMirror = this.repo.mediator.currentPushMirror.value ?? false;
+        u122.pushDowngradePreference = this.repo.mediator.currentPushDowngradePreference.value ?? PLVPushDowngradePreference.PREFER_BETTER_QUALITY;
+        this.repo.setLocalVideoEncodeParam(u122);
     }
     parseChannelBitRateSetting() {
         if (this.isChannelUsePushStreamTemplate()) {
@@ -69,85 +69,85 @@ export class LinkMicTeacherEncodeParamUseCase {
         }
     }
     parsePushStreamTemplate() {
-        const l122 = requireNotNull(this.repo.mediator.channelData?.streamerData?.pushStreamTemplateJson);
-        const m122 = extendArray(l122.VideoParams ?? [])
-            .map((p122, index) => {
-            const q122 = runCatching(() => {
-                const bitRate = new PLVLinkMicBitRate(index, requireNotNull(p122.QualityName));
-                return new PLVLinkMicBitRateEncodeParam(bitRate, requireNotNull(p122.VideoFps), requireNotNull(p122.VideoGop), requireNotNull(p122.VideoWidth), requireNotNull(p122.VideoHeight), requireNotNull(p122.VideoBitrate), requireNotNull(p122.ScreenFps), requireNotNull(p122.ScreenGop), requireNotNull(p122.ScreenWidth), requireNotNull(p122.ScreenHeight), requireNotNull(p122.ScreenBitrate));
+        const k122 = requireNotNull(this.repo.mediator.channelData?.streamerData?.pushStreamTemplateJson);
+        const l122 = extendArray(k122.VideoParams ?? [])
+            .map((o122, index) => {
+            const p122 = runCatching(() => {
+                const bitRate = new PLVLinkMicBitRate(index, requireNotNull(o122.QualityName));
+                return new PLVLinkMicBitRateEncodeParam(bitRate, requireNotNull(o122.VideoFps), requireNotNull(o122.VideoGop), requireNotNull(o122.VideoWidth), requireNotNull(o122.VideoHeight), requireNotNull(o122.VideoBitrate), requireNotNull(o122.ScreenFps), requireNotNull(o122.ScreenGop), requireNotNull(o122.ScreenWidth), requireNotNull(o122.ScreenHeight), requireNotNull(o122.ScreenBitrate));
             });
-            return q122.success ? q122.data : null;
+            return p122.success ? p122.data : null;
         })
             .filterNotNull_ext();
-        this.repo.mediator.channelSupportBitRateEncodeParams.setValue(m122);
-        const n122 = m122.map(o122 => o122.bitRate);
-        this.repo.mediator.channelSupportBitRates.setValue(n122);
+        this.repo.mediator.channelSupportBitRateEncodeParams.setValue(l122);
+        const m122 = l122.map(n122 => n122.bitRate);
+        this.repo.mediator.channelSupportBitRates.setValue(m122);
     }
     parseBuiltinBitRateSetting() {
-        const z121 = requireNotNull(this.repo.mediator.channelData?.streamerData);
-        const maxResolution = z121.rtcMaxResolution ?? 0;
-        let a122;
-        if (isLiteralTrue(z121.appPushResolution1080Enabled) || maxResolution >= 1080) {
-            a122 = [PLVLinkMicBitRate.STANDARD, PLVLinkMicBitRate.HIGH, PLVLinkMicBitRate.SUPER, PLVLinkMicBitRate.SUPER_HIGH];
+        const y121 = requireNotNull(this.repo.mediator.channelData?.streamerData);
+        const maxResolution = y121.rtcMaxResolution ?? 0;
+        let z121;
+        if (isLiteralTrue(y121.appPushResolution1080Enabled) || maxResolution >= 1080) {
+            z121 = [PLVLinkMicBitRate.STANDARD, PLVLinkMicBitRate.HIGH, PLVLinkMicBitRate.SUPER, PLVLinkMicBitRate.SUPER_HIGH];
         }
         else if (maxResolution >= 720) {
-            a122 = [PLVLinkMicBitRate.STANDARD, PLVLinkMicBitRate.HIGH, PLVLinkMicBitRate.SUPER];
+            z121 = [PLVLinkMicBitRate.STANDARD, PLVLinkMicBitRate.HIGH, PLVLinkMicBitRate.SUPER];
         }
         else if (maxResolution >= 360) {
-            a122 = [PLVLinkMicBitRate.STANDARD, PLVLinkMicBitRate.HIGH];
+            z121 = [PLVLinkMicBitRate.STANDARD, PLVLinkMicBitRate.HIGH];
         }
         else {
-            a122 = [PLVLinkMicBitRate.STANDARD];
+            z121 = [PLVLinkMicBitRate.STANDARD];
         }
-        const b122 = z121.clientParams?.fps ?? 15;
-        const c122 = this.repo.mediator.currentPushResolutionRatio.value ?? PLVLinkMicPushResolutionRatio.RATIO_16_9;
-        const d122 = extendArray(DEFAULT_BITRATE_ENCODE_PARAM_TABLE)
-            .filter(k122 => a122.includes(k122.bitRate))
-            .groupBy_ext(j122 => j122.bitRate)
-            .filter_ext(i122 => i122[1].length > 0)
-            .mapValues_ext(h122 => this.reduceEncodeParams(h122[1], b122, c122))
-            .toArray_ext(g122 => g122[1]);
-        this.repo.mediator.channelSupportBitRateEncodeParams.setValue(d122);
-        const e122 = d122.map(f122 => f122.bitRate);
-        this.repo.mediator.channelSupportBitRates.setValue(e122);
+        const a122 = y121.clientParams?.fps ?? 15;
+        const b122 = this.repo.mediator.currentPushResolutionRatio.value ?? PLVLinkMicPushResolutionRatio.RATIO_16_9;
+        const c122 = extendArray(DEFAULT_BITRATE_ENCODE_PARAM_TABLE)
+            .filter(j122 => z121.includes(j122.bitRate))
+            .groupBy_ext(i122 => i122.bitRate)
+            .filter_ext(h122 => h122[1].length > 0)
+            .mapValues_ext(g122 => this.reduceEncodeParams(g122[1], a122, b122))
+            .toArray_ext(f122 => f122[1]);
+        this.repo.mediator.channelSupportBitRateEncodeParams.setValue(c122);
+        const d122 = c122.map(e122 => e122.bitRate);
+        this.repo.mediator.channelSupportBitRates.setValue(d122);
     }
-    reduceEncodeParams(o121, p121, ratio) {
-        const q121 = (a, b) => Math.abs(a - b) < 1e-6;
-        const r121 = o121.filter(y121 => y121.videoFps >= p121 && q121(y121.videoWidth / y121.videoHeight, ratio.ratio));
-        if (r121.length > 0) {
-            if (r121.length === 1) {
-                return r121[0];
+    reduceEncodeParams(n121, o121, ratio) {
+        const p121 = (a, b) => Math.abs(a - b) < 1e-6;
+        const q121 = n121.filter(x121 => x121.videoFps >= o121 && p121(x121.videoWidth / x121.videoHeight, ratio.ratio));
+        if (q121.length > 0) {
+            if (q121.length === 1) {
+                return q121[0];
             }
             else {
-                return r121.reduce((w121, x121) => w121.videoFps > x121.videoFps ? x121 : w121);
+                return q121.reduce((v121, w121) => v121.videoFps > w121.videoFps ? w121 : v121);
             }
         }
-        const s121 = o121.filter(v121 => q121(v121.videoWidth / v121.videoHeight, ratio.ratio));
-        if (s121.length > 0) {
-            if (s121.length === 1) {
-                return s121[0];
+        const r121 = n121.filter(u121 => p121(u121.videoWidth / u121.videoHeight, ratio.ratio));
+        if (r121.length > 0) {
+            if (r121.length === 1) {
+                return r121[0];
             }
             else {
-                return r121.reduce((t121, u121) => t121.videoFps > u121.videoFps ? u121 : t121);
+                return q121.reduce((s121, t121) => s121.videoFps > t121.videoFps ? t121 : s121);
             }
         }
-        return o121[0];
+        return n121[0];
     }
     setupDefaultBitRate() {
         if (this.isChannelUsePushStreamTemplate()) {
-            const j121 = requireNotNull(this.repo.mediator.channelData?.streamerData?.pushStreamTemplateJson);
-            const k121 = j121.VideoParams?.findIndex(n121 => n121.QualityLevel === j121.teacherDefaultQualityLevel);
-            const l121 = (this.repo.mediator.channelSupportBitRates.value ?? []).find(m121 => m121.index === k121) ?? PLVLinkMicBitRate.STANDARD;
-            this.setBitRate(l121);
+            const i121 = requireNotNull(this.repo.mediator.channelData?.streamerData?.pushStreamTemplateJson);
+            const j121 = i121.VideoParams?.findIndex(m121 => m121.QualityLevel === i121.teacherDefaultQualityLevel);
+            const k121 = (this.repo.mediator.channelSupportBitRates.value ?? []).find(l121 => l121.index === j121) ?? PLVLinkMicBitRate.STANDARD;
+            this.setBitRate(k121);
         }
         else {
-            const i121 = extendArray(this.repo.mediator.channelSupportBitRates.value ?? [])
+            const h121 = extendArray(this.repo.mediator.channelSupportBitRates.value ?? [])
                 .lastOrNull_ext() ?? PLVLinkMicBitRate.STANDARD;
-            this.setBitRate(i121);
+            this.setBitRate(h121);
         }
     }
     isChannelUsePushStreamTemplate() {
-        const h121 = this.repo.mediator.channelData?.streamerData;
-        return isLiteralTrue(h121?.clientPushStreamTemplateEnabled) && h121?.pushStreamTemplateJson !== undefined;
+        const g121 = this.repo.mediator.channelData?.streamerData;
+        return isLiteralTrue(g121?.clientPushStreamTemplateEnabled) && g121?.pushStreamTemplateJson !== undefined;
     }
 }

package/src/main/ets/modules/linkmic/viewmodel/usecase/roles/teacher/LinkMicTeacherHandleRTCUseCase.d.ets

@@ -5,7 +5,7 @@ import { ILinkMicHandleRTCUseCase } from '../base/ILinkMicHandleRTCUseCase';
 export declare class LinkMicTeacherHandleRTCUseCase implements ILinkMicHandleRTCUseCase {
     private readonly repo;
     private observers;
-    constructor(k123: PLVLinkMicRepo);
+    constructor(j123: PLVLinkMicRepo);
     init(): void;
     joinChannel(): void;
     leaveChannel(): void;
@@ -14,9 +14,9 @@ export declare class LinkMicTeacherHandleRTCUseCase implements ILinkMicHandleRTC
     enableMicrophone(enable: boolean): void;
     enableCameraMicrophoneToLastState(): void;
     switchCamera(): void;
-    setLocalRenderMirror(h123: boolean): void;
-    setupVideoRender(f123: PLVLinkMicVideoRenderParam): void;
-    removeVideoRender(d123: PLVLinkMicVideoRenderParam): void;
+    setLocalRenderMirror(g123: boolean): void;
+    setupVideoRender(e123: PLVLinkMicVideoRenderParam): void;
+    removeVideoRender(c123: PLVLinkMicVideoRenderParam): void;
     onDestroy(): void;
     private getVideoRenderParam;
 }

package/src/main/ets/modules/linkmic/viewmodel/usecase/roles/teacher/LinkMicTeacherHandleRTCUseCase.js

@@ -3,9 +3,9 @@ import { PLVRTCClientRole, PLVRTCVideoRenderParam, PLVVideoRenderFitMode } from
 import { PLVLinkMicCameraFacing } from '../../../../model/vo/PLVLinkMicCameraFacing';
 import { PLVLinkMicVideoRenderParam } from '../../../../model/vo/PLVLinkMicVideoRenderParam';
 export class LinkMicTeacherHandleRTCUseCase {
-    constructor(k123) {
+    constructor(j123) {
         this.observers = [];
-        this.repo = k123;
+        this.repo = j123;
     }
     init() {
     }
@@ -33,41 +33,41 @@ export class LinkMicTeacherHandleRTCUseCase {
         this.repo.mediator.cameraFacing.value = (this.repo.mediator.cameraFacing.value ?? PLVLinkMicCameraFacing.FRONT).switchNext();
         this.repo.switchCamera();
     }
-    setLocalRenderMirror(h123) {
-        const i123 = this.repo.mediator.linkmicId;
-        if (i123 === undefined) {
+    setLocalRenderMirror(g123) {
+        const h123 = this.repo.mediator.linkmicId;
+        if (h123 === undefined) {
             return;
         }
-        this.repo.mediator.localRenderMirror.setValue(h123);
-        const j123 = this.getVideoRenderParam(i123);
-        this.setupVideoRender(new PLVLinkMicVideoRenderParam(i123, j123.viewId));
+        this.repo.mediator.localRenderMirror.setValue(g123);
+        const i123 = this.getVideoRenderParam(h123);
+        this.setupVideoRender(new PLVLinkMicVideoRenderParam(h123, i123.viewId));
     }
-    setupVideoRender(f123) {
-        const g123 = this.getVideoRenderParam(f123.linkmicId);
-        g123.viewId = f123.xcomponentId;
-        if (this.repo.mediator.isMySocketLinkMicId(f123.linkmicId)) {
-            g123.renderMirror = this.repo.mediator.localRenderMirror.value ?? false;
+    setupVideoRender(e123) {
+        const f123 = this.getVideoRenderParam(e123.linkmicId);
+        f123.viewId = e123.xcomponentId;
+        if (this.repo.mediator.isMySocketLinkMicId(e123.linkmicId)) {
+            f123.renderMirror = this.repo.mediator.localRenderMirror.value ?? false;
         }
-        this.repo.setVideoRender(g123);
+        this.repo.setVideoRender(f123);
     }
-    removeVideoRender(d123) {
-        const e123 = this.getVideoRenderParam(d123.linkmicId);
-        if (d123.xcomponentId === null || e123.viewId === d123.xcomponentId) {
-            e123.viewId = null;
-            this.repo.setVideoRender(e123);
+    removeVideoRender(c123) {
+        const d123 = this.getVideoRenderParam(c123.linkmicId);
+        if (c123.xcomponentId === null || d123.viewId === c123.xcomponentId) {
+            d123.viewId = null;
+            this.repo.setVideoRender(d123);
         }
     }
     onDestroy() {
         MutableObserver.disposeAll(this.observers);
         this.observers = [];
     }
-    getVideoRenderParam(c123) {
-        let param = this.repo.getVideoRenderParam(c123);
+    getVideoRenderParam(b123) {
+        let param = this.repo.getVideoRenderParam(b123);
         if (param !== null) {
             return param;
         }
         param = new PLVRTCVideoRenderParam();
-        param.linkmicId = c123;
+        param.linkmicId = b123;
         param.viewId = null;
         param.renderFitMode = PLVVideoRenderFitMode.HIDDEN;
         param.renderMirror = false;

package/src/main/ets/modules/linkmic/viewmodel/usecase/roles/teacher/LinkMicTeacherHandleStateUseCase.d.ets

@@ -12,7 +12,7 @@ export declare class LinkMicTeacherHandleStateUseCase implements ILinkMicHandleS
     private lastEmitLinkMicStatusModeUpdatePromise;
     private disposables;
     private observers;
-    constructor(z124: PLVLinkMicRepo, a125: LinkMicHandleQueueOrderUseCase, b125: LinkMicHandleRTCUseCase, c125: LinkMicUpdateChannelViewerUseCase);
+    constructor(y124: PLVLinkMicRepo, z124: LinkMicHandleQueueOrderUseCase, a125: LinkMicHandleRTCUseCase, b125: LinkMicUpdateChannelViewerUseCase);
     init(): void;
     requestJoinLinkMic(): Promise<void>;
     acceptInvitation(): Promise<void>;
@@ -20,19 +20,19 @@ export declare class LinkMicTeacherHandleStateUseCase implements ILinkMicHandleS
     leaveLinkMic(): void;
     onStreamerStart(): void;
     onLiveStreamStart(): void;
-    setLinkMicMode(x124: PLVLinkMicMode): Promise<boolean>;
+    setLinkMicMode(w124: PLVLinkMicMode): Promise<boolean>;
     openLinkMic(): Promise<boolean>;
     closeLinkMic(): Promise<boolean>;
     private emitLinkMicStatusModeUpdate;
-    acceptViewerLinkMicRequest(t124: string): void;
-    inviteViewerLinkMic(r124: string, s124: boolean): void;
-    hangupViewerLinkMic(o124: string): void;
+    acceptViewerLinkMicRequest(s124: string): void;
+    inviteViewerLinkMic(q124: string, r124: boolean): void;
+    hangupViewerLinkMic(n124: string): void;
     hangupAllViewersLinkMic(): void;
-    setViewerEnableCamera(l124: string, enable: boolean): void;
-    setViewerEnableMicrophone(j124: string, enable: boolean): void;
-    grantSpeaker(i124: string): void;
-    revokeSpeaker(g124: string): void;
-    setMainView(d124: string): void;
+    setViewerEnableCamera(k124: string, enable: boolean): void;
+    setViewerEnableMicrophone(i124: string, enable: boolean): void;
+    grantSpeaker(h124: string): void;
+    revokeSpeaker(f124: string): void;
+    setMainView(c124: string): void;
     private moveSpeaker;
     onLiveStreamStop(): void;
     onStreamerStop(): void;