fixed: 接口list范型支持

Key
1 parent 99efc573
Showing 8 changed files with 86 additions and 79 deletions
lib/common/extension/exception_ext.dart
lib/common/request/api_response/api_response_entity.g.dart
lib/common/request/dao/home_dao.dart
lib/common/request/request_client.dart
lib/generated/json/base/json_convert_content.dart
lib/generated/json/lesson_entity.g.dart → lib/generated/json/course_module_entity.g.dart
lib/models/lesson_entity.dart → lib/models/course_module_entity.dart
lib/pages/lessons/bloc/lesson_bloc.dart
+import 'package:wow_english/common/request/exception.dart';
+
+extension ExceptionExtension on Exception {
+  String get getShowMessage {
+    if (this is ApiException) {
+      return (this as ApiException).message ?? '未知错误';
+    } else {
+      return '未知错误';
+    }
+  }
+}
@@ -19,7 +19,7 @@ ApiResponse&lt;T&gt; $ApiResponseFromJson&lt;T&gt;(Map&lt;String, dynamic&gt; json) {
     print("ApiResponse<T> T-type:$type, data-type:${json['data'].runtimeType}");
   }
   if (json['data'] != null) {
-    data = jsonConvert.convert<T>(json['data']);
+    data = JsonConvert.fromJsonAsT(json['data']);
   }
   if (data != null) {
     apiResponseEntity.data = data;
 import 'package:wow_english/common/request/apis.dart';
 import 'package:wow_english/common/request/request_client.dart';
+import '../../../models/course_module_entity.dart';
+
 class HomeDao {
   ///获取课程模块信息
-  static Future<List<dynamic>?> courseModule() async {
-    var data = await requestClient.get<List<dynamic>?>(Apis.courseModule);
+  static Future<List<CourseModuleEntity?>?> courseModule() async {
+    var data = await requestClient.get<List<CourseModuleEntity>>(Apis.courseModule);
     return data;
   }
@@ -148,8 +148,6 @@ class RequestClient {
         raw.value = response.data;
         return raw as T;
       } else {
-        print('response.data.runtimeType=${response.data.runtimeType}');
-
         // 应对response的header中content-type: [text/html;charset=utf-8]的情况
         // 实际上都是json格式返回
         Map<String, dynamic> json;
@@ -158,7 +156,6 @@ class RequestClient {
         } else {
           json = response.data;
         }
-        //ApiResponse<T> apiResponse = ApiResponse<T>.fromJson(json.decode(response.data));
         ApiResponse<T> apiResponse = ApiResponse.fromJson(json);
         onResponse?.call(apiResponse);
         return _handleBusinessResponse<T>(apiResponse);
@@ -4,7 +4,7 @@
 // This file is automatically generated. DO NOT EDIT, all your changes would be lost.
 import 'package:flutter/material.dart' show debugPrint;
-import 'package:wow_english/models/lesson_entity.dart';
+import 'package:wow_english/models/course_module_entity.dart';
 import 'package:wow_english/models/listen_entity.dart';
 import 'package:wow_english/models/user_entity.dart';
@@ -14,7 +14,7 @@ typedef EnumConvertFunction&lt;T&gt; = T Function(String value);
 class JsonConvert {
 	static final Map<String, JsonConvertFunction> convertFuncMap = {
-		(LessonEntity).toString(): LessonEntity.fromJson,
+		(CourseModuleEntity).toString(): CourseModuleEntity.fromJson,
 		(ListenEntity).toString(): ListenEntity.fromJson,
 		(UserEntity).toString(): UserEntity.fromJson,
 	};
@@ -95,8 +95,8 @@ List&lt;T&gt;? convertListNotNull&lt;T&gt;(dynamic value, {EnumConvertFunction? enumConvert}
 	//list is returned by type
 	static M? _getListChildType<M>(List<Map<String, dynamic>> data) {
-		if(<LessonEntity>[] is M){
-			return data.map<LessonEntity>((Map<String, dynamic> e) => LessonEntity.fromJson(e)).toList() as M;
+		if(<CourseModuleEntity>[] is M){
+			return data.map<CourseModuleEntity>((Map<String, dynamic> e) => CourseModuleEntity.fromJson(e)).toList() as M;
 		}
 		if(<ListenEntity>[] is M){
 			return data.map<ListenEntity>((Map<String, dynamic> e) => ListenEntity.fromJson(e)).toList() as M;
@@ -106,7 +106,7 @@ List&lt;T&gt;? convertListNotNull&lt;T&gt;(dynamic value, {EnumConvertFunction? enumConvert}
 		}
 		debugPrint("${M.toString()} not found");
-	
+
 		return null;
 }
@@ -117,4 +117,4 @@ List&lt;T&gt;? convertListNotNull&lt;T&gt;(dynamic value, {EnumConvertFunction? enumConvert}
 			return jsonConvert.convert<M>(json);
 		}
 	}
-}
 \ No newline at end of file
+}
 import 'package:wow_english/generated/json/base/json_convert_content.dart';
-import 'package:wow_english/models/lesson_entity.dart';
+import 'package:wow_english/models/course_module_entity.dart';
-LessonEntity $LessonEntityFromJson(Map<String, dynamic> json) {
-	final LessonEntity lessonEntity = LessonEntity();
+CourseModuleEntity $CourseModuleEntityFromJson(Map<String, dynamic> json) {
+	final CourseModuleEntity courseModuleEntity = CourseModuleEntity();
+	final String? id = jsonConvert.convert<String>(json['id']);
+	if (id != null) {
+		courseModuleEntity.id = id;
+	}
 	final String? code = jsonConvert.convert<String>(json['code']);
 	if (code != null) {
-		lessonEntity.code = code;
+		courseModuleEntity.code = code;
 	}
 	final int? courseModuleThemeId = jsonConvert.convert<int>(json['courseModuleThemeId']);
 	if (courseModuleThemeId != null) {
-		lessonEntity.courseModuleThemeId = courseModuleThemeId;
+		courseModuleEntity.courseModuleThemeId = courseModuleThemeId;
 	}
 	final int? courseTotal = jsonConvert.convert<int>(json['courseTotal']);
 	if (courseTotal != null) {
-		lessonEntity.courseTotal = courseTotal;
+		courseModuleEntity.courseTotal = courseTotal;
 	}
 	final String? coverUrl = jsonConvert.convert<String>(json['coverUrl']);
 	if (coverUrl != null) {
-		lessonEntity.coverUrl = coverUrl;
+		courseModuleEntity.coverUrl = coverUrl;
 	}
 	final String? createTime = jsonConvert.convert<String>(json['createTime']);
 	if (createTime != null) {
-		lessonEntity.createTime = createTime;
+		courseModuleEntity.createTime = createTime;
 	}
 	final String? deleted = jsonConvert.convert<String>(json['deleted']);
 	if (deleted != null) {
-		lessonEntity.deleted = deleted;
+		courseModuleEntity.deleted = deleted;
 	}
 	final String? des = jsonConvert.convert<String>(json['des']);
 	if (des != null) {
-		lessonEntity.des = des;
-	}
-	final String? id = jsonConvert.convert<String>(json['id']);
-	if (id != null) {
-		lessonEntity.id = id;
+		courseModuleEntity.des = des;
 	}
 	final String? modifyTime = jsonConvert.convert<String>(json['modifyTime']);
 	if (modifyTime != null) {
-		lessonEntity.modifyTime = modifyTime;
+		courseModuleEntity.modifyTime = modifyTime;
 	}
 	final String? name = jsonConvert.convert<String>(json['name']);
 	if (name != null) {
-		lessonEntity.name = name;
+		courseModuleEntity.name = name;
 	}
 	final int? opening = jsonConvert.convert<int>(json['opening']);
 	if (opening != null) {
-		lessonEntity.opening = opening;
+		courseModuleEntity.opening = opening;
 	}
 	final String? picUrl = jsonConvert.convert<String>(json['picUrl']);
 	if (picUrl != null) {
-		lessonEntity.picUrl = picUrl;
+		courseModuleEntity.picUrl = picUrl;
 	}
 	final int? sortOrder = jsonConvert.convert<int>(json['sortOrder']);
 	if (sortOrder != null) {
-		lessonEntity.sortOrder = sortOrder;
+		courseModuleEntity.sortOrder = sortOrder;
 	}
 	final int? status = jsonConvert.convert<int>(json['status']);
 	if (status != null) {
-		lessonEntity.status = status;
+		courseModuleEntity.status = status;
 	}
-	return lessonEntity;
+	return courseModuleEntity;
 }
-Map<String, dynamic> $LessonEntityToJson(LessonEntity entity) {
+Map<String, dynamic> $CourseModuleEntityToJson(CourseModuleEntity entity) {
 	final Map<String, dynamic> data = <String, dynamic>{};
+	data['id'] = entity.id;
 	data['code'] = entity.code;
 	data['courseModuleThemeId'] = entity.courseModuleThemeId;
 	data['courseTotal'] = entity.courseTotal;
@@ -71,7 +72,6 @@ Map&lt;String, dynamic&gt; $LessonEntityToJson(LessonEntity entity) {
 	data['createTime'] = entity.createTime;
 	data['deleted'] = entity.deleted;
 	data['des'] = entity.des;
-	data['id'] = entity.id;
 	data['modifyTime'] = entity.modifyTime;
 	data['name'] = entity.name;
 	data['opening'] = entity.opening;
@@ -79,4 +79,4 @@ Map&lt;String, dynamic&gt; $LessonEntityToJson(LessonEntity entity) {
 	data['sortOrder'] = entity.sortOrder;
 	data['status'] = entity.status;
 	return data;
-}
 \ No newline at end of file
+}
-import 'package:wow_english/generated/json/base/json_field.dart';
-import 'package:wow_english/generated/json/lesson_entity.g.dart';
 import 'dart:convert';
+import 'package:wow_english/generated/json/base/json_field.dart';
+import 'package:wow_english/generated/json/course_module_entity.g.dart';
+
 @JsonSerializable()
-class LessonEntity {
-	String? code;
-	int? courseModuleThemeId;
-	int? courseTotal;
-	String? coverUrl;
-	String? createTime;
-	String? deleted;
-	String? des;
-	String? id;
-	String? modifyTime;
-	String? name;
-	int? opening;
-	String? picUrl;
-	int? sortOrder;
-	int? status;
+class CourseModuleEntity {
+  late String id;
+  String? code;
+  int? courseModuleThemeId;
+  int? courseTotal;
+  String? coverUrl;
+  String? createTime;
+  String? deleted;
+  String? des;
+  String? modifyTime;
+  String? name;
+  int? opening;
+  String? picUrl;
+  int? sortOrder;
+  int? status;
-	LessonEntity();
+  CourseModuleEntity();
-	factory LessonEntity.fromJson(Map<String, dynamic> json) => $LessonEntityFromJson(json);
+  factory CourseModuleEntity.fromJson(Map<String, dynamic> json) => $CourseModuleEntityFromJson(json);
-	Map<String, dynamic> toJson() => $LessonEntityToJson(this);
+  Map<String, dynamic> toJson() => $CourseModuleEntityToJson(this);
-	@override
-	String toString() {
-		return jsonEncode(this);
-	}
-}
 \ No newline at end of file
+  @override
+  String toString() {
+    return jsonEncode(this);
+  }
+}
-import 'dart:convert';
-
 import 'package:flutter/cupertino.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:wow_english/common/request/dao/home_dao.dart';
 import 'package:wow_english/common/request/exception.dart';
-import 'package:wow_english/models/lesson_entity.dart';
+import 'package:wow_english/models/course_module_entity.dart';
 import 'package:wow_english/utils/loading.dart';
 part 'lesson_event.dart';
 part 'lesson_state.dart';
 class LessonBloc extends Bloc<LessonEvent, LessonState> {
-
   final int pageIndex;
   final PageController pageController;
@@ -21,10 +18,11 @@ class LessonBloc extends Bloc&lt;LessonEvent, LessonState&gt; {
   int get currentPageIndex => _currentPageIndex;
-  List<LessonEntity?> _listData = [];
-  List<LessonEntity?> get listData => _listData;
+  List<CourseModuleEntity?> _listData = [];
-  LessonBloc(this.pageIndex,this.pageController) : super(LessonInitial()) {
+  List<CourseModuleEntity?> get listData => _listData;
+
+  LessonBloc(this.pageIndex, this.pageController) : super(LessonInitial()) {
     _currentPageIndex = pageIndex;
     on<PageViewChangeIndexEvent>(_pageIndexChange);
   }
@@ -32,23 +30,21 @@ class LessonBloc extends Bloc&lt;LessonEvent, LessonState&gt; {
   Future<void> requestData() async {
     try {
       await loading(() async {
-        List list = await HomeDao.courseModule()??[];
-        // if (list.isNotEmpty) {
-        //   for (dynamic jsonStr in list) {
-        //     LessonEntity? data = LessonEntity.fromJson(jsonStr);
-        //     _listData.add(data);
-        //   }
-        // }
-        emit(LessonDataLoadState());
+        var list = await HomeDao.courseModule();
+        if (list?.isNotEmpty == true) {
+          _listData = list!;
+          emit(LessonDataLoadState());
+        } else {
+          EasyLoading.showToast("数据获取失败！");
+        }
       });
     } catch (e) {
       if (e is ApiException) {
-
       }
     }
   }
-  void _pageIndexChange(PageViewChangeIndexEvent event,Emitter<LessonState> emitter) async {
+  void _pageIndexChange(PageViewChangeIndexEvent event, Emitter<LessonState> emitter) async {
     _currentPageIndex = event.index;
     emitter(PageIndexChangeState());
   }