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

package/src/main/ets/modules/member/viewmodel/usecase/roles/teacher/MemberTeacherHandleStateUseCase.js

@@ -8,99 +8,99 @@ import { PLVMemberErrorEvent } from '../../../../model/vo/PLVMemberErrorEvent';
 import { PLVMemberSocketBanIpRecv, PLVMemberSocketKickSend, PLVMemberSocketLoginRecv, PLVMemberSocketLogoutRecv, PLVMemberSocketSetNickRecv, PLVMemberSocketShieldSend, PLVMemberSocketUnShieldRecv, PLVMemberSocketUnShieldSend } from '../../../../model/vo/PLVMemberSocketEvent';
 const TAG = "PLVMemberManager";
 export class MemberTeacherHandleStateUseCase {
-    constructor(l139, m139) {
+    constructor(k139, l139) {
         this.disposables = [];
         this.observers = [];
-        this.repo = l139;
-        this.updateViewerUseCase = m139;
+        this.repo = k139;
+        this.updateViewerUseCase = l139;
     }
     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_ANSWER, (data) => this.onSocketJoinAnswer(data)), this.observeSocketEvent(PLVSocketOnEvent.JOIN_SUCCESS, (data) => this.onSocketJoinSuccess(data)), this.observeSocketEvent(PLVSocketOnEvent.JOIN_LEAVE, (data) => this.onSocketJoinLeave(data)));
     }
