重构代码

@@ -3,7 +3,10 @@
 // ignore_for_file: prefer_single_quotes
 
 // This file is automatically generated. DO NOT EDIT, all your changes would be lost.
-import 'package:one_poem/components/user_entity.dart';
+import 'package:one_poem/account/models/user_entity.dart';
+import 'package:one_poem/generated/json/user_entity.g.dart';
+import 'package:one_poem/timeline/models/friend_entity.dart';
+import 'package:one_poem/generated/json/friend_entity.g.dart';
 
 JsonConvert jsonConvert = JsonConvert();
 
@@ -77,6 +80,14 @@ class JsonConvert {
 		if(type == (UserEntity).toString()){
 			return UserEntity.fromJson(json) as M;
 		}
+		if(type == (FriendEntity).toString()){
+			return FriendEntity.fromJson(json) as M;
+		}
+		if(type == (FriendData).toString()){
+			return FriendData.fromJson(json) as M;
+		}
+
+		print("$type not found");
 	
 		return null;
 }
@@ -86,6 +97,14 @@ class JsonConvert {
 		if(<UserEntity>[] is M){
 			return data.map<UserEntity>((e) => UserEntity.fromJson(e)).toList() as M;
 		}
+		if(<FriendEntity>[] is M){
+			return data.map<FriendEntity>((e) => FriendEntity.fromJson(e)).toList() as M;
+		}
+		if(<FriendData>[] is M){
+			return data.map<FriendData>((e) => FriendData.fromJson(e)).toList() as M;
+		}
+
+		print("${M.toString()} not found");
 	
 		return null;
 }

+import 'package:one_poem/generated/json/base/json_convert_content.dart';
+import 'package:one_poem/timeline/models/friend_entity.dart';
+
+FriendEntity $FriendEntityFromJson(Map<String, dynamic> json) {
+	final FriendEntity friendEntity = FriendEntity();
+	final List<FriendData>? data = jsonConvert.convertListNotNull<FriendData>(json['data']);
+	if (data != null) {
+		friendEntity.data = data;
+	}
+	return friendEntity;
+}
+
+Map<String, dynamic> $FriendEntityToJson(FriendEntity entity) {
+	final Map<String, dynamic> data = <String, dynamic>{};
+	data['data'] =  entity.data.map((v) => v.toJson()).toList();
+	return data;
+}
+
+FriendData $FriendDataFromJson(Map<String, dynamic> json) {
+	final FriendData friendData = FriendData();
+	final String? head = jsonConvert.convert<String>(json['head']);
+	if (head != null) {
+		friendData.head = head;
+	}
+	final String? name = jsonConvert.convert<String>(json['name']);
+	if (name != null) {
+		friendData.name = name;
+	}
+	final String? desc = jsonConvert.convert<String>(json['desc']);
+	if (desc != null) {
+		friendData.desc = desc;
+	}
+	final List<String>? pics = jsonConvert.convertListNotNull<String>(json['pics']);
+	if (pics != null) {
+		friendData.pics = pics;
+	}
+	final String? time = jsonConvert.convert<String>(json['time']);
+	if (time != null) {
+		friendData.time = time;
+	}
+	return friendData;
+}
+
+Map<String, dynamic> $FriendDataToJson(FriendData entity) {
+	final Map<String, dynamic> data = <String, dynamic>{};
+	data['head'] = entity.head;
+	data['name'] = entity.name;
+	data['desc'] = entity.desc;
+	data['pics'] =  entity.pics;
+	data['time'] = entity.time;
+	return data;
+}
\ No newline at end of file

+import 'package:one_poem/generated/json/base/json_convert_content.dart';
+import 'package:one_poem/account/models/user_entity.dart';
+
+UserEntity $UserEntityFromJson(Map<String, dynamic> json) {
+	final UserEntity userEntity = UserEntity();
+	final int? id = jsonConvert.convert<int>(json['id']);
+	if (id != null) {
+		userEntity.id = id;
+	}
+	final String? name = jsonConvert.convert<String>(json['name']);
+	if (name != null) {
+		userEntity.name = name;
+	}
+	final String? avatar = jsonConvert.convert<String>(json['avatar']);
+	if (avatar != null) {
+		userEntity.avatar = avatar;
+	}
+	return userEntity;
+}
+
+Map<String, dynamic> $UserEntityToJson(UserEntity entity) {
+	final Map<String, dynamic> data = <String, dynamic>{};
+	data['id'] = entity.id;
+	data['name'] = entity.name;
+	data['avatar'] = entity.avatar;
+	return data;
+}
\ No newline at end of file

 
-import 'package:one_poem/components/user_entity.dart';
+import 'package:one_poem/account/models/user_entity.dart';
 import 'package:one_poem/mvp/mvps.dart';
 
 abstract class ShopIMvpView implements IMvpView {

 import 'package:flutter/material.dart';
 import 'package:one_poem/account/account_router.dart';
-import 'package:one_poem/components/user_entity.dart';
+import 'package:one_poem/account/models/user_entity.dart';
 import 'package:one_poem/mvp/base_page.dart';
 import 'package:one_poem/res/resources.dart';
 import 'package:one_poem/routers/fluro_navigator.dart';

 import 'package:flutter/material.dart';
-import 'package:one_poem/components/user_entity.dart';
+import 'package:one_poem/account/models/user_entity.dart';
 import 'package:one_poem/mvp/base_page_presenter.dart';
 import 'package:one_poem/net/dio_utils.dart';
 import 'package:one_poem/net/http_api.dart';

 import 'package:flutter/material.dart';
-import 'package:one_poem/components/user_entity.dart';
+import 'package:one_poem/account/models/user_entity.dart';
 
 class UserProvider extends ChangeNotifier {
 

@@ -3,7 +3,7 @@ import 'dart:convert';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:one_poem/components/friend_entity.dart';
+import 'package:one_poem/timeline/models/friend_entity.dart';
 import 'package:one_poem/timeline/widgets/friend_cell.dart';
 import 'package:one_poem/timeline/widgets/header_view.dart';
 

 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
-import 'package:one_poem/components/friend_entity.dart';
+import 'package:one_poem/timeline/models/friend_entity.dart';
 
 class FriendCell extends StatefulWidget {