feat:调整文件结构

liangchengyou
1 parent 056970d8
Showing 85 changed files with 72 additions and 58 deletions
lib/common/request/exception.dart
lib/home/bloc/home_bloc.dart → lib/pages/home/bloc/home_bloc.dart
lib/home/bloc/home_event.dart → lib/pages/home/bloc/home_event.dart
lib/home/bloc/home_state.dart → lib/pages/home/bloc/home_state.dart
lib/home/home_page.dart → lib/pages/home/home_page.dart
lib/home/widgets/home_lesson_item_widget.dart → lib/pages/home/widgets/home_lesson_item_widget.dart
lib/home/widgets/home_tab_header_widget.dart → lib/pages/home/widgets/home_tab_header_widget.dart
lib/lessons/bloc/lesson_bloc.dart → lib/pages/lessons/bloc/lesson_bloc.dart
lib/lessons/bloc/lesson_event.dart → lib/pages/lessons/bloc/lesson_event.dart
lib/lessons/bloc/lesson_state.dart → lib/pages/lessons/bloc/lesson_state.dart
lib/lessons/lesson_page.dart → lib/pages/lessons/lesson_page.dart
lib/lessons/widgets/lesson_item_widget.dart → lib/pages/lessons/widgets/lesson_item_widget.dart
lib/listen/bloc/listen_bloc.dart → lib/pages/listen/bloc/listen_bloc.dart
lib/listen/bloc/listen_event.dart → lib/pages/listen/bloc/listen_event.dart
lib/listen/bloc/listen_state.dart → lib/pages/listen/bloc/listen_state.dart
lib/listen/listen_page.dart → lib/pages/listen/listen_page.dart
lib/listen/widgets/listen_item_widget.dart → lib/pages/listen/widgets/listen_item_widget.dart
lib/login/forgetpwd/bloc/forget_pwd_home_bloc.dart → lib/pages/login/forgetpwd/bloc/forget_pwd_home_bloc.dart
lib/login/forgetpwd/bloc/forget_pwd_home_event.dart → lib/pages/login/forgetpwd/bloc/forget_pwd_home_event.dart
lib/login/forgetpwd/bloc/forget_pwd_home_state.dart → lib/pages/login/forgetpwd/bloc/forget_pwd_home_state.dart
 import 'package:dio/dio.dart';
