@aceplus/smartace-api 2.9.0-publish-dart.1 → 2.10.0-alpha.1

package/auth.account_pb.d.ts

@@ -688,6 +688,7 @@ export namespace AccountProto {
     SERVICE_USER: 4;
     DRUM_API_ERP: 5;
     DRUM_TRACKER_VIEW_ALL: 6;
+    DRUM_TRACKER_DEMO: 7;
   }
 
   export const Roles: RolesMap;

package/auth.account_pb.js

@@ -787,7 +787,8 @@ proto.Auth.AccountProto.Roles = {
   APP_CLUSTER: 3,
   SERVICE_USER: 4,
   DRUM_API_ERP: 5,
-  DRUM_TRACKER_VIEW_ALL: 6
+  DRUM_TRACKER_VIEW_ALL: 6,
+  DRUM_TRACKER_DEMO: 7
 };
 
 /**

package/auth.firmware_pb.d.ts

@@ -40,6 +40,11 @@ export class FirmwareProto extends jspb.Message {
   getUpdatedDate(): google_protobuf_timestamp_pb.Timestamp | undefined;
   setUpdatedDate(value?: google_protobuf_timestamp_pb.Timestamp): void;
 
+  clearFromCrcsList(): void;
+  getFromCrcsList(): Array<string>;
+  setFromCrcsList(value: Array<string>): void;
+  addFromCrcs(value: string, index?: number): string;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): FirmwareProto.AsObject;
   static toObject(includeInstance: boolean, msg: FirmwareProto): FirmwareProto.AsObject;
@@ -61,6 +66,7 @@ export namespace FirmwareProto {
     uidsList: Array<string>,
     createdDate?: google_protobuf_timestamp_pb.Timestamp.AsObject,
     updatedDate?: google_protobuf_timestamp_pb.Timestamp.AsObject,
+    fromCrcsList: Array<string>,
   }
 
   export class CreateRequest extends jspb.Message {
@@ -80,6 +86,11 @@ export namespace FirmwareProto {
     setUidsList(value: Array<string>): void;
     addUids(value: string, index?: number): string;
 
+    clearFromCrcsList(): void;
+    getFromCrcsList(): Array<string>;
+    setFromCrcsList(value: Array<string>): void;
+    addFromCrcs(value: string, index?: number): string;
+
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): CreateRequest.AsObject;
     static toObject(includeInstance: boolean, msg: CreateRequest): CreateRequest.AsObject;
@@ -96,6 +107,7 @@ export namespace FirmwareProto {
       file: Uint8Array | string,
       enabled: boolean,
       uidsList: Array<string>,
+      fromCrcsList: Array<string>,
     }
   }
 
@@ -131,6 +143,11 @@ export namespace FirmwareProto {
     setUidsList(value: Array<string>): void;
     addUids(value: string, index?: number): string;
 
+    clearFromCrcsList(): void;
+    getFromCrcsList(): Array<string>;
+    setFromCrcsList(value: Array<string>): void;
+    addFromCrcs(value: string, index?: number): string;
+
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): UpdateRequest.AsObject;
     static toObject(includeInstance: boolean, msg: UpdateRequest): UpdateRequest.AsObject;
@@ -146,6 +163,7 @@ export namespace FirmwareProto {
       id: number,
       enabled: boolean,
       uidsList: Array<string>,
+      fromCrcsList: Array<string>,
     }
   }
 
@@ -214,8 +232,8 @@ export namespace FirmwareProto {
     getVersion(): string;
     setVersion(value: string): void;
 
-    getEnabled(): boolean;
-    setEnabled(value: boolean): void;
+    getEnabled(): platform_pagination_pb.BooleanFilterTypeMap[keyof platform_pagination_pb.BooleanFilterTypeMap];
+    setEnabled(value: platform_pagination_pb.BooleanFilterTypeMap[keyof platform_pagination_pb.BooleanFilterTypeMap]): void;
 
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): FirmwareFilters.AsObject;
@@ -231,7 +249,7 @@ export namespace FirmwareProto {
     export type AsObject = {
       crc: string,
       version: string,
-      enabled: boolean,
+      enabled: platform_pagination_pb.BooleanFilterTypeMap[keyof platform_pagination_pb.BooleanFilterTypeMap],
     }
   }
 }

package/auth.firmware_pb.js

@@ -187,7 +187,7 @@ if (goog.DEBUG && !COMPILED) {
  * @private {!Array<number>}
  * @const
  */
