From e8732a0151405553be69ebed01891999773bcd2e Mon Sep 17 00:00:00 2001 From: xiazhichao9 Date: Tue, 25 Jun 2024 14:19:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=BC=80=E4=BB=BB=E6=84=8F=E7=AC=94?= =?UTF-8?q?=E8=AE=B0=EF=BC=8C=E4=B8=8D=E5=81=9A=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=B0=B1=E4=BC=9A=E5=88=B7=E6=96=B0=E4=B8=BA?= =?UTF-8?q?=E6=9C=80=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xiazhichao9 --- .../src/main/ets/default/baseUtil/NoteUtil.ets | 15 +++++++++++++++ .../default/model/databaseModel/SysDefData.ets | 2 +- features/src/main/ets/components/NoteContent.ets | 4 ++++ .../src/main/ets/components/NoteContentComp.ets | 4 ++++ .../ets/components/NoteContentCompPortrait.ets | 4 ++++ 5 files changed, 28 insertions(+), 1 deletion(-) diff --git a/common/utils/src/main/ets/default/baseUtil/NoteUtil.ets b/common/utils/src/main/ets/default/baseUtil/NoteUtil.ets index df10ebb..5f1e072 100644 --- a/common/utils/src/main/ets/default/baseUtil/NoteUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/NoteUtil.ets @@ -22,6 +22,7 @@ import StyleConstants from '../constants/StyleConstants' import {LogUtil} from './LogUtil' import FolderUtil from './FolderUtil' import RdbStoreUtil from './RdbStoreUtil' +import buffer from '@ohos.buffer'; const TAG = "NoteUtil" @@ -282,6 +283,20 @@ export class NoteUtil { let isRefresh = AppStorage.Get('isUpdate') AppStorage.Set('isUpdate',!isRefresh) } + + /** + * Format conversion + * @param initContent + */ + contrastInitType(initContent:string):string { + let base64regex = /^([0-9a-zA-Z+/]{4})*(([0-9a-zA-Z+/]{2}==)|([0-9a-zA-Z+/]{3}=))?$/; + if(!base64regex.test(initContent)) { + const inputBuffer = buffer.from(initContent,'utf-8'); + initContent = inputBuffer.toString('base64'); + } + return initContent; + }; + } let noteUtil = new NoteUtil() diff --git a/common/utils/src/main/ets/default/model/databaseModel/SysDefData.ets b/common/utils/src/main/ets/default/model/databaseModel/SysDefData.ets index 68fe7be..538a4ee 100644 --- a/common/utils/src/main/ets/default/model/databaseModel/SysDefData.ets +++ b/common/utils/src/main/ets/default/model/databaseModel/SysDefData.ets @@ -174,7 +174,7 @@ export default { '玉米油40g
' + '
 1.   添加鸡蛋、盐、糖、蛋糕粉
' + ' 2.   加入玉米油、牛奶，烤箱预热15分钟
' + - ' 3.   加入葡萄干、核桃仁，烤箱定时40分钟

', + ' 3.   加入葡萄干、核桃仁，烤箱定时40分钟

', "content_img": "", "note_type": NoteType.CusDef, "is_top": Top.No, diff --git a/features/src/main/ets/components/NoteContent.ets b/features/src/main/ets/components/NoteContent.ets index d0cf46f..c368925 100644 --- a/features/src/main/ets/components/NoteContent.ets +++ b/features/src/main/ets/components/NoteContent.ets @@ -85,6 +85,10 @@ export struct NoteContent { noteContent = { callbackhtml: (html) => { LogUtil.info(TAG, 'note uuid is:' + this.selectedNoteData.uuid) + this.selectedNoteData.content_text = NoteUtil.contrastInitType(this.selectedNoteData.content_text); + if (this.selectedNoteData.content_text === html ) { + return; + }; this.selectedNoteData.content_text = html this.selectedNoteData.modified_time = new Date().getTime() let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable) diff --git a/features/src/main/ets/components/NoteContentComp.ets b/features/src/main/ets/components/NoteContentComp.ets index be331c1..0c6cd42 100644 --- a/features/src/main/ets/components/NoteContentComp.ets +++ b/features/src/main/ets/components/NoteContentComp.ets @@ -107,6 +107,10 @@ export struct NoteContentComp { noteContent = { callbackhtml: (html) => { LogUtil.info(TAG, 'note uuid is:' + this.selectedNoteData.uuid) + this.selectedNoteData.content_text = NoteUtil.contrastInitType(this.selectedNoteData.content_text); + if (this.selectedNoteData.content_text === html ) { + return; + }; this.selectedNoteData.content_text = html this.selectedNoteData.modified_time = new Date().getTime() let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable) diff --git a/features/src/main/ets/components/NoteContentCompPortrait.ets b/features/src/main/ets/components/NoteContentCompPortrait.ets index e5ef28d..a304494 100644 --- a/features/src/main/ets/components/NoteContentCompPortrait.ets +++ b/features/src/main/ets/components/NoteContentCompPortrait.ets @@ -111,6 +111,10 @@ export struct NoteContentCompPortrait { noteContent = { callbackhtml: (html) => { LogUtil.info(TAG, 'note uuid is:' + this.selectedNoteData?.uuid) + this.selectedNoteData.content_text = NoteUtil.contrastInitType(this.selectedNoteData.content_text); + if (this.selectedNoteData.content_text === html ) { + return; + }; this.selectedNoteData.content_text = html this.selectedNoteData.modified_time = new Date().getTime() let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable)