model-action 2.2.6 → 2.2.8

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.
Files changed (11) hide show
  1. package/dist/modules/Path.d.ts +3 -3
  2. package/dist/modules/Path.d.ts.map +1 -1
  3. package/dist/modules/Path.js +3 -2
  4. package/dist/modules/Path.js.map +1 -1
  5. package/dist/modules/Routing.d.ts +13 -1
  6. package/dist/modules/Routing.d.ts.map +1 -1
  7. package/dist/modules/Routing.js +32 -0
  8. package/dist/modules/Routing.js.map +1 -1
  9. package/package.json +1 -1
  10. package/src/modules/Path.ts +9 -8
  11. package/src/modules/Routing.ts +51 -1
package/dist/modules/Path.d.ts CHANGED
@@ -59,10 +59,10 @@ export declare class PathAction extends Action {
59
59
  */
60
60
  static pathMove(action: 'start', pathId: string, rolerMoveParam: RolerMoveParam): void;
61
61
  /**
62
- * 在生成的路径上面移动 - 停止或重启
63
- * @param action 操作类型：stop 停止移动 | restart 重启移动
62
+ * 在生成的路径上面移动 - 暂停、停止或重启
63
+ * @param action 操作类型：pause 暂停移动 | stop 停止移动 | restart 重启移动
64
64
  */
65
- static pathMove(action: 'stop' | 'restart'): void;
65
+ static pathMove(action: 'pause' | 'stop' | 'restart'): void;
66
66
  /**
67
67
  * 开启路径编辑
68
68
  * @param pathId 自定义轨迹ID，前端配置界面提供数据，为空或者不传，UE自动生成一个
package/dist/modules/Path.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Path.d.ts","sourceRoot":"","sources":["../../src/modules/Path.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAa,MAAM,UAAU,CAAC;AAI7C,KAAK,kBAAkB,GAAG,QAAQ,GAAG,QAAQ,GAAG,KAAK,CAAA;AAKrD,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,YAAY,CAAA;AAGlD,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,KAAK,CAAA;AAGnD,MAAM,MAAM,gBAAgB,GAAG,eAAe,GAAG,oBAAoB,CAAA;AAGrE,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,MAAM,CAAA;AAG5C,MAAM,WAAW,cAAc;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAGD,MAAM,WAAW,SAAS;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,aAAa,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;CACjB;AAGD,MAAM,WAAW,SAAS;IACtB,EAAE,EAAE,MAAM,CAAC;CACd;AAGD,MAAM,WAAW,aAAa;IAC1B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAsBD,qBAAa,UAAW,SAAQ,MAAM;IAClC;;;;;;;;;OASG;IACH,MAAM,CAAC,OAAO,CACV,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,SAAS,EAAE,EACnB,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,SAAS,CAAC,EAAE,MAAM,EAClB,cAAc,CAAC,EAAE,cAAc,EAC/B,SAAS,CAAC,EAAE,SAAS;IAgCzB;;;;;OAKG;IACH,MAAM,CAAC,kBAAkB,CACrB,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,EAClC,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,cAAc;IA6B3B;;;;OAIG;IACH,MAAM,CAAC,qBAAqB,CACxB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,cAAc;IAmBlC;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,GAAG,IAAI;IACtF;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IA2CjD;;;;;OAKG;IACH,MAAM,CAAC,aAAa,CAChB,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,aAAa;IAiCjC;;OAEG;IACH,MAAM,CAAC,WAAW;CAarB"}
1
+ {"version":3,"file":"Path.d.ts","sourceRoot":"","sources":["../../src/modules/Path.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAa,MAAM,UAAU,CAAC;AAI7C,KAAK,kBAAkB,GAAG,QAAQ,GAAG,QAAQ,GAAG,KAAK,CAAA;AAKrD,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,YAAY,CAAA;AAGlD,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,QAAQ,GAAG,KAAK,CAAA;AAGnD,MAAM,MAAM,gBAAgB,GAAG,eAAe,GAAG,oBAAoB,CAAA;AAGrE,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG,MAAM,CAAA;AAG5C,MAAM,WAAW,cAAc;IAC3B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAGD,MAAM,WAAW,SAAS;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,aAAa,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;CACjB;AAGD,MAAM,WAAW,SAAS;IACtB,EAAE,EAAE,MAAM,CAAC;CACd;AAGD,MAAM,WAAW,aAAa;IAC1B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAsBD,qBAAa,UAAW,SAAQ,MAAM;IAClC;;;;;;;;;OASG;IACH,MAAM,CAAC,OAAO,CACV,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,EAAE,SAAS,EAAE,EACnB,kBAAkB,CAAC,EAAE,kBAAkB,EACvC,SAAS,CAAC,EAAE,MAAM,EAClB,cAAc,CAAC,EAAE,cAAc,EAC/B,SAAS,CAAC,EAAE,SAAS;IAgCzB;;;;;OAKG;IACH,MAAM,CAAC,kBAAkB,CACrB,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,QAAQ,EAClC,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,cAAc;IA6B3B;;;;OAIG;IACH,MAAM,CAAC,qBAAqB,CACxB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,cAAc;IAmBlC;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,cAAc,GAAG,IAAI;IACtF;;;OAGG;IACH,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,IAAI;IA4C3D;;;;;OAKG;IACH,MAAM,CAAC,aAAa,CAChB,MAAM,CAAC,EAAE,MAAM,EACf,QAAQ,CAAC,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,aAAa;IAiCjC;;OAEG;IACH,MAAM,CAAC,WAAW;CAarB"}
package/dist/modules/Path.js CHANGED
@@ -84,7 +84,7 @@ export class PathAction extends Action {
84
84
  }
85
85
  /**
86
86
  * 在生成的路径上面移动
87
- * @param action 操作类型：start 开始移动 | stop 停止移动 | restart 重启移动
87
+ * @param action 操作类型：start 开始移动 | pause 暂停移动 | stop 停止移动 | restart 重启移动
88
88
  * @param pathId 自定义轨迹ID（仅 start 时需要）
89
89
  * @param rolerMoveParam 沿路径移动的参数（仅 start 时需要）
90
90
  */
@@ -100,13 +100,14 @@ export class PathAction extends Action {
100
100
  data.pathId = pathId;
101
101
  data.rolerMoveParam = rolerMoveParam;
102
102
  }
103
- // stop 和 restart 不需要 pathId 和 rolerMoveParam
103
+ // pause、stop 和 restart 不需要 pathId 和 rolerMoveParam
104
104
  const param = {
105
105
  cmd: "path",
106
106
  data
107
107
  };
108
108
  const actionMap = {
109
109
  start: '开始移动',
110
+ pause: '暂停移动',
110
111
  stop: '停止移动',
111
112
  restart: '重启移动'
112
113
  };
package/dist/modules/Path.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Path.js","sourceRoot":"","sources":["../../src/modules/Path.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Path.js","sourceRoot":"","sources":["../../src/modules/Path.ts"],"names":[],"mappings":"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"}
package/dist/modules/Routing.d.ts CHANGED
@@ -2,7 +2,7 @@
2
2
  * 巡检操作方法
3
3
  */
4
4
  import { Action } from "./Action";
5
- export type RoutingActionType = 'start' | 'stop' | 'pause' | 'restart';
5
+ export type RoutingActionType = 'start' | 'stop' | 'pause' | 'restart' | 'updateMoveParam';
6
6
  export type RoutingType = 'videoPatrol';
7
7
  export interface RoutingParam {
8
8
  type: RoutingType;
@@ -12,6 +12,12 @@ export interface RoutingParam {
12
12
  isRolerMoveOnRouting?: boolean;
13
13
  isViewFollow?: boolean;
14
14
  }
15
+ export interface RoutingMoveParam {
16
+ speed?: number;
17
+ isPauseAtRouting?: boolean;
18
+ isRolerMoveOnRouting?: boolean;
19
+ isViewFollow?: boolean;
20
+ }
15
21
  export declare class RoutingAction extends Action {
16
22
  /**
17
23
  * 开始路由巡视
@@ -33,5 +39,11 @@ export declare class RoutingAction extends Action {
33
39
  * 从暂停点继续开始巡视
34
40
  */
35
41
  static restart(): Promise<any>;
42
+ /**
43
+ * 更新移动参数
44
+ * 巡视过程中动态更新移动相关参数
45
+ * @param param 移动参数
46
+ */
47
+ static updateMoveParam(param: RoutingMoveParam): Promise<any>;
36
48
  }
37
49
  //# sourceMappingURL=Routing.d.ts.map
package/dist/modules/Routing.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Routing.d.ts","sourceRoot":"","sources":["../../src/modules/Routing.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAa,MAAM,UAAU,CAAC;AAG7C,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;AAGtE,MAAM,MAAM,WAAW,GAAG,aAAa,CAAA;AAGvC,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,WAAW,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAeD,qBAAa,aAAc,SAAQ,MAAM;IACrC;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,YAAY;IAyChC;;;OAGG;IACH,MAAM,CAAC,IAAI;IAcX;;OAEG;IACH,MAAM,CAAC,KAAK;IAcZ;;;OAGG;IACH,MAAM,CAAC,OAAO;CAajB"}
1
+ {"version":3,"file":"Routing.d.ts","sourceRoot":"","sources":["../../src/modules/Routing.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAa,MAAM,UAAU,CAAC;AAG7C,MAAM,MAAM,iBAAiB,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,GAAG,iBAAiB,CAAA;AAG1F,MAAM,MAAM,WAAW,GAAG,aAAa,CAAA;AAGvC,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,WAAW,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAGD,MAAM,WAAW,gBAAgB;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAeD,qBAAa,aAAc,SAAQ,MAAM;IACrC;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,YAAY;IAyChC;;;OAGG;IACH,MAAM,CAAC,IAAI;IAcX;;OAEG;IACH,MAAM,CAAC,KAAK;IAcZ;;;OAGG;IACH,MAAM,CAAC,OAAO;IAcd;;;;OAIG;IACH,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,gBAAgB;CAoCjD"}
package/dist/modules/Routing.js CHANGED
@@ -78,5 +78,37 @@ export class RoutingAction extends Action {
78
78
  };
79
79
  return this.sendParam(sendParam, '重新开始路由巡视');
80
80
  }
81
+ /**
82
+ * 更新移动参数
83
+ * 巡视过程中动态更新移动相关参数
84
+ * @param param 移动参数
85
+ */
86
+ static updateMoveParam(param) {
87
+ // 如果 isViewFollow 为 true，则 isRolerMoveOnRouting 应该为 false
88
+ if (param.isViewFollow === true && param.isRolerMoveOnRouting === true) {
89
+ console.warn('当 isViewFollow 为 true 时，isRolerMoveOnRouting 应该为 false');
90
+ }
91
+ const data = {
92
+ action: 'updateMoveParam'
93
+ };
94
+ // 可选参数
95
+ if (param.speed !== undefined) {
96
+ data.speed = param.speed;
97
+ }
98
+ if (param.isPauseAtRouting !== undefined) {
99
+ data.isPauseAtRouting = param.isPauseAtRouting;
100
+ }
101
+ if (param.isRolerMoveOnRouting !== undefined) {
102
+ data.isRolerMoveOnRouting = param.isRolerMoveOnRouting;
103
+ }
104
+ if (param.isViewFollow !== undefined) {
105
+ data.isViewFollow = param.isViewFollow;
106
+ }
107
+ const sendParam = {
108
+ cmd: "routing",
109
+ data
110
+ };
111
+ return this.sendParam(sendParam, '更新移动参数');
112
+ }
81
113
  }
82
114
  //# sourceMappingURL=Routing.js.map
package/dist/modules/Routing.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Routing.js","sourceRoot":"","sources":["../../src/modules/Routing.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,MAAM,EAAa,MAAM,UAAU,CAAC;AA+B7C,MAAM,OAAO,aAAc,SAAQ,MAAM;IACrC;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,KAAmB;QAC5B,0DAA0D;QAC1D,IAAI,KAAK,CAAC,YAAY,KAAK,IAAI,IAAI,KAAK,CAAC,oBAAoB,KAAK,IAAI,EAAE,CAAC;YACrE,OAAO,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,IAAI,GAQN;YACA,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,EAAE,EAAE,KAAK,CAAC,EAAE;SACf,CAAC;QAEF,OAAO;QACP,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QAC7B,CAAC;QACD,IAAI,KAAK,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACvC,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC;QACnD,CAAC;QACD,IAAI,KAAK,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;YAC3C,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC,oBAAoB,CAAC;QAC3D,CAAC;QACD,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACnC,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;QAC3C,CAAC;QAED,MAAM,SAAS,GAAqB;YAChC,GAAG,EAAE,SAAS;YACd,IAAI;SACP,CAAC;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,IAAI;QACP,MAAM,IAAI,GAEN;YACA,MAAM,EAAE,MAAM;SACjB,CAAC;QAEF,MAAM,SAAS,GAAqB;YAChC,GAAG,EAAE,SAAS;YACd,IAAI;SACP,CAAC;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAK;QACR,MAAM,IAAI,GAEN;YACA,MAAM,EAAE,OAAO;SAClB,CAAC;QAEF,MAAM,SAAS,GAAqB;YAChC,GAAG,EAAE,SAAS;YACd,IAAI;SACP,CAAC;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,OAAO;QACV,MAAM,IAAI,GAEN;YACA,MAAM,EAAE,SAAS;SACpB,CAAC;QAEF,MAAM,SAAS,GAAqB;YAChC,GAAG,EAAE,SAAS;YACd,IAAI;SACP,CAAC;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACjD,CAAC;CACJ"}
1
+ {"version":3,"file":"Routing.js","sourceRoot":"","sources":["../../src/modules/Routing.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "model-action",
3
- "version": "2.2.6",
3
+ "version": "2.2.8",
4
4
  "description": "与三维交互api",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/modules/Path.ts CHANGED
@@ -10,7 +10,7 @@ import { Action, SendParam } from "./Action";
10
10
  // 路径的用途
11
11
  type PathPublicUsedType = 'Normal' | 'Person' | 'Car'
12
12
 
13
- type PathActionType = 'getRoadNet' | 'remove' | 'add' | 'show' | 'hide' | 'updateMovingParam' | 'start' | 'stop' | 'restart' | 'beginEdit' | 'endEdit'
13
+ type PathActionType = 'getRoadNet' | 'remove' | 'add' | 'show' | 'hide' | 'updateMovingParam' | 'start' | 'pause' | 'stop' | 'restart' | 'beginEdit' | 'endEdit'
14
14
 
15
15
  // 路径模块类型
16
16
  export type PathModuleType = 'Edit' | 'PathTracer'
@@ -193,23 +193,23 @@ export class PathAction extends Action {
193
193
  */
194
194
  static pathMove(action: 'start', pathId: string, rolerMoveParam: RolerMoveParam): void;
195
195
  /**
196
- * 在生成的路径上面移动 - 停止或重启
197
- * @param action 操作类型：stop 停止移动 | restart 重启移动
196
+ * 在生成的路径上面移动 - 暂停、停止或重启
197
+ * @param action 操作类型：pause 暂停移动 | stop 停止移动 | restart 重启移动
198
198
  */
199
- static pathMove(action: 'stop' | 'restart'): void;
199
+ static pathMove(action: 'pause' | 'stop' | 'restart'): void;
200
200
  /**
201
201
  * 在生成的路径上面移动
202
- * @param action 操作类型：start 开始移动 | stop 停止移动 | restart 重启移动
202
+ * @param action 操作类型：start 开始移动 | pause 暂停移动 | stop 停止移动 | restart 重启移动
203
203
  * @param pathId 自定义轨迹ID（仅 start 时需要）
204
204
  * @param rolerMoveParam 沿路径移动的参数（仅 start 时需要）
205
205
  */
206
206
  static pathMove(
207
- action: 'start' | 'stop' | 'restart',
207
+ action: 'start' | 'pause' | 'stop' | 'restart',
208
208
  pathId?: string,
209
209
  rolerMoveParam?: RolerMoveParam
210
210
  ) {
211
211
  const data: {
212
- action: 'start' | 'stop' | 'restart';
212
+ action: 'start' | 'pause' | 'stop' | 'restart';
213
213
  pathId?: string;
214
214
  rolerMoveParam?: RolerMoveParam;
215
215
  } = {
@@ -224,7 +224,7 @@ export class PathAction extends Action {
224
224
  data.pathId = pathId;
225
225
  data.rolerMoveParam = rolerMoveParam;
226
226
  }
227
- // stop 和 restart 不需要 pathId 和 rolerMoveParam
227
+ // pause、stop 和 restart 不需要 pathId 和 rolerMoveParam
228
228
 
229
229
  const param: PathType = {
230
230
  cmd: "path",
@@ -233,6 +233,7 @@ export class PathAction extends Action {
233
233
 
234
234
  const actionMap = {
235
235
  start: '开始移动',
236
+ pause: '暂停移动',
236
237
  stop: '停止移动',
237
238
  restart: '重启移动'
238
239
  };
package/src/modules/Routing.ts CHANGED
@@ -4,7 +4,7 @@
4
4
  import { Action, SendParam } from "./Action";
5
5
 
6
6
  // 路由巡视动作类型
7
- export type RoutingActionType = 'start' | 'stop' | 'pause' | 'restart'
7
+ export type RoutingActionType = 'start' | 'stop' | 'pause' | 'restart' | 'updateMoveParam'
8
8
 
9
9
  // 路由巡视类型
10
10
  export type RoutingType = 'videoPatrol'
@@ -19,6 +19,14 @@ export interface RoutingParam {
19
19
  isViewFollow?: boolean; // 巡检途中视角是否跟随路径线，默认 false。true时，isRolerMoveOnRouting 应为 false
20
20
  }
21
21
 
22
+ // 更新移动参数
23
+ export interface RoutingMoveParam {
24
+ speed?: number; // 移动速度，越小越慢
25
+ isPauseAtRouting?: boolean; // 巡检途中遇到摄像头弹框时是否停下来，默认 false
26
+ isRolerMoveOnRouting?: boolean; // 巡检途中是否有人在路径上行走，默认 false
27
+ isViewFollow?: boolean; // 巡检途中视角是否跟随路径线，默认 false。true时，isRolerMoveOnRouting 应为 false
28
+ }
29
+
22
30
  type RoutingParamType = SendParam & {
23
31
  cmd: "routing";
24
32
  data: {
@@ -131,4 +139,46 @@ export class RoutingAction extends Action {
131
139
  };
132
140
  return this.sendParam(sendParam, '重新开始路由巡视');
133
141
  }
142
+
143
+ /**
144
+ * 更新移动参数
145
+ * 巡视过程中动态更新移动相关参数
146
+ * @param param 移动参数
147
+ */
148
+ static updateMoveParam(param: RoutingMoveParam) {
149
+ // 如果 isViewFollow 为 true，则 isRolerMoveOnRouting 应该为 false
150
+ if (param.isViewFollow === true && param.isRolerMoveOnRouting === true) {
151
+ console.warn('当 isViewFollow 为 true 时，isRolerMoveOnRouting 应该为 false');
152
+ }
153
+
154
+ const data: {
155
+ action: 'updateMoveParam';
156
+ speed?: number;
157
+ isPauseAtRouting?: boolean;
158
+ isRolerMoveOnRouting?: boolean;
159
+ isViewFollow?: boolean;
160
+ } = {
161
+ action: 'updateMoveParam'
162
+ };
163
+
164
+ // 可选参数
165
+ if (param.speed !== undefined) {
166
+ data.speed = param.speed;
167
+ }
168
+ if (param.isPauseAtRouting !== undefined) {
169
+ data.isPauseAtRouting = param.isPauseAtRouting;
170
+ }
171
+ if (param.isRolerMoveOnRouting !== undefined) {
172
+ data.isRolerMoveOnRouting = param.isRolerMoveOnRouting;
173
+ }
174
+ if (param.isViewFollow !== undefined) {
175
+ data.isViewFollow = param.isViewFollow;
176
+ }
177
+
178
+ const sendParam: RoutingParamType = {
179
+ cmd: "routing",
180
+ data
181
+ };
182
+ return this.sendParam(sendParam, '更新移动参数');
183
+ }
134
184
  }