-proto.Auth.FirmwareProto.repeatedFields_ = [7];
+proto.Auth.FirmwareProto.repeatedFields_ = [7,10];
 
 
 
@@ -228,7 +228,8 @@ proto.Auth.FirmwareProto.toObject = function(includeInstance, msg) {
     enabled: jspb.Message.getBooleanFieldWithDefault(msg, 6, false),
     uidsList: (f = jspb.Message.getRepeatedField(msg, 7)) == null ? undefined : f,
     createdDate: (f = msg.getCreatedDate()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
-    updatedDate: (f = msg.getUpdatedDate()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f)
+    updatedDate: (f = msg.getUpdatedDate()) && google_protobuf_timestamp_pb.Timestamp.toObject(includeInstance, f),
+    fromCrcsList: (f = jspb.Message.getRepeatedField(msg, 10)) == null ? undefined : f
   };
 
   if (includeInstance) {
@@ -303,6 +304,10 @@ proto.Auth.FirmwareProto.deserializeBinaryFromReader = function(msg, reader) {
       reader.readMessage(value,google_protobuf_timestamp_pb.Timestamp.deserializeBinaryFromReader);
       msg.setUpdatedDate(value);
       break;
+    case 10:
+      var value = /** @type {string} */ (reader.readString());
+      msg.addFromCrcs(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -397,6 +402,13 @@ proto.Auth.FirmwareProto.serializeBinaryToWriter = function(message, writer) {
       google_protobuf_timestamp_pb.Timestamp.serializeBinaryToWriter
     );
   }
+  f = message.getFromCrcsList();
+  if (f.length > 0) {
+    writer.writeRepeatedString(
+      10,
+      f
+    );
+  }
 };
 
 
@@ -406,7 +418,7 @@ proto.Auth.FirmwareProto.serializeBinaryToWriter = function(message, writer) {
  * @private {!Array<number>}
  * @const
  */
-proto.Auth.FirmwareProto.CreateRequest.repeatedFields_ = [4];
+proto.Auth.FirmwareProto.CreateRequest.repeatedFields_ = [4,5];
 
 
 
@@ -442,7 +454,8 @@ proto.Auth.FirmwareProto.CreateRequest.toObject = function(includeInstance, msg)
     version: jspb.Message.getFieldWithDefault(msg, 1, ""),
     file: msg.getFile_asB64(),
     enabled: jspb.Message.getBooleanFieldWithDefault(msg, 3, false),
-    uidsList: (f = jspb.Message.getRepeatedField(msg, 4)) == null ? undefined : f
+    uidsList: (f = jspb.Message.getRepeatedField(msg, 4)) == null ? undefined : f,
+    fromCrcsList: (f = jspb.Message.getRepeatedField(msg, 5)) == null ? undefined : f
   };
 
   if (includeInstance) {
@@ -495,6 +508,10 @@ proto.Auth.FirmwareProto.CreateRequest.deserializeBinaryFromReader = function(ms
       var value = /** @type {string} */ (reader.readString());
       msg.addUids(value);
       break;
+    case 5:
+      var value = /** @type {string} */ (reader.readString());
+      msg.addFromCrcs(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -552,6 +569,13 @@ proto.Auth.FirmwareProto.CreateRequest.serializeBinaryToWriter = function(messag
       f
     );
   }
+  f = message.getFromCrcsList();
+  if (f.length > 0) {
+    writer.writeRepeatedString(
+      5,
+      f
+    );
+  }
 };
 
 
@@ -670,6 +694,43 @@ proto.Auth.FirmwareProto.CreateRequest.prototype.clearUidsList = function() {
 };
 
 
+/**
+ * repeated string from_crcs = 5;
+ * @return {!Array<string>}
+ */
+proto.Auth.FirmwareProto.CreateRequest.prototype.getFromCrcsList = function() {
+  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 5));
+};
+
+
+/**
+ * @param {!Array<string>} value
+ * @return {!proto.Auth.FirmwareProto.CreateRequest} returns this
+ */
+proto.Auth.FirmwareProto.CreateRequest.prototype.setFromCrcsList = function(value) {
+  return jspb.Message.setField(this, 5, value || []);
+};
+
+
+/**
+ * @param {string} value
+ * @param {number=} opt_index
+ * @return {!proto.Auth.FirmwareProto.CreateRequest} returns this
+ */
+proto.Auth.FirmwareProto.CreateRequest.prototype.addFromCrcs = function(value, opt_index) {
+  return jspb.Message.addToRepeatedField(this, 5, value, opt_index);
+};
+
+
+/**
+ * Clears the list making it empty but non-null.
+ * @return {!proto.Auth.FirmwareProto.CreateRequest} returns this
+ */
+proto.Auth.FirmwareProto.CreateRequest.prototype.clearFromCrcsList = function() {
+  return this.setFromCrcsList([]);
+};
+
+
 
 
 
@@ -806,7 +867,7 @@ proto.Auth.FirmwareProto.RetrieveRequest.prototype.setId = function(value) {
  * @private {!Array<number>}
  * @const
  */
-proto.Auth.FirmwareProto.UpdateRequest.repeatedFields_ = [3];
+proto.Auth.FirmwareProto.UpdateRequest.repeatedFields_ = [3,4];
 
 
 
@@ -841,7 +902,8 @@ proto.Auth.FirmwareProto.UpdateRequest.toObject = function(includeInstance, msg)
   var f, obj = {
     id: jspb.Message.getFieldWithDefault(msg, 1, 0),
     enabled: jspb.Message.getBooleanFieldWithDefault(msg, 2, false),
-    uidsList: (f = jspb.Message.getRepeatedField(msg, 3)) == null ? undefined : f
+    uidsList: (f = jspb.Message.getRepeatedField(msg, 3)) == null ? undefined : f,
+    fromCrcsList: (f = jspb.Message.getRepeatedField(msg, 4)) == null ? undefined : f
   };
 
   if (includeInstance) {
@@ -890,6 +952,10 @@ proto.Auth.FirmwareProto.UpdateRequest.deserializeBinaryFromReader = function(ms
       var value = /** @type {string} */ (reader.readString());
       msg.addUids(value);
       break;
+    case 4:
+      var value = /** @type {string} */ (reader.readString());
+      msg.addFromCrcs(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -940,6 +1006,13 @@ proto.Auth.FirmwareProto.UpdateRequest.serializeBinaryToWriter = function(messag
       f
     );
   }
+  f = message.getFromCrcsList();
+  if (f.length > 0) {
+    writer.writeRepeatedString(
+      4,
+      f
+    );
+  }
 };
 
 
@@ -1016,6 +1089,43 @@ proto.Auth.FirmwareProto.UpdateRequest.prototype.clearUidsList = function() {
 };
 
 
+/**
+ * repeated string from_crcs = 4;
+ * @return {!Array<string>}
+ */
+proto.Auth.FirmwareProto.UpdateRequest.prototype.getFromCrcsList = function() {
+  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 4));
+};
+
+
+/**
+ * @param {!Array<string>} value
+ * @return {!proto.Auth.FirmwareProto.UpdateRequest} returns this
+ */
+proto.Auth.FirmwareProto.UpdateRequest.prototype.setFromCrcsList = function(value) {
+  return jspb.Message.setField(this, 4, value || []);
+};
+
+
+/**
+ * @param {string} value
+ * @param {number=} opt_index
+ * @return {!proto.Auth.FirmwareProto.UpdateRequest} returns this
+ */
+proto.Auth.FirmwareProto.UpdateRequest.prototype.addFromCrcs = function(value, opt_index) {
+  return jspb.Message.addToRepeatedField(this, 4, value, opt_index);
+};
+
+
+/**
+ * Clears the list making it empty but non-null.
+ * @return {!proto.Auth.FirmwareProto.UpdateRequest} returns this
+ */
+proto.Auth.FirmwareProto.UpdateRequest.prototype.clearFromCrcsList = function() {
+  return this.setFromCrcsList([]);
+};
+
+
 
 
 
@@ -1472,7 +1582,7 @@ proto.Auth.FirmwareProto.FirmwareFilters.toObject = function(includeInstance, ms
   var f, obj = {
     crc: jspb.Message.getFieldWithDefault(msg, 1, ""),
     version: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    enabled: jspb.Message.getBooleanFieldWithDefault(msg, 3, false)
+    enabled: jspb.Message.getFieldWithDefault(msg, 3, 0)
   };
 
   if (includeInstance) {
@@ -1518,7 +1628,7 @@ proto.Auth.FirmwareProto.FirmwareFilters.deserializeBinaryFromReader = function(
       msg.setVersion(value);
       break;
     case 3:
-      var value = /** @type {boolean} */ (reader.readBool());
+      var value = /** @type {!proto.Platform.BooleanFilterType} */ (reader.readEnum());
       msg.setEnabled(value);
       break;
     default:
@@ -1565,8 +1675,8 @@ proto.Auth.FirmwareProto.FirmwareFilters.serializeBinaryToWriter = function(mess
     );
   }
   f = message.getEnabled();
-  if (f) {
-    writer.writeBool(
+  if (f !== 0.0) {
+    writer.writeEnum(
       3,
       f
     );
@@ -1611,20 +1721,20 @@ proto.Auth.FirmwareProto.FirmwareFilters.prototype.setVersion = function(value)
 
 
 /**
- * optional bool enabled = 3;
- * @return {boolean}
+ * optional Platform.BooleanFilterType enabled = 3;
+ * @return {!proto.Platform.BooleanFilterType}
  */
 proto.Auth.FirmwareProto.FirmwareFilters.prototype.getEnabled = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 3, false));
+  return /** @type {!proto.Platform.BooleanFilterType} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
 };
 
 
 /**
- * @param {boolean} value
+ * @param {!proto.Platform.BooleanFilterType} value
  * @return {!proto.Auth.FirmwareProto.FirmwareFilters} returns this
  */
 proto.Auth.FirmwareProto.FirmwareFilters.prototype.setEnabled = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 3, value);
+  return jspb.Message.setProto3EnumField(this, 3, value);
 };
 
 
@@ -1847,4 +1957,41 @@ proto.Auth.FirmwareProto.prototype.hasUpdatedDate = function() {
 };
 
 
+/**
+ * repeated string from_crcs = 10;
+ * @return {!Array<string>}
+ */
+proto.Auth.FirmwareProto.prototype.getFromCrcsList = function() {
+  return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 10));
+};
+
+
+/**
+ * @param {!Array<string>} value
+ * @return {!proto.Auth.FirmwareProto} returns this
+ */
+proto.Auth.FirmwareProto.prototype.setFromCrcsList = function(value) {
+  return jspb.Message.setField(this, 10, value || []);
+};
+
+
+/**
+ * @param {string} value
+ * @param {number=} opt_index
+ * @return {!proto.Auth.FirmwareProto} returns this
+ */
+proto.Auth.FirmwareProto.prototype.addFromCrcs = function(value, opt_index) {
+  return jspb.Message.addToRepeatedField(this, 10, value, opt_index);
+};
+
+
+/**
+ * Clears the list making it empty but non-null.
+ * @return {!proto.Auth.FirmwareProto} returns this
+ */
+proto.Auth.FirmwareProto.prototype.clearFromCrcsList = function() {
+  return this.setFromCrcsList([]);
+};
+
+
 goog.object.extend(exports, proto.Auth);

