diff --git a/source/ios/Runner.xcodeproj/project.pbxproj b/source/ios/Runner.xcodeproj/project.pbxproj index 6c12933..6e1c09f 100644 --- a/source/ios/Runner.xcodeproj/project.pbxproj +++ b/source/ios/Runner.xcodeproj/project.pbxproj @@ -608,7 +608,7 @@ "@executable_path/../../Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.0.6; + MARKETING_VERSION = 2.0.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.vpntunnel.vpnzeus.PacketTunnel; @@ -651,7 +651,7 @@ "@executable_path/../../Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.0.6; + MARKETING_VERSION = 2.0.0; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.vpntunnel.vpnzeus.PacketTunnel; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -691,7 +691,7 @@ "@executable_path/../../Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 1.0.6; + MARKETING_VERSION = 2.0.0; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = com.vpntunnel.vpnzeus.PacketTunnel; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/source/lib/entity/server_entity.dart b/source/lib/entity/server_entity.dart index 7ea3d12..ad498ad 100644 --- a/source/lib/entity/server_entity.dart +++ b/source/lib/entity/server_entity.dart @@ -55,17 +55,17 @@ class ServerEntity { groupId: List.from(json["group_id"]?.map((x) => x) ?? []), parentId: json["parent_id"], tags: List.from(json["tags"]?.map((x) => x) ?? []), - name: "" + json["name"], + name: json["name"] ?? "", rate: json["rate"], - host: json["host"] + "", + host: json["host"] ?? "", port: int.parse(json["port"] ?? "0"), serverPort: int.parse(json["server_port"] ?? "0"), //json["server_port"], cipher: json["cipher"] ?? "", - show: json["show"], - sort: json["sort"], - createdAt: json["created_at"], - updatedAt: json["updated_at"], + show: json["show"] ?? 0, + sort: json["sort"] ?? 0, + createdAt: json["created_at"] ?? 0, + updatedAt: json["updated_at"] ?? 0, type: json["type"], lastCheckAt: "", //json["last_check_at"] + ); diff --git a/source/lib/pages/accountPage.dart b/source/lib/pages/accountPage.dart index 8b972f4..b929d9e 100644 --- a/source/lib/pages/accountPage.dart +++ b/source/lib/pages/accountPage.dart @@ -254,7 +254,7 @@ class AccountState extends State { onTap: () => Navigator.of(context).push(MaterialPageRoute( builder: (builder) => const SettingsRoute()))), divider, - Text("App Version: 1.0.6", + Text("App Version: 2.0.0", style: Theme.of(context).primaryTextTheme.labelMedium), /*userModel.isLogin ? GestureDetector(