-
 import 'api_response/api_response_entity.dart';
  
 class ApiException implements Exception {
@@ -3,11 +3,12 @@ import &#39;package:flutter_bloc/flutter_bloc.dart&#39;;
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
-import 'package:wow_english/home/bloc/home_bloc.dart';
-import 'package:wow_english/home/widgets/home_lesson_item_widget.dart';
-import 'package:wow_english/home/widgets/home_tab_header_widget.dart';
+import 'package:wow_english/pages/home/widgets/home_lesson_item_widget.dart';
+import 'package:wow_english/pages/home/widgets/home_tab_header_widget.dart';
 import 'package:wow_english/route/route.dart';
  
+import 'bloc/home_bloc.dart';
+
 class HomePage extends StatelessWidget {
   const HomePage({super.key});
  
@@ -4,8 +4,9 @@ import &#39;package:flutter_easyloading/flutter_easyloading.dart&#39;;
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
 import 'package:wow_english/common/widgets/we_app_bar.dart';
-import 'package:wow_english/lessons/bloc/lesson_bloc.dart';
-import 'package:wow_english/lessons/widgets/lesson_item_widget.dart';
+
+import 'bloc/lesson_bloc.dart';
+import 'widgets/lesson_item_widget.dart';
  
 class LessonPage extends StatelessWidget {
   const LessonPage({super.key, this.starPageIndex});
@@ -2,8 +2,9 @@ import &#39;package:flutter/material.dart&#39;;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/widgets/we_app_bar.dart';
-import 'package:wow_english/listen/bloc/listen_bloc.dart';
-import 'package:wow_english/listen/widgets/listen_item_widget.dart';
+
+import 'bloc/listen_bloc.dart';
+import 'widgets/listen_item_widget.dart';
  
 class ListenPage extends StatelessWidget {
   const ListenPage({super.key});
@@ -3,10 +3,11 @@ import &#39;package:flutter_bloc/flutter_bloc.dart&#39;;
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
 import 'package:wow_english/common/widgets/textfield_customer_widget.dart';
-import 'package:wow_english/login/forgetpwd/bloc/forget_pwd_home_bloc.dart';
-import 'package:wow_english/login/loginpage/time_widget.dart';
+import 'package:wow_english/pages/login/loginpage/time_widget.dart';
 import 'package:wow_english/route/route.dart';
  
+import 'bloc/forget_pwd_home_bloc.dart';
+
 class ForgetPasswordHomePage extends StatelessWidget {
   const ForgetPasswordHomePage({super.key});
  
@@ -2,11 +2,11 @@ import &#39;package:flutter/cupertino.dart&#39;;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
  
-import '../../../common/request/api_response/api_response_entity.dart';
-import '../../../common/request/apis.dart';
-import '../../../common/request/request.dart';
-import '../../../common/request/request_client.dart';
-import '../../../models/user_entity.dart';
+import '../../../../common/request/api_response/api_response_entity.dart';
+import '../../../../common/request/apis.dart';
+import '../../../../common/request/request.dart';
+import '../../../../common/request/request_client.dart';
+import '../../../../models/user_entity.dart';
  
 part 'login_event.dart';
 part 'login_state.dart';
@@ -4,10 +4,11 @@ import &#39;package:flutter_bloc/flutter_bloc.dart&#39;;
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
 import 'package:wow_english/common/widgets/textfield_customer_widget.dart';
-import 'package:wow_english/login/loginpage/bloc/login_bloc.dart';
-import 'package:wow_english/login/loginpage/time_widget.dart';
+import 'package:wow_english/pages/login/loginpage/time_widget.dart';
 import 'package:wow_english/route/route.dart';
  
+import 'bloc/login_bloc.dart';
+
 class LoginPage extends StatelessWidget {
   const LoginPage({super.key});
  
@@ -2,10 +2,11 @@ import &#39;package:flutter/material.dart&#39;;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
-import 'package:wow_english/login/setpwd/bloc/set_pwd_bloc.dart';
+import 'package:wow_english/common/widgets/textfield_customer_widget.dart';
 import 'package:wow_english/route/route.dart';
  
-import '../../common/widgets/textfield_customer_widget.dart';
+import 'bloc/set_pwd_bloc.dart';
+
  
 class SetPassWordPage extends StatelessWidget {
   const SetPassWordPage({super.key, this.phoneNum});
@@ -2,9 +2,9 @@ import &#39;package:flutter/material.dart&#39;;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
-import 'package:wow_english/practice/chosetopic/topicpicture/bloc/topic_picture_bloc.dart';
  
 import '../../widgets/practice_header_widget.dart';
+import 'bloc/topic_picture_bloc.dart';
  
 class TopicPicturePage extends StatelessWidget {
   const TopicPicturePage({super.key});
@@ -2,8 +2,9 @@ import &#39;package:flutter/material.dart&#39;;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
-import 'package:wow_english/practice/chosetopic/topicword/bloc/topic_word_bloc.dart';
-import 'package:wow_english/practice/widgets/practice_header_widget.dart';
+import 'package:wow_english/pages/practice/widgets/practice_header_widget.dart';
+
+import 'bloc/topic_word_bloc.dart';
  
 class TopicWordPage extends StatelessWidget {
   const TopicWordPage({super.key});
@@ -2,8 +2,9 @@ import &#39;package:flutter/material.dart&#39;;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
-import 'package:wow_english/practice/voicetopic/voicepicture/bloc/voice_pic_bloc.dart';
-import 'package:wow_english/practice/widgets/practice_header_widget.dart';
+import 'package:wow_english/pages/practice/widgets/practice_header_widget.dart';
+
+import 'bloc/voice_pic_bloc.dart';
  
 class VoicePicPage extends StatelessWidget {
   const VoicePicPage({super.key});
@@ -2,8 +2,9 @@ import &#39;package:flutter/material.dart&#39;;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
-import 'package:wow_english/practice/voicetopic/voiceword/bloc/voice_word_bloc.dart';
-import 'package:wow_english/practice/widgets/practice_header_widget.dart';
+import 'package:wow_english/pages/practice/widgets/practice_header_widget.dart';
+
+import 'bloc/voice_word_bloc.dart';
  
 class VoiceWordPage extends StatelessWidget {
   const VoiceWordPage({super.key});
@@ -4,7 +4,7 @@ import &#39;package:flutter/material.dart&#39;;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';
 import 'package:wow_english/common/widgets/we_app_bar.dart';
-import 'package:wow_english/repeatafter/widgets/repeat_after_item.dart';
+import 'package:wow_english/pages/repeatafter/widgets/repeat_after_item.dart';
  
 import 'bloc/repeat_after_bloc.dart';
  
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:wow_english/common/widgets/we_app_bar.dart';
-import 'package:wow_english/shop/exchangelist/widgets/exchange_list_item.dart';
+import 'package:wow_english/pages/shop/exchangelist/widgets/exchange_list_item.dart';
  
 import 'bloc/exchange_list_bloc.dart';
  
@@ -4,9 +4,10 @@ import &#39;package:flutter_easyloading/flutter_easyloading.dart&#39;;
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
 import 'package:wow_english/common/widgets/we_app_bar.dart';
+import 'package:wow_english/pages/shop/home/widgets/lesson_card_item.dart';
 import 'package:wow_english/route/route.dart';
-import 'package:wow_english/shop/home/bloc/shop_home_bloc.dart';
-import 'package:wow_english/shop/home/widgets/lesson_card_item.dart';
+
+import 'bloc/shop_home_bloc.dart';
  
 class ShopHomePage extends StatelessWidget {
   const ShopHomePage({super.key});
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:wow_english/home/home_page.dart';
-import 'package:wow_english/lessons/lesson_page.dart';
-import 'package:wow_english/tab/blocs/tab_bloc.dart';
+import 'package:wow_english/pages/home/home_page.dart';
+import 'package:wow_english/pages/lessons/lesson_page.dart';
+
+import 'blocs/tab_bloc.dart';
  
 class TabPage extends StatelessWidget {
   const TabPage({super.key});
 import 'package:flutter/material.dart';
+import 'package:wow_english/common/widgets/we_app_bar.dart';
  
-import '../common/widgets/we_app_bar.dart';
  
 class UserPage extends StatelessWidget {
   const UserPage({super.key});
  
   @override
   Widget build(BuildContext context) {
-    return Scaffold(
+    return const Scaffold(
       backgroundColor: Colors.white,
       appBar: WEAppBar(
         titleText: '1',
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:wow_english/video/lookvideo/bloc/look_video_bloc.dart';
-import 'package:wow_english/video/lookvideo/widgets/video_widget.dart';
+import 'package:wow_english/pages/video/lookvideo/widgets/video_widget.dart';
+
+import 'bloc/look_video_bloc.dart';
  
 class LookVideoPage extends StatefulWidget {
   const LookVideoPage({super.key});
@@ -3,7 +3,8 @@ import &#39;package:flutter/foundation.dart&#39;;
 import 'package:flutter/material.dart';
 import 'package:video_player/video_player.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
-import 'package:wow_english/video/lookvideo/widgets/video_opera_widget.dart';
+
+import 'video_opera_widget.dart';
  
 class VideoWidget extends StatefulWidget {
   const VideoWidget({super.key, this.videoUrl = ''});
@@ -2,8 +2,9 @@ import &#39;package:flutter/material.dart&#39;;
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:wow_english/common/extension/string_extension.dart';
-import 'package:wow_english/practice/widgets/practice_header_widget.dart';
-import 'package:wow_english/voiceanswer/bloc/voice_answer_bloc.dart';
+import 'package:wow_english/pages/practice/widgets/practice_header_widget.dart';
+
+import 'bloc/voice_answer_bloc.dart';
  
 class VoiceAnswerPage extends StatelessWidget {
   const VoiceAnswerPage({super.key});
@@ -2,24 +2,25 @@ import &#39;package:flutter/cupertino.dart&#39;;
 import 'package:flutter/material.dart';
 import 'package:wow_english/app/splash_page.dart';
 import 'package:wow_english/common/pages/wow_web_page.dart';
-import 'package:wow_english/home/home_page.dart';
-import 'package:wow_english/lessons/lesson_page.dart';
-import 'package:wow_english/listen/listen_page.dart';
-import 'package:wow_english/login/forgetpwd/forget_password_home_page.dart';
-import 'package:wow_english/login/loginpage/login_page.dart';
-import 'package:wow_english/login/setpwd/set_pwd_page.dart';
-import 'package:wow_english/practice/chosetopic/topicpicture/topic_picture_page.dart';
-import 'package:wow_english/practice/chosetopic/topicword/topic_word_page.dart';
-import 'package:wow_english/practice/voicetopic/voicepicture/voice_pic_page.dart';
-import 'package:wow_english/practice/voicetopic/voiceword/voice_word_page.dart';
-import 'package:wow_english/repeatafter/repeat_after_page.dart';
-import 'package:wow_english/shop/exchane/exchange_lesson_page.dart';
-import 'package:wow_english/shop/exchangelist/exchange_lesson_list_page.dart';
-import 'package:wow_english/shop/home/shop_home_page.dart';
-import 'package:wow_english/tab/tab_page.dart';
-import 'package:wow_english/user/user_page.dart';
-import 'package:wow_english/video/lookvideo/look_video_page.dart';
-import 'package:wow_english/voiceanswer/voice_answer_page.dart';
+import 'package:wow_english/pages/home/home_page.dart';
+import 'package:wow_english/pages/lessons/lesson_page.dart';
+import 'package:wow_english/pages/listen/listen_page.dart';
+import 'package:wow_english/pages/login/forgetpwd/forget_password_home_page.dart';
+import 'package:wow_english/pages/login/loginpage/login_page.dart';
+import 'package:wow_english/pages/login/setpwd/set_pwd_page.dart';
+import 'package:wow_english/pages/practice/chosetopic/topicpicture/topic_picture_page.dart';
+import 'package:wow_english/pages/practice/chosetopic/topicword/topic_word_page.dart';
+import 'package:wow_english/pages/practice/voicetopic/voicepicture/voice_pic_page.dart';
+import 'package:wow_english/pages/practice/voicetopic/voiceword/voice_word_page.dart';
+import 'package:wow_english/pages/repeatafter/repeat_after_page.dart';
+import 'package:wow_english/pages/shop/exchane/exchange_lesson_page.dart';
+import 'package:wow_english/pages/shop/exchangelist/exchange_lesson_list_page.dart';
+import 'package:wow_english/pages/shop/home/shop_home_page.dart';
+import 'package:wow_english/pages/tab/tab_page.dart';
+import 'package:wow_english/pages/user/user_page.dart';
+import 'package:wow_english/pages/video/lookvideo/look_video_page.dart';
+import 'package:wow_english/pages/voiceanswer/voice_answer_page.dart';
+
  
  
 class AppRouteName {