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

# Conflicts:
#	lib/app/modules/home/controllers/home_controller.dart

lib/app/modules/home/controllers/home_controller.dart

@@ -30,6 +30,7 @@ class HomeController extends GetxController {
   final chatMsgList = RxList<ChatMsg>([]);
   final scrollController = ScrollController();
   final selectKnowledge = Rx<KnowledgePoint?>(null);
+  final knowledgePoints = RxList<Rx<KnowledgePoint>>([]);
 
   late String account = '';
   late int gender = 1;
@@ -41,9 +42,7 @@ class HomeController extends GetxController {
   late List<ExploreApp> leftExploreApps = [];
   late List<ExploreApp> rightExploreApps = [];
   late List<Goal> goals = [];
-  late List<KnowledgePoint> knowledgePoints = [];
+  final int second = 3;
-
-  final int second = 5;
   StreamSubscription<dynamic>? subscription;
 
   @override
@@ -54,7 +53,7 @@ class HomeController extends GetxController {
     age = SpUtil.getInt(Constant.age, defValue: 10)!;
     occupationName = SpUtil.getString(Constant.occupationName).nullSafe;
     occupationId = SpUtil.getInt(Constant.occupationId, defValue: 2)!;
-    create.value = SpUtil.getBool(Constant.create, defValue: true)!;
+    // create.value = SpUtil.getBool(Constant.create, defValue: true)!;
     initLeftExploreApps();
     initRightExploreApps();
     initArtistGoals();
@@ -95,17 +94,23 @@ class HomeController extends GetxController {
 
   void initKnowledgePoints() {
     knowledgePoints.add(KnowledgePoint(
-        id: 1, left: 559.0, top: 149.0, title: '钱是怎么形成的？', leared: false));
+            id: 1, left: 559.0, top: 149.0, title: '钱是怎么形成的？', leared: false)
+        .obs);
     knowledgePoints.add(KnowledgePoint(
-        id: 2, right: 751.0, top: 198.0, title: '小实验溶解糖', leared: false));
+            id: 2, right: 751.0, top: 198.0, title: '小实验溶解糖', leared: false)
+        .obs);
     knowledgePoints.add(KnowledgePoint(
-        id: 3, left: 632.0, top: 278.0, title: '科学家是怎么工作的？', leared: false));
+            id: 3, left: 632.0, top: 278.0, title: '科学家是怎么工作的？', leared: false)
+        .obs);
     knowledgePoints.add(KnowledgePoint(
-        id: 4, left: 814.0, top: 376.0, title: '艺术家——梵高', leared: false));
+            id: 4, left: 814.0, top: 376.0, title: '艺术家——梵高', leared: false)
+        .obs);
     knowledgePoints.add(KnowledgePoint(
-        id: 5, right: 696.0, top: 438.0, title: '什么是科学？', leared: false));
+            id: 5, right: 696.0, top: 438.0, title: '什么是科学？', leared: false)
+        .obs);
     knowledgePoints.add(KnowledgePoint(
-        id: 6, left: 741.0, top: 499.0, title: '足球比赛规则', leared: false));
+            id: 6, left: 741.0, top: 499.0, title: '足球比赛规则', leared: false)
+        .obs);
   }
 
   void initArtistGoals() {
@@ -297,9 +302,11 @@ class HomeController extends GetxController {
       scrollController.jumpTo(scrollController.position.maxScrollExtent);
     });
 
-    var knowledge =
+    var knowledge = knowledgePoints
-        knowledgePoints.firstWhere((t) => t.id == selectKnowledge.value!.id);
+        .firstWhere((t) => t.value.id == selectKnowledge.value!.id);
-    knowledge.leared = true;
+    knowledge.update((val) {
+      val!.leared = true;
+    });
     selectKnowledge.update((val) {
       val!.leared = true;
     });

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

@@ -159,41 +159,43 @@ class ExploreView extends GetView<HomeController> {
   }
 
   Widget buildKnowledge(BuildContext context) {
-    return Stack(
+    return Obx(
-      children: controller.knowledgePoints.map((e) {
+      () => Stack(
-        return Positioned(
+        children: controller.knowledgePoints.map((e) {
-          top: e.top!.h,
+          return Positioned(
-          left: e.left != null ? e.left!.w : null,
+            top: e.value.top!.h,
-          right: e.right != null ? e.right!.w : null,
+            left: e.value.left != null ? e.value.left!.w : null,
-          child: ConstrainedBox(
+            right: e.value.right != null ? e.value.right!.w : null,
-            constraints: BoxConstraints(minWidth: 214.w, minHeight: 68.h),
+            child: ConstrainedBox(
-            child: GestureDetector(
+              constraints: BoxConstraints(minWidth: 214.w, minHeight: 68.h),
-              onTap: () async {
+              child: GestureDetector(
-                await controller.leareKnowledge(e);
+                onTap: () async {
-              },
+                  await controller.leareKnowledge(e.value);
-              child: Container(
+                },
-                padding: REdgeInsets.symmetric(horizontal: 9.0),
+                child: Container(
-                decoration: BoxDecoration(
+                  padding: REdgeInsets.symmetric(horizontal: 9.0),
-                  image: DecorationImage(
+                  decoration: BoxDecoration(
-                    image: e.leared!
+                    image: DecorationImage(
-                        ? Images.studyKnowledgePointPre
+                      image: e.value.leared!
-                        : Images.studyKnowledgePointDefault,
+                          ? Images.studyKnowledgePointPre
-                    fit: BoxFit.fill,
+                          : Images.studyKnowledgePointDefault,
+                      fit: BoxFit.fill,
+                    ),
                   ),
-                ),
+                  child: Center(
-                child: Center(
+                    child: Text(
-                  child: Text(
+                      e.value.title!,
-                    e.title!,
+                      style: e.value.leared!
-                    style: e.leared!
+                          ? TextStyles.boldWhiteShadow22_104
-                        ? TextStyles.boldWhiteShadow22_104
+                          : TextStyles.mediumColor22,
-                        : TextStyles.mediumColor22,
+                    ),
                   ),
                 ),
               ),
             ),
-          ),
+          );
-        );
+        }).toList(),
-      }).toList(),
+      ),
     );
   }
 }

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

@@ -549,7 +549,7 @@ class HomeView extends GetView<HomeController> {
 
   void showGoalDialog(Goal goal) {
     SmartDialog.show(
-      maskColor: const Color(0xFF02184B).withOpacity(0.8),
+      maskColor: const Color(0xFF02184B).withOpacity(0.7),
       alignment: Alignment.center,
       builder: (_) {
         return GoalDialog(