package/package.json

@@ -5,7 +5,7 @@
     "grpc-web": "^1.4.2",
     "ts-protoc-gen": "^0.15.0"
   },
-  "version": "2.9.0-publish-dart.1",
+  "version": "2.10.0-alpha.1",
   "description": "Generated proto files.",
   "author": "TKF",
   "files": [

package/platform.pagination_pb.d.ts

@@ -35,3 +35,11 @@ export namespace PaginationProto {
   }
 }
 
+export interface BooleanFilterTypeMap {
+  TRUE: 0;
+  FALSE: 1;
+  ALL: 2;
+}
+
+export const BooleanFilterType: BooleanFilterTypeMap;
+

package/platform.pagination_pb.js

@@ -21,6 +21,7 @@ var global =
     (function () { return this; }).call(null) ||
     Function('return this')();
 
+goog.exportSymbol('proto.Platform.BooleanFilterType', null, global);
 goog.exportSymbol('proto.Platform.PaginationProto', null, global);
 /**
  * Generated by JsPbCodeGenerator.
@@ -263,4 +264,13 @@ proto.Platform.PaginationProto.prototype.setCount = function(value) {
 };
 
 
+/**
+ * @enum {number}
+ */
+proto.Platform.BooleanFilterType = {
+  TRUE: 0,
+  FALSE: 1,
+  ALL: 2
+};
+
 goog.object.extend(exports, proto.Platform);

