Merge branch 'master' of http://192.168.0.115:3000/xiewenjie/fdkk_meta

src/main/java/com/fdkk/fdkkmeta/grpcService/sceneGrpcServer.java

@@ -206,19 +206,22 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
     		String frameSrc = metaConfig.getVideoFramePath()+"/"+rotateFrameEntity.getDirectory()+"/"+rotateFrameEntity.getFileName();
             /// metaConfig.getVideoFramePath()
             log.info("VideoFramePath{}", metaConfig.getVideoFramePath());
-    		NormalReply res = NormalReply.newBuilder()
-    				.setTraceIds(0, trace_id)
-    				//.setVehicle(null)
-    				.setNewUserStates(0, userState)
-    				.setActionResponses(0, 0)              //这个要查查
-    				.setGetStateType(0)
-    				.setCode(0)
-    				.setMsg("OK")
-    				.setFrameSrc(frameSrc)                     //从数据库中获取对应的路径
-    				.build();
-
-
-	        responseObserver.onNext(res);
+			NormalReply.Builder builder = NormalReply.newBuilder();
+//			for (int i = 0; i < 100; i++) {
+//				builder.addActionResponses(0);//这个要查查
+//			}
+
+			builder.addTraceIds(trace_id);
+			builder.addNewUserStates(userState);
+			builder.addActionResponses(0);//这个要查查
+			builder.addNewUserStates(userState);
+
+			builder.setVehicle("");
+			builder.setGetStateType(0);
+			builder.setCode(0);
+			builder.setMsg("OK");
+			builder.setFrameSrc(frameSrc); //从数据库中获取对应的路径
+	        responseObserver.onNext(builder.build());
 	        responseObserver.onCompleted();
     	}
     	catch(Exception e) {
@@ -310,7 +313,7 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
                 Point cameraPosition = createPoint(String.valueOf(cameraPoint.getX()),String.valueOf(cameraPoint.getY()),String.valueOf(cameraPoint.getZ()));
                 AngleUe4 cameraAngle = createAngle(cameraAnglePO.getPitch(),cameraAnglePO.getYaw(),cameraAnglePO.getRoll());
                 Space camera = createSpace(cameraPosition,cameraAngle);
-                
+
             	Point cameraCenter = createPoint(String.valueOf(playerPoint.getX()),String.valueOf(playerPoint.getY()),String.valueOf(playerPoint.getZ()));
             	String frameSrc = metaConfig.getVideoFramePath()+"/"+_rotateFrameEntity.getDirectory()+"/"+_rotateFrameEntity.getFileName();
             	//添加player，camera，cameraCenter，frameSrc
@@ -319,11 +322,11 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
 
             breakpointsEntity = breakpointsService.findByAppIdAndBreakPointId(appId,nextbreakPointId);
             PointPO endPosition = breakpointsEntity.getPosition();
-            
+
             JSONObject p1 = new JSONObject();
             p1.put("x", playerPoint.getX());
             p1.put("y", playerPoint.getY());
-            
+
             JSONObject p2 = new JSONObject();
 			p2.put("x", playerPoint.getX()+1);
 			p2.put("y", playerPoint.getY());
@@ -335,27 +338,27 @@ public class sceneGrpcServer extends SceneGrpcServiceGrpc.SceneGrpcServiceImplBa
 			int _angle = (int)calAngle(p1,p2,p3);
 
             List<MoveFrameEntity> moveFrameEntityList = moveFrameService.findByAppIAndStartBreakPointIdAndEndBreakPointIdAndAngle(appId, breakPointId, nextbreakPointId, (int)(offAngle + angle)/45);
-            
+
             double offsetX = endPosition.getX() - playerPoint.getX();
             double offsetY = endPosition.getY() - playerPoint.getY();
             double offsetZ = endPosition.getZ() - playerPoint.getZ();
-            
+
             for(int i=0;i<moveFrameEntityList.size();++i) {
             	MoveFrameEntity _moveFrameEntityList = moveFrameEntityList.get(i);
             	PointPO cameraPoint = _moveFrameEntityList.getCameraPosition();
             	Point cameraPosition = createPoint(String.valueOf(cameraPoint.getX()),String.valueOf(cameraPoint.getY()),String.valueOf(cameraPoint.getZ()));
             	AngleUe4 cameraAngle = createAngle(cameraAnglePO.getPitch(),cameraAnglePO.getYaw(),cameraAnglePO.getRoll());
                 Space camera = createSpace(cameraPosition,cameraAngle);
-                
+
             	Point cameraCenter = createPoint(String.valueOf(playerPoint.getX()),String.valueOf(playerPoint.getY()),String.valueOf(playerPoint.getZ()));
             	String frameSrc = metaConfig.getVideoFramePath()+"/"+_moveFrameEntityList.getDirectory()+"/"+_moveFrameEntityList.getFileName();
-            	
+
             	Point _playerPosition = createPoint(String.valueOf(playerPoint.getX()+offsetX/moveFrameEntityList.size()),String.valueOf(playerPoint.getY()+offsetY/moveFrameEntityList.size()),String.valueOf(playerPoint.getZ()+offsetZ/moveFrameEntityList.size()));
 				AngleUe4 _playerAngle = createAngle(playerAnglePO.getPitch(),_angle,playerAnglePO.getRoll());
 				Space _player = createSpace(_playerPosition,_playerAngle);
             	//添加_player，camera，cameraCenter，frameSrc
             }
-            
+
 //          PointPO cameraPoint = rotateFrameEntity.getCameraPosition();
 //          Point cameraPosition = createPoint(String.valueOf(cameraPoint.getX()),String.valueOf(cameraPoint.getY()),String.valueOf(cameraPoint.getZ()));
 //          AngleUe4 cameraAngle = createAngle(cameraAnglePO.getPitch(),cameraAnglePO.getYaw(),cameraAnglePO.getRoll());