update

src/move/move.service.ts

@@ -1011,7 +1011,6 @@ export class MoveService implements OnModuleInit {
 
         if (cameraInfo.mediaSrc) {
           this.reply.mediaSrc = cameraInfo.mediaSrc;
-<<<<<<< HEAD
         } 
         // if (this.cameraInfos.length == 0) {
         //   this.reply.moveOver = true;
@@ -1022,12 +1021,6 @@ export class MoveService implements OnModuleInit {
         );
         user.camera.angle.yaw = cameraInfo.camera_angle.yaw;
 
-=======
-        }
-        if (this.cameraInfos.length == 0) {
-          this.reply.moveOver = true;
-        }
->>>>>>> 7a74beedb6f8bfe0401e0fc837cd96cd26026949
         this.sendingFrameForJoystick = true;
       } else {
         console.log('joystick自由--->不合并');
@@ -1094,7 +1087,6 @@ export class MoveService implements OnModuleInit {
 
         if (cameraInfo.mediaSrc) {
           this.reply.mediaSrc = cameraInfo.mediaSrc;
-<<<<<<< HEAD
         } 
         // if (this.cameraInfos.length == 0) {
         //   this.reply.moveOver = true;
@@ -1105,12 +1097,6 @@ export class MoveService implements OnModuleInit {
         );
         user.camera.angle.yaw = cameraInfo.camera_angle.yaw;
         
-=======
-        }
-        if (this.cameraInfos.length == 0) {
-          this.reply.moveOver = true;
-        }
->>>>>>> 7a74beedb6f8bfe0401e0fc837cd96cd26026949
         this.sendingFrameForJoystick = true;
       }
       return this.reply;
@@ -1267,16 +1253,10 @@ export class MoveService implements OnModuleInit {
         this.reply.mediaSrc = cameraInfo.mediaSrc;
       }
 
-<<<<<<< HEAD
       // if(this.cameraInfos.length == 0){
       //   this.reply.moveOver = true;
       // }
       this.sendingFrameForJoystick = true;
-=======
-      if (this.cameraInfos.length == 0) {
-        this.reply.moveOver = true;
-      }
->>>>>>> 7a74beedb6f8bfe0401e0fc837cd96cd26026949
       return this.reply;
     } else {
       return null;

src/scene/scene.service.ts

@@ -626,14 +626,9 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
               console.log('回传updateUser', data);
               const userId = this.user_id;
               // 回传点暂时有问题，待修复
-              const breakPointId = data.endBreakPointId || data.breakPointId;
-              const lastReply = JSON.stringify(joystickRes);
-<<<<<<< HEAD
+              //const breakPointId = data.endBreakPointId || data.breakPointId;
+              //const lastReply = JSON.stringify(joystickRes);
               //this.moveService.updateUser(userId, breakPointId, lastReply);
-              this.resumeStream();
-=======
-              this.moveService.updateUser(userId, breakPointId, lastReply);
->>>>>>> 7a74beedb6f8bfe0401e0fc837cd96cd26026949
             }
             clearTimeout(this._JoyStickingTimeout);
             this._JoyStickingTimeout = setTimeout(() => {