package/spic.cabinet_pb.d.ts

@@ -512,15 +512,21 @@ export namespace CabinetProto {
     getCabinetId(): number;
     setCabinetId(value: number): void;
 
-    getBatteryEstimator(): number;
-    setBatteryEstimator(value: number): void;
-
     getBatteryEmpty(): boolean;
     setBatteryEmpty(value: boolean): void;
 
     getCommunicationTime(): number;
     setCommunicationTime(value: number): void;
 
+    getBatteryUnloaded(): number;
+    setBatteryUnloaded(value: number): void;
+
+    getBatteryLoaded(): number;
+    setBatteryLoaded(value: number): void;
+
+    getBatteryTemperature(): number;
+    setBatteryTemperature(value: number): void;
+
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): State.AsObject;
     static toObject(includeInstance: boolean, msg: State): State.AsObject;
@@ -551,9 +557,11 @@ export namespace CabinetProto {
       crc: string,
       settingNumber: number,
       cabinetId: number,
-      batteryEstimator: number,
       batteryEmpty: boolean,
       communicationTime: number,
+      batteryUnloaded: number,
+      batteryLoaded: number,
+      batteryTemperature: number,
     }
 
     export class SearchRequest extends jspb.Message {
@@ -692,8 +700,10 @@ export namespace CabinetProto {
     getNotificationSent(): boolean;
     setNotificationSent(value: boolean): void;
 
-    getUserId(): number;
-    setUserId(value: number): void;
+    hasOpenRequest(): boolean;
+    clearOpenRequest(): void;
+    getOpenRequest(): CabinetProto.OpenRequest | undefined;
+    setOpenRequest(value?: CabinetProto.OpenRequest): void;
 
     getDetail(): string;
     setDetail(value: string): void;
@@ -716,7 +726,7 @@ export namespace CabinetProto {
       cabinetId: number,
       eventType: CabinetProto.Event.EventTypeMap[keyof CabinetProto.Event.EventTypeMap],
       notificationSent: boolean,
-      userId: number,
+      openRequest?: CabinetProto.OpenRequest.AsObject,
       detail: string,
     }
 
@@ -724,8 +734,8 @@ export namespace CabinetProto {
       getCabinetId(): number;
       setCabinetId(value: number): void;
 
-      getUserId(): number;
-      setUserId(value: number): void;
+      getActive(): platform_pagination_pb.BooleanFilterTypeMap[keyof platform_pagination_pb.BooleanFilterTypeMap];
+      setActive(value: platform_pagination_pb.BooleanFilterTypeMap[keyof platform_pagination_pb.BooleanFilterTypeMap]): void;
 
       clearEventTypeList(): void;
       getEventTypeList(): Array<CabinetProto.Event.EventTypeMap[keyof CabinetProto.Event.EventTypeMap]>;
@@ -764,7 +774,7 @@ export namespace CabinetProto {
     export namespace SearchRequest {
       export type AsObject = {
         cabinetId: number,
-        userId: number,
+        active: platform_pagination_pb.BooleanFilterTypeMap[keyof platform_pagination_pb.BooleanFilterTypeMap],
         eventTypeList: Array<CabinetProto.Event.EventTypeMap[keyof CabinetProto.Event.EventTypeMap]>,
         page: number,
         count: number,

package/spic.cabinet_pb.js

@@ -3627,9 +3627,11 @@ proto.Spic.CabinetProto.State.toObject = function(includeInstance, msg) {
     crc: jspb.Message.getFieldWithDefault(msg, 16, ""),
     settingNumber: jspb.Message.getFieldWithDefault(msg, 17, 0),
     cabinetId: jspb.Message.getFieldWithDefault(msg, 18, 0),
-    batteryEstimator: jspb.Message.getFieldWithDefault(msg, 19, 0),
-    batteryEmpty: jspb.Message.getBooleanFieldWithDefault(msg, 20, false),
-    communicationTime: jspb.Message.getFieldWithDefault(msg, 21, 0)
+    batteryEmpty: jspb.Message.getBooleanFieldWithDefault(msg, 19, false),
+    communicationTime: jspb.Message.getFieldWithDefault(msg, 20, 0),
+    batteryUnloaded: jspb.Message.getFieldWithDefault(msg, 21, 0),
+    batteryLoaded: jspb.Message.getFieldWithDefault(msg, 22, 0),
+    batteryTemperature: jspb.Message.getFieldWithDefault(msg, 23, 0)
   };
 
   if (includeInstance) {
@@ -3742,17 +3744,25 @@ proto.Spic.CabinetProto.State.deserializeBinaryFromReader = function(msg, reader
       msg.setCabinetId(value);
       break;
     case 19:
-      var value = /** @type {number} */ (reader.readInt32());
-      msg.setBatteryEstimator(value);
-      break;
-    case 20:
       var value = /** @type {boolean} */ (reader.readBool());
       msg.setBatteryEmpty(value);
       break;
-    case 21:
+    case 20:
       var value = /** @type {number} */ (reader.readUint32());
       msg.setCommunicationTime(value);
       break;
+    case 21:
+      var value = /** @type {number} */ (reader.readInt32());
+      msg.setBatteryUnloaded(value);
+      break;
+    case 22:
+      var value = /** @type {number} */ (reader.readInt32());
+      msg.setBatteryLoaded(value);
+      break;
+    case 23:
+      var value = /** @type {number} */ (reader.readInt32());
+      msg.setBatteryTemperature(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -3909,27 +3919,41 @@ proto.Spic.CabinetProto.State.serializeBinaryToWriter = function(message, writer
       f
     );
   }
-  f = message.getBatteryEstimator();
-  if (f !== 0) {
-    writer.writeInt32(
-      19,
-      f
-    );
-  }
   f = message.getBatteryEmpty();
   if (f) {
     writer.writeBool(
-      20,
+      19,
       f
     );
   }
   f = message.getCommunicationTime();
   if (f !== 0) {
     writer.writeUint32(
+      20,
+      f
+    );
+  }
+  f = message.getBatteryUnloaded();
+  if (f !== 0) {
+    writer.writeInt32(
       21,
       f
     );
   }
+  f = message.getBatteryLoaded();
+  if (f !== 0) {
+    writer.writeInt32(
+      22,
+      f
+    );
+  }
+  f = message.getBatteryTemperature();
+  if (f !== 0) {
+    writer.writeInt32(
+      23,
+      f
+    );
+  }
 };
 
 
@@ -5148,46 +5172,46 @@ proto.Spic.CabinetProto.State.prototype.setCabinetId = function(value) {
 
 
 /**
- * optional int32 battery_estimator = 19;
- * @return {number}
+ * optional bool battery_empty = 19;
+ * @return {boolean}
  */
-proto.Spic.CabinetProto.State.prototype.getBatteryEstimator = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 19, 0));
+proto.Spic.CabinetProto.State.prototype.getBatteryEmpty = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 19, false));
 };
 
 
 /**
- * @param {number} value
+ * @param {boolean} value
  * @return {!proto.Spic.CabinetProto.State} returns this
  */
-proto.Spic.CabinetProto.State.prototype.setBatteryEstimator = function(value) {
-  return jspb.Message.setProto3IntField(this, 19, value);
+proto.Spic.CabinetProto.State.prototype.setBatteryEmpty = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 19, value);
 };
 
 
 /**
- * optional bool battery_empty = 20;
- * @return {boolean}
+ * optional uint32 communication_time = 20;
+ * @return {number}
  */
-proto.Spic.CabinetProto.State.prototype.getBatteryEmpty = function() {
-  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 20, false));
+proto.Spic.CabinetProto.State.prototype.getCommunicationTime = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 20, 0));
 };
 
 
 /**
- * @param {boolean} value
+ * @param {number} value
  * @return {!proto.Spic.CabinetProto.State} returns this
  */
