model-action 2.2.2 → 2.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/modules/SceneAsset.d.ts +7 -1
- package/dist/modules/SceneAsset.d.ts.map +1 -1
- package/dist/modules/SceneAsset.js +14 -1
- package/dist/modules/SceneAsset.js.map +1 -1
- package/dist/modules/VideoFusion.d.ts +5 -0
- package/dist/modules/VideoFusion.d.ts.map +1 -1
- package/dist/modules/VideoFusion.js +23 -0
- package/dist/modules/VideoFusion.js.map +1 -1
- package/package.json +1 -1
- package/src/modules/SceneAsset.ts +47 -28
- package/src/modules/VideoFusion.ts +34 -1
|
@@ -58,6 +58,8 @@ export type SceneAssetPayload = SceneAssetMapLocationPayload | {
|
|
|
58
58
|
id: string;
|
|
59
59
|
} | {
|
|
60
60
|
action: "disableSceneEdit";
|
|
61
|
+
} | {
|
|
62
|
+
action: "enableSceneEdit";
|
|
61
63
|
};
|
|
62
64
|
/** 三维推送:编辑模式下选中资产,前端可据此弹出编辑框 */
|
|
63
65
|
export interface SceneAssetOnAssetSelectedData {
|
|
@@ -93,7 +95,7 @@ export declare class SceneAssetAction extends Action {
|
|
|
93
95
|
* @param buildingId 建筑唯一 ID
|
|
94
96
|
* @param floor 楼层,如 1F、B1
|
|
95
97
|
*/
|
|
96
|
-
static mapRoomLocation(
|
|
98
|
+
static mapRoomLocation(params: RoomMapLocationParam[], buildingId: string, floor: string): Promise<any>;
|
|
97
99
|
/**
|
|
98
100
|
* POI 打点上图。不传 `buildingId`、`floor`(或仅空白)视为室外;
|
|
99
101
|
* 传入时三维会与当前分层匹配,不匹配则打点失败,前端需提示先分层到目标楼层。
|
|
@@ -109,6 +111,10 @@ export declare class SceneAssetAction extends Action {
|
|
|
109
111
|
* @param id 三维返回的 sceneId
|
|
110
112
|
*/
|
|
111
113
|
static editCancel(id: string, type?: SceneAssetType): Promise<any>;
|
|
114
|
+
/**
|
|
115
|
+
* 进入场景编辑模式
|
|
116
|
+
*/
|
|
117
|
+
static enableSceneEdit(): Promise<any>;
|
|
112
118
|
/** 退出整个资产管理编辑模块 */
|
|
113
119
|
static disableSceneEdit(): Promise<any>;
|
|
114
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SceneAsset.d.ts","sourceRoot":"","sources":["../../src/modules/SceneAsset.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAa,MAAM,UAAU,CAAC;AAE7C,qBAAqB;AACrB,MAAM,MAAM,oBAAoB,GAC1B,aAAa,GACb,UAAU,GACV,YAAY,GACZ,kBAAkB,CAAC;AAEzB,oBAAoB;AACpB,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,CAAC;AAErD,uBAAuB;AACvB,MAAM,WAAW,oBAAoB;IACjC,mBAAmB;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,+BAA+B;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc;IACd,IAAI,EAAE,MAAM,CAAC;IACb,4CAA4C;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4BAA4B;IAC5B,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,0CAA0C;AAC1C,MAAM,WAAW,mBAAmB;IAChC,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,iCAAiC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iBAAiB;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,6BAA6B;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,4BAA4B,GAClC;
|
|
1
|
+
{"version":3,"file":"SceneAsset.d.ts","sourceRoot":"","sources":["../../src/modules/SceneAsset.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ export class SceneAssetAction extends Action {
|
|
|
16
16
|
* @param buildingId 建筑唯一 ID
|
|
17
17
|
* @param floor 楼层,如 1F、B1
|
|
18
18
|
*/
|
|
19
|
-
static mapRoomLocation(buildingId, floor
|
|
19
|
+
static mapRoomLocation(params, buildingId, floor) {
|
|
20
20
|
const data = {
|
|
21
21
|
action: "mapLocation",
|
|
22
22
|
type: "Room",
|
|
@@ -82,6 +82,19 @@ export class SceneAssetAction extends Action {
|
|
|
82
82
|
};
|
|
83
83
|
return this.sendParam(sendParam, `场景资产编辑取消 - ${type} sceneId: ${id}`);
|
|
84
84
|
}
|
|
85
|
+
/**
|
|
86
|
+
* 进入场景编辑模式
|
|
87
|
+
*/
|
|
88
|
+
static enableSceneEdit() {
|
|
89
|
+
const data = {
|
|
90
|
+
action: "enableSceneEdit"
|
|
91
|
+
};
|
|
92
|
+
const sendParam = {
|
|
93
|
+
cmd: "sceneAsset",
|
|
94
|
+
data
|
|
95
|
+
};
|
|
96
|
+
return this.sendParam(sendParam, "进入场景资产编辑模块");
|
|
97
|
+
}
|
|
85
98
|
/** 退出整个资产管理编辑模块 */
|
|
86
99
|
static disableSceneEdit() {
|
|
87
100
|
const data = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SceneAsset.js","sourceRoot":"","sources":["../../src/modules/SceneAsset.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAa,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"SceneAsset.js","sourceRoot":"","sources":["../../src/modules/SceneAsset.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,11 @@ export declare class VideoFusionAction extends Action {
|
|
|
37
37
|
* @param options 初始化参数
|
|
38
38
|
*/
|
|
39
39
|
static init(options: VideoFusionInitOptions): Promise<any>;
|
|
40
|
+
/**
|
|
41
|
+
* 多台视频融合主机批量初始化(现场多台主机时)
|
|
42
|
+
* @param infos 各主机 token / ip / port / isHttps,port 默认 8080,isHttps 默认 true
|
|
43
|
+
*/
|
|
44
|
+
static initBatch(infos: VideoFusionInitOptions[]): Promise<any>;
|
|
40
45
|
/**
|
|
41
46
|
* 刷新token
|
|
42
47
|
* @param token 新的token
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VideoFusion.d.ts","sourceRoot":"","sources":["../../src/modules/VideoFusion.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAa,MAAM,UAAU,CAAC;AAM7C,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,QAAQ,CAAC;AAG3C,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,QAAQ,CAAC;AAG5C,MAAM,WAAW,YAAY;IACzB,EAAE,EAAE,MAAM,CAAC;CACd;AAGD,MAAM,WAAW,sBAAsB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAGD,MAAM,WAAW,sBAAsB;IACnC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,YAAY,EAAE,CAAC;CACxB;AAGD,MAAM,WAAW,uBAAuB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAGD,MAAM,WAAW,yBAAyB;IACtC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;
|
|
1
|
+
{"version":3,"file":"VideoFusion.d.ts","sourceRoot":"","sources":["../../src/modules/VideoFusion.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAa,MAAM,UAAU,CAAC;AAM7C,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,QAAQ,CAAC;AAG3C,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,QAAQ,CAAC;AAG5C,MAAM,WAAW,YAAY;IACzB,EAAE,EAAE,MAAM,CAAC;CACd;AAGD,MAAM,WAAW,sBAAsB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAGD,MAAM,WAAW,sBAAsB;IACnC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,YAAY,EAAE,CAAC;CACxB;AAGD,MAAM,WAAW,uBAAuB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAGD,MAAM,WAAW,yBAAyB;IACtC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AA2BD,qBAAa,iBAAkB,SAAQ,MAAM;IACzC;;;OAGG;IACH,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB;IAuB3C;;;OAGG;IACH,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,sBAAsB,EAAE;IA2BhD;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM;IAiB5B;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,OAAO,GAAE,sBAA2B;IA4CjD;;;OAGG;IACH,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE;IAoBhC;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE;IAoBjC;;;OAGG;IACH,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE;IAoBlC;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,uBAAuB;IAmB7C;;OAEG;IACH,MAAM,CAAC,GAAG;IAeV;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAC,OAAO,GAAE,yBAA8B;CA2BzD"}
|
|
@@ -22,6 +22,29 @@ export class VideoFusionAction extends Action {
|
|
|
22
22
|
};
|
|
23
23
|
return this.sendParam(param, '初始化视频融合');
|
|
24
24
|
}
|
|
25
|
+
/**
|
|
26
|
+
* 多台视频融合主机批量初始化(现场多台主机时)
|
|
27
|
+
* @param infos 各主机 token / ip / port / isHttps,port 默认 8080,isHttps 默认 true
|
|
28
|
+
*/
|
|
29
|
+
static initBatch(infos) {
|
|
30
|
+
const data = {
|
|
31
|
+
action: 'initBatch',
|
|
32
|
+
infos: infos.map((o) => {
|
|
33
|
+
var _a, _b;
|
|
34
|
+
return ({
|
|
35
|
+
token: o.token,
|
|
36
|
+
ip: o.ip,
|
|
37
|
+
port: (_a = o.port) !== null && _a !== void 0 ? _a : '8080',
|
|
38
|
+
isHttps: (_b = o.isHttps) !== null && _b !== void 0 ? _b : true,
|
|
39
|
+
});
|
|
40
|
+
}),
|
|
41
|
+
};
|
|
42
|
+
const param = {
|
|
43
|
+
cmd: 'videoFusion',
|
|
44
|
+
data,
|
|
45
|
+
};
|
|
46
|
+
return this.sendParam(param, `批量初始化视频融合(${infos.length} 台)`);
|
|
47
|
+
}
|
|
25
48
|
/**
|
|
26
49
|
* 刷新token
|
|
27
50
|
* @param token 新的token
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VideoFusion.js","sourceRoot":"","sources":["../../src/modules/VideoFusion.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAa,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"VideoFusion.js","sourceRoot":"","sources":["../../src/modules/VideoFusion.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -44,37 +44,40 @@ export interface PoiMapLocationParam {
|
|
|
44
44
|
|
|
45
45
|
export type SceneAssetMapLocationPayload =
|
|
46
46
|
| {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
47
|
+
action: "mapLocation";
|
|
48
|
+
type: "Room";
|
|
49
|
+
buildingId: string;
|
|
50
|
+
floor: string;
|
|
51
|
+
params: RoomMapLocationParam[];
|
|
52
|
+
}
|
|
53
53
|
| {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
54
|
+
action: "mapLocation";
|
|
55
|
+
type: "POI";
|
|
56
|
+
/** 不传或空:室外打点;传入时三维会与当前分层校验 */
|
|
57
|
+
buildingId?: string;
|
|
58
|
+
floor?: string;
|
|
59
|
+
params: PoiMapLocationParam[];
|
|
60
|
+
};
|
|
61
61
|
|
|
62
62
|
export type SceneAssetPayload =
|
|
63
63
|
| SceneAssetMapLocationPayload
|
|
64
64
|
| {
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
65
|
+
action: "editSave";
|
|
66
|
+
type: SceneAssetType;
|
|
67
|
+
/** 三维返回的 sceneId */
|
|
68
|
+
id: string;
|
|
69
|
+
}
|
|
70
|
+
| {
|
|
71
|
+
action: "editCancel";
|
|
72
|
+
type: SceneAssetType;
|
|
73
|
+
id: string;
|
|
74
|
+
}
|
|
70
75
|
| {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
id: string;
|
|
74
|
-
}
|
|
76
|
+
action: "disableSceneEdit";
|
|
77
|
+
}
|
|
75
78
|
| {
|
|
76
|
-
|
|
77
|
-
|
|
79
|
+
action: "enableSceneEdit";
|
|
80
|
+
};
|
|
78
81
|
|
|
79
82
|
/** 三维推送:编辑模式下选中资产,前端可据此弹出编辑框 */
|
|
80
83
|
export interface SceneAssetOnAssetSelectedData {
|
|
@@ -135,9 +138,9 @@ export class SceneAssetAction extends Action {
|
|
|
135
138
|
* @param floor 楼层,如 1F、B1
|
|
136
139
|
*/
|
|
137
140
|
static mapRoomLocation(
|
|
141
|
+
params: RoomMapLocationParam[],
|
|
138
142
|
buildingId: string,
|
|
139
143
|
floor: string,
|
|
140
|
-
params: RoomMapLocationParam[]
|
|
141
144
|
) {
|
|
142
145
|
const data: Extract<SceneAssetMapLocationPayload, { type: "Room" }> = {
|
|
143
146
|
action: "mapLocation",
|
|
@@ -226,12 +229,28 @@ export class SceneAssetAction extends Action {
|
|
|
226
229
|
);
|
|
227
230
|
}
|
|
228
231
|
|
|
232
|
+
/**
|
|
233
|
+
* 进入场景编辑模式
|
|
234
|
+
*/
|
|
235
|
+
static enableSceneEdit() {
|
|
236
|
+
const data: Extract<SceneAssetPayload, { action: "enableSceneEdit" }> =
|
|
237
|
+
{
|
|
238
|
+
action: "enableSceneEdit"
|
|
239
|
+
};
|
|
240
|
+
|
|
241
|
+
const sendParam: SceneAssetParamType = {
|
|
242
|
+
cmd: "sceneAsset",
|
|
243
|
+
data
|
|
244
|
+
};
|
|
245
|
+
return this.sendParam(sendParam, "进入场景资产编辑模块");
|
|
246
|
+
}
|
|
247
|
+
|
|
229
248
|
/** 退出整个资产管理编辑模块 */
|
|
230
249
|
static disableSceneEdit() {
|
|
231
250
|
const data: Extract<SceneAssetPayload, { action: "disableSceneEdit" }> =
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
251
|
+
{
|
|
252
|
+
action: "disableSceneEdit"
|
|
253
|
+
};
|
|
235
254
|
|
|
236
255
|
const sendParam: SceneAssetParamType = {
|
|
237
256
|
cmd: "sceneAsset",
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
import { Action, SendParam } from "./Action";
|
|
5
5
|
|
|
6
6
|
// 视频融合操作类型
|
|
7
|
-
type VideoFusionActionType = 'init' | 'refresh' | 'start' | 'stop' | 'pause' | 'resume' | 'flyTo' | 'get' | 'setting';
|
|
7
|
+
type VideoFusionActionType = 'init' | 'initBatch' | 'refresh' | 'start' | 'stop' | 'pause' | 'resume' | 'flyTo' | 'get' | 'setting';
|
|
8
8
|
|
|
9
9
|
// 视频类型
|
|
10
10
|
export type VideoType = 'Video' | 'Record';
|
|
@@ -64,6 +64,8 @@ type VideoFusionParamType = SendParam & {
|
|
|
64
64
|
recordEndTime?: string;
|
|
65
65
|
backPlay?: boolean;
|
|
66
66
|
ids?: FusionIdItem[];
|
|
67
|
+
/** action 为 initBatch 时:多台视频融合主机连接信息 */
|
|
68
|
+
infos?: VideoFusionInitOptions[];
|
|
67
69
|
id?: string;
|
|
68
70
|
fov?: number;
|
|
69
71
|
armLengthThreshold?: number;
|
|
@@ -100,6 +102,37 @@ export class VideoFusionAction extends Action {
|
|
|
100
102
|
return this.sendParam(param, '初始化视频融合');
|
|
101
103
|
}
|
|
102
104
|
|
|
105
|
+
/**
|
|
106
|
+
* 多台视频融合主机批量初始化(现场多台主机时)
|
|
107
|
+
* @param infos 各主机 token / ip / port / isHttps,port 默认 8080,isHttps 默认 true
|
|
108
|
+
*/
|
|
109
|
+
static initBatch(infos: VideoFusionInitOptions[]) {
|
|
110
|
+
const data: {
|
|
111
|
+
action: 'initBatch';
|
|
112
|
+
infos: Array<{
|
|
113
|
+
token: string;
|
|
114
|
+
ip: string;
|
|
115
|
+
port: string;
|
|
116
|
+
isHttps: boolean;
|
|
117
|
+
}>;
|
|
118
|
+
} = {
|
|
119
|
+
action: 'initBatch',
|
|
120
|
+
infos: infos.map((o) => ({
|
|
121
|
+
token: o.token,
|
|
122
|
+
ip: o.ip,
|
|
123
|
+
port: o.port ?? '8080',
|
|
124
|
+
isHttps: o.isHttps ?? true,
|
|
125
|
+
})),
|
|
126
|
+
};
|
|
127
|
+
|
|
128
|
+
const param: VideoFusionParamType = {
|
|
129
|
+
cmd: 'videoFusion',
|
|
130
|
+
data,
|
|
131
|
+
};
|
|
132
|
+
|
|
133
|
+
return this.sendParam(param, `批量初始化视频融合(${infos.length} 台)`);
|
|
134
|
+
}
|
|
135
|
+
|
|
103
136
|
/**
|
|
104
137
|
* 刷新token
|
|
105
138
|
* @param token 新的token
|