sample-xmonitor-js 2.0.0 → 2.0.2-beta.0

package/lib/Monitor.d.ts

@@ -66,7 +66,7 @@ export declare class MonitorType {
  * changed 状态改变
  * statistics 通话质量统计
  */
-export type MonitorEvent = 'cancel' | 'start' | 'playing' | 'pause' | 'shot' | 'stop' | 'error' | 'changed' | 'message' | 'statistics';
+export type MonitorEvent = 'cancel' | 'start' | 'playing' | 'pause' | 'shot' | 'stop' | 'error' | 'changed' | 'message' | 'statistics' | 'publish-state-changed';
 export declare const MonitorEvents: Array<MonitorEvent>;
 export type MonitorEventObject = {
     event: MonitorEvent;

package/lib/Monitor.js

@@ -119,7 +119,7 @@ export class MonitorType {
         return new MonitorType(type, device);
     }
 }
-export const MonitorEvents = ['cancel', 'start', 'playing', 'pause', 'shot', 'stop', 'error', 'changed', 'message', 'statistics'];
+export const MonitorEvents = ['cancel', 'start', 'playing', 'pause', 'shot', 'stop', 'error', 'changed', 'message', 'statistics', 'publish-state-changed'];
 export class MObject {
     constructor(room, id) {
         this.room = room;

package/lib/txrtc/index.js

@@ -114,6 +114,9 @@ export default class TxrtcMonitor extends Monitor {
                 this.dispatchEvent('error', event, event.error);
                 this.stop();
             }
+            else {
+                this.dispatchEvent('publish-state-changed', event);
+            }
         }).on(TRTC.EVENT.CONNECTION_STATE_CHANGED, event => {
             if (event.state === 'CONNECTING' && event.prevState === 'DISCONNECTED' && event.isReconnecting) {
                 // 尝试重连 10次之后抛出异常
@@ -166,10 +169,12 @@ export class TxrtcScreenMonitor extends TxrtcMonitor {
     async start() {
         try {
             await super.start();
+            const viewElement = this.options.element.querySelector('video')
+                || this.options.element.querySelector('canvas') || this.options.element;
             await this.trtc.startScreenShare({
                 option: { profile: '720p', ...this.setup.option },
                 publish: true,
-                view: this.options.element
+                view: viewElement
             });
         }
         catch (e) {
@@ -195,10 +200,12 @@ export class TxrtcCameraMonitor extends TxrtcMonitor {
         try {
             await super.start();
             await this.trtc.startLocalAudio({ publish: true });
+            const viewElement = this.options.element.querySelector('video')
+                || this.options.element.querySelector('canvas') || this.options.element;
             await this.trtc.startLocalVideo({
                 option: { profile: '480p', ...this.setup.option },
                 publish: true,
-                view: this.options.element
+                view: viewElement
             });
             // 检测人脸 需要在调用本地摄像头之后启动该插件
             if (this.setup.faceDetection) {
@@ -220,10 +227,12 @@ export class TxrtcCameraMonitor extends TxrtcMonitor {
     async switch(option) {
         option.cameraId = option.cameraId || option.deviceId;
         if (option.cameraId || option.useFrontCamera) {
+            const viewElement = this.options.element.querySelector('video')
+                || this.options.element.querySelector('canvas') || this.options.element;
             await this.trtc.updateLocalVideo({
                 option: { profile: '480p', ...this.setup.option, ...option },
                 publish: true,
-                view: this.options.element
+                view: viewElement
             });
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sample-xmonitor-js",
-  "version": "2.0.0",
+  "version": "2.0.2-beta.0",
   "description": "",
   "main": "./lib/index",
   "files": [