OnePoem / OnePoem-App

Go to a project
Toggle navigation Toggle navigation pinning
reason
6573cb41 1 parent 9ff61cf5

重构代码

Inline Side-by-side
Showing 11 changed files with 105 additions and 7 deletions
...@@ -3,7 +3,10 @@ ...@@ -3,7 +3,10 @@
3 // ignore_for_file: prefer_single_quotes 3 // ignore_for_file: prefer_single_quotes
4 4
5 // This file is automatically generated. DO NOT EDIT, all your changes would be lost. 5 // This file is automatically generated. DO NOT EDIT, all your changes would be lost.
6 -import 'package:one_poem/components/user_entity.dart'; 6 +import 'package:one_poem/account/models/user_entity.dart';
7 +import 'package:one_poem/generated/json/user_entity.g.dart';
8 +import 'package:one_poem/timeline/models/friend_entity.dart';
9 +import 'package:one_poem/generated/json/friend_entity.g.dart';
7 10
8 JsonConvert jsonConvert = JsonConvert(); 11 JsonConvert jsonConvert = JsonConvert();
9 12
...@@ -77,6 +80,14 @@ class JsonConvert { ...@@ -77,6 +80,14 @@ class JsonConvert {
77 if(type == (UserEntity).toString()){ 80 if(type == (UserEntity).toString()){
78 return UserEntity.fromJson(json) as M; 81 return UserEntity.fromJson(json) as M;
79 } 82 }
83 + if(type == (FriendEntity).toString()){
84 + return FriendEntity.fromJson(json) as M;
85 + }
86 + if(type == (FriendData).toString()){
87 + return FriendData.fromJson(json) as M;
88 + }
89 +
90 + print("$type not found");
80 91
81 return null; 92 return null;
82 } 93 }
...@@ -86,6 +97,14 @@ class JsonConvert { ...@@ -86,6 +97,14 @@ class JsonConvert {
86 if(<UserEntity>[] is M){ 97 if(<UserEntity>[] is M){
87 return data.map<UserEntity>((e) => UserEntity.fromJson(e)).toList() as M; 98 return data.map<UserEntity>((e) => UserEntity.fromJson(e)).toList() as M;
88 } 99 }
100 + if(<FriendEntity>[] is M){
101 + return data.map<FriendEntity>((e) => FriendEntity.fromJson(e)).toList() as M;
102 + }
103 + if(<FriendData>[] is M){
104 + return data.map<FriendData>((e) => FriendData.fromJson(e)).toList() as M;
105 + }
106 +
107 + print("${M.toString()} not found");
89 108
90 return null; 109 return null;
91 } 110 }
......
1 +import 'package:one_poem/generated/json/base/json_convert_content.dart';
2 +import 'package:one_poem/timeline/models/friend_entity.dart';
3 +
4 +FriendEntity $FriendEntityFromJson(Map<String, dynamic> json) {
5 + final FriendEntity friendEntity = FriendEntity();
6 + final List<FriendData>? data = jsonConvert.convertListNotNull<FriendData>(json['data']);
7 + if (data != null) {
8 + friendEntity.data = data;
9 + }
10 + return friendEntity;
11 +}
12 +
13 +Map<String, dynamic> $FriendEntityToJson(FriendEntity entity) {
14 + final Map<String, dynamic> data = <String, dynamic>{};
15 + data['data'] = entity.data.map((v) => v.toJson()).toList();
16 + return data;
17 +}
18 +
19 +FriendData $FriendDataFromJson(Map<String, dynamic> json) {
20 + final FriendData friendData = FriendData();
21 + final String? head = jsonConvert.convert<String>(json['head']);
22 + if (head != null) {
23 + friendData.head = head;
24 + }
25 + final String? name = jsonConvert.convert<String>(json['name']);
26 + if (name != null) {
27 + friendData.name = name;
28 + }
29 + final String? desc = jsonConvert.convert<String>(json['desc']);
30 + if (desc != null) {
31 + friendData.desc = desc;
32 + }
33 + final List<String>? pics = jsonConvert.convertListNotNull<String>(json['pics']);
34 + if (pics != null) {
35 + friendData.pics = pics;
36 + }
37 + final String? time = jsonConvert.convert<String>(json['time']);
38 + if (time != null) {
39 + friendData.time = time;
40 + }
41 + return friendData;
42 +}
43 +
44 +Map<String, dynamic> $FriendDataToJson(FriendData entity) {
45 + final Map<String, dynamic> data = <String, dynamic>{};
46 + data['head'] = entity.head;
47 + data['name'] = entity.name;
48 + data['desc'] = entity.desc;
49 + data['pics'] = entity.pics;
50 + data['time'] = entity.time;
51 + return data;
52 +}
...\ No newline at end of file ...\ No newline at end of file
1 +import 'package:one_poem/generated/json/base/json_convert_content.dart';
2 +import 'package:one_poem/account/models/user_entity.dart';
3 +
4 +UserEntity $UserEntityFromJson(Map<String, dynamic> json) {
5 + final UserEntity userEntity = UserEntity();
6 + final int? id = jsonConvert.convert<int>(json['id']);
7 + if (id != null) {
8 + userEntity.id = id;
9 + }
10 + final String? name = jsonConvert.convert<String>(json['name']);
11 + if (name != null) {
12 + userEntity.name = name;
13 + }
14 + final String? avatar = jsonConvert.convert<String>(json['avatar']);
15 + if (avatar != null) {
16 + userEntity.avatar = avatar;
17 + }
18 + return userEntity;
19 +}
20 +
21 +Map<String, dynamic> $UserEntityToJson(UserEntity entity) {
22 + final Map<String, dynamic> data = <String, dynamic>{};
23 + data['id'] = entity.id;
24 + data['name'] = entity.name;
25 + data['avatar'] = entity.avatar;
26 + return data;
27 +}
...\ No newline at end of file ...\ No newline at end of file
1 1
2 -import 'package:one_poem/components/user_entity.dart'; 2 +import 'package:one_poem/account/models/user_entity.dart';
3 import 'package:one_poem/mvp/mvps.dart'; 3 import 'package:one_poem/mvp/mvps.dart';
4 4
5 abstract class ShopIMvpView implements IMvpView { 5 abstract class ShopIMvpView implements IMvpView {
......
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 import 'package:one_poem/account/account_router.dart'; 2 import 'package:one_poem/account/account_router.dart';
3 -import 'package:one_poem/components/user_entity.dart'; 3 +import 'package:one_poem/account/models/user_entity.dart';
4 import 'package:one_poem/mvp/base_page.dart'; 4 import 'package:one_poem/mvp/base_page.dart';
5 import 'package:one_poem/res/resources.dart'; 5 import 'package:one_poem/res/resources.dart';
6 import 'package:one_poem/routers/fluro_navigator.dart'; 6 import 'package:one_poem/routers/fluro_navigator.dart';
......
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 -import 'package:one_poem/components/user_entity.dart'; 2 +import 'package:one_poem/account/models/user_entity.dart';
3 import 'package:one_poem/mvp/base_page_presenter.dart'; 3 import 'package:one_poem/mvp/base_page_presenter.dart';
4 import 'package:one_poem/net/dio_utils.dart'; 4 import 'package:one_poem/net/dio_utils.dart';
5 import 'package:one_poem/net/http_api.dart'; 5 import 'package:one_poem/net/http_api.dart';
......
1 import 'package:flutter/material.dart'; 1 import 'package:flutter/material.dart';
2 -import 'package:one_poem/components/user_entity.dart'; 2 +import 'package:one_poem/account/models/user_entity.dart';
3 3
4 class UserProvider extends ChangeNotifier { 4 class UserProvider extends ChangeNotifier {
5 5
......
...@@ -3,7 +3,7 @@ import 'dart:convert'; ...@@ -3,7 +3,7 @@ import 'dart:convert';
3 import 'package:flutter/cupertino.dart'; 3 import 'package:flutter/cupertino.dart';
4 import 'package:flutter/material.dart'; 4 import 'package:flutter/material.dart';
5 import 'package:flutter/services.dart'; 5 import 'package:flutter/services.dart';
6 -import 'package:one_poem/components/friend_entity.dart'; 6 +import 'package:one_poem/timeline/models/friend_entity.dart';
7 import 'package:one_poem/timeline/widgets/friend_cell.dart'; 7 import 'package:one_poem/timeline/widgets/friend_cell.dart';
8 import 'package:one_poem/timeline/widgets/header_view.dart'; 8 import 'package:one_poem/timeline/widgets/header_view.dart';
9 9
......
1 import 'package:flutter/cupertino.dart'; 1 import 'package:flutter/cupertino.dart';
2 import 'package:flutter/material.dart'; 2 import 'package:flutter/material.dart';
3 -import 'package:one_poem/components/friend_entity.dart'; 3 +import 'package:one_poem/timeline/models/friend_entity.dart';
4 4
5 class FriendCell extends StatefulWidget { 5 class FriendCell extends StatefulWidget {
6 6
......