diff --git a/star_lock/lib/main/lockMian/entity/lockInfoEntity.dart b/star_lock/lib/main/lockMian/entity/lockInfoEntity.dart
index 8e406175..37dbf908 100644
--- a/star_lock/lib/main/lockMian/entity/lockInfoEntity.dart
+++ b/star_lock/lib/main/lockMian/entity/lockInfoEntity.dart
@@ -4,16 +4,13 @@ class LockMainEntity {
   String? errorMsg;
   LockInfoEntity? data;
 
-  LockMainEntity(
-      {this.errorCode, this.description, this.errorMsg, this.data});
+  LockMainEntity({this.errorCode, this.description, this.errorMsg, this.data});
 
   LockMainEntity.fromJson(Map<String, dynamic> json) {
     errorCode = json['errorCode'];
     description = json['description'];
     errorMsg = json['errorMsg'];
-    data = json['data'] != null
-        ? LockInfoEntity.fromJson(json['data'])
-        : null;
+    data = json['data'] != null ? LockInfoEntity.fromJson(json['data']) : null;
   }
 
   Map<String, dynamic> toJson() {
@@ -30,39 +27,39 @@ class LockMainEntity {
 
 class LockInfoEntity {
   UserSettings? userSettings;
-  bool? hasXmeyeLock;
-  bool? hasMoreService;
+  int? hasXmeyeLock;
+  int? hasMoreService;
   int? pages;
   List<KeyGroups>? keyGroups;
-  bool? isReply;
+  int? isReply;
   int? paidUserStatus;
-  bool? hasAdvert;
-  bool? hasAlexa;
-  bool? isUserSettingCompleted;
+  int? hasAdvert;
+  int? hasAlexa;
+  int? isUserSettingCompleted;
   List<KeyInfos>? keyInfos;
-  bool? hasPaidFeature;
-  bool? hasCameraLock;
-  bool? hasGoogleHome;
+  int? hasPaidFeature;
+  int? hasCameraLock;
+  int? hasGoogleHome;
   int? pageNo;
   int? lastUpdateDate;
 
   LockInfoEntity(
       {this.userSettings,
-        this.hasXmeyeLock,
-        this.hasMoreService,
-        this.pages,
-        this.keyGroups,
-        this.isReply,
-        this.paidUserStatus,
-        this.hasAdvert,
-        this.hasAlexa,
-        this.isUserSettingCompleted,
-        this.keyInfos,
-        this.hasPaidFeature,
-        this.hasCameraLock,
-        this.hasGoogleHome,
-        this.pageNo,
-        this.lastUpdateDate});
+      this.hasXmeyeLock,
+      this.hasMoreService,
+      this.pages,
+      this.keyGroups,
+      this.isReply,
+      this.paidUserStatus,
+      this.hasAdvert,
+      this.hasAlexa,
+      this.isUserSettingCompleted,
+      this.keyInfos,
+      this.hasPaidFeature,
+      this.hasCameraLock,
+      this.hasGoogleHome,
+      this.pageNo,
+      this.lastUpdateDate});
 
   LockInfoEntity.fromJson(Map<String, dynamic> json) {
     userSettings = json['userSettings'] != null
@@ -140,18 +137,18 @@ class UserSettings {
 
   UserSettings(
       {this.touchUnlockFlag,
-        this.modifyManagePwdFlag,
-        this.gesturePassword,
-        this.resetFlag,
-        this.delManagerFlag,
-        this.hideExpiredAccessFlag,
-        this.sendKeyFlag,
-        this.viberateFlag,
-        this.lockScreen,
-        this.authorizeFlag,
-        this.sendPwdFlag,
-        this.alertToneFlag,
-        this.status});
+      this.modifyManagePwdFlag,
+      this.gesturePassword,
+      this.resetFlag,
+      this.delManagerFlag,
+      this.hideExpiredAccessFlag,
+      this.sendKeyFlag,
+      this.viberateFlag,
+      this.lockScreen,
+      this.authorizeFlag,
+      this.sendPwdFlag,
+      this.alertToneFlag,
+      this.status});
 
   UserSettings.fromJson(Map<String, dynamic> json) {
     touchUnlockFlag = json['touchUnlockFlag'];
@@ -264,58 +261,58 @@ class KeyInfos {
   int? roomStatus;
   KeyInfos(
       {this.lightingTime,
-        this.privacyLock,
-        this.keyGroupId,
-        this.remarks,
-        this.autoUnlock,
-        this.noKeyPwd,
-        this.isAttendance,
-        this.keyStatus,
-        this.faceAuthentication,
-        this.sensitivity,
-        this.date,
-        this.appUnlockMustOnline,
-        this.lockKey,
-        this.resetButton,
-        this.endDate,
-        this.keyRight,
-        this.electricQuantity,
-        this.lockSound,
-        this.volume,
-        this.specialValue,
-        this.displayPasscode,
-        this.lockId,
-        this.doubleVerification,
-        this.keyName,
-        this.lockVersion,
-        this.lockName,
-        this.monitorFlag,
-        this.bondPassword,
-        this.lockAlias,
-        this.isFrozen,
-        this.remoteEnable,
-        this.lockFlagPos,
-        this.autoLockTime,
-        this.unlockDirection,
-        this.isCameraEnable,
-        this.startDate,
-        this.keyGroupName,
-        this.aesKeyStr,
-        this.uid,
-        this.passageMode,
-        this.admin,
-        this.keyId,
-        this.adminPwd,
-        this.deletePwd,
-        this.timezoneRawOffSet,
-        this.userType,
-        this.validPwdNum,
-        this.featureValue,
-        this.adminUid,
-        this.lockMac,
-        this.wirelessKeypadFeatureValue,
-        this.tamperAlert,
-        this.roomStatus,
+      this.privacyLock,
+      this.keyGroupId,
+      this.remarks,
+      this.autoUnlock,
+      this.noKeyPwd,
+      this.isAttendance,
+      this.keyStatus,
+      this.faceAuthentication,
+      this.sensitivity,
+      this.date,
+      this.appUnlockMustOnline,
+      this.lockKey,
+      this.resetButton,
+      this.endDate,
+      this.keyRight,
+      this.electricQuantity,
+      this.lockSound,
+      this.volume,
+      this.specialValue,
+      this.displayPasscode,
+      this.lockId,
+      this.doubleVerification,
+      this.keyName,
+      this.lockVersion,
+      this.lockName,
+      this.monitorFlag,
+      this.bondPassword,
+      this.lockAlias,
+      this.isFrozen,
+      this.remoteEnable,
+      this.lockFlagPos,
+      this.autoLockTime,
+      this.unlockDirection,
+      this.isCameraEnable,
+      this.startDate,
+      this.keyGroupName,
+      this.aesKeyStr,
+      this.uid,
+      this.passageMode,
+      this.admin,
+      this.keyId,
+      this.adminPwd,
+      this.deletePwd,
+      this.timezoneRawOffSet,
+      this.userType,
+      this.validPwdNum,
+      this.featureValue,
+      this.adminUid,
+      this.lockMac,
+      this.wirelessKeypadFeatureValue,
+      this.tamperAlert,
+      this.roomStatus,
       this.bluetooth});
 
   KeyInfos.fromJson(Map<String, dynamic> json) {
@@ -454,12 +451,12 @@ class LockVersion {
 
   LockVersion(
       {this.scene,
-        this.protocolVersion,
-        this.logoUrl,
-        this.orgId,
-        this.showAdminKbpwdFlag,
-        this.protocolType,
-        this.groupId});
+      this.protocolVersion,
+      this.logoUrl,
+      this.orgId,
+      this.showAdminKbpwdFlag,
+      this.protocolType,
+      this.groupId});
 
   LockVersion.fromJson(Map<String, dynamic> json) {
     scene = json['scene'];
@@ -493,9 +490,9 @@ class Bluetooth {
 
   Bluetooth(
       {this.bluetoothDeviceId,
-        this.bluetoothDeviceName,
-        this.publicKey,
-        this.privateKey,
+      this.bluetoothDeviceName,
+      this.publicKey,
+      this.privateKey,
       this.signKey});
 
   Bluetooth.fromJson(Map<String, dynamic> json) {