Merge remote-tracking branch 'origin/yuanjunyao_dev' into yuanjunyao_dev

# Conflicts:
#	lib/app/modules/home/views/home_view.dart
#	lib/app/modules/select/controllers/select_controller.dart

lib/app/modules/home/views/home_view.dart

@@ -557,11 +557,12 @@ class HomeView extends GetView<HomeController> {
               )
             : Container(),
         controller.explored2.value >= 1 ? firstLeafWidget() : Container(),
-        LanternWidget(
+        controller.explored2.value >= 4
+              ?LanternWidget(
           brightCount: controller.exploreCount.value >= 2
               ? controller.exploreDay.value
               : controller.exploreDay.value - 1,
-        ),
+        ): Container(),
         Positioned(
           left: 168.w,
           top: 244.h,

lib/app/modules/home/widgets/lantern_widget.dart

@@ -15,33 +15,35 @@ class LanternWidget extends GetView {
     return Positioned(
       right: 60.w,
       top: 346.h,
-      child: Container(
+      child: ShowUp(
-        height: 90.h,
+        child: Container(
-        width: 180.w,
+          height: 90.h,
-        decoration: const BoxDecoration(
+          width: 180.w,
-          image: DecorationImage(
+          decoration: const BoxDecoration(
-            image: Images.homeLantern,
+            image: DecorationImage(
-            fit: BoxFit.fill,
+              image: Images.homeLantern,
+              fit: BoxFit.fill,
+            ),
+          ),
+          child: Stack(
+            clipBehavior: Clip.none,
+            children: [
+              brightCount! >= 1
+                  ? Positioned(
+                      left: -9.w,
+                      top: 36.h,
+                      child: Images.homeLanternBright,
+                    )
+                  : Container(),
+              brightCount! >= 2
+                  ? Positioned(
+                      left: 18.w,
+                      top: 27.h,
+                      child: Images.homeLanternBright,
+                    )
+                  : Container(),
+            ],
           ),
-        ),
-        child: Stack(
-          clipBehavior: Clip.none,
-          children: [
-            brightCount! >= 1
-                ? Positioned(
-                    left: -9.w,
-                    top: 36.h,
-                    child: Images.homeLanternBright,
-                  )
-                : Container(),
-            brightCount! >= 2
-                ? Positioned(
-                    left: 18.w,
-                    top: 27.h,
-                    child: Images.homeLanternBright,
-                  )
-                : Container(),
-          ],
         ),
       ),
     );

lib/app/modules/select/controllers/select_controller.dart

@@ -121,7 +121,7 @@ class SelectController extends GetxController {
       enName: 'academician',
       vImage: 'btn_female_pic_academician',
       hImage: 'pic_female_academician',
-      enable: true,
+      enable: false,
     ));
     occupations.add(Occupation(
       id: 2,

lib/app/shared/widgets/show_up.dart

@@ -0,0 +1,24 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+
+class ShowUp extends HookWidget {
+  const ShowUp({
+    super.key,
+    required this.child,
+  });
+
+  final Widget child;
+
+  @override
+  Widget build(BuildContext context) {
+    final controller =
+        useAnimationController(duration: const Duration(milliseconds: 300));
+    useMemoized(() {
+      controller.forward();
+    });
+    return FadeTransition(
+      opacity: CurvedAnimation(curve: Curves.easeIn, parent: controller),
+      child: child,
+    );
+  }
+}

lib/app/shared/widgets/widgets.dart

@@ -9,4 +9,5 @@ export 'my_back_button.dart';
 export 'question_dialog.dart';
 export 'swipe_next_page_container.dart';
 export 'animated_visibility_widget.dart';
-export 'animated_column_widget.dart';
+export 'animated_column_widget.dart';
+export 'show_up.dart';