xushiting пре 3 година
родитељ
комит
1c26d8a42f
5 измењених фајлова са 10 додато и 7 уклоњено
  1. 1 1
      src/Rtcp.js
  2. 2 2
      src/Socket.js
  3. 5 2
      src/Workers.js
  4. 1 1
      src/XMaterialComponent.js
  5. 1 1
      src/main.js

+ 1 - 1
src/Rtcp.js

@@ -120,7 +120,7 @@ export default class Rtcp extends EventEmitter {
             var o = this.inputChannel;
             var o = this.inputChannel;
 			if(!this.actived || !this.inputChannel || this.inputChannel.readyState === "open"){
 			if(!this.actived || !this.inputChannel || this.inputChannel.readyState === "open"){
 				if(o != null){
 				if(o != null){
-					//console.log('发送webrtc数据:'+e)
+					console.log('发送webrtc数据:'+e)
 					o.send(e)
 					o.send(e)
 				}
 				}
 			}
 			}

+ 2 - 2
src/Socket.js

@@ -28,7 +28,7 @@ export default class Socket extends EventEmitter {
             const t = JSON.stringify(e);
             const t = JSON.stringify(e);
             e.id !== "heartbeat" && logger.info("send ws frame", t);
             e.id !== "heartbeat" && logger.info("send ws frame", t);
             this._ws.send(t)
             this._ws.send(t)
-            //console.log('socket发送数据:'+t)
+            console.log('socket发送数据:'+t)
         }
         }
         );
         );
         E(this, "startGame", ()=>{
         E(this, "startGame", ()=>{
@@ -164,7 +164,7 @@ export default class Socket extends EventEmitter {
             let r = null;
             let r = null;
             try {
             try {
                 r = JSON.parse(t.data)
                 r = JSON.parse(t.data)
-                //console.log('接收socket数据:'+t.data)
+                console.log('接收socket数据:'+t.data)
             } catch (o) {
             } catch (o) {
                 logger.error(o);
                 logger.error(o);
                 return
                 return

+ 5 - 2
src/Workers.js

@@ -473,7 +473,7 @@ export default class Workers {
             this.getPtr = (this.getPtr + 1) % this.cachedLength
             this.getPtr = (this.getPtr + 1) % this.cachedLength
         }
         }
         const s = e.data.metadata;
         const s = e.data.metadata;
-        console.log('接受的webrtc数据:'+JSON.stringify(s));
+        //console.log('接受的webrtc数据:'+JSON.stringify(s));
         if ((b = s == null ? void 0 : s.traceIds) != null && b.length)
         if ((b = s == null ? void 0 : s.traceIds) != null && b.length)
             for (const k of s.traceIds) {
             for (const k of s.traceIds) {
                 if (this.traceIdMap.has(k)) {
                 if (this.traceIdMap.has(k)) {
@@ -766,7 +766,7 @@ export default class Workers {
                 this.moveDisplayCircular.add(_e),
                 this.moveDisplayCircular.add(_e),
                 this.lastMoveDisplayTime = $
                 this.lastMoveDisplayTime = $
             }
             }
-            //console.log('接受webrtc请求(定时执行UpdateYUV):'+JSON.stringify(this.cachedMetas[e]))
+            console.log('接受webrtc请求(定时执行UpdateYUV):'+JSON.stringify(this.cachedMetas[e]))
             this.executeFunction("signal", {
             this.executeFunction("signal", {
                 signal: this.cachedMetas[e],
                 signal: this.cachedMetas[e],
                 pts: this.cachedPtss[e],
                 pts: this.cachedPtss[e],
@@ -1116,6 +1116,9 @@ export default class Workers {
         }
         }
         this.noWasmBytesReceived += e.byteLength;
         this.noWasmBytesReceived += e.byteLength;
         const o = JSON.parse(this.Stringify(i));
         const o = JSON.parse(this.Stringify(i));
+        // if(o.actionType == 1024){
+        //     console.log('接受webrtc请求(不是心跳,视频):'+JSON.stringify(o));
+        // }
         console.log('接受webrtc请求(不是心跳,视频):'+JSON.stringify(o));
         console.log('接受webrtc请求(不是心跳,视频):'+JSON.stringify(o));
         this.executeFunction("signal", {
         this.executeFunction("signal", {
             signal: o,
             signal: o,

+ 1 - 1
src/XMaterialComponent.js

@@ -86,7 +86,7 @@ export default class XMaterialComponent {
             var o, a;
             var o, a;
             fov == -1 && (fov = this.yuvInfo.fov);
             fov == -1 && (fov = this.yuvInfo.fov);
             if (this._isUpdateYUV == !0) {
             if (this._isUpdateYUV == !0) {
-                console.log('执行:updateRawYUVData')
+                //console.log('执行:updateRawYUVData')
                 const s = {
                 const s = {
                     width: width,
                     width: width,
                     height: height,
                     height: height,

+ 1 - 1
src/main.js

@@ -34,7 +34,7 @@ const l = async()=>{
             avatarId: 'KGe_Boy',
             avatarId: 'KGe_Boy',
             roomId: 'e629ef3e-022d-4e64-8654-703bb96410eb',
             roomId: 'e629ef3e-022d-4e64-8654-703bb96410eb',
             userId: nickname,
             userId: nickname,
-            wsServerUrl: 'wss://uat-eks.xverse.cn/ws',
+            wsServerUrl: 'wss://uat-eks.xverse.cn/ws', //'wss://meta-socket.4dage.com/ws',
             appId: "10016",
             appId: "10016",
             token: " ",
             token: " ",
             nickname: nickname,
             nickname: nickname,