diff --git a/assets/images/home/bg_pic_dream_tree_page.png b/assets/images/home/bg_pic_dream_tree_page.png index 2d4d6e3..293b542 100644 Binary files a/assets/images/home/bg_pic_dream_tree_page.png and b/assets/images/home/bg_pic_dream_tree_page.png differ diff --git a/assets/images/home/bg_pic_user_name.png b/assets/images/home/bg_pic_user_name.png index 6347d31..96e4098 100644 Binary files a/assets/images/home/bg_pic_user_name.png and b/assets/images/home/bg_pic_user_name.png differ diff --git a/assets/images/home/btn_app_bilibili_gray.png b/assets/images/home/btn_app_bilibili_gray.png index ed820a9..927e144 100644 Binary files a/assets/images/home/btn_app_bilibili_gray.png and b/assets/images/home/btn_app_bilibili_gray.png differ diff --git a/assets/images/home/btn_app_dailyart_gray.png b/assets/images/home/btn_app_dailyart_gray.png index 7c69337..9ac2b42 100644 Binary files a/assets/images/home/btn_app_dailyart_gray.png and b/assets/images/home/btn_app_dailyart_gray.png differ diff --git a/assets/images/home/btn_app_danzaipaidui_gray.png b/assets/images/home/btn_app_danzaipaidui_gray.png index bef746d..7408632 100644 Binary files a/assets/images/home/btn_app_danzaipaidui_gray.png and b/assets/images/home/btn_app_danzaipaidui_gray.png differ diff --git a/assets/images/home/btn_app_duolingo_gray.png b/assets/images/home/btn_app_duolingo_gray.png index db5441b..710d318 100644 Binary files a/assets/images/home/btn_app_duolingo_gray.png and b/assets/images/home/btn_app_duolingo_gray.png differ diff --git a/assets/images/home/btn_app_funexpected_gray.png b/assets/images/home/btn_app_funexpected_gray.png index 2e0dda6..7b514c7 100644 Binary files a/assets/images/home/btn_app_funexpected_gray.png and b/assets/images/home/btn_app_funexpected_gray.png differ diff --git a/assets/images/home/btn_app_gushiwenwang_gray.png b/assets/images/home/btn_app_gushiwenwang_gray.png index 15f2d0e..0ce55f9 100644 Binary files a/assets/images/home/btn_app_gushiwenwang_gray.png and b/assets/images/home/btn_app_gushiwenwang_gray.png differ diff --git a/assets/images/home/btn_app_jinianbeigu_gray.png b/assets/images/home/btn_app_jinianbeigu_gray.png index b7400e7..2744a8c 100644 Binary files a/assets/images/home/btn_app_jinianbeigu_gray.png and b/assets/images/home/btn_app_jinianbeigu_gray.png differ diff --git a/assets/images/home/btn_app_zhihu_gray.png b/assets/images/home/btn_app_zhihu_gray.png index a309ba2..217252c 100644 Binary files a/assets/images/home/btn_app_zhihu_gray.png and b/assets/images/home/btn_app_zhihu_gray.png differ diff --git a/assets/images/home/btn_bg_explore_default.png b/assets/images/home/btn_bg_explore_default.png index eaa3ab7..0b166ec 100644 Binary files a/assets/images/home/btn_bg_explore_default.png and b/assets/images/home/btn_bg_explore_default.png differ diff --git a/assets/images/home/btn_bg_grey.png b/assets/images/home/btn_bg_grey.png index 151503b..1d1c874 100644 Binary files a/assets/images/home/btn_bg_grey.png and b/assets/images/home/btn_bg_grey.png differ diff --git a/assets/images/home/btn_bg_shine.png b/assets/images/home/btn_bg_shine.png index 35513e2..a76aa9a 100644 Binary files a/assets/images/home/btn_bg_shine.png and b/assets/images/home/btn_bg_shine.png differ diff --git a/assets/images/home/btn_icon_begin_gray.png b/assets/images/home/btn_icon_begin_gray.png index 1323df1..60e4b25 100644 Binary files a/assets/images/home/btn_icon_begin_gray.png and b/assets/images/home/btn_icon_begin_gray.png differ diff --git a/assets/images/home/btn_icon_dream_exploration.png b/assets/images/home/btn_icon_dream_exploration.png index 2a8ccad..ac0fac0 100644 Binary files a/assets/images/home/btn_icon_dream_exploration.png and b/assets/images/home/btn_icon_dream_exploration.png differ diff --git a/assets/images/home/btn_icon_music_grey.png b/assets/images/home/btn_icon_music_grey.png index ea94bd5..20e3195 100644 Binary files a/assets/images/home/btn_icon_music_grey.png and b/assets/images/home/btn_icon_music_grey.png differ diff --git a/assets/images/home/btn_icon_picture_book_grey.png b/assets/images/home/btn_icon_picture_book_grey.png index 99dcc32..89e2d69 100644 Binary files a/assets/images/home/btn_icon_picture_book_grey.png and b/assets/images/home/btn_icon_picture_book_grey.png differ diff --git a/assets/images/home/btn_icon_programme_grey.png b/assets/images/home/btn_icon_programme_grey.png index 71464a5..de6b72b 100644 Binary files a/assets/images/home/btn_icon_programme_grey.png and b/assets/images/home/btn_icon_programme_grey.png differ diff --git a/assets/images/home/btn_icon_reset.png b/assets/images/home/btn_icon_reset.png index 92cb951..3031f79 100644 Binary files a/assets/images/home/btn_icon_reset.png and b/assets/images/home/btn_icon_reset.png differ diff --git a/assets/images/home/label_icon_lantern.png b/assets/images/home/label_icon_lantern.png index c8ff947..26f0257 100644 Binary files a/assets/images/home/label_icon_lantern.png and b/assets/images/home/label_icon_lantern.png differ diff --git a/assets/images/home/label_progress_bar.png b/assets/images/home/label_progress_bar.png index 15d14c4..92335f5 100644 Binary files a/assets/images/home/label_progress_bar.png and b/assets/images/home/label_progress_bar.png differ diff --git a/assets/images/home/pic_avatar.png b/assets/images/home/pic_avatar.png index 8eb4390..ba1cc85 100644 Binary files a/assets/images/home/pic_avatar.png and b/assets/images/home/pic_avatar.png differ diff --git a/assets/images/home/pic_cloud.png b/assets/images/home/pic_cloud.png index 9f4d0e3..375d810 100644 Binary files a/assets/images/home/pic_cloud.png and b/assets/images/home/pic_cloud.png differ diff --git a/assets/images/home/pic_first_leaf.png b/assets/images/home/pic_first_leaf.png index eba9a12..5966dff 100644 Binary files a/assets/images/home/pic_first_leaf.png and b/assets/images/home/pic_first_leaf.png differ diff --git a/assets/images/home/pic_ip.png b/assets/images/home/pic_ip.png index 50813be..833c8b2 100644 Binary files a/assets/images/home/pic_ip.png and b/assets/images/home/pic_ip.png differ diff --git a/assets/images/home/pic_tree.png b/assets/images/home/pic_tree.png index 360be18..a9ef988 100644 Binary files a/assets/images/home/pic_tree.png and b/assets/images/home/pic_tree.png differ diff --git a/lib/app/modules/home/views/home_view.dart b/lib/app/modules/home/views/home_view.dart index d297cc6..4fb908a 100644 --- a/lib/app/modules/home/views/home_view.dart +++ b/lib/app/modules/home/views/home_view.dart @@ -183,7 +183,7 @@ class HomeView extends GetView { Widget goalWidget() { return Stack( children: [ - controller.explored2.value >= 4 + controller.explored2.value >= 1 ? Positioned( left: 15.w, top: 20.h, @@ -195,7 +195,7 @@ class HomeView extends GetView { ), ) : Container(), - controller.explored2.value >= 3 + controller.explored2.value >= 2 ? Positioned( left: 352.w, top: 0.0, @@ -207,7 +207,7 @@ class HomeView extends GetView { ), ) : Container(), - controller.explored2.value >= 2 + controller.explored2.value >= 3 ? Positioned( left: 363.w, top: 180.h, @@ -476,7 +476,7 @@ class HomeView extends GetView { ), ), ), - controller.explored2.value >= 4 + controller.explored2.value >= 1 ? Positioned( left: 15.w, top: 20.h, @@ -495,7 +495,7 @@ class HomeView extends GetView { ), ) : Container(), - controller.explored2.value >= 3 + controller.explored2.value >= 2 ? Positioned( left: 352.w, top: 0.0, @@ -517,7 +517,7 @@ class HomeView extends GetView { ), ) : Container(), - controller.explored2.value >= 2 + controller.explored2.value >= 3 ? Positioned( left: 363.w, top: 180.h, @@ -536,7 +536,7 @@ class HomeView extends GetView { ), ) : Container(), - controller.explored2.value >= 1 ? firstLeafWidget() : Container(), + controller.explored2.value >= 4 ? firstLeafWidget() : Container(), Positioned( right: 60.w, top: 346.h, @@ -544,9 +544,9 @@ class HomeView extends GetView { animationWidgetBuilder: AnimatedVisibilityWidget.fadeAnimationWidgetBuilder, duration: const Duration(milliseconds: 800), - isVisible: controller.explored2.value >= 1, + isVisible: controller.explored2.value >= 4, child: Visibility( - visible: controller.explored2.value >= 1, + visible: controller.explored2.value >= 4, child: const LanternWidget( brightCount: 0, ), diff --git a/lib/app/modules/home/widgets/lantern_widget.dart b/lib/app/modules/home/widgets/lantern_widget.dart index 993b620..3ab4232 100644 --- a/lib/app/modules/home/widgets/lantern_widget.dart +++ b/lib/app/modules/home/widgets/lantern_widget.dart @@ -13,7 +13,7 @@ class LanternWidget extends GetView { @override Widget build(BuildContext context) { return ShowUp( - duration: const Duration(seconds: 2), + duration: const Duration(seconds: 1, milliseconds: 500), child: Container( height: 90.h, width: 180.w, diff --git a/lib/app/modules/select/controllers/select_controller.dart b/lib/app/modules/select/controllers/select_controller.dart index 002d055..42fbaae 100644 --- a/lib/app/modules/select/controllers/select_controller.dart +++ b/lib/app/modules/select/controllers/select_controller.dart @@ -113,7 +113,7 @@ class SelectController extends GetxController { vImage: 'btn_male_pic_artist', hImage: 'pic_male_artist', selected: false, - enable: true, + enable: false, )); occupations.add(Occupation( id: 6, @@ -188,7 +188,7 @@ class SelectController extends GetxController { vImage: 'btn_female_pic_artist', hImage: 'pic_female_artist', selected: false, - enable: true, + enable: false, )); occupations.add(Occupation( id: 6, diff --git a/lib/app/modules/select/views/select_view.dart b/lib/app/modules/select/views/select_view.dart index 42884d4..46a2878 100644 --- a/lib/app/modules/select/views/select_view.dart +++ b/lib/app/modules/select/views/select_view.dart @@ -41,12 +41,12 @@ class SelectView extends GetView { } Widget buildSelect(BuildContext context) { - return Stack( - children: [ - Positioned( - top: 2.h, - left: 412.w, - child: _ShowUp( + return _ShowUp( + child: Stack( + children: [ + Positioned( + top: 2.h, + left: 412.w, child: Container( width: 360.w, height: 164.h, @@ -63,9 +63,9 @@ class SelectView extends GetView { ), ), ), - ), - buildSelectOccupation(context), - ], + buildSelectOccupation(context), + ], + ), ); } @@ -287,22 +287,24 @@ class SelectView extends GetView { ), ), ), + Positioned( + left: 90.w, + top: 62.h, + child: AnimatedVisibilityWidget( + isVisible: !controller.showOccupationName.value, + animationWidgetBuilder: AnimatedVisibilityWidget.fadeAnimationWidgetBuilder, + child: Container( + width: 999.w, + height: 558.h, + color: const Color(0x8C02184B), + ), + ), + ), controller.recommend.value ? buildRecommendConfirmBtn( context, controller.selectOccupation.value!.name!) : buildConfirmBtn( context, controller.selectOccupation.value!.name!), - controller.showOccupationName.value - ? Container() - : Positioned( - left: 90.w, - top: 62.h, - child: Container( - width: 999.w, - height: 558.h, - color: const Color(0x8C02184B), - ), - ), RSizedBox( child: Stack( children: controller.questionAnswers.map((element) {