Merge branch 'yuanjunyao_dev' of https://git.sqlce.cn/jest/dreampad into yuanjunyao_dev

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

@@ -183,7 +183,7 @@ class HomeView extends GetView<HomeController> {
   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<HomeController> {
                 ),
               )
             : Container(),
-        controller.explored2.value >= 3
+        controller.explored2.value >= 2
             ? Positioned(
                 left: 352.w,
                 top: 0.0,
@@ -207,7 +207,7 @@ class HomeView extends GetView<HomeController> {
                 ),
               )
             : Container(),
-        controller.explored2.value >= 2
+        controller.explored2.value >= 3
             ? Positioned(
                 left: 363.w,
                 top: 180.h,
@@ -476,7 +476,7 @@ class HomeView extends GetView<HomeController> {
             ),
           ),
         ),
-        controller.explored2.value >= 4
+        controller.explored2.value >= 1
             ? Positioned(
                 left: 15.w,
                 top: 20.h,
@@ -495,7 +495,7 @@ class HomeView extends GetView<HomeController> {
                 ),
               )
             : Container(),
-        controller.explored2.value >= 3
+        controller.explored2.value >= 2
             ? Positioned(
                 left: 352.w,
                 top: 0.0,
@@ -517,7 +517,7 @@ class HomeView extends GetView<HomeController> {
                 ),
               )
             : Container(),
-        controller.explored2.value >= 2
+        controller.explored2.value >= 3
             ? Positioned(
                 left: 363.w,
                 top: 180.h,
@@ -536,7 +536,7 @@ class HomeView extends GetView<HomeController> {
                 ),
               )
             : 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<HomeController> {
             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,
               ),

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,

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,

lib/app/modules/select/views/select_view.dart

@@ -41,12 +41,12 @@ class SelectView extends GetView<SelectController> {
   }
 
   Widget buildSelect(BuildContext context) {
-    return Stack(
+    return _ShowUp(
-      children: [
+      child: Stack(
-        Positioned(
+        children: [
-          top: 2.h,
+          Positioned(
-          left: 412.w,
+            top: 2.h,
-          child: _ShowUp(
+            left: 412.w,
             child: Container(
               width: 360.w,
               height: 164.h,
@@ -63,9 +63,9 @@ class SelectView extends GetView<SelectController> {
               ),
             ),
           ),
-        ),
+          buildSelectOccupation(context),
-        buildSelectOccupation(context),
+        ],
-      ],
+      ),
     );
   }
 
@@ -287,22 +287,24 @@ class SelectView extends GetView<SelectController> {
                 ),
               ),
             ),
+            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) {