diff --git a/lib/main.dart b/lib/main.dart index f24ce1e1..ee1da6a1 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,3 @@ -import 'package:akuCommunity/main_initialize.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -9,6 +8,7 @@ import 'package:get/get.dart'; import 'package:provider/provider.dart'; import 'package:akuCommunity/constants/app_theme.dart'; +import 'package:akuCommunity/main_initialize.dart'; import 'package:akuCommunity/pages/splash/splash_page.dart'; import 'package:akuCommunity/provider/app_provider.dart'; import 'package:akuCommunity/provider/sign_up_provider.dart'; diff --git a/lib/main_initialize.dart b/lib/main_initialize.dart index 823916bd..0eb59b6a 100644 --- a/lib/main_initialize.dart +++ b/lib/main_initialize.dart @@ -1,13 +1,15 @@ -import 'package:akuCommunity/constants/app_theme.dart'; -import 'package:akuCommunity/constants/config.dart'; -import 'package:firebase_core/firebase_core.dart'; -import 'package:firebase_crashlytics/firebase_crashlytics.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; + +import 'package:firebase_core/firebase_core.dart'; +import 'package:firebase_crashlytics/firebase_crashlytics.dart'; import 'package:fluwx/fluwx.dart'; import 'package:jpush_flutter/jpush_flutter.dart'; import 'package:power_logger/power_logger.dart'; +import 'package:akuCommunity/constants/app_theme.dart'; +import 'package:akuCommunity/constants/config.dart'; + class MainInitialize { ///初始化firebase static Future initFirebase() async { diff --git a/lib/pages/life_pay/life_pay_page.dart b/lib/pages/life_pay/life_pay_page.dart index 6cdca603..39dfe0f0 100644 --- a/lib/pages/life_pay/life_pay_page.dart +++ b/lib/pages/life_pay/life_pay_page.dart @@ -1,6 +1,3 @@ -import 'package:akuCommunity/pages/life_pay/life_pay_record_page.dart'; -import 'package:akuCommunity/provider/app_provider.dart'; -import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -12,8 +9,11 @@ import 'package:velocity_x/velocity_x.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/model/manager/life_pay_model.dart'; +import 'package:akuCommunity/pages/life_pay/life_pay_record_page.dart'; import 'package:akuCommunity/pages/life_pay/widget/life_pay_detail_page.dart'; import 'package:akuCommunity/pages/things_page/widget/bee_list_view.dart'; +import 'package:akuCommunity/provider/app_provider.dart'; +import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart'; import 'package:akuCommunity/utils/bee_parse.dart'; import 'package:akuCommunity/utils/headers.dart'; import 'package:akuCommunity/widget/bee_divider.dart'; diff --git a/lib/pages/tab_navigator.dart b/lib/pages/tab_navigator.dart index b81d6c86..7d68abfc 100644 --- a/lib/pages/tab_navigator.dart +++ b/lib/pages/tab_navigator.dart @@ -1,4 +1,3 @@ -import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -6,6 +5,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:akuCommunity/const/resource.dart'; import 'package:akuCommunity/ui/community/community_views/community_page.dart'; +import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'home/home_page.dart'; import 'personal/personal_page.dart'; import 'property/property_index.dart'; diff --git a/lib/pages/things_page/fixed_submit_page.dart b/lib/pages/things_page/fixed_submit_page.dart index aad9c125..738d6d1e 100644 --- a/lib/pages/things_page/fixed_submit_page.dart +++ b/lib/pages/things_page/fixed_submit_page.dart @@ -1,4 +1,3 @@ -import 'package:akuCommunity/constants/app_theme.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -10,6 +9,7 @@ import 'package:velocity_x/velocity_x.dart'; import 'package:akuCommunity/base/base_style.dart'; import 'package:akuCommunity/constants/api.dart'; +import 'package:akuCommunity/constants/app_theme.dart'; import 'package:akuCommunity/extensions/num_ext.dart'; import 'package:akuCommunity/model/user/fixed_submit_model.dart'; import 'package:akuCommunity/pages/manager_func.dart'; diff --git a/lib/pages/things_page/widget/add_fixed_submit_page.dart b/lib/pages/things_page/widget/add_fixed_submit_page.dart index 4ad1ab32..25949180 100644 --- a/lib/pages/things_page/widget/add_fixed_submit_page.dart +++ b/lib/pages/things_page/widget/add_fixed_submit_page.dart @@ -1,6 +1,5 @@ import 'dart:io'; -import 'package:akuCommunity/widget/picker/bee_house_picker.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; @@ -22,6 +21,7 @@ import 'package:akuCommunity/utils/network/net_util.dart'; import 'package:akuCommunity/widget/bee_divider.dart'; import 'package:akuCommunity/widget/bee_scaffold.dart'; import 'package:akuCommunity/widget/buttons/bottom_button.dart'; +import 'package:akuCommunity/widget/picker/bee_house_picker.dart'; import 'package:akuCommunity/widget/picker/grid_image_picker.dart'; class AddFixedSubmitPage extends StatefulWidget { diff --git a/lib/provider/app_provider.dart b/lib/provider/app_provider.dart index 1f4c8490..20f3cdbc 100644 --- a/lib/provider/app_provider.dart +++ b/lib/provider/app_provider.dart @@ -1,4 +1,3 @@ -import 'package:akuCommunity/constants/config.dart'; import 'package:flutter/material.dart'; import 'package:amap_flutter_location/amap_flutter_location.dart'; @@ -8,6 +7,7 @@ import 'package:power_logger/power_logger.dart'; import 'package:akuCommunity/constants/api.dart'; import 'package:akuCommunity/constants/application_objects.dart'; +import 'package:akuCommunity/constants/config.dart'; import 'package:akuCommunity/model/common/real_time_weather_model.dart'; import 'package:akuCommunity/model/community/hot_topic_model.dart'; import 'package:akuCommunity/model/message/message_center_model.dart'; diff --git a/lib/widget/bee_scaffold.dart b/lib/widget/bee_scaffold.dart index e2b1cd65..4c94b729 100644 --- a/lib/widget/bee_scaffold.dart +++ b/lib/widget/bee_scaffold.dart @@ -1,9 +1,9 @@ -import 'package:akuCommunity/constants/app_theme.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:velocity_x/velocity_x.dart'; +import 'package:akuCommunity/constants/app_theme.dart'; import 'package:akuCommunity/widget/bee_back_button.dart'; class BeeScaffold extends StatelessWidget { diff --git a/lib/widget/picker/bee_house_picker.dart b/lib/widget/picker/bee_house_picker.dart index 98b843e0..e5550698 100644 --- a/lib/widget/picker/bee_house_picker.dart +++ b/lib/widget/picker/bee_house_picker.dart @@ -1,10 +1,12 @@ -import 'package:akuCommunity/provider/app_provider.dart'; -import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; + import 'package:get/get.dart'; import 'package:provider/provider.dart'; import 'package:velocity_x/velocity_x.dart'; + +import 'package:akuCommunity/provider/app_provider.dart'; +import 'package:akuCommunity/ui/profile/house/pick_my_house_page.dart'; import 'package:akuCommunity/utils/headers.dart'; class BeeHousePicker extends StatelessWidget {