|
@@ -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;
|
|
@@ -313,11 +313,14 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
|
|
|
'walkingRes-length',
|
|
|
Array.from(walkingRes).flat().length,
|
|
|
);
|
|
|
-
|
|
|
+
|
|
|
if (walkingRes && !this.onMoving.value) {
|
|
|
// console.log('walkingRes-front', walkingRes);
|
|
|
// shift出前第一个镜头数据
|
|
|
const rotateCamData = walkingRes.shift();
|
|
|
+
|
|
|
+ console.log('rotateCamData', rotateCamData.length);
|
|
|
+
|
|
|
if (rotateCamData?.length) {
|
|
|
rotateCamData.forEach((item: StreamReplyType) => {
|
|
|
item.type = 'rotate';
|
|
@@ -333,9 +336,10 @@ 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;
|
|
|
+ console.log('walking --总序列--seqs', seqs.length);
|
|
|
this.handleSeqMoving(lastSeq);
|
|
|
} else {
|
|
|
console.error('walking-move无数据');
|
|
@@ -379,8 +383,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 {
|
|
@@ -685,7 +689,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,
|