-proto.Spic.CabinetProto.State.prototype.setBatteryEmpty = function(value) {
-  return jspb.Message.setProto3BooleanField(this, 20, value);
+proto.Spic.CabinetProto.State.prototype.setCommunicationTime = function(value) {
+  return jspb.Message.setProto3IntField(this, 20, value);
 };
 
 
 /**
- * optional uint32 communication_time = 21;
+ * optional int32 battery_unloaded = 21;
  * @return {number}
  */
-proto.Spic.CabinetProto.State.prototype.getCommunicationTime = function() {
+proto.Spic.CabinetProto.State.prototype.getBatteryUnloaded = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 21, 0));
 };
 
@@ -5196,11 +5220,47 @@ proto.Spic.CabinetProto.State.prototype.getCommunicationTime = function() {
  * @param {number} value
  * @return {!proto.Spic.CabinetProto.State} returns this
  */
-proto.Spic.CabinetProto.State.prototype.setCommunicationTime = function(value) {
+proto.Spic.CabinetProto.State.prototype.setBatteryUnloaded = function(value) {
   return jspb.Message.setProto3IntField(this, 21, value);
 };
 
 
+/**
+ * optional int32 battery_loaded = 22;
+ * @return {number}
+ */
+proto.Spic.CabinetProto.State.prototype.getBatteryLoaded = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 22, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.Spic.CabinetProto.State} returns this
+ */
+proto.Spic.CabinetProto.State.prototype.setBatteryLoaded = function(value) {
+  return jspb.Message.setProto3IntField(this, 22, value);
+};
+
+
+/**
+ * optional int32 battery_temperature = 23;
+ * @return {number}
+ */
+proto.Spic.CabinetProto.State.prototype.getBatteryTemperature = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 23, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.Spic.CabinetProto.State} returns this
+ */
+proto.Spic.CabinetProto.State.prototype.setBatteryTemperature = function(value) {
+  return jspb.Message.setProto3IntField(this, 23, value);
+};
+
+
 
 
 
