From 08ef5d8e92e2ef5fe0a623e44d12bac479fbe5bd Mon Sep 17 00:00:00 2001
From: gaoxiangzhong <2323004635@qq.com>
Date: Sat, 30 Mar 2024 17:56:34 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20ec7c847=20from=20https://gitee.com/gxia?=
 =?UTF-8?q?ngz/applications=5Fnotes/pulls/256=20=E4=BD=BF=E7=94=A8wukong?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E8=BF=9B=E8=A1=8C=E7=A8=B3=E5=AE=9A=E6=80=A7?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=97=B6=E5=87=BA=E7=8E=B0jscrash?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: gaoxiangzhong <2323004635@qq.com>
---
 .../src/main/ets/components/NoteContent.ets   | 24 +++++++------
 .../main/ets/components/NoteContentComp.ets   | 36 ++++++++++---------
 2 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/features/src/main/ets/components/NoteContent.ets b/features/src/main/ets/components/NoteContent.ets
index 63cfe74..d0cf46f 100644
--- a/features/src/main/ets/components/NoteContent.ets
+++ b/features/src/main/ets/components/NoteContent.ets
@@ -302,16 +302,20 @@ export struct ToolBarComp {
           Image(this.selectedNoteData.is_favorite == Favorite.Yes ? $r('app.media.favorite') : $r('app.media.favorite_cancel'))
             .height(24).width(24)
             .onClick(() => {
-              this.selectedNoteData.is_favorite = (this.selectedNoteData.is_favorite == Favorite.Yes ? Favorite.No : Favorite.Yes)
-              // update note to db
-              let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable)
-              predicates_note.equalTo(NoteTableColumn.Uuid, this.selectedNoteData.uuid)
-              RdbStoreUtil.update(this.selectedNoteData.toNoteObject(), predicates_note, null)
-              // save continue data
-              let continueNote: string = JSON.stringify(this.selectedNoteData.toNoteObject())
-              AppStorage.SetOrCreate<string>('ContinueNote', continueNote)
-              LogUtil.info(TAG, 'ToolBarComp, set continue note success')
-              NoteUtil.refreshAll()
+              try {
+                this.selectedNoteData.is_favorite = (this.selectedNoteData.is_favorite == Favorite.Yes ? Favorite.No : Favorite.Yes)
+                // update note to db
+                let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable)
+                predicates_note.equalTo(NoteTableColumn.Uuid, this.selectedNoteData.uuid)
+                RdbStoreUtil.update(this.selectedNoteData.toNoteObject(), predicates_note, null)
+                // save continue data
+                let continueNote: string = JSON.stringify(this.selectedNoteData.toNoteObject())
+                AppStorage.SetOrCreate<string>('ContinueNote', continueNote)
+                LogUtil.info(TAG, 'ToolBarComp, set continue note success')
+                NoteUtil.refreshAll()
+              } catch (error) {
+                LogUtil.error(TAG, 'favorite error: ' + JSON.stringify(error));
+              }
             })
         }.width(36)
         .visibility(this.selectedNoteData.is_deleted == Delete.Yes ? Visibility.None : Visibility.Visible)
diff --git a/features/src/main/ets/components/NoteContentComp.ets b/features/src/main/ets/components/NoteContentComp.ets
index 423665c..be331c1 100644
--- a/features/src/main/ets/components/NoteContentComp.ets
+++ b/features/src/main/ets/components/NoteContentComp.ets
@@ -773,23 +773,27 @@ export struct ToolBarComp {
               .height(24)
               .width(24)
               .onClick(() => {
-                this.selectedNoteData.is_favorite = (this.selectedNoteData.is_favorite == Favorite.Yes ? Favorite.No : Favorite.Yes)
-                this.refreshFlag = (this.refreshFlag == 0 ? 1 : 0)
-                // update note to db
-                let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable)
-                predicates_note.equalTo(NoteTableColumn.Uuid, this.selectedNoteData.uuid)
-                RdbStoreUtil.update(this.selectedNoteData.toNoteObject(), predicates_note, null)
-                if (this.selectedFolderData.uuid === SysDefFolderUuid.MyFavorites) {
-                  this.selectedNoteData = NoteUtil.getFirstNoteData(AppStorage.Get('AllNoteArray'), SysDefFolderUuid.MyFavorites)
-                  this.controllerShow.runJavaScript(
-                    "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')"
-                  )
-                  // save continue data
-                  let continueNote: string = JSON.stringify(this.selectedNoteData.toNoteObject())
-                  AppStorage.SetOrCreate<string>('ContinueNote', continueNote)
-                  LogUtil.info(TAG, "ToolBarComp, set continue note success")
+                try {
+                  this.selectedNoteData.is_favorite = (this.selectedNoteData.is_favorite == Favorite.Yes ? Favorite.No : Favorite.Yes)
+                  this.refreshFlag = (this.refreshFlag == 0 ? 1 : 0)
+                  // update note to db
+                  let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable)
+                  predicates_note.equalTo(NoteTableColumn.Uuid, this.selectedNoteData.uuid)
+                  RdbStoreUtil.update(this.selectedNoteData.toNoteObject(), predicates_note, null)
+                  if (this.selectedFolderData.uuid === SysDefFolderUuid.MyFavorites) {
+                    this.selectedNoteData = NoteUtil.getFirstNoteData(AppStorage.Get('AllNoteArray'), SysDefFolderUuid.MyFavorites)
+                    this.controllerShow.runJavaScript(
+                      "RICH_EDITOR.setHtml('" + this.selectedNoteData.content_text + "')"
+                    )
+                    // save continue data
+                    let continueNote: string = JSON.stringify(this.selectedNoteData.toNoteObject())
+                    AppStorage.SetOrCreate<string>('ContinueNote', continueNote)
+                    LogUtil.info(TAG, "ToolBarComp, set continue note success")
+                  }
+                  NoteUtil.refreshAll()
+                } catch (error) {
+                  LogUtil.error(TAG, 'favorite error: ' + JSON.stringify(error));
                 }
-                NoteUtil.refreshAll()
               })
             Image($r('app.media.delete'))
               .height(24)
-- 
Gitee