From 55d8db1718f5b97283543e7faa88d4c01b093c08 Mon Sep 17 00:00:00 2001 From: ShiKhu Date: Tue, 13 Jul 2021 18:04:39 +0300 Subject: [PATCH] fix(assist): dev propose --- .../StatedScreen/Screen/BaseScreen.ts | 10 ++++++---- .../MessageDistributor/managers/AssistManager.ts | 6 +++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/frontend/app/player/MessageDistributor/StatedScreen/Screen/BaseScreen.ts b/frontend/app/player/MessageDistributor/StatedScreen/Screen/BaseScreen.ts index bf17777fa..6f49a4b82 100644 --- a/frontend/app/player/MessageDistributor/StatedScreen/Screen/BaseScreen.ts +++ b/frontend/app/player/MessageDistributor/StatedScreen/Screen/BaseScreen.ts @@ -60,14 +60,16 @@ export default abstract class BaseScreen { private boundingRect: DOMRect | null = null; private getBoundingClientRect(): DOMRect { - if (this.boundingRect === null) { - this.boundingRect = this.overlay.getBoundingClientRect(); // expensive operation? - } - return this.boundingRect; + //if (this.boundingRect === null) { + return this.boundingRect = this.overlay.getBoundingClientRect(); // expensive operation? + //} + //return this.boundingRect; } getInternalCoordinates({ x, y }: Point): Point { const { x: overlayX, y: overlayY, width } = this.getBoundingClientRect(); + console.log("x y ", x,y,'ovx y', overlayX, overlayY, width) + const screenWidth = this.overlay.offsetWidth; const scale = screenWidth / width; diff --git a/frontend/app/player/MessageDistributor/managers/AssistManager.ts b/frontend/app/player/MessageDistributor/managers/AssistManager.ts index ed5723842..7700c540d 100644 --- a/frontend/app/player/MessageDistributor/managers/AssistManager.ts +++ b/frontend/app/player/MessageDistributor/managers/AssistManager.ts @@ -4,6 +4,7 @@ import type MessageDistributor from '../MessageDistributor'; import type { TimedMessage } from '../Timed'; import type { Message } from '../messages' import { ID_TP_MAP } from '../messages'; +import store from 'App/store'; import { update, getState } from '../../store'; @@ -285,10 +286,13 @@ export default class AssistManager { update({ calling: CallingState.Requesting }); console.log('calling...') const call = this.peer.call(this.peerID, localStream); - call.on('stream', stream => { update({ calling: CallingState.True }); onStream(stream); + this.dataConnection?.send({ + name: store.getState().getIn([ 'user', 'account', 'name']), + }); + // @ts-ignore ?? this.md.overlay.addEventListener("mousemove", this.onMouseMove) });