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

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

@@ -10,20 +10,20 @@ import { PLVSocketUserSend } from '../../../../../socket/model/PLVSocketUserBean
 import { PLVMemberSocketSetNickRecv } from '../../../../../member/model/vo/PLVMemberSocketEvent';
 const TAG = "PLVLinkMicManager";
 export class LinkMicGuestHandleStateUseCase {
-    constructor(d121, e121, f121, g121) {
+    constructor(c121, d121, e121, f121) {
         this.disposables = [];
         this.observers = [];
-        this.repo = d121;
-        this.handleQueueOrderUseCase = e121;
-        this.handleRTCUseCase = f121;
-        this.updateChannelViewerUseCase = g121;
+        this.repo = c121;
+        this.handleQueueOrderUseCase = d121;
+        this.handleRTCUseCase = e121;
+        this.updateChannelViewerUseCase = f121;
     }
     init() {
         this.disposables.push(this.observeSocketEvent(PLVSocketOnEvent.MESSAGE, (data, event) => this.onSocketMessage(data, event)), this.observeSocketEvent(PLVSocketOnEvent.JOIN_REQUEST, (data) => this.onSocketJoinRequest(data)), this.observeSocketEvent(PLVSocketOnEvent.JOIN_RESPONSE, (data) => this.onSocketJoinResponse(data)), this.observeSocketEvent(PLVSocketOnEvent.JOIN_SUCCESS, (data) => this.onSocketJoinSuccess(data)), this.observeSocketEvent(PLVSocketOnEvent.JOIN_LEAVE, (data) => this.onSocketJoinLeave(data)), this.observeSocketEvent(PLVSocketOnEvent.SWITCH_VIEW, (data) => this.onSocketSwitchView(data)));
     }
     async requestJoinLinkMic() {
-        const c121 = this.repo.mediator.linkmicState.value;
-        if (c121 === PLVLinkMicState.Inviting) {
+        const b121 = this.repo.mediator.linkmicState.value;
+        if (b121 === PLVLinkMicState.Inviting) {
             this.acceptInvitation();
             return;
         }
@@ -50,8 +50,8 @@ export class LinkMicGuestHandleStateUseCase {
         event.roomId = this.repo.mediator.channelData?.loginChannelId;
         event.status = 1;
         this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.JOIN_ANSWER, encodeToJson(event), () => {
-            const b121 = this.repo.mediator.linkmicState.value;
-            if (b121 === PLVLinkMicState.Inviting) {
+            const a121 = this.repo.mediator.linkmicState.value;
+            if (a121 === PLVLinkMicState.Inviting) {
                 this.repo.mediator.linkmicState.setValue(PLVLinkMicState.WaitingResponse);
             }
         });
@@ -65,8 +65,8 @@ export class LinkMicGuestHandleStateUseCase {
         this.repo.mediator.linkmicState.setValue(PLVLinkMicState.NoLinkMic);
     }
     leaveLinkMic() {
-        const a121 = this.repo.mediator.linkmicState.value;
-        if (a121 === undefined || ![PLVLinkMicState.Requesting, PLVLinkMicState.Joined].includes(a121)) {
+        const z120 = this.repo.mediator.linkmicState.value;
+        if (z120 === undefined || ![PLVLinkMicState.Requesting, PLVLinkMicState.Joined].includes(z120)) {
             return;
         }
         const event = new PLVLinkMicSocketJoinLeaveSend();
@@ -83,7 +83,7 @@ export class LinkMicGuestHandleStateUseCase {
         this.tryAutoJoinLinkMic();
         this.updateChannelViewerUseCase.startUpdateChannelLinkMicViewersInterval();
     }
-    async setLinkMicMode(z120) {
+    async setLinkMicMode(y120) {
         return false;
     }
     async openLinkMic() {
@@ -92,64 +92,64 @@ export class LinkMicGuestHandleStateUseCase {
     async closeLinkMic() {
         return false;
     }
-    acceptViewerLinkMicRequest(y120) {
+    acceptViewerLinkMicRequest(x120) {
     }
-    inviteViewerLinkMic(w120, x120) {
+    inviteViewerLinkMic(v120, w120) {
     }
-    hangupViewerLinkMic(v120) {
+    hangupViewerLinkMic(u120) {
     }
     hangupAllViewersLinkMic() {
     }
-    setViewerEnableCamera(u120, enable) {
+    setViewerEnableCamera(t120, enable) {
     }
-    setViewerEnableMicrophone(t120, enable) {
+    setViewerEnableMicrophone(s120, enable) {
     }
-    grantSpeaker(s120) {
+    grantSpeaker(r120) {
         if (!this.isMyselfSpeaker()) {
             return;
         }
-        this.moveSpeaker(s120);
-        this.setMainView(s120);
+        this.moveSpeaker(r120);
+        this.setMainView(r120);
     }
-    revokeSpeaker(q120) {
+    revokeSpeaker(p120) {
         if (!this.isMyselfSpeaker()) {
             return;
         }
-        const r120 = requireNotNull(this.repo.mediator.channelData?.loginChannelId);
-        this.moveSpeaker(r120);
-        this.setMainView(r120);
+        const q120 = requireNotNull(this.repo.mediator.channelData?.loginChannelId);
+        this.moveSpeaker(q120);
+        this.setMainView(q120);
     }
-    setMainView(n120) {
+    setMainView(m120) {
         if (!this.isMyselfSpeaker()) {
             return;
         }
-        const o120 = this.repo.mediator.memberMediator?.findViewerByViewerId(n120);
-        if (o120 === undefined) {
-            PLVLogger.error(TAG, `setMainView fail, viewerId ${n120} not found.`);
+        const n120 = this.repo.mediator.memberMediator?.findViewerByViewerId(m120);
+        if (n120 === undefined) {
+            PLVLogger.error(TAG, `setMainView fail, viewerId ${m120} not found.`);
             return;
         }
-        const p120 = new PLVLinkMicSocketSwitchViewSend();
-        p120.emitMode = 0;
-        p120.roomId = this.repo.mediator.channelData?.loginChannelId;
-        p120.userId = o120.linkmicId;
-        p120.socketId = o120.socketId;
-        this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.SWITCH_VIEW, encodeToJson(p120));
+        const o120 = new PLVLinkMicSocketSwitchViewSend();
+        o120.emitMode = 0;
+        o120.roomId = this.repo.mediator.channelData?.loginChannelId;
+        o120.userId = n120.linkmicId;
+        o120.socketId = n120.socketId;
+        this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.SWITCH_VIEW, encodeToJson(o120));
     }
     isMyselfSpeaker() {
-        const m120 = this.repo.mediator.channelMainViewLinkMicId.value;
-        return !isNullOrUndefined(m120) && this.repo.mediator.isMySocketLinkMicId(m120);
-    }
-    moveSpeaker(k120) {
-        const l120 = new PLVLinkMicSocketTeacherSetPermissionSend();
-        l120.emitMode = 0;
-        l120.roomId = this.repo.mediator.channelData?.loginChannelId;
-        l120.sessionId = this.repo.mediator.channelData?.sessionId;
-        l120.type = "speaker";
-        l120.status = "1";
-        l120.userId = k120;
-        l120.sign = PLVRequestSetting.createSign(new Map(Object.entries(l120)), "polyvChatSign")
+        const l120 = this.repo.mediator.channelMainViewLinkMicId.value;
+        return !isNullOrUndefined(l120) && this.repo.mediator.isMySocketLinkMicId(l120);
+    }
+    moveSpeaker(j120) {
+        const k120 = new PLVLinkMicSocketTeacherSetPermissionSend();
+        k120.emitMode = 0;
+        k120.roomId = this.repo.mediator.channelData?.loginChannelId;
+        k120.sessionId = this.repo.mediator.channelData?.sessionId;
+        k120.type = "speaker";
+        k120.status = "1";
+        k120.userId = j120;
+        k120.sign = PLVRequestSetting.createSign(new Map(Object.entries(k120)), "polyvChatSign")
             .toUpperCase();
-        this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.MESSAGE, encodeToJson(l120));
+        this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.MESSAGE, encodeToJson(k120));
     }
     onLiveStreamStop() {
         this.leaveLinkMic();
@@ -164,19 +164,19 @@ export class LinkMicGuestHandleStateUseCase {
         event.userId = this.repo.mediator.channelData?.viewerId;
         event.roomId = this.repo.mediator.channelData?.loginChannelId;
         event.sessionId = this.repo.mediator.channelData?.sessionId;
-        const h120 = Date.now();
+        const g120 = Date.now();
         this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.JOIN_ANSWER_TTL, encodeToJson(event), (data) => {
             const ttl = decodeFromJson(data, PLVLinkMicSocketJoinAnswerTTLAck).message?.[0] ?? 0;
-            const expire = h120 + seconds(ttl).toMillis();
+            const expire = g120 + seconds(ttl).toMillis();
             this.repo.mediator.invitationExpireTimestamp.setValue(expire);
-            const i120 = expire - Date.now();
+            const h120 = expire - Date.now();
             setTimeout(() => {
                 const expire = this.repo.mediator.invitationExpireTimestamp.value ?? 0;
-                const j120 = this.repo.mediator.linkmicState.value;
-                if (j120 === PLVLinkMicState.Inviting && Date.now() >= expire) {
+                const i120 = this.repo.mediator.linkmicState.value;
+                if (i120 === PLVLinkMicState.Inviting && Date.now() >= expire) {
                     this.refuseInvitation();
                 }
-            }, i120);
+            }, h120);
         });
     }
     onSocketMessage(data, event) {
@@ -189,17 +189,17 @@ export class LinkMicGuestHandleStateUseCase {
         }
     }
     onSocketOpenMicrophone(data) {
-        const f120 = decodeFromJson(data, PLVLinkMicSocketOpenMicrophoneRecv);
-        const g120 = f120.userId !== undefined;
-        if (f120.status === 'open') {
-            if (!g120) {
+        const e120 = decodeFromJson(data, PLVLinkMicSocketOpenMicrophoneRecv);
+        const f120 = e120.userId !== undefined;
+        if (e120.status === 'open') {
+            if (!f120) {
                 this.repo.mediator.channelAllowLinkMic.setValue(true);
                 this.repo.mediator.channelAllowRequestHandsUpLinkMic.setValue(true);
-                this.updateLinkMicMode(f120.type);
+                this.updateLinkMicMode(e120.type);
             }
         }
-        else if (f120.status === 'close') {
-            if (!g120) {
+        else if (e120.status === 'close') {
+            if (!f120) {
                 if (this.repo.mediator.isLinkMicStrategyV2.value === true) {
                     this.repo.mediator.channelAllowRequestHandsUpLinkMic.setValue(false);
                 }
@@ -208,66 +208,66 @@ export class LinkMicGuestHandleStateUseCase {
                     this.repo.mediator.channelAllowRequestHandsUpLinkMic.setValue(false);
                 }
             }
-            if (g120 && this.repo.mediator.isMySocketLinkMicId(f120.userId)) {
+            if (f120 && this.repo.mediator.isMySocketLinkMicId(e120.userId)) {
                 this.repo.mediator.teacherHangUpLinkMicEvent.setValue(Date.now());
                 this.leaveLinkMic();
             }
         }
     }
     onSocketMuteUserMicro(data) {
-        const e120 = decodeFromJson(data, PLVLinkMicSocketMuteUserMicroRecv);
-        if (e120.type === 'audio') {
-            if (e120.mute === true) {
+        const d120 = decodeFromJson(data, PLVLinkMicSocketMuteUserMicroRecv);
+        if (d120.type === 'audio') {
+            if (d120.mute === true) {
                 this.handleRTCUseCase.enableMicrophone(false);
             }
-            if (e120.mute === false) {
+            if (d120.mute === false) {
                 this.handleRTCUseCase.enableMicrophone(true);
             }
         }
-        if (e120.type === 'video') {
-            if (e120.mute === true) {
+        if (d120.type === 'video') {
+            if (d120.mute === true) {
                 this.handleRTCUseCase.enableCamera(false);
             }
-            if (e120.mute === false) {
+            if (d120.mute === false) {
                 this.handleRTCUseCase.enableCamera(true);
             }
         }
     }
     onSocketTeacherSetPermission(data) {
-        const b120 = decodeFromJson(data, PLVLinkMicSocketTeacherSetPermissionRecv);
-        this.updateChannelViewerUseCase.onEventTeacherSetPermission(b120);
-        if (b120.type === "voice") {
-            const c120 = b120.status === "1";
-            const d120 = !isNullOrUndefined(b120.userId) && b120.userId === this.repo.mediator.channelData?.viewerId;
-            if (d120) {
-                this.repo.mediator.linkmicState.setValue(c120 ? PLVLinkMicState.Joined : PLVLinkMicState.NoLinkMic);
+        const a120 = decodeFromJson(data, PLVLinkMicSocketTeacherSetPermissionRecv);
+        this.updateChannelViewerUseCase.onEventTeacherSetPermission(a120);
+        if (a120.type === "voice") {
+            const b120 = a120.status === "1";
+            const c120 = !isNullOrUndefined(a120.userId) && a120.userId === this.repo.mediator.channelData?.viewerId;
+            if (c120) {
+                this.repo.mediator.linkmicState.setValue(b120 ? PLVLinkMicState.Joined : PLVLinkMicState.NoLinkMic);
             }
         }
     }
     onSocketUserSetNick(data) {
-        const y119 = decodeFromJson(data, PLVMemberSocketSetNickRecv);
-        const z119 = y119.userId;
-        const a120 = this.repo.mediator.findViewerByViewerId(z119);
-        if (a120 !== undefined) {
-            a120.viewerName.setValue(y119.nick);
+        const x119 = decodeFromJson(data, PLVMemberSocketSetNickRecv);
+        const y119 = x119.userId;
+        const z119 = this.repo.mediator.findViewerByViewerId(y119);
+        if (z119 !== undefined) {
+            z119.viewerName.setValue(x119.nick);
         }
     }
     onSocketJoinRequest(data) {
-        const x119 = decodeFromJson(data, PLVLinkMicSocketJoinRequestRecv);
-        this.handleQueueOrderUseCase.onEventJoinRequest(x119);
+        const w119 = decodeFromJson(data, PLVLinkMicSocketJoinRequestRecv);
+        this.handleQueueOrderUseCase.onEventJoinRequest(w119);
     }
     onSocketJoinResponse(data) {
-        const v119 = decodeFromJson(data, PLVLinkMicSocketJoinResponseRecv);
-        if (!this.repo.mediator.isMySocketLinkMicId(v119.user?.userId)) {
+        const u119 = decodeFromJson(data, PLVLinkMicSocketJoinResponseRecv);
+        if (!this.repo.mediator.isMySocketLinkMicId(u119.user?.userId)) {
             return;
         }
-        this.updateLinkMicMode(v119.type);
-        const w119 = this.repo.mediator.linkmicState.value;
-        if (v119.isNeedAnswer()) {
-            if (w119 === PLVLinkMicState.Requesting) {
+        this.updateLinkMicMode(u119.type);
+        const v119 = this.repo.mediator.linkmicState.value;
+        if (u119.isNeedAnswer()) {
+            if (v119 === PLVLinkMicState.Requesting) {
                 this.acceptInvitation();
             }
-            else if (w119 === PLVLinkMicState.NoLinkMic) {
+            else if (v119 === PLVLinkMicState.NoLinkMic) {
                 this.repo.mediator.invitationExpireTimestamp.setValue(Date.now() + seconds(30).toMillis());
                 this.repo.mediator.linkmicState.setValue(PLVLinkMicState.Inviting);
                 this.updateInvitationExpireTime();
@@ -278,64 +278,64 @@ export class LinkMicGuestHandleStateUseCase {
         }
     }
     onSocketJoinSuccess(data) {
-        const u119 = decodeFromJson(data, PLVLinkMicSocketJoinSuccessRecv);
-        this.handleQueueOrderUseCase.onEventJoinSuccess(u119);
-        this.updateChannelViewerUseCase.onEventJoinSuccess(u119);
+        const t119 = decodeFromJson(data, PLVLinkMicSocketJoinSuccessRecv);
+        this.handleQueueOrderUseCase.onEventJoinSuccess(t119);
+        this.updateChannelViewerUseCase.onEventJoinSuccess(t119);
     }
     onSocketJoinLeave(data) {
-        const t119 = decodeFromJson(data, PLVLinkMicSocketJoinLeaveRecv);
-        this.handleQueueOrderUseCase.onEventJoinLeave(t119);
-        this.updateChannelViewerUseCase.onEventJoinLeave(t119);
+        const s119 = decodeFromJson(data, PLVLinkMicSocketJoinLeaveRecv);
+        this.handleQueueOrderUseCase.onEventJoinLeave(s119);
+        this.updateChannelViewerUseCase.onEventJoinLeave(s119);
     }
     onSocketSwitchView(data) {
-        const s119 = decodeFromJson(data, PLVLinkMicSocketSwitchViewRecv);
-        if (isNullOrUndefined(s119.userId)) {
+        const r119 = decodeFromJson(data, PLVLinkMicSocketSwitchViewRecv);
+        if (isNullOrUndefined(r119.userId)) {
             return;
         }
-        this.repo.mediator.channelMainViewLinkMicId.setValue(s119.userId);
-        this.updateChannelViewerUseCase.onEventSwitchView(s119);
+        this.repo.mediator.channelMainViewLinkMicId.setValue(r119.userId);
+        this.updateChannelViewerUseCase.onEventSwitchView(r119);
     }
     async tryAutoJoinLinkMic() {
-        const m119 = this.repo.mediator.channelData?.streamerData?.colinMicType === "auto";
-        if (!m119) {
+        const l119 = this.repo.mediator.channelData?.streamerData?.colinMicType === "auto";
+        if (!l119) {
             return;
         }
-        const n119 = Promises.withResolvers();
-        const o119 = this.repo.mediator.linkmicState.observe((r119) => {
-            if (r119 === PLVLinkMicState.Joined) {
-                n119.resolve();
-                o119.dispose();
+        const m119 = Promises.withResolvers();
+        const n119 = this.repo.mediator.linkmicState.observe((q119) => {
+            if (q119 === PLVLinkMicState.Joined) {
+                m119.resolve();
+                n119.dispose();
             }
         });
-        this.observers.push(o119);
-        const p119 = async () => {
-            const q119 = new PLVLinkMicSocketJoinResponseSend();
-            q119.roomId = await this.repo.mediator.channelData?.loginRoomIdPromise.get();
-            q119.value = "1";
-            q119.toEmitAll = 1;
-            q119.user = this.createSocketUser();
-            this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.JOIN_RESPONSE, encodeToJson(q119));
+        this.observers.push(n119);
+        const o119 = async () => {
+            const p119 = new PLVLinkMicSocketJoinResponseSend();
+            p119.roomId = await this.repo.mediator.channelData?.loginRoomIdPromise.get();
+            p119.value = "1";
+            p119.toEmitAll = 1;
+            p119.user = this.createSocketUser();
+            this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.JOIN_RESPONSE, encodeToJson(p119));
         };
         await runCatching(retry(async () => {
             await withTimeout(seconds(8), async () => {
-                await p119();
-                await n119.promise;
+                await o119();
+                await m119.promise;
             });
         }, RetryConditions.delay(3, seconds(1))));
-        o119.dispose();
+        n119.dispose();
     }
     onDestroy() {
-        this.disposables.forEach((l119) => {
-            l119.dispose();
+        this.disposables.forEach((k119) => {
+            k119.dispose();
         });
         this.disposables = [];
         MutableObserver.disposeAll(this.observers);
         this.observers = [];
     }
     observeSocketEvent(event, callback) {
-        const k119 = requireNotNull(this.repo.mediator.socketMediator);
-        k119.onData(event, callback);
-        return disposable(() => k119.offData(event, callback));
+        const j119 = requireNotNull(this.repo.mediator.socketMediator);
+        j119.onData(event, callback);
+        return disposable(() => j119.offData(event, callback));
     }
     createSocketUser() {
         const user = new PLVSocketUserSend();
@@ -351,21 +351,21 @@ export class LinkMicGuestHandleStateUseCase {
         }
     }
     async isChannelReachLinkMicLimit() {
-        const g119 = this.repo.mediator.channelData?.liveDetail?.linkMicLimit;
-        if (g119 === undefined) {
+        const f119 = this.repo.mediator.channelData?.liveDetail?.linkMicLimit;
+        if (f119 === undefined) {
             PLVLogger.warn(TAG, "channel linkmic limit is undefined, treat as reach limit.");
             return true;
         }
-        const h119 = await runCatching(this.repo.getChannelLinkMicStatus());
-        if (h119.success === false) {
-            PLVLogger.warn(TAG, `channel linkmic status response fail: ${h119.error.message}`);
+        const g119 = await runCatching(this.repo.getChannelLinkMicStatus());
+        if (g119.success === false) {
+            PLVLogger.warn(TAG, `channel linkmic status response fail: ${g119.error.message}`);
             return true;
         }
-        const i119 = h119.data.joinList?.filter(j119 => {
-            j119.userType === PLVUserType.USERTYPE_TEACHER || j119.classStatus?.voice === 1;
+        const h119 = g119.data.joinList?.filter(i119 => {
+            i119.userType === PLVUserType.USERTYPE_TEACHER || i119.classStatus?.voice === 1;
         })?.length ?? 0;
-        if (i119 >= g119 + 1) {
-            PLVLogger.warn(TAG, `channel reach linkmic limit, current join ${i119}, limit ${g119}`);
+        if (h119 >= f119 + 1) {
+            PLVLogger.warn(TAG, `channel reach linkmic limit, current join ${h119}, limit ${f119}`);
             return true;
         }
         else {
@@ -374,15 +374,15 @@ export class LinkMicGuestHandleStateUseCase {
     }
 }
 class SocketDisposable extends PLVDisposable {
-    constructor(f119) {
+    constructor(e119) {
         super();
-        this.onDispose = f119;
+        this.onDispose = e119;
     }
     dispose() {
         super.dispose();
         this.onDispose?.();
     }
 }
-function disposable(e119) {
-    return new SocketDisposable(e119);
+function disposable(d119) {
+    return new SocketDisposable(d119);
 }

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

@@ -5,13 +5,13 @@ import { PLVLinkMicPushResolutionRatio } from '../../../../model/vo/PLVLinkMicPu
 import { ILinkMicEncodeParamUseCase } from '../base/ILinkMicEncodeParamUseCase';
 export declare class LinkMicTeacherEncodeParamUseCase implements ILinkMicEncodeParamUseCase {
     private readonly repo;
-    constructor(b123: PLVLinkMicRepo);
+    constructor(a123: PLVLinkMicRepo);
     init(): void;
     setBitRate(bitRate: PLVLinkMicBitRate): void;
-    setPushResolutionRatio(a123: PLVLinkMicPushResolutionRatio): void;
-    setPushOrientation(z122: PLVPushOrientation): void;
-    setPushMirror(y122: boolean): void;
-    setPushDowngradePreference(x122: PLVPushDowngradePreference): void;
+    setPushResolutionRatio(z122: PLVLinkMicPushResolutionRatio): void;
+    setPushOrientation(y122: PLVPushOrientation): void;
+    setPushMirror(x122: boolean): void;
+    setPushDowngradePreference(w122: PLVPushDowngradePreference): void;
     private updateEncodeParam;
     private parseChannelBitRateSetting;
     private parsePushStreamTemplate;