fix(*): fix many bugs

Closes #36, #38
ZhuJHua · Nov 12, 2024 · 4d4474c · 4d4474c
1 parent a843b51
commit 4d4474c
Show file tree

Hide file tree

Showing 23 changed files with 234 additions and 190 deletions.
diff --git a/lib/common/models/isar/diary.dart b/lib/common/models/isar/diary.dart
@@ -114,6 +114,27 @@ class Diary {
 
   Diary();
 
+  // 深拷贝方法
+  Diary clone() {
+    return Diary()
+      ..id = id
+      ..categoryId = categoryId
+      ..title = title
+      ..content = content
+      ..contentText = contentText
+      ..time = DateTime.fromMillisecondsSinceEpoch(time.millisecondsSinceEpoch)
+      ..show = show
+      ..mood = mood
+      ..weather = List<String>.from(weather)
+      ..imageName = List<String>.from(imageName)
+      ..audioName = List<String>.from(audioName)
+      ..videoName = List<String>.from(videoName)
+      ..tags = List<String>.from(tags)
+      ..position = List<String>.from(position)
+      ..imageColor = imageColor
+      ..aspect = aspect;
+  }
+
   // 将 Diary 对象转换为 JSON
   Map<String, dynamic> toJson() {
     return {

diff --git a/lib/components/audio_player/audio_player_view.dart b/lib/components/audio_player/audio_player_view.dart
@@ -22,6 +22,7 @@ class AudioPlayerComponent extends StatelessWidget {
       initState: (_) async {
         await logic.initAudioPlayer(path);
       },
+      assignId: true,
       builder: (_) {
         return ConstrainedBox(
           constraints: const BoxConstraints(maxWidth: 400),

diff --git a/lib/components/category_add/category_add_logic.dart b/lib/components/category_add/category_add_logic.dart
@@ -51,10 +51,12 @@ class CategoryAddLogic extends GetxController {
   void selectCategory(int index) {
     Get.backLegacy();
     editLogic.selectCategory(state.categoryList.value[index].id);
+    editLogic.update(['CategoryName']);
   }
 
   void cancelCategory() {
     Get.backLegacy();
     editLogic.selectCategory(null);
+    editLogic.update(['CategoryName']);
   }
 }
diff --git a/lib/components/category_add/category_add_view.dart b/lib/components/category_add/category_add_view.dart
@@ -16,6 +16,7 @@ class CategoryAddComponent extends StatelessWidget {
     final i18n = AppLocalizations.of(context)!;
 
     return GetBuilder<CategoryAddLogic>(
+      assignId: true,
       builder: (_) {
         return Padding(
           padding: const EdgeInsets.all(16.0),

diff --git a/lib/components/color_dialog/color_dialog_view.dart b/lib/components/color_dialog/color_dialog_view.dart
@@ -67,6 +67,7 @@ class ColorDialogComponent extends StatelessWidget {
     }
 
     return GetBuilder<ColorDialogLogic>(
+      assignId: true,
       builder: (_) {
         return SimpleDialog(
           title: Text(i18n.settingColor),

diff --git a/lib/components/diary_card/basic_diary_card/basic_card_logic.dart b/lib/components/diary_card/basic_diary_card/basic_card_logic.dart
@@ -11,48 +11,48 @@ mixin BasicCardLogic {
   Future<void> toDiary(Diary diary) async {
     HapticFeedback.mediumImpact();
     Bind.lazyPut(() => DiaryDetailsLogic(), tag: diary.id);
-    var res = await Get.toNamed(AppRoutes.diaryPage, arguments: [diary, true]);
-    var oldCategoryId = diary.categoryId;
+    var res = await Get.toNamed(AppRoutes.diaryPage, arguments: [diary.clone(), true]);
     if (res == 'delete') {
       //如果分类为空，删除主页即可，如果分类不为空，双删除
       if (diary.categoryId != null && Bind.isRegistered<DiaryTabViewLogic>(tag: diary.categoryId)) {
         Bind.find<DiaryTabViewLogic>(tag: diary.categoryId).state.diaryList.removeWhere((e) => e.id == diary.id);
+        Bind.find<DiaryTabViewLogic>(tag: diary.categoryId).update(['TabView']);
       }
       Bind.find<DiaryTabViewLogic>(tag: 'default').state.diaryList.removeWhere((e) => e.id == diary.id);
+      Bind.find<DiaryTabViewLogic>(tag: 'default').update(['TabView']);
     } else {
-      //重新获取日记
       var newDiary = await Utils().isarUtil.getDiaryByID(diary.isarId);
-      if (newDiary != null) {
-        var newCategoryId = newDiary.categoryId;
-        //如果没修改
-        if (diary == newDiary) {
-          return;
-        }
-        //如果修改了但是没有修改分类，就替换掉原来的
-        if (oldCategoryId == newCategoryId) {
-          //替换掉全部分类中的
-          var oldIndex =
-              Bind.find<DiaryTabViewLogic>(tag: 'default').state.diaryList.indexWhere((e) => e.id == diary.id);
-          Bind.find<DiaryTabViewLogic>(tag: 'default').state.diaryList.replaceRange(oldIndex, oldIndex + 1, [newDiary]);
-
-          //如果注册了控制器
-          if (diary.categoryId != null && Bind.isRegistered<DiaryTabViewLogic>(tag: diary.categoryId)) {
-            var oldIndex =
-                Bind.find<DiaryTabViewLogic>(tag: diary.categoryId).state.diaryList.indexWhere((e) => e.id == diary.id);
-            Bind.find<DiaryTabViewLogic>(tag: diary.categoryId)
-                .state
-                .diaryList
-                .replaceRange(oldIndex, oldIndex + 1, [newDiary]);
-          }
-
-          //await Bind.find<DiaryLogic>().updateDiary(oldCategoryId);
-        } else {
-          //如果修改了分类
-          //再去新的分类
-          await Bind.find<DiaryLogic>().updateDiary(newCategoryId);
-          //先改旧分类
-          await Bind.find<DiaryLogic>().updateDiary(oldCategoryId, jump: false);
+      if (diary == newDiary) {
+        return;
+      }
+      var newCategoryId = newDiary!.categoryId;
+      var oldCategoryId = diary.categoryId;
+      //如果修改了但是没有修改分类，就替换掉原来的
+      if (oldCategoryId == newCategoryId) {
+        //替换掉全部分类中的
+        var oldIndex =
+            Bind.find<DiaryTabViewLogic>(tag: 'default').state.diaryList.indexWhere((e) => e.id == newDiary.id);
+        Bind.find<DiaryTabViewLogic>(tag: 'default').state.diaryList.replaceRange(oldIndex, oldIndex + 1, [newDiary]);
+        Bind.find<DiaryTabViewLogic>(tag: 'default').update(['TabView']);
+        //如果注册了控制器
+        if (newDiary.categoryId != null && Bind.isRegistered<DiaryTabViewLogic>(tag: newDiary.categoryId)) {
+          var oldIndex = Bind.find<DiaryTabViewLogic>(tag: newDiary.categoryId)
+              .state
+              .diaryList
+              .indexWhere((e) => e.id == newDiary.id);
+          Bind.find<DiaryTabViewLogic>(tag: newDiary.categoryId)
+              .state
+              .diaryList
+              .replaceRange(oldIndex, oldIndex + 1, [newDiary]);
+          Bind.find<DiaryTabViewLogic>(tag: newDiary.categoryId).update(['TabView']);
         }
+        //await Bind.find<DiaryLogic>().updateDiary(oldCategoryId);
+      } else {
+        //如果修改了分类
+        //再去新的分类
+        await Bind.find<DiaryLogic>().updateDiary(newCategoryId);
+        //先改旧分类
+        await Bind.find<DiaryLogic>().updateDiary(oldCategoryId, jump: false);
       }
     }
   }
@@ -62,7 +62,7 @@ mixin BasicCardLogic {
     Bind.lazyPut(() => DiaryDetailsLogic(), tag: diary.id);
     await Get.toNamed(
       AppRoutes.diaryPage,
-      arguments: [diary, false],
+      arguments: [diary.clone(), false],
     );
   }
 

diff --git a/lib/components/diary_card/large_diary_card/large_diary_card_view.dart b/lib/components/diary_card/large_diary_card/large_diary_card_view.dart
@@ -32,8 +32,8 @@ class LargeDiaryCardComponent extends StatelessWidget with BasicCardLogic {
 
     return InkWell(
       borderRadius: AppBorderRadius.mediumBorderRadius,
-      onTap: () async {
-        await toDiary(diary);
+      onTap: () {
+        toDiary(diary);
       },
       child: Card.filled(
         color: colorScheme.surfaceContainerLow,

diff --git a/lib/components/record_sheet/record_sheet_view.dart b/lib/components/record_sheet/record_sheet_view.dart
@@ -15,6 +15,7 @@ class RecordSheetComponent extends StatelessWidget {
 
     return LayoutBuilder(builder: (context, constrains) {
       return GetBuilder<RecordSheetLogic>(
+        assignId: true,
         initState: (_) {
           logic.initMaxWidth(constrains.maxWidth);
         },

diff --git a/lib/components/remove_password/remove_password_view.dart b/lib/components/remove_password/remove_password_view.dart
@@ -79,62 +79,67 @@ class RemovePasswordComponent extends StatelessWidget {
       });
     }
 
-    return Padding(
-      padding: const EdgeInsets.all(16.0),
-      child: Column(
-        mainAxisSize: MainAxisSize.min,
-        spacing: 16.0,
-        children: [
-          Text(
-            '请输入密码',
-            style: textStyle.titleMedium,
-          ),
-          GetBuilder<RemovePasswordLogic>(builder: (_) {
-            return AnimatedBuilder(
-              animation: logic.animation,
-              builder: (context, child) {
-                return Transform.translate(
-                  offset: Offset(logic.interpolate(logic.animation.value), 0),
-                  child: Wrap(
-                    spacing: 16.0,
-                    children: buildPasswordIndicator(),
-                  ),
-                );
-              },
-            );
-          }),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.center,
+    return GetBuilder<RemovePasswordLogic>(
+      assignId: true,
+      builder: (_) {
+        return Padding(
+          padding: const EdgeInsets.all(16.0),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            spacing: 16.0,
             children: [
-              SizedBox(
-                width: buttonSize * 3 + 20,
-                height: buttonSize * 4 + 30,
-                child: GridView.count(
-                  crossAxisCount: 3,
-                  childAspectRatio: 1.0,
-                  crossAxisSpacing: 10,
-                  mainAxisSpacing: 10,
-                  physics: const NeverScrollableScrollPhysics(),
-                  children: [
-                    buildNumButton('1'),
-                    buildNumButton('2'),
-                    buildNumButton('3'),
-                    buildNumButton('4'),
-                    buildNumButton('5'),
-                    buildNumButton('6'),
-                    buildNumButton('7'),
-                    buildNumButton('8'),
-                    buildNumButton('9'),
-                    buildBiometricsButton(),
-                    buildNumButton('0'),
-                    buildDeleteButton()
-                  ],
-                ),
+              Text(
+                '请输入密码',
+                style: textStyle.titleMedium,
+              ),
+              GetBuilder<RemovePasswordLogic>(builder: (_) {
+                return AnimatedBuilder(
+                  animation: logic.animation,
+                  builder: (context, child) {
+                    return Transform.translate(
+                      offset: Offset(logic.interpolate(logic.animation.value), 0),
+                      child: Wrap(
+                        spacing: 16.0,
+                        children: buildPasswordIndicator(),
+                      ),
+                    );
+                  },
+                );
+              }),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  SizedBox(
+                    width: buttonSize * 3 + 20,
+                    height: buttonSize * 4 + 30,
+                    child: GridView.count(
+                      crossAxisCount: 3,
+                      childAspectRatio: 1.0,
+                      crossAxisSpacing: 10,
+                      mainAxisSpacing: 10,
+                      physics: const NeverScrollableScrollPhysics(),
+                      children: [
+                        buildNumButton('1'),
+                        buildNumButton('2'),
+                        buildNumButton('3'),
+                        buildNumButton('4'),
+                        buildNumButton('5'),
+                        buildNumButton('6'),
+                        buildNumButton('7'),
+                        buildNumButton('8'),
+                        buildNumButton('9'),
+                        buildBiometricsButton(),
+                        buildNumButton('0'),
+                        buildDeleteButton()
+                      ],
+                    ),
+                  ),
+                ],
               ),
             ],
           ),
-        ],
-      ),
+        );
+      },
     );
   }
 }
diff --git a/lib/components/search_card/search_card_logic.dart b/lib/components/search_card/search_card_logic.dart
@@ -1,5 +1,6 @@
 import 'package:get/get.dart';
 import 'package:mood_diary/common/models/isar/diary.dart';
+import 'package:mood_diary/pages/diary_details/diary_details_logic.dart';
 import 'package:mood_diary/router/app_routes.dart';
 
 import 'search_card_state.dart';
@@ -9,6 +10,7 @@ class SearchCardLogic extends GetxController {
 
   //选中卡片后跳转到详情页，直接携带Diary作为参数
   Future<void> toDiaryPage(Diary diary) async {
-    await Get.toNamed(AppRoutes.diaryPage, arguments: [diary, false]);
+    Bind.lazyPut(() => DiaryDetailsLogic(), tag: diary.id);
+    await Get.toNamed(AppRoutes.diaryPage, arguments: [diary.clone(), false]);
   }
 }