fix another bug related to edit/add page

Author: yingshaoxo

2022/freedom/lib/pages/editing.dart

@@ -85,23 +85,30 @@ class _EditingPageState extends State<EditingPage> {
                 String text = textInputController.text.trim();
 
                 if (text != "" || seletctedImages.isNotEmpty) {
-                  Message msg = Message(
-                      type: "freedom",
-                      date: getDate(),
-                      content: text,
-                      images: seletctedImages);
-
                   if (oldMessage != null) {
+                    // edit
+                    Message msg = Message(
+                        type: oldMessage?.type ?? "freedom",
+                        date: getDate(),
+                        content: text,
+                        images: seletctedImages);
                     await sqlite_database_controlelr.updateMessage(msg);
                     await memory_database_controller.refresh_the_list_view();
+
+                    Navigator.of(context).pop();
                   } else {
+                    // add
+                    Message msg = Message(
+                        type: "freedom",
+                        date: getDate(),
+                        content: text,
+                        images: seletctedImages);
                     await sqlite_database_controlelr.insertMessage(msg);
                     await memory_database_controller
                         .show_default_message_list();
-                  }
 
-                  //Get.offAndToNamed(RouterRoutings.home);
-                  Navigator.of(context).pop();
+                    Get.offAndToNamed(RouterRoutings.home);
+                  }
 
                   EasyLoading.dismiss();
                 }

2022/freedom/lib/store/json_export_and_import_controller.dart

@@ -29,7 +29,13 @@ class JsonExportAndImportControlelr extends GetxController {
 
   Future<void> saveDatabaseMessageListIntoTheJsonFile() async {
     List<Message> theData = await sqlite_database_controlelr.getMessageList();
-    List<Map<String, dynamic>> theList = theData.map((e) => e.toMap()).toList();
+    List<Map<String, dynamic>> theList = theData.map((e) {
+      // if (e.content.contains('中秋')) {
+      //   print(e);
+      //   print('.');
+      // }
+      return e.toMap();
+    }).toList();
 
     var spaces = ' ' * 4;
     var encoder = JsonEncoder.withIndent(spaces);
@@ -55,6 +61,13 @@ class JsonExportAndImportControlelr extends GetxController {
     Iterable list = json.decode(jsonString);
     List<Map<String, dynamic>> new_list = [];
     for (Map<String, dynamic> msg in list) {
+      // if (msg.containsKey('content')) {
+      //   String content = msg['content'];
+      //   if (content.contains("中秋")) {
+      //     print(msg);
+      //     print(".");
+      //   }
+      // }
       if (!msg.containsKey('type')) {
         msg['type'] = 'freedom';
       }