@@ -5239,7 +5299,7 @@ proto.Spic.CabinetProto.Event.toObject = function(includeInstance, msg) {
     cabinetId: jspb.Message.getFieldWithDefault(msg, 4, 0),
     eventType: jspb.Message.getFieldWithDefault(msg, 5, 0),
     notificationSent: jspb.Message.getBooleanFieldWithDefault(msg, 6, false),
-    userId: jspb.Message.getFieldWithDefault(msg, 7, 0),
+    openRequest: (f = msg.getOpenRequest()) && proto.Spic.CabinetProto.OpenRequest.toObject(includeInstance, f),
     detail: jspb.Message.getFieldWithDefault(msg, 8, "")
   };
 
@@ -5304,8 +5364,9 @@ proto.Spic.CabinetProto.Event.deserializeBinaryFromReader = function(msg, reader
       msg.setNotificationSent(value);
       break;
     case 7:
-      var value = /** @type {number} */ (reader.readInt64());
-      msg.setUserId(value);
+      var value = new proto.Spic.CabinetProto.OpenRequest;
+      reader.readMessage(value,proto.Spic.CabinetProto.OpenRequest.deserializeBinaryFromReader);
+      msg.setOpenRequest(value);
       break;
     case 8:
       var value = /** @type {string} */ (reader.readString());
@@ -5384,11 +5445,12 @@ proto.Spic.CabinetProto.Event.serializeBinaryToWriter = function(message, writer
       f
     );
   }
