修正注册接口使用的对象

reason
Commit 378a307db7a7678a85fdb990b61410e0cdb11cfc 378a307d 1 parent 62f1230e
Showing 5 changed files with 43 additions and 42 deletions
lib/generated/json/base/json_convert_content.dart
lib/generated/json/login_entity.g.dart
lib/login/models/login_entity.dart → lib/login/models/auth_entity.dart
lib/login/page/login_page.dart
lib/login/page/register_page.dart
--- a/lib/generated/json/base/json_convert_content.dart
View file @378a307
+++ b/lib/generated/json/base/json_convert_content.dart
View file @378a307
@@ -9,7 +9,7 @@ import 'package:Parlando/category/models/category_item_entity.dart';
 import 'package:Parlando/generated/json/category_item_entity.g.dart';
 import 'package:Parlando/home/models/setting_entity.dart';
 import 'package:Parlando/generated/json/setting_entity.g.dart';
-import 'package:Parlando/login/models/login_entity.dart';
+import 'package:Parlando/login/models/auth_entity.dart';
 import 'package:Parlando/generated/json/login_entity.g.dart';
 import 'package:Parlando/poem/models/lang_sort_entity.dart';
 import 'package:Parlando/generated/json/lang_sort_entity.g.dart';
@@ -104,14 +104,14 @@ class JsonConvert {
     if (type == (SettingError).toString()) {
       return SettingError.fromJson(json) as M;
     }
-    if (type == (LoginEntity).toString()) {
+    if (type == (AuthEntity).toString()) {
-      return LoginEntity.fromJson(json) as M;
+      return AuthEntity.fromJson(json) as M;
     }
-    if (type == (LoginData).toString()) {
+    if (type == (AuthData).toString()) {
-      return LoginData.fromJson(json) as M;
+      return AuthData.fromJson(json) as M;
     }
-    if (type == (LoginError).toString()) {
+    if (type == (AuthError).toString()) {
-      return LoginError.fromJson(json) as M;
+      return AuthError.fromJson(json) as M;
     }
     if (type == (LangSortEntity).toString()) {
       return LangSortEntity.fromJson(json) as M;
@@ -176,19 +176,19 @@ class JsonConvert {
               (Map<String, dynamic> e) => SettingError.fromJson(e))
           .toList() as M;
     }
-    if (<LoginEntity>[] is M) {
+    if (<AuthEntity>[] is M) {
       return data
-          .map<LoginEntity>((Map<String, dynamic> e) => LoginEntity.fromJson(e))
+          .map<AuthEntity>((Map<String, dynamic> e) => AuthEntity.fromJson(e))
           .toList() as M;
     }
-    if (<LoginData>[] is M) {
+    if (<AuthData>[] is M) {
       return data
-          .map<LoginData>((Map<String, dynamic> e) => LoginData.fromJson(e))
+          .map<AuthData>((Map<String, dynamic> e) => AuthData.fromJson(e))
           .toList() as M;
     }
-    if (<LoginError>[] is M) {
+    if (<AuthError>[] is M) {
       return data
-          .map<LoginError>((Map<String, dynamic> e) => LoginError.fromJson(e))
+          .map<AuthError>((Map<String, dynamic> e) => AuthError.fromJson(e))
           .toList() as M;
     }
     if (<LangSortEntity>[] is M) {
--- a/lib/generated/json/login_entity.g.dart
View file @378a307
+++ b/lib/generated/json/login_entity.g.dart
View file @378a307
 import 'package:Parlando/generated/json/base/json_convert_content.dart';
-import 'package:Parlando/login/models/login_entity.dart';
+import 'package:Parlando/login/models/auth_entity.dart';
-LoginEntity $LoginEntityFromJson(Map<String, dynamic> json) {
+AuthEntity $LoginEntityFromJson(Map<String, dynamic> json) {
-  final LoginEntity loginEntity = LoginEntity();
+  final AuthEntity loginEntity = AuthEntity();
   final String? status = jsonConvert.convert<String>(json['status']);
   if (status != null) {
     loginEntity.status = status;
@@ -15,18 +15,18 @@ LoginEntity $LoginEntityFromJson(Map<String, dynamic> json) {
   if (message != null) {
     loginEntity.message = message;
   }
-  final LoginData? data = jsonConvert.convert<LoginData>(json['data']);
+  final AuthData? data = jsonConvert.convert<AuthData>(json['data']);
   if (data != null) {
     loginEntity.data = data;
   }
-  final LoginError? error = jsonConvert.convert<LoginError>(json['error']);
+  final AuthError? error = jsonConvert.convert<AuthError>(json['error']);
   if (error != null) {
     loginEntity.error = error;
   }
   return loginEntity;
 }
-Map<String, dynamic> $LoginEntityToJson(LoginEntity entity) {
+Map<String, dynamic> $LoginEntityToJson(AuthEntity entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['status'] = entity.status;
   data['code'] = entity.code;
@@ -36,8 +36,8 @@ Map<String, dynamic> $LoginEntityToJson(LoginEntity entity) {
   return data;
 }
-LoginData $LoginDataFromJson(Map<String, dynamic> json) {
+AuthData $LoginDataFromJson(Map<String, dynamic> json) {
-  final LoginData loginData = LoginData();
+  final AuthData loginData = AuthData();
   final String? token = jsonConvert.convert<String>(json['token']);
   if (token != null) {
     loginData.token = token;
@@ -45,18 +45,18 @@ LoginData $LoginDataFromJson(Map<String, dynamic> json) {
   return loginData;
 }
-Map<String, dynamic> $LoginDataToJson(LoginData entity) {
+Map<String, dynamic> $LoginDataToJson(AuthData entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   data['token'] = entity.token;
   return data;
 }
-LoginError $LoginErrorFromJson(Map<String, dynamic> json) {
+AuthError $LoginErrorFromJson(Map<String, dynamic> json) {
-  final LoginError loginError = LoginError();
+  final AuthError loginError = AuthError();
   return loginError;
 }
-Map<String, dynamic> $LoginErrorToJson(LoginError entity) {
+Map<String, dynamic> $LoginErrorToJson(AuthError entity) {
   final Map<String, dynamic> data = <String, dynamic>{};
   return data;
 }
--- a/lib/login/models/login_entity.dart → lib/login/models/auth_entity.dart
View file @378a307
+++ b/lib/login/models/login_entity.dart → lib/login/models/auth_entity.dart
View file @378a307
@@ -3,16 +3,16 @@ import 'package:Parlando/generated/json/base/json_field.dart';
 import 'package:Parlando/generated/json/login_entity.g.dart';
 @JsonSerializable()
-class LoginEntity {
+class AuthEntity {
   String? status;
   int? code;
   String? message;
-  LoginData? data;
+  AuthData? data;
-  LoginError? error;
+  AuthError? error;
-  LoginEntity();
+  AuthEntity();
-  factory LoginEntity.fromJson(Map<String, dynamic> json) =>
+  factory AuthEntity.fromJson(Map<String, dynamic> json) =>
       $LoginEntityFromJson(json);
   Map<String, dynamic> toJson() => $LoginEntityToJson(this);
@@ -24,12 +24,12 @@ class LoginEntity {
 }
 @JsonSerializable()
-class LoginData {
+class AuthData {
   String? token;
-  LoginData();
+  AuthData();
-  factory LoginData.fromJson(Map<String, dynamic> json) =>
+  factory AuthData.fromJson(Map<String, dynamic> json) =>
       $LoginDataFromJson(json);
   Map<String, dynamic> toJson() => $LoginDataToJson(this);
@@ -41,10 +41,10 @@ class LoginData {
 }
 @JsonSerializable()
-class LoginError {
+class AuthError {
-  LoginError();
+  AuthError();
-  factory LoginError.fromJson(Map<String, dynamic> json) =>
+  factory AuthError.fromJson(Map<String, dynamic> json) =>
       $LoginErrorFromJson(json);
   Map<String, dynamic> toJson() => $LoginErrorToJson(this);
--- a/lib/login/page/login_page.dart
View file @378a307
+++ b/lib/login/page/login_page.dart
View file @378a307
-import 'package:Parlando/login/models/login_entity.dart';
+import 'package:Parlando/login/models/auth_entity.dart';
 import 'package:Parlando/net/dio_utils.dart';
 import 'package:Parlando/net/http_api.dart';
 import 'package:Parlando/util/toast_utils.dart';
@@ -133,7 +133,7 @@ class _LoginPageState extends State<LoginPage>
       "email": _nameController.text,
       "password": _passwordController.text,
     };
-    DioUtils.instance.asyncRequestNetwork<LoginEntity>(
+    DioUtils.instance.asyncRequestNetwork<AuthEntity>(
       Method.post,
       HttpApi.login,
       params: params,
--- a/lib/login/page/register_page.dart
View file @378a307
+++ b/lib/login/page/register_page.dart
View file @378a307
+import 'package:Parlando/login/models/auth_entity.dart';
 import 'package:Parlando/net/dio_utils.dart';
 import 'package:Parlando/net/http_api.dart';
 import 'package:Parlando/res/constant.dart';
@@ -83,12 +84,12 @@ class _RegisterPageState extends State<RegisterPage>
       "password": _passwordController.text,
       "verify_code": _vCodeController.text,
     };
-    DioUtils.instance.asyncRequestNetwork(
+    DioUtils.instance.asyncRequestNetwork<AuthEntity>(
       Method.post,
       HttpApi.register,
       params: params,
       onSuccess: (data) {
-        SpUtil.putString(Constant.userToken, "this is user token!");
+        SpUtil.putString(Constant.userToken, data!.data!.token!);
         NavigatorUtils.push(context, Routes.home, clearStack: true);
         _isLoading = false;
       },
@@ -189,7 +190,7 @@ class _RegisterPageState extends State<RegisterPage>
                         .push(MaterialPageRoute(builder: (context) {
                       return WebViewPage(
                           title:
-                              '《${ParlandoLocalizations.of(context).user_agreement}》',
+                          '《${ParlandoLocalizations.of(context).user_agreement}》',
                           url: 'https://flutter.dev');
                     }));
                   },
@@ -204,7 +205,7 @@ class _RegisterPageState extends State<RegisterPage>
                         .push(MaterialPageRoute(builder: (context) {
                       return WebViewPage(
                           title:
-                              '《${ParlandoLocalizations.of(context).privacy_policy}》',
+                          '《${ParlandoLocalizations.of(context).privacy_policy}》',
                           url: 'https://flutter.dev');
                     }));
                   },