aircitytype 1.1.6 → 1.1.9

package/aircity/index.d.ts

@@ -494,10 +494,13 @@ type CustomObjectType = {
     coordinateType?: number;
     location?: number[]; //位置坐标
     rotation?: [number, number, number]; //旋转
+    isEffectRotation?:boolean;
+    supportAttach?:boolean;
     localRotation?: [number, number, number];
     scale?: [number, number, number] | number[]; //缩放
     smoothMotion?: number; //1: 平滑插值，0: 跳跃
     UserData?: string; //
+    visible?:boolean;
 };
 
 interface CustomObjectBPParam {
@@ -583,6 +586,7 @@ type marker3dType = {
     textLocation?: number[]; // 文字位置
     textRotation?: number[]; // 文字旋转
     textScale?: number[]; // 文字缩放
+    fixedSize?:boolean;
     pointName?: string; //3D标注展示的特效名称
     pointVisible?: boolean; //3D标注是否显示
     pointScale?: number; //3D标注整体缩放比例
@@ -668,6 +672,20 @@ interface TileLayerType {
     scale: [number, number, number] | number[];
 }
 
+interface VehicleData{
+    id :string //Vehicle对象的ID
+    groupId?:string //可选，Group分组
+    userData?:string //可选，用户自定义数据
+    assetPath:string //资源库车辆载具路径，类似CustomObject对象的assetPath，示例值：'/JC_CustomAssets/VehicleLibrary/Exhibition/SUV_01'
+    coordinate:number[] //载具初始位置坐标：[X,Y,Z]，取值示例，数组元素类型：(number)，取值范围：[任意数值]
+    coordinateType?:number //可选，坐标系类型，取值：0为Projection类型，1为WGS84类型，默认值：0
+    autoHeight?:boolean //可选，是否自动计算载具行驶高度，默认值：true，注意：当设置为false时会使用载具坐标的高度Z
+    rotation?:number[] //可选，载具旋转，世界坐标系旋转：[Pitch,Yaw,Roll]，数组元素类型：(number)，取值范围：[任意数值]，默认值：[0,0,0]
+    colorType?:number //可选，载具涂装颜色类型，取值范围：[0~任意正整数]，默认值：0 随机使用涂装颜色，大于0则使用其他固定的涂装颜色。
+    localOffset?:number[] //可选，载具基于原始位置坐标的偏移量，默认值：[0,0,0]
+    supportAttach :boolean //是否支持贴画贴合，默认值：true
+}
+
 interface Marker {
     clear(): void;
     add(p: markType | markType[]): Promise<null>;
@@ -691,6 +709,7 @@ interface Marker {
 interface Marker3D {
     clear(): void;
     add(p: marker3dType | marker3dType[]): Promise<null>;
+    update(p: marker3dType | marker3dType[]): Promise<null>;
     /**
      * o1 distance
      * o2 flytime
@@ -703,8 +722,43 @@ interface Marker3D {
     hideByGroupId(id: string): void;
 }
 
+/**
+ * 
+ */
+type VehicleBatch = {
+    id:string // Vehicle对象的ID
+    functionName:string // 蓝图函数名
+    parameters:{"paramType":string,"paramValue":string|number}[] //蓝图函数包含的多个参数结构，可选参数，数组类型，注意：传入多参数的顺序与类型务必与蓝图函数的参数顺序及其参数类型一致以保证执行结果符合预期。多个参数结构示例：[{"paramType":BPFuncParamType.String,"paramValue":"示例值"},{"paramType":BPFuncParamType.Bool,"paramValue":false},{"paramType":BPFuncParamType.Float,"paramValue":100.8}]
+}
+
 interface Vehicle {
     delete(id: string): void;
+    add(data:VehicleData|VehicleData[], fn?:()=>void):void;
+    callBatchFunction(data:VehicleBatch|VehicleBatch[], fn?:()=>void):void;
+    clear(fn?:()=>void):void;
+    delete(ids:string|string[], fn?:()=>void):void;
+    focus(ids:string|string[], followEnable?:boolean, distance?:number, flyTime?:number, rotation?:number[], distanceRotation?:number[], fn?:()=>void):void;
+    get(ids:string|string[], fn?:()=>void):void;
+    hide(ids:string|string[], fn?:()=>void):void;
+    moveTo(data, fn?:()=>void):void;
+    pause(ids:string|string[], fn?:()=>void):void;
+    resume(id:string, fn?:()=>void):void;
+    setWayPoint(data, fn?:()=>void):void;
+    show(ids:string|string[], fn?:()=>void):void;
+    /**
+     * 
+     * @param data [
+        {"id":"vc1","timeStamp":1},
+        {"id":"vc2","timeStamp":5},
+        {"id":"vc3","timeStamp":7}
+        ]
+     * @param fn 
+     */
+    start(data:{"id":string,"timeStamp":number}[], fn?:()=>void):void; //以下参数表示三辆载具开始运动，v1第一秒开始运动，v2第五秒开始运动，v3第七秒开始运动
+    stop(ids:string|string[], fn?:()=>void):void;
+    update(data:VehicleData|VehicleData[], fn?:()=>void):void;
+    updateBegin():void;
+    updateEnd(fn?:()=>void):void;
 }
 
 interface EditHelper {
@@ -739,7 +793,7 @@ interface EditHelper {
     start(fn?: () => void): void;
 }
 
-declare class fdapi {
+declare class FDAPITYPE {
     tag: any;
     coord: any;
     constructor(a: any, b: any, c: any);
@@ -861,7 +915,8 @@ type EchartTool = {
 
 declare var HostConfig: HOSTINFO;
 declare var offline: boolean;
-declare var __g: fdapi;
+declare var __g: FDAPITYPE;
+declare var fdapi: FDAPITYPE;
 declare var __player: { resize: () => void };
 declare var tools: EchartTool;
 declare var projectROOT: string;

package/main.js

@@ -73,8 +73,6 @@ function parseJsonFile(filePath, callback) {
       return;
     }
 
-    console.log(data);
-
     let jsonData;
     try {
       jsonData = parse(data);
@@ -83,8 +81,6 @@ function parseJsonFile(filePath, callback) {
       return;
     }
 
-    console.log(`解析的配置文件内容:`, jsonData);
-
     // 检查和修改配置
     modifyCompilerOptions(jsonData);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aircitytype",
-  "description": "增加了types中aircity的检测",
+  "description": "marker3d更新方法",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -14,8 +14,8 @@
   "bin": {
     "installdts": "./main.js"
   },
-  "version": "1.1.6",
   "dependencies": {
     "jsonc-parser": "^3.3.1"
-  }
+  },
+  "version": "1.1.9"
 }