langjie-m-play 0.0.6 → 0.0.8

package/domain/SubscribeDatagramResult.d.ts

@@ -0,0 +1,6 @@
+export interface SubscribeDatagramResult {
+    tag: string;
+    maxScale: number;
+    unitCode: number;
+    unitName: string;
+}

package/domain/SubscribeDatagramResult.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "langjie-m-play",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",

package/service/GtcClient.d.ts

@@ -5,6 +5,7 @@ import { ReadDataDO } from "../domain/ReadDataDO";
 import { VinChnl } from "../domain/VinChnl";
 import { OutMsg } from "../domain/OutMsg";
 import { AtsLoadResponse } from "../domain/AtsLoadResponse";
+import { SubscribeDatagramResult } from "../domain/SubscribeDatagramResult";
 /**
  * 提供给前端接口调用
  */
@@ -88,7 +89,7 @@ export declare class GtcClient {
      * @param serviceType   服务类型
      * @param tags          通道列表 Time,Event,Disp,Load
      */
-    static subscribeForDatagram(slaveInstId: string | null, serviceType: ServiceTypeEnum, tags: string): Promise<string[]>;
+    static subscribeForDatagram(slaveInstId: string | null, serviceType: ServiceTypeEnum, tags: string): Promise<Array<SubscribeDatagramResult>>;
     /**
      * 取消订阅通道数据流
      *
@@ -246,7 +247,7 @@ export declare class GtcClient {
      * @param keys          参数keys
      * @param values        参数values
      */
-    static atsSetParam(slaveInstId: string | null, serviceType: ServiceTypeEnum, ctrlIndex: number, atsHandle: number, keys: string[], values: Array<string | number>): Promise<null>;
+    static atsSetParam<K extends string, V>(slaveInstId: string | null, serviceType: ServiceTypeEnum, ctrlIndex: number, atsHandle: number, keys: string[], values: Array<string | number>): Promise<Record<K, V>>;
     /**
      * 获取ats参数
      *

package/service/MPlay.d.ts

@@ -1,5 +1,6 @@
 import { ServiceTypeEnum } from "../domain/enums/ServiceTypeEnum";
 import { AtsLoadResponse } from "../domain/AtsLoadResponse";
+import { SubscribeDatagramResult } from "../domain/SubscribeDatagramResult";
 export declare class MPlay {
     private readonly instId;
     private readonly serviceType;
@@ -27,7 +28,7 @@ export declare class MPlay {
      * @param tags   The channel tags to subscribe.
      * @param fn     The callback function to handle the datagram.
      */
-    subscribeForDatagram(tags: string, fn: (data: Array<Array<string>>) => void): Promise<void>;
+    subscribeForDatagram(tags: string, fn: (data: Array<Array<string>>) => void): Promise<Array<SubscribeDatagramResult>>;
     /**
      * Unsubscribe datagram from the MPlay server.
      */
@@ -64,5 +65,5 @@ export declare class MPlay {
      * @param atsHandle     The handle of the ATS script.
      * @param param         The parameter to set.
      */
-    atsSetParam(atsHandle: number, param: Record<string, number>): Promise<void>;
+    atsSetParam(atsHandle: number, param: Record<string, number>): Promise<Record<string, number>>;
 }

package/service/MPlay.js

@@ -73,7 +73,8 @@ class MPlay {
             }
             else if (msg.msgId >= 0x0700 && msg.msgId < 0x0800) {
                 // ats跳转到指定步骤
-                // PubSubUtil.publish(SubKeyEnum.ATS_JUMP_ACTION, { instId, ctrlIndex });
+                const hAts = msg.msgId & 0x00F0 >> 4;
+                PubSubUtil_1.PubSubUtil.publish(SubKeyEnum_1.SubKeyEnum.ATS_JUMP_ACTION, { instId, ctrlIndex, hAts, step: msg.msg });
             }
             else if (msg.msgId >= 0x0800 && msg.msgId < 0x0900) {
                 // ats异常停止
@@ -97,8 +98,8 @@ class MPlay {
      */
     subscribeForDatagram(tags, fn) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield GtcClient_1.GtcClient.subscribeForDatagram(this.instId, this.serviceType, tags);
             this.dataGramCallBack = fn;
+            return yield GtcClient_1.GtcClient.subscribeForDatagram(this.instId, this.serviceType, tags);
         });
     }
     /**
@@ -184,7 +185,7 @@ class MPlay {
             for (const key in param) {
                 values.push(param[key]);
             }
-            yield GtcClient_1.GtcClient.atsSetParam(this.instId, this.serviceType, this.ctrlIndex, atsHandle, keys, values);
+            return yield GtcClient_1.GtcClient.atsSetParam(this.instId, this.serviceType, this.ctrlIndex, atsHandle, keys, values);
         });
     }
 }