gemercheung 3 年之前
父节点
当前提交
94c58482cf
共有 2 个文件被更改,包括 10 次插入9 次删除
  1. 2 1
      src/rotate/rotate.service.ts
  2. 8 8
      src/scene/scene.service.ts

+ 2 - 1
src/rotate/rotate.service.ts

@@ -446,6 +446,7 @@ export class RotateService {
         '?m=' +
         new Date().getTime();
       reply.breakPointId = user.breakPointId;
+      return reply;
     } else {
       const key =
         'rotateframe:app_id:' +
@@ -472,7 +473,7 @@ export class RotateService {
         return reply;
       } else {
         this.logger.error('echo返回null');
-        return null;
+        return {};
       }
     }
   }

+ 8 - 8
src/scene/scene.service.ts

@@ -25,7 +25,7 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
     private rotateService: RotateService,
     private moveService: MoveService,
     private getRouterService: GetRouterService, // @InjectQueue('rotate') private rotateQueue: Queue, // @InjectQueue('walking') private walkingQueue: Queue,
-  ) {}
+  ) { }
   @Client(grpcClientOptions) private readonly client: ClientGrpc;
 
   public _frameInteval: NodeJS.Timeout;
@@ -329,8 +329,8 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
             if (seqs?.length) {
               const lastSeq = rotateCamData?.length
                 ? (Array.from(rotateCamData).concat(
-                    seqs,
-                  ) as any as StreamReplyType[])
+                  seqs,
+                ) as any as StreamReplyType[])
                 : seqs;
               this.handleSeqMoving(lastSeq);
             } else {
@@ -375,8 +375,8 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
                 console.log('joystickRes-seqs', seqs.length);
                 const lastSeq = rotateCamData?.length
                   ? (Array.from(rotateCamData).concat(
-                      seqs,
-                    ) as any as StreamReplyType[])
+                    seqs,
+                  ) as any as StreamReplyType[])
                   : seqs;
                 this.handleSeqMoving(lastSeq);
               } else {
@@ -666,10 +666,10 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
         try {
           console.log('frame', frame);
           if (frame === 1) {
+            debugger;
             const redisData = await this.rotateService.echo(this.user_id, true);
             this.onSteaming = true;
             this.holdSteam();
-
             if (redisData && 'mediaSrc' in redisData) {
               const mediaSrc: string = redisData.mediaSrc || '';
               if (mediaSrc.length > 0) {
@@ -681,7 +681,7 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
                 delete redisData.mediaSrc;
                 this.logger.log(
                   `user:${this.user_id}:first render stream` +
-                    JSON.stringify({ path: clipPath, meta: redisData }),
+                  JSON.stringify({ path: clipPath, meta: redisData }),
                 );
                 const status = await this.pushFirstRender(
                   clipPath,
@@ -696,7 +696,7 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
                 }
               }
             } else {
-              console.log(`首屏::无数据:${frame}`);
+              this.logger.error(`首屏::无数据:${frame}`);
             }
           }
           if (