-    acceptViewerLinkMicRequest(h139) {
+    acceptViewerLinkMicRequest(g139) {
         if (this.isChannelReachLinkMicLimit()) {
             this.repo.mediator.reportError(PLVMemberErrorEvent.REACH_LINKMIC_LIMIT, "acceptViewerLinkMicRequest channel reach linkmic limit");
             return;
         }
-        const i139 = this.repo.mediator.findViewerByViewerId(h139);
-        if (i139 === undefined) {
-            PLVLogger.error(TAG, `acceptViewerLinkMicRequest viewerId ${h139} not found.`);
+        const h139 = this.repo.mediator.findViewerByViewerId(g139);
+        if (h139 === undefined) {
+            PLVLogger.error(TAG, `acceptViewerLinkMicRequest viewerId ${g139} not found.`);
             return;
         }
-        const j139 = this.createViewerSocketUser(i139);
-        const k139 = new PLVLinkMicSocketJoinResponseSend();
-        k139.user = j139;
-        k139.roomId = i139.channelId;
-        k139.value = "1";
-        k139.toEmitAll = 1;
-        k139.needAnswer = 0;
-        this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.JOIN_RESPONSE, encodeToJson(k139), () => {
-            if (i139.linkmicState.value !== PLVLinkMicState.Joined) {
-                i139.linkmicState.setValue(PLVLinkMicState.WaitingResponse);
+        const i139 = this.createViewerSocketUser(h139);
+        const j139 = new PLVLinkMicSocketJoinResponseSend();
+        j139.user = i139;
+        j139.roomId = h139.channelId;
+        j139.value = "1";
+        j139.toEmitAll = 1;
+        j139.needAnswer = 0;
+        this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.JOIN_RESPONSE, encodeToJson(j139), () => {
+            if (h139.linkmicState.value !== PLVLinkMicState.Joined) {
+                h139.linkmicState.setValue(PLVLinkMicState.WaitingResponse);
                 this.updateViewerUseCase.sortChannelViewers();
             }
         });
     }
-    inviteViewerLinkMic(c139, d139 = true) {
+    inviteViewerLinkMic(b139, c139 = true) {
         if (this.isChannelReachLinkMicLimit()) {
             this.repo.mediator.reportError(PLVMemberErrorEvent.REACH_LINKMIC_LIMIT, "inviteViewerLinkMic channel reach linkmic limit");
             return;
         }
-        const e139 = this.repo.mediator.findViewerByViewerId(c139);
-        if (e139 === undefined) {
-            PLVLogger.error(TAG, `acceptViewerLinkMicRequest viewerId ${c139} not found.`);
+        const d139 = this.repo.mediator.findViewerByViewerId(b139);
+        if (d139 === undefined) {
+            PLVLogger.error(TAG, `acceptViewerLinkMicRequest viewerId ${b139} not found.`);
             return;
         }
-        if (e139.linkmicState.value === PLVLinkMicState.Requesting) {
-            return this.acceptViewerLinkMicRequest(c139);
-        }
-        const f139 = this.createViewerSocketUser(e139);
-        const g139 = new PLVLinkMicSocketJoinResponseSend();
-        g139.user = f139;
-        g139.roomId = e139.channelId;
-        g139.value = "1";
-        g139.toEmitAll = 1;
-        g139.needAnswer = d139 ? 1 : 0;
-        this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.JOIN_RESPONSE, encodeToJson(g139), () => {
-            if (e139.linkmicState.value !== PLVLinkMicState.Joined) {
-                e139.linkmicState.setValue(PLVLinkMicState.Inviting);
+        if (d139.linkmicState.value === PLVLinkMicState.Requesting) {
+            return this.acceptViewerLinkMicRequest(b139);
+        }
+        const e139 = this.createViewerSocketUser(d139);
+        const f139 = new PLVLinkMicSocketJoinResponseSend();
+        f139.user = e139;
+        f139.roomId = d139.channelId;
+        f139.value = "1";
+        f139.toEmitAll = 1;
+        f139.needAnswer = c139 ? 1 : 0;
+        this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.JOIN_RESPONSE, encodeToJson(f139), () => {
+            if (d139.linkmicState.value !== PLVLinkMicState.Joined) {
+                d139.linkmicState.setValue(PLVLinkMicState.Inviting);
                 this.updateViewerUseCase.sortChannelViewers();
             }
         });
     }
-    hangupViewerLinkMic(z138) {
-        const a139 = this.repo.mediator.findViewerByViewerId(z138);
-        if (a139 === undefined) {
-            PLVLogger.error(TAG, `acceptViewerLinkMicRequest viewerId ${z138} not found.`);
+    hangupViewerLinkMic(y138) {
+        const z138 = this.repo.mediator.findViewerByViewerId(y138);
+        if (z138 === undefined) {
+            PLVLogger.error(TAG, `acceptViewerLinkMicRequest viewerId ${y138} not found.`);
             return;
         }
-        const b139 = new PLVLinkMicSocketOpenMicrophoneSend();
-        b139.roomId = a139.channelId;
-        b139.status = "close";
-        b139.userId = a139.linkmicId;
-        this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.MESSAGE, encodeToJson(b139));
-        a139.linkmicState.setValue(PLVLinkMicState.NoLinkMic);
+        const a139 = new PLVLinkMicSocketOpenMicrophoneSend();
+        a139.roomId = z138.channelId;
+        a139.status = "close";
+        a139.userId = z138.linkmicId;
+        this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.MESSAGE, encodeToJson(a139));
+        z138.linkmicState.setValue(PLVLinkMicState.NoLinkMic);
         this.updateViewerUseCase.sortChannelViewers();
     }
-    async kickViewer(w138) {
-        const x138 = await this.repo.mediator.channelData?.loginRoomIdPromise.get();
-        const y138 = new PLVMemberSocketKickSend();
-        y138.roomId = x138;
-        y138.channelId = this.repo.mediator.channelData?.loginChannelId;
-        y138.type = "userId";
-        y138.userId = w138;
-        y138.sign = md5(`polyv_room_sign${x138}`);
-        this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.MESSAGE, encodeToJson(y138));
-    }
-    async banViewer(s138, t138 = true) {
-        const u138 = await this.repo.mediator.channelData?.loginRoomIdPromise.get();
-        const v138 = t138 ? new PLVMemberSocketShieldSend() : new PLVMemberSocketUnShieldSend();
-        v138.roomId = u138;
-        v138.channelId = this.repo.mediator.channelData?.loginChannelId;
-        v138.type = "userId";
-        v138.value = s138;
-        v138.sign = md5(`polyv_room_sign${u138}`);
-        this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.MESSAGE, encodeToJson(v138));
+    async kickViewer(v138) {
+        const w138 = await this.repo.mediator.channelData?.loginRoomIdPromise.get();
+        const x138 = new PLVMemberSocketKickSend();
+        x138.roomId = w138;
+        x138.channelId = this.repo.mediator.channelData?.loginChannelId;
+        x138.type = "userId";
+        x138.userId = v138;
+        x138.sign = md5(`polyv_room_sign${w138}`);
+        this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.MESSAGE, encodeToJson(x138));
+    }
+    async banViewer(r138, s138 = true) {
+        const t138 = await this.repo.mediator.channelData?.loginRoomIdPromise.get();
+        const u138 = s138 ? new PLVMemberSocketShieldSend() : new PLVMemberSocketUnShieldSend();
+        u138.roomId = t138;
+        u138.channelId = this.repo.mediator.channelData?.loginChannelId;
+        u138.type = "userId";
+        u138.value = r138;
+        u138.sign = md5(`polyv_room_sign${t138}`);
+        this.repo.mediator.socketMediator?.emit(PLVSocketOnEvent.MESSAGE, encodeToJson(u138));
     }
     onSocketMessage(data, event) {
         switch (event) {
@@ -115,114 +115,114 @@ export class MemberTeacherHandleStateUseCase {
         }
     }
     onSocketUserLogin(data) {
-        const r138 = decodeFromJson(data, PLVMemberSocketLoginRecv);
-        this.updateViewerUseCase.onSocketUserLogin(r138);
+        const q138 = decodeFromJson(data, PLVMemberSocketLoginRecv);
+        this.updateViewerUseCase.onSocketUserLogin(q138);
     }
     onSocketUserLogout(data) {
-        const q138 = decodeFromJson(data, PLVMemberSocketLogoutRecv);
-        this.updateViewerUseCase.onSocketUserLogout(q138);
+        const p138 = decodeFromJson(data, PLVMemberSocketLogoutRecv);
+        this.updateViewerUseCase.onSocketUserLogout(p138);
     }
     onSocketTeacherSetPermission(data) {
-        const n138 = decodeFromJson(data, PLVLinkMicSocketTeacherSetPermissionRecv);
-        const o138 = this.repo.mediator.findViewerByViewerId(n138.userId);
-        if (o138 === undefined) {
+        const m138 = decodeFromJson(data, PLVLinkMicSocketTeacherSetPermissionRecv);
+        const n138 = this.repo.mediator.findViewerByViewerId(m138.userId);
+        if (n138 === undefined) {
             return;
         }
-        if (n138.type === "voice") {
-            const p138 = n138.status === "1";
-            o138.linkmicState.setValue(p138 ? PLVLinkMicState.Joined : PLVLinkMicState.NoLinkMic);
+        if (m138.type === "voice") {
+            const o138 = m138.status === "1";
+            n138.linkmicState.setValue(o138 ? PLVLinkMicState.Joined : PLVLinkMicState.NoLinkMic);
         }
     }
     onSocketUserSetNick(data) {
-        const k138 = decodeFromJson(data, PLVMemberSocketSetNickRecv);
-        const l138 = k138.userId;
-        const m138 = this.repo.mediator.findViewerByViewerId(l138);
-        if (m138 !== undefined) {
-            m138.viewerName.setValue(k138.nick);
+        const j138 = decodeFromJson(data, PLVMemberSocketSetNickRecv);
+        const k138 = j138.userId;
+        const l138 = this.repo.mediator.findViewerByViewerId(k138);
+        if (l138 !== undefined) {
+            l138.viewerName.setValue(j138.nick);
         }
     }
     onSocketBanIp(data) {
-        const h138 = decodeFromJson(data, PLVMemberSocketBanIpRecv);
-        const i138 = h138.data?.userId;
-        const j138 = this.repo.mediator.findViewerByViewerId(i138);
-        if (j138 !== undefined) {
-            j138.ban.setValue(true);
+        const g138 = decodeFromJson(data, PLVMemberSocketBanIpRecv);
+        const h138 = g138.data?.userId;
+        const i138 = this.repo.mediator.findViewerByViewerId(h138);
+        if (i138 !== undefined) {
+            i138.ban.setValue(true);
         }
     }
     onSocketUnShield(data) {
-        const e138 = decodeFromJson(data, PLVMemberSocketUnShieldRecv);
-        const f138 = e138.data?.userId;
-        const g138 = this.repo.mediator.findViewerByViewerId(f138);
-        if (g138 !== undefined) {
-            g138.ban.setValue(false);
+        const d138 = decodeFromJson(data, PLVMemberSocketUnShieldRecv);
+        const e138 = d138.data?.userId;
+        const f138 = this.repo.mediator.findViewerByViewerId(e138);
+        if (f138 !== undefined) {
+            f138.ban.setValue(false);
         }
     }
     onSocketSwitchJoinVoice(data) {
-        const a138 = decodeFromJson(data, PLVLinkMicSocketSwitchJoinVoiceRecv);
-        const b138 = a138.user?.loginId;
-        const c138 = a138.user?.micId?.toString() ?? a138.user?.userId;
-        const d138 = this.repo.mediator.findViewerByViewerId(b138);
-        if (d138 !== undefined && !isNullOrUndefined(c138)) {
-            d138.linkmicId = c138;
+        const z137 = decodeFromJson(data, PLVLinkMicSocketSwitchJoinVoiceRecv);
+        const a138 = z137.user?.loginId;
+        const b138 = z137.user?.micId?.toString() ?? z137.user?.userId;
+        const c138 = this.repo.mediator.findViewerByViewerId(a138);
+        if (c138 !== undefined && !isNullOrUndefined(b138)) {
+            c138.linkmicId = b138;
         }
     }
     onSocketJoinRequest(data) {
-        const x137 = decodeFromJson(data, PLVLinkMicSocketJoinRequestRecv);
-        this.updateViewerUseCase.onSocketJoinRequest(x137);
-        const y137 = x137.user?.loginId;
-        const z137 = this.repo.mediator.findViewerByViewerId(y137);
-        if (z137 !== undefined) {
-            if (y137 !== undefined && z137.linkmicState.value === PLVLinkMicState.Inviting) {
-                this.acceptViewerLinkMicRequest(y137);
+        const w137 = decodeFromJson(data, PLVLinkMicSocketJoinRequestRecv);
+        this.updateViewerUseCase.onSocketJoinRequest(w137);
+        const x137 = w137.user?.loginId;
+        const y137 = this.repo.mediator.findViewerByViewerId(x137);
+        if (y137 !== undefined) {
+            if (x137 !== undefined && y137.linkmicState.value === PLVLinkMicState.Inviting) {
+                this.acceptViewerLinkMicRequest(x137);
             }
             else {
-                this.repo.mediator.onViewerRequestLinkMic.setValue(z137);
+                this.repo.mediator.onViewerRequestLinkMic.setValue(y137);
             }
         }
     }
     onSocketJoinAnswer(data) {
-        const w137 = decodeFromJson(data, PLVLinkMicSocketJoinAnswerRecv);
-        this.updateViewerUseCase.onSocketJoinAnswer(w137);
+        const v137 = decodeFromJson(data, PLVLinkMicSocketJoinAnswerRecv);
+        this.updateViewerUseCase.onSocketJoinAnswer(v137);
     }
     onSocketJoinSuccess(data) {
-        const v137 = decodeFromJson(data, PLVLinkMicSocketJoinSuccessRecv);
-        this.updateViewerUseCase.onSocketJoinSuccess(v137);
+        const u137 = decodeFromJson(data, PLVLinkMicSocketJoinSuccessRecv);
+        this.updateViewerUseCase.onSocketJoinSuccess(u137);
     }
     onSocketJoinLeave(data) {
-        const u137 = decodeFromJson(data, PLVLinkMicSocketJoinLeaveRecv);
-        this.updateViewerUseCase.onSocketJoinLeave(u137);
+        const t137 = decodeFromJson(data, PLVLinkMicSocketJoinLeaveRecv);
+        this.updateViewerUseCase.onSocketJoinLeave(t137);
     }
     onDestroy() {
-        this.disposables.forEach((t137) => {
-            t137.dispose();
+        this.disposables.forEach((s137) => {
+            s137.dispose();
         });
         this.disposables = [];
         MutableObserver.disposeAll(this.observers);
         this.observers = [];
     }
     observeSocketEvent(event, callback) {
-        const s137 = requireNotNull(this.repo.mediator.socketMediator);
-        s137.onData(event, callback);
-        return disposable(() => s137.offData(event, callback));
+        const r137 = requireNotNull(this.repo.mediator.socketMediator);
+        r137.onData(event, callback);
+        return disposable(() => r137.offData(event, callback));
     }
-    createViewerSocketUser(r137) {
+    createViewerSocketUser(q137) {
         const user = new PLVSocketUserSend();
-        user.nick = r137.viewerName.value;
-        user.pic = r137.viewerAvatar;
-        user.userType = r137.viewerType;
-        user.userId = r137.viewerId;
+        user.nick = q137.viewerName.value;
+        user.pic = q137.viewerAvatar;
+        user.userType = q137.viewerType;
+        user.userId = q137.viewerId;
         return user;
     }
     isChannelReachLinkMicLimit() {
-        const n137 = this.repo.mediator.channelData?.liveDetail?.linkMicLimit;
-        if (n137 === undefined) {
+        const m137 = this.repo.mediator.channelData?.liveDetail?.linkMicLimit;
+        if (m137 === undefined) {
             PLVLogger.warn(TAG, "channel linkmic limit is undefined, treat as reach limit.");
             return true;
         }
-        const o137 = this.repo.mediator.channelViewers.value ?? [];
-        const p137 = o137.filter(q137 => q137.linkmicState.value === PLVLinkMicState.Joined).length;
-        if (p137 >= n137) {
-            PLVLogger.warn(TAG, `channel reach linkmic limit, current join ${p137}, limit ${n137}`);
+        const n137 = this.repo.mediator.channelViewers.value ?? [];
+        const o137 = n137.filter(p137 => p137.linkmicState.value === PLVLinkMicState.Joined).length;
+        if (o137 >= m137) {
+            PLVLogger.warn(TAG, `channel reach linkmic limit, current join ${o137}, limit ${m137}`);
             return true;
         }
         else {
@@ -231,15 +231,15 @@ export class MemberTeacherHandleStateUseCase {
     }
 }
 class SocketDisposable extends PLVDisposable {
-    constructor(m137) {
+    constructor(l137) {
         super();
-        this.onDispose = m137;
+        this.onDispose = l137;
     }
     dispose() {
         super.dispose();
         this.onDispose?.();
     }
 }
-function disposable(l137) {
-    return new SocketDisposable(l137);
+function disposable(k137) {
+    return new SocketDisposable(k137);
 }

package/src/main/ets/modules/member/viewmodel/usecase/roles/teacher/MemberTeacherUpdateViewerUseCase.d.ets

@@ -6,18 +6,18 @@ import { IMemberUpdateViewerUseCase, MemberUpdateChannelViewersPayload } from '.
 export declare class MemberTeacherUpdateViewerUseCase implements IMemberUpdateViewerUseCase {
     private readonly repo;
     private updateChannelViewerTask;
-    constructor(y142: PLVMemberRepo);
+    constructor(x142: PLVMemberRepo);
     startUpdateChannelViewersInterval(): void;
     stopUpdateChannelViewersInterval(): void;
     handleChannelViewersUpdate(payload: MemberUpdateChannelViewersPayload): void;
     sortChannelViewers(): void;
-    updateByLinkMicStatusList(d141: PLVLinkMicChannelStatus): void;
-    onSocketUserLogin(w140: PLVMemberSocketLoginRecv): void;
-    onSocketUserLogout(s140: PLVMemberSocketLogoutRecv): void;
-    onSocketJoinRequest(n140: PLVLinkMicSocketJoinRequestRecv): void;
-    onSocketJoinAnswer(k140: PLVLinkMicSocketJoinAnswerRecv): void;
-    onSocketJoinSuccess(f140: PLVLinkMicSocketJoinSuccessRecv): void;
-    onSocketJoinLeave(c140: PLVLinkMicSocketJoinLeaveRecv): void;
+    updateByLinkMicStatusList(c141: PLVLinkMicChannelStatus): void;
+    onSocketUserLogin(v140: PLVMemberSocketLoginRecv): void;
+    onSocketUserLogout(r140: PLVMemberSocketLogoutRecv): void;
+    onSocketJoinRequest(m140: PLVLinkMicSocketJoinRequestRecv): void;
+    onSocketJoinAnswer(j140: PLVLinkMicSocketJoinAnswerRecv): void;
+    onSocketJoinSuccess(e140: PLVLinkMicSocketJoinSuccessRecv): void;
+    onSocketJoinLeave(b140: PLVLinkMicSocketJoinLeaveRecv): void;
     private updateServerListViewer;
     private getViewerSortOrder;
 }