OnePoem / OnePoem-App

Go to a project
Toggle navigation Toggle navigation pinning
reason
378a307d 1 parent 62f1230e

修正注册接口使用的对象

Inline Side-by-side
Showing 5 changed files with 41 additions and 40 deletions
...@@ -9,7 +9,7 @@ import 'package:Parlando/category/models/category_item_entity.dart'; ...@@ -9,7 +9,7 @@ import 'package:Parlando/category/models/category_item_entity.dart';
9 import 'package:Parlando/generated/json/category_item_entity.g.dart'; 9 import 'package:Parlando/generated/json/category_item_entity.g.dart';
10 import 'package:Parlando/home/models/setting_entity.dart'; 10 import 'package:Parlando/home/models/setting_entity.dart';
11 import 'package:Parlando/generated/json/setting_entity.g.dart'; 11 import 'package:Parlando/generated/json/setting_entity.g.dart';
12 -import 'package:Parlando/login/models/login_entity.dart'; 12 +import 'package:Parlando/login/models/auth_entity.dart';
13 import 'package:Parlando/generated/json/login_entity.g.dart'; 13 import 'package:Parlando/generated/json/login_entity.g.dart';
14 import 'package:Parlando/poem/models/lang_sort_entity.dart'; 14 import 'package:Parlando/poem/models/lang_sort_entity.dart';
15 import 'package:Parlando/generated/json/lang_sort_entity.g.dart'; 15 import 'package:Parlando/generated/json/lang_sort_entity.g.dart';
...@@ -104,14 +104,14 @@ class JsonConvert { ...@@ -104,14 +104,14 @@ class JsonConvert {
104 if (type == (SettingError).toString()) { 104 if (type == (SettingError).toString()) {
105 return SettingError.fromJson(json) as M; 105 return SettingError.fromJson(json) as M;
106 } 106 }
107 - if (type == (LoginEntity).toString()) { 107 + if (type == (AuthEntity).toString()) {
108 - return LoginEntity.fromJson(json) as M; 108 + return AuthEntity.fromJson(json) as M;
109 } 109 }
110 - if (type == (LoginData).toString()) { 110 + if (type == (AuthData).toString()) {
111 - return LoginData.fromJson(json) as M; 111 + return AuthData.fromJson(json) as M;
112 } 112 }
113 - if (type == (LoginError).toString()) { 113 + if (type == (AuthError).toString()) {
114 - return LoginError.fromJson(json) as M; 114 + return AuthError.fromJson(json) as M;
115 } 115 }
116 if (type == (LangSortEntity).toString()) { 116 if (type == (LangSortEntity).toString()) {
117 return LangSortEntity.fromJson(json) as M; 117 return LangSortEntity.fromJson(json) as M;
...@@ -176,19 +176,19 @@ class JsonConvert { ...@@ -176,19 +176,19 @@ class JsonConvert {
176 (Map<String, dynamic> e) => SettingError.fromJson(e)) 176 (Map<String, dynamic> e) => SettingError.fromJson(e))
177 .toList() as M; 177 .toList() as M;
178 } 178 }
179 - if (<LoginEntity>[] is M) { 179 + if (<AuthEntity>[] is M) {
180 return data 180 return data
181 - .map<LoginEntity>((Map<String, dynamic> e) => LoginEntity.fromJson(e)) 181 + .map<AuthEntity>((Map<String, dynamic> e) => AuthEntity.fromJson(e))
182 .toList() as M; 182 .toList() as M;
183 } 183 }
184 - if (<LoginData>[] is M) { 184 + if (<AuthData>[] is M) {
185 return data 185 return data
186 - .map<LoginData>((Map<String, dynamic> e) => LoginData.fromJson(e)) 186 + .map<AuthData>((Map<String, dynamic> e) => AuthData.fromJson(e))
187 .toList() as M; 187 .toList() as M;
188 } 188 }
189 - if (<LoginError>[] is M) { 189 + if (<AuthError>[] is M) {
190 return data 190 return data
191 - .map<LoginError>((Map<String, dynamic> e) => LoginError.fromJson(e)) 191 + .map<AuthError>((Map<String, dynamic> e) => AuthError.fromJson(e))
192 .toList() as M; 192 .toList() as M;
193 } 193 }
194 if (<LangSortEntity>[] is M) { 194 if (<LangSortEntity>[] is M) {
......
1 import 'package:Parlando/generated/json/base/json_convert_content.dart'; 1 import 'package:Parlando/generated/json/base/json_convert_content.dart';
2 -import 'package:Parlando/login/models/login_entity.dart'; 2 +import 'package:Parlando/login/models/auth_entity.dart';
3 3
4 -LoginEntity $LoginEntityFromJson(Map<String, dynamic> json) { 4 +AuthEntity $LoginEntityFromJson(Map<String, dynamic> json) {
5 - final LoginEntity loginEntity = LoginEntity(); 5 + final AuthEntity loginEntity = AuthEntity();
6 final String? status = jsonConvert.convert<String>(json['status']); 6 final String? status = jsonConvert.convert<String>(json['status']);
7 if (status != null) { 7 if (status != null) {
8 loginEntity.status = status; 8 loginEntity.status = status;
...@@ -15,18 +15,18 @@ LoginEntity $LoginEntityFromJson(Map<String, dynamic> json) { ...@@ -15,18 +15,18 @@ LoginEntity $LoginEntityFromJson(Map<String, dynamic> json) {
15 if (message != null) { 15 if (message != null) {
16 loginEntity.message = message; 16 loginEntity.message = message;
17 } 17 }
18 - final LoginData? data = jsonConvert.convert<LoginData>(json['data']); 18 + final AuthData? data = jsonConvert.convert<AuthData>(json['data']);
19 if (data != null) { 19 if (data != null) {
20 loginEntity.data = data; 20 loginEntity.data = data;
21 } 21 }
22 - final LoginError? error = jsonConvert.convert<LoginError>(json['error']); 22 + final AuthError? error = jsonConvert.convert<AuthError>(json['error']);
23 if (error != null) { 23 if (error != null) {
24 loginEntity.error = error; 24 loginEntity.error = error;
25 } 25 }
26 return loginEntity; 26 return loginEntity;
27 } 27 }
28 28
29 -Map<String, dynamic> $LoginEntityToJson(LoginEntity entity) { 29 +Map<String, dynamic> $LoginEntityToJson(AuthEntity entity) {
30 final Map<String, dynamic> data = <String, dynamic>{}; 30 final Map<String, dynamic> data = <String, dynamic>{};
31 data['status'] = entity.status; 31 data['status'] = entity.status;
32 data['code'] = entity.code; 32 data['code'] = entity.code;
...@@ -36,8 +36,8 @@ Map<String, dynamic> $LoginEntityToJson(LoginEntity entity) { ...@@ -36,8 +36,8 @@ Map<String, dynamic> $LoginEntityToJson(LoginEntity entity) {
36 return data; 36 return data;
37 } 37 }
38 38
39 -LoginData $LoginDataFromJson(Map<String, dynamic> json) { 39 +AuthData $LoginDataFromJson(Map<String, dynamic> json) {
40 - final LoginData loginData = LoginData(); 40 + final AuthData loginData = AuthData();
41 final String? token = jsonConvert.convert<String>(json['token']); 41 final String? token = jsonConvert.convert<String>(json['token']);
42 if (token != null) { 42 if (token != null) {
43 loginData.token = token; 43 loginData.token = token;
...@@ -45,18 +45,18 @@ LoginData $LoginDataFromJson(Map<String, dynamic> json) { ...@@ -45,18 +45,18 @@ LoginData $LoginDataFromJson(Map<String, dynamic> json) {
45 return loginData; 45 return loginData;
46 } 46 }
47 47
48 -Map<String, dynamic> $LoginDataToJson(LoginData entity) { 48 +Map<String, dynamic> $LoginDataToJson(AuthData entity) {
49 final Map<String, dynamic> data = <String, dynamic>{}; 49 final Map<String, dynamic> data = <String, dynamic>{};
50 data['token'] = entity.token; 50 data['token'] = entity.token;
51 return data; 51 return data;
52 } 52 }
53 53
54 -LoginError $LoginErrorFromJson(Map<String, dynamic> json) { 54 +AuthError $LoginErrorFromJson(Map<String, dynamic> json) {
55 - final LoginError loginError = LoginError(); 55 + final AuthError loginError = AuthError();
56 return loginError; 56 return loginError;
57 } 57 }
58 58
59 -Map<String, dynamic> $LoginErrorToJson(LoginError entity) { 59 +Map<String, dynamic> $LoginErrorToJson(AuthError entity) {
60 final Map<String, dynamic> data = <String, dynamic>{}; 60 final Map<String, dynamic> data = <String, dynamic>{};
61 return data; 61 return data;
62 } 62 }
......
...@@ -3,16 +3,16 @@ import 'package:Parlando/generated/json/base/json_field.dart'; ...@@ -3,16 +3,16 @@ import 'package:Parlando/generated/json/base/json_field.dart';
3 import 'package:Parlando/generated/json/login_entity.g.dart'; 3 import 'package:Parlando/generated/json/login_entity.g.dart';
4 4
5 @JsonSerializable() 5 @JsonSerializable()
6 -class LoginEntity { 6 +class AuthEntity {
7 String? status; 7 String? status;
8 int? code; 8 int? code;
9 String? message; 9 String? message;
10 - LoginData? data; 10 + AuthData? data;
11 - LoginError? error; 11 + AuthError? error;
12 12
13 - LoginEntity(); 13 + AuthEntity();
14 14
15 - factory LoginEntity.fromJson(Map<String, dynamic> json) => 15 + factory AuthEntity.fromJson(Map<String, dynamic> json) =>
16 $LoginEntityFromJson(json); 16 $LoginEntityFromJson(json);
17 17
18 Map<String, dynamic> toJson() => $LoginEntityToJson(this); 18 Map<String, dynamic> toJson() => $LoginEntityToJson(this);
...@@ -24,12 +24,12 @@ class LoginEntity { ...@@ -24,12 +24,12 @@ class LoginEntity {
24 } 24 }
25 25
26 @JsonSerializable() 26 @JsonSerializable()
27 -class LoginData { 27 +class AuthData {
28 String? token; 28 String? token;
29 29
30 - LoginData(); 30 + AuthData();
31 31
32 - factory LoginData.fromJson(Map<String, dynamic> json) => 32 + factory AuthData.fromJson(Map<String, dynamic> json) =>
33 $LoginDataFromJson(json); 33 $LoginDataFromJson(json);
34 34
35 Map<String, dynamic> toJson() => $LoginDataToJson(this); 35 Map<String, dynamic> toJson() => $LoginDataToJson(this);
...@@ -41,10 +41,10 @@ class LoginData { ...@@ -41,10 +41,10 @@ class LoginData {
41 } 41 }
42 42
43 @JsonSerializable() 43 @JsonSerializable()
44 -class LoginError { 44 +class AuthError {
45 - LoginError(); 45 + AuthError();
46 46
47 - factory LoginError.fromJson(Map<String, dynamic> json) => 47 + factory AuthError.fromJson(Map<String, dynamic> json) =>
48 $LoginErrorFromJson(json); 48 $LoginErrorFromJson(json);
49 49
50 Map<String, dynamic> toJson() => $LoginErrorToJson(this); 50 Map<String, dynamic> toJson() => $LoginErrorToJson(this);
......
1 -import 'package:Parlando/login/models/login_entity.dart'; 1 +import 'package:Parlando/login/models/auth_entity.dart';
2 import 'package:Parlando/net/dio_utils.dart'; 2 import 'package:Parlando/net/dio_utils.dart';
3 import 'package:Parlando/net/http_api.dart'; 3 import 'package:Parlando/net/http_api.dart';
4 import 'package:Parlando/util/toast_utils.dart'; 4 import 'package:Parlando/util/toast_utils.dart';
...@@ -133,7 +133,7 @@ class _LoginPageState extends State<LoginPage> ...@@ -133,7 +133,7 @@ class _LoginPageState extends State<LoginPage>
133 "email": _nameController.text, 133 "email": _nameController.text,
134 "password": _passwordController.text, 134 "password": _passwordController.text,
135 }; 135 };
136 - DioUtils.instance.asyncRequestNetwork<LoginEntity>( 136 + DioUtils.instance.asyncRequestNetwork<AuthEntity>(
137 Method.post, 137 Method.post,
138 HttpApi.login, 138 HttpApi.login,
139 params: params, 139 params: params,
......
1 +import 'package:Parlando/login/models/auth_entity.dart';
1 import 'package:Parlando/net/dio_utils.dart'; 2 import 'package:Parlando/net/dio_utils.dart';
2 import 'package:Parlando/net/http_api.dart'; 3 import 'package:Parlando/net/http_api.dart';
3 import 'package:Parlando/res/constant.dart'; 4 import 'package:Parlando/res/constant.dart';
...@@ -83,12 +84,12 @@ class _RegisterPageState extends State<RegisterPage> ...@@ -83,12 +84,12 @@ class _RegisterPageState extends State<RegisterPage>
83 "password": _passwordController.text, 84 "password": _passwordController.text,
84 "verify_code": _vCodeController.text, 85 "verify_code": _vCodeController.text,
85 }; 86 };
86 - DioUtils.instance.asyncRequestNetwork( 87 + DioUtils.instance.asyncRequestNetwork<AuthEntity>(
87 Method.post, 88 Method.post,
88 HttpApi.register, 89 HttpApi.register,
89 params: params, 90 params: params,
90 onSuccess: (data) { 91 onSuccess: (data) {
91 - SpUtil.putString(Constant.userToken, "this is user token!"); 92 + SpUtil.putString(Constant.userToken, data!.data!.token!);
92 NavigatorUtils.push(context, Routes.home, clearStack: true); 93 NavigatorUtils.push(context, Routes.home, clearStack: true);
93 _isLoading = false; 94 _isLoading = false;
94 }, 95 },
......