Toggle navigation
Toggle navigation
This project
Loading...
Sign in
OnePoem
/
OnePoem-App
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
reason
2022-04-01 18:51:48 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
378a307db7a7678a85fdb990b61410e0cdb11cfc
378a307d
1 parent
62f1230e
修正注册接口使用的对象
Hide whitespace changes
Inline
Side-by-side
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
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
==
(
Login
Entity
).
toString
())
{
return
Login
Entity
.
fromJson
(
json
)
as
M
;
if
(
type
==
(
Auth
Entity
).
toString
())
{
return
Auth
Entity
.
fromJson
(
json
)
as
M
;
}
if
(
type
==
(
Login
Data
).
toString
())
{
return
Login
Data
.
fromJson
(
json
)
as
M
;
if
(
type
==
(
Auth
Data
).
toString
())
{
return
Auth
Data
.
fromJson
(
json
)
as
M
;
}
if
(
type
==
(
Login
Error
).
toString
())
{
return
Login
Error
.
fromJson
(
json
)
as
M
;
if
(
type
==
(
Auth
Error
).
toString
())
{
return
Auth
Error
.
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
(<
Login
Entity
>[]
is
M
)
{
if
(<
Auth
Entity
>[]
is
M
)
{
return
data
.
map
<
LoginEntity
>((
Map
<
String
,
dynamic
>
e
)
=>
Login
Entity
.
fromJson
(
e
))
.
map
<
AuthEntity
>((
Map
<
String
,
dynamic
>
e
)
=>
Auth
Entity
.
fromJson
(
e
))
.
toList
()
as
M
;
}
if
(<
Login
Data
>[]
is
M
)
{
if
(<
Auth
Data
>[]
is
M
)
{
return
data
.
map
<
LoginData
>((
Map
<
String
,
dynamic
>
e
)
=>
Login
Data
.
fromJson
(
e
))
.
map
<
AuthData
>((
Map
<
String
,
dynamic
>
e
)
=>
Auth
Data
.
fromJson
(
e
))
.
toList
()
as
M
;
}
if
(<
Login
Error
>[]
is
M
)
{
if
(<
Auth
Error
>[]
is
M
)
{
return
data
.
map
<
LoginError
>((
Map
<
String
,
dynamic
>
e
)
=>
Login
Error
.
fromJson
(
e
))
.
map
<
AuthError
>((
Map
<
String
,
dynamic
>
e
)
=>
Auth
Error
.
fromJson
(
e
))
.
toList
()
as
M
;
}
if
(<
LangSortEntity
>[]
is
M
)
{
...
...
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'
;
Login
Entity
$LoginEntityFromJson
(
Map
<
String
,
dynamic
>
json
)
{
final
LoginEntity
loginEntity
=
Login
Entity
();
Auth
Entity
$LoginEntityFromJson
(
Map
<
String
,
dynamic
>
json
)
{
final
AuthEntity
loginEntity
=
Auth
Entity
();
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
<
Login
Data
>(
json
[
'data'
]);
final
AuthData
?
data
=
jsonConvert
.
convert
<
Auth
Data
>(
json
[
'data'
]);
if
(
data
!=
null
)
{
loginEntity
.
data
=
data
;
}
final
LoginError
?
error
=
jsonConvert
.
convert
<
Login
Error
>(
json
[
'error'
]);
final
AuthError
?
error
=
jsonConvert
.
convert
<
Auth
Error
>(
json
[
'error'
]);
if
(
error
!=
null
)
{
loginEntity
.
error
=
error
;
}
return
loginEntity
;
}
Map
<
String
,
dynamic
>
$LoginEntityToJson
(
Login
Entity
entity
)
{
Map
<
String
,
dynamic
>
$LoginEntityToJson
(
Auth
Entity
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
;
}
Login
Data
$LoginDataFromJson
(
Map
<
String
,
dynamic
>
json
)
{
final
LoginData
loginData
=
Login
Data
();
Auth
Data
$LoginDataFromJson
(
Map
<
String
,
dynamic
>
json
)
{
final
AuthData
loginData
=
Auth
Data
();
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
(
Login
Data
entity
)
{
Map
<
String
,
dynamic
>
$LoginDataToJson
(
Auth
Data
entity
)
{
final
Map
<
String
,
dynamic
>
data
=
<
String
,
dynamic
>{};
data
[
'token'
]
=
entity
.
token
;
return
data
;
}
Login
Error
$LoginErrorFromJson
(
Map
<
String
,
dynamic
>
json
)
{
final
LoginError
loginError
=
Login
Error
();
Auth
Error
$LoginErrorFromJson
(
Map
<
String
,
dynamic
>
json
)
{
final
AuthError
loginError
=
Auth
Error
();
return
loginError
;
}
Map
<
String
,
dynamic
>
$LoginErrorToJson
(
Login
Error
entity
)
{
Map
<
String
,
dynamic
>
$LoginErrorToJson
(
Auth
Error
entity
)
{
final
Map
<
String
,
dynamic
>
data
=
<
String
,
dynamic
>{};
return
data
;
}
...
...
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
Login
Entity
{
class
Auth
Entity
{
String
?
status
;
int
?
code
;
String
?
message
;
Login
Data
?
data
;
Login
Error
?
error
;
Auth
Data
?
data
;
Auth
Error
?
error
;
Login
Entity
();
Auth
Entity
();
factory
Login
Entity
.
fromJson
(
Map
<
String
,
dynamic
>
json
)
=>
factory
Auth
Entity
.
fromJson
(
Map
<
String
,
dynamic
>
json
)
=>
$LoginEntityFromJson
(
json
);
Map
<
String
,
dynamic
>
toJson
()
=>
$LoginEntityToJson
(
this
);
...
...
@@ -24,12 +24,12 @@ class LoginEntity {
}
@JsonSerializable
()
class
Login
Data
{
class
Auth
Data
{
String
?
token
;
Login
Data
();
Auth
Data
();
factory
Login
Data
.
fromJson
(
Map
<
String
,
dynamic
>
json
)
=>
factory
Auth
Data
.
fromJson
(
Map
<
String
,
dynamic
>
json
)
=>
$LoginDataFromJson
(
json
);
Map
<
String
,
dynamic
>
toJson
()
=>
$LoginDataToJson
(
this
);
...
...
@@ -41,10 +41,10 @@ class LoginData {
}
@JsonSerializable
()
class
Login
Error
{
Login
Error
();
class
Auth
Error
{
Auth
Error
();
factory
Login
Error
.
fromJson
(
Map
<
String
,
dynamic
>
json
)
=>
factory
Auth
Error
.
fromJson
(
Map
<
String
,
dynamic
>
json
)
=>
$LoginErrorFromJson
(
json
);
Map
<
String
,
dynamic
>
toJson
()
=>
$LoginErrorToJson
(
this
);
...
...
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
<
Login
Entity
>(
DioUtils
.
instance
.
asyncRequestNetwork
<
Auth
Entity
>(
Method
.
post
,
HttpApi
.
login
,
params:
params
,
...
...
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'
);
}));
},
...
...
Please
register
or
login
to post a comment