-  f = message.getUserId();
-  if (f !== 0) {
-    writer.writeInt64(
+  f = message.getOpenRequest();
+  if (f != null) {
+    writer.writeMessage(
       7,
-      f
+      f,
+      proto.Spic.CabinetProto.OpenRequest.serializeBinaryToWriter
     );
   }
   f = message.getDetail();
@@ -5461,7 +5523,7 @@ proto.Spic.CabinetProto.Event.SearchRequest.prototype.toObject = function(opt_in
 proto.Spic.CabinetProto.Event.SearchRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
     cabinetId: jspb.Message.getFieldWithDefault(msg, 1, 0),
-    userId: jspb.Message.getFieldWithDefault(msg, 2, 0),
+    active: jspb.Message.getFieldWithDefault(msg, 2, 0),
     eventTypeList: (f = jspb.Message.getRepeatedField(msg, 3)) == null ? undefined : f,
     page: jspb.Message.getFieldWithDefault(msg, 4, 0),
     count: jspb.Message.getFieldWithDefault(msg, 5, 0),
@@ -5509,8 +5571,8 @@ proto.Spic.CabinetProto.Event.SearchRequest.deserializeBinaryFromReader = functi
       msg.setCabinetId(value);
       break;
     case 2:
-      var value = /** @type {number} */ (reader.readInt64());
-      msg.setUserId(value);
+      var value = /** @type {!proto.Platform.BooleanFilterType} */ (reader.readEnum());
+      msg.setActive(value);
       break;
     case 3:
       var values = /** @type {!Array<!proto.Spic.CabinetProto.Event.EventType>} */ (reader.isDelimited() ? reader.readPackedEnum() : [reader.readEnum()]);
@@ -5576,9 +5638,9 @@ proto.Spic.CabinetProto.Event.SearchRequest.serializeBinaryToWriter = function(m
       f
     );
   }
-  f = message.getUserId();
-  if (f !== 0) {
-    writer.writeInt64(
+  f = message.getActive();
+  if (f !== 0.0) {
+    writer.writeEnum(
       2,
       f
     );
@@ -5649,20 +5711,20 @@ proto.Spic.CabinetProto.Event.SearchRequest.prototype.setCabinetId = function(va
 
 
 /**
- * optional int64 user_id = 2;
- * @return {number}
+ * optional Platform.BooleanFilterType active = 2;
+ * @return {!proto.Platform.BooleanFilterType}
  */
-proto.Spic.CabinetProto.Event.SearchRequest.prototype.getUserId = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
+proto.Spic.CabinetProto.Event.SearchRequest.prototype.getActive = function() {
+  return /** @type {!proto.Platform.BooleanFilterType} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
 /**
- * @param {number} value
+ * @param {!proto.Platform.BooleanFilterType} value
  * @return {!proto.Spic.CabinetProto.Event.SearchRequest} returns this
  */
-proto.Spic.CabinetProto.Event.SearchRequest.prototype.setUserId = function(value) {
-  return jspb.Message.setProto3IntField(this, 2, value);
+proto.Spic.CabinetProto.Event.SearchRequest.prototype.setActive = function(value) {
+  return jspb.Message.setProto3EnumField(this, 2, value);
 };
 
 
@@ -6189,20 +6251,39 @@ proto.Spic.CabinetProto.Event.prototype.setNotificationSent = function(value) {
 
 
 /**
- * optional int64 user_id = 7;
- * @return {number}
+ * optional OpenRequest open_request = 7;
+ * @return {?proto.Spic.CabinetProto.OpenRequest}
  */
-proto.Spic.CabinetProto.Event.prototype.getUserId = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 7, 0));
+proto.Spic.CabinetProto.Event.prototype.getOpenRequest = function() {
+  return /** @type{?proto.Spic.CabinetProto.OpenRequest} */ (
+    jspb.Message.getWrapperField(this, proto.Spic.CabinetProto.OpenRequest, 7));
 };
 
 
 /**
- * @param {number} value
+ * @param {?proto.Spic.CabinetProto.OpenRequest|undefined} value
+ * @return {!proto.Spic.CabinetProto.Event} returns this
+*/
+proto.Spic.CabinetProto.Event.prototype.setOpenRequest = function(value) {
+  return jspb.Message.setWrapperField(this, 7, value);
+};
+
+
+/**
+ * Clears the message field making it undefined.
  * @return {!proto.Spic.CabinetProto.Event} returns this
  */
-proto.Spic.CabinetProto.Event.prototype.setUserId = function(value) {
-  return jspb.Message.setProto3IntField(this, 7, value);
+proto.Spic.CabinetProto.Event.prototype.clearOpenRequest = function() {
+  return this.setOpenRequest(undefined);
+};
+
+
+/**
+ * Returns whether this field is set.
+ * @return {boolean}
+ */
+proto.Spic.CabinetProto.Event.prototype.hasOpenRequest = function() {
+  return jspb.Message.getField(this, 7) != null;
 };