From e3fadd0a58f5bae6a548190ea43fcda497eaf6c1 Mon Sep 17 00:00:00 2001 From: guozejun Date: Tue, 24 May 2022 11:31:33 +0800 Subject: [PATCH] fix permission request problem on release branch Signed-off-by: guozejun --- .../src/main/ets/components/CusDialogComp.ets | 7 +- .../main/ets/components/FolderListComp.ets | 2 +- .../components/NoteContentCompPortrait.ets | 46 ++++- .../src/main/ets/components/NoteListComp.ets | 4 +- .../main/resources/base/element/string.json | 2 +- .../main/resources/rawfile/editor_style.css | 2 +- .../main/resources/zh_CN/element/string.json | 12 -- .../ets/default/baseUtil/RdbStoreUtil.ets | 51 +++-- .../main/resources/base/element/color.json | 184 ------------------ .../main/resources/base/element/string.json | 164 ---------------- .../main/resources/en_US/element/string.json | 164 ---------------- .../main/resources/zh_CN/element/string.json | 164 ---------------- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../src/main/ets/MainAbility/MainAbility.ts | 2 +- .../tablet/src/main/ets/pages/NoteHome.ets | 7 - product/tablet/src/main/module.json5 | 14 ++ 16 files changed, 87 insertions(+), 740 deletions(-) delete mode 100644 product/pc/src/main/resources/base/element/color.json delete mode 100644 product/pc/src/main/resources/base/element/string.json delete mode 100644 product/pc/src/main/resources/en_US/element/string.json delete mode 100644 product/pc/src/main/resources/zh_CN/element/string.json diff --git a/common/component/src/main/ets/components/CusDialogComp.ets b/common/component/src/main/ets/components/CusDialogComp.ets index 82e011f..03bcf2d 100644 --- a/common/component/src/main/ets/components/CusDialogComp.ets +++ b/common/component/src/main/ets/components/CusDialogComp.ets @@ -22,7 +22,6 @@ import { circleColorArray, fontColorArray, SysDefFolderUuid, DeleteFileType, Fol const TAG = "CusDialogComp" -const TAG = "CusDialogComp" @CustomDialog export struct NewOrEditFolderDialog { newOrEditFolderDialogCtl: CustomDialogController @@ -193,14 +192,14 @@ export struct DeleteDialog { .textAlign(TextAlign.Center) .maxLines(1) .visibility(this.multiSelect == false || this.selectedFolderData.uuid == SysDefFolderUuid.RecentDeletes ? Visibility.None : Visibility.Visible) - } else if (this.CheckedNoteArray.length == 1) { - Text($r("app.string.deleteNote")) + } else if (this.CheckedNoteArray.length > 1){ + Text($r("app.string.deletePartNote", this.CheckedNoteArray.length)) .fontSize(14) .textAlign(TextAlign.Center) .maxLines(1) .visibility(this.multiSelect == false || this.selectedFolderData.uuid == SysDefFolderUuid.RecentDeletes ? Visibility.None : Visibility.Visible) } else { - Text($r("app.string.deletePartNote", this.CheckedNoteArray.length)) + Text($r("app.string.deleteNote")) .fontSize(14) .textAlign(TextAlign.Center) .maxLines(1) diff --git a/common/component/src/main/ets/components/FolderListComp.ets b/common/component/src/main/ets/components/FolderListComp.ets index 52062cf..df97271 100644 --- a/common/component/src/main/ets/components/FolderListComp.ets +++ b/common/component/src/main/ets/components/FolderListComp.ets @@ -55,7 +55,7 @@ export struct FolderListComp { .margin({ top: 28 }) .padding({ left: 24 }) - NoteAndCreateComp() + NoteAndCreateComp() // center List() { ForEach(this.AllFolderArray, (folderItem: FolderData) => { diff --git a/common/component/src/main/ets/components/NoteContentCompPortrait.ets b/common/component/src/main/ets/components/NoteContentCompPortrait.ets index 0666b23..c0cce27 100644 --- a/common/component/src/main/ets/components/NoteContentCompPortrait.ets +++ b/common/component/src/main/ets/components/NoteContentCompPortrait.ets @@ -34,6 +34,14 @@ var time_id: number const TAG = "NoteContentCompPortrait" +async function routePage() { + try { + await router.back() + } catch (err) { + LogUtil.info(TAG, "fail callback") + } +} + // Note content component @Component export struct NoteContentCompPortrait { @@ -75,7 +83,6 @@ export struct NoteContentCompPortrait { AppStorage.SetOrCreate('ContinueNote', continueNote) LogUtil.info(TAG, 'callbackScheduledSave, set continue note success') } - } build() { @@ -118,11 +125,6 @@ export struct NoteContentCompPortrait { }, 3000) LogUtil.info(TAG, "setInterval time_id : " + time_id) this.editModel = true - // 添加定时器：3s自动保存 - timeId = setInterval(() => { - this.controllerShow.runJavaScript({ script: "scheduled_save_content()" }) - }, 3000) - LogUtil.info(TAG, "NoteContentCompPortrait, setInterval timeId : " + timeId) }) .margin({ top: 16 }) .width(StyleConstants.PERCENTAGE_100) @@ -256,6 +258,32 @@ export struct ToolBarComp { @StorageLink('AllNoteArray') AllNoteArray: NoteData[] = AppStorage.Link('AllNoteArray') controllerShow: WebController + onDeleteConfirm() { + if (this.selectedFolderData.uuid != SysDefFolderUuid.RecentDeletes) { + this.selectedNoteData.is_deleted = Delete.Yes + this.selectedNoteData.deleted_time = new Date().getTime() + // 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) + routePage() + } else { + NoteUtil.removeNoteData(this.AllNoteArray, this.selectedNoteData.uuid) + // delete note from db + let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable) + predicates_note.equalTo(NoteTableColumn.Uuid, this.selectedNoteData.uuid) + RdbStoreUtil.delete(predicates_note, null) + routePage() + } + } + + noteDataDeleteDialogCtl: CustomDialogController = new CustomDialogController({ + builder: DeleteDialog({ onConfirm: this.onDeleteConfirm.bind(this), multiSelect: true }), + alignment: DialogAlignment.Bottom, + autoCancel: false, + customStyle: true, + }) + build() { Flex({ direction: FlexDirection.Row, wrap: FlexWrap.NoWrap, justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { @@ -292,7 +320,11 @@ export struct ToolBarComp { AppStorage.SetOrCreate('ContinueNote', continueNote) LogUtil.info(TAG, 'ToolBarComp, set continue note success') }) - }.width(36) + Image($r('app.media.delete')).height(24).width(24) + .onClick(()=>{ + this.noteDataDeleteDialogCtl.open() + }) + }.width(72) .visibility(this.selectedNoteData.is_deleted == Delete.Yes ? Visibility.None : Visibility.Visible) } else { Row({ space: StyleConstants.SPACE_6 }) { diff --git a/common/component/src/main/ets/components/NoteListComp.ets b/common/component/src/main/ets/components/NoteListComp.ets index 15478a1..7729992 100644 --- a/common/component/src/main/ets/components/NoteListComp.ets +++ b/common/component/src/main/ets/components/NoteListComp.ets @@ -292,7 +292,6 @@ export struct NoteItemComp { } else { this.selectedNoteData = this.noteItem this.chooseNote = true - AppStorage.SetOrCreate('ContinueChoose', this.chooseNote) // save continue data let continueNote: string = JSON.stringify(this.selectedNoteData.toNoteObject()) AppStorage.SetOrCreate('ContinueNote', continueNote) @@ -652,7 +651,6 @@ export struct AddNoteComp { this.editModel = true } this.chooseNote = true - AppStorage.SetOrCreate('ContinueChoose', this.chooseNote) // save continue data let continueNote: string = JSON.stringify(this.selectedNoteData.toNoteObject()) AppStorage.SetOrCreate('ContinueNote', continueNote) @@ -892,7 +890,7 @@ export struct OperateNoteCompForPortrait { this.CheckedNoteArray.forEach((noteItem) => { noteItem.is_deleted = Delete.No noteItem.deleted_time = 0 - prompt.showToast({ message: $r('app.string.restore').toString(), duration: 2000 }) + prompt.showToast({ message: $r('app.string.restore'), duration: 2000 }) // update note to db let predicates_note = RdbStoreUtil.getRdbPredicates(TableName.NoteTable) predicates_note.equalTo(NoteTableColumn.Uuid, noteItem.uuid) diff --git a/common/resources/src/main/resources/base/element/string.json b/common/resources/src/main/resources/base/element/string.json index 8ac0103..5220352 100644 --- a/common/resources/src/main/resources/base/element/string.json +++ b/common/resources/src/main/resources/base/element/string.json @@ -98,7 +98,7 @@ }, { "name": "searchNote", - "value": "搜索笔记..." + "value": "搜索笔记" }, { "name": "chooseFolder", diff --git a/common/resources/src/main/resources/rawfile/editor_style.css b/common/resources/src/main/resources/rawfile/editor_style.css index 234d8f2..06b9eb8 100644 --- a/common/resources/src/main/resources/rawfile/editor_style.css +++ b/common/resources/src/main/resources/rawfile/editor_style.css @@ -14,7 +14,7 @@ */ html { - height: 15%; + height: 100%; font-family: sans-serif; -webkit-text-size-adjust: 100%; } diff --git a/common/resources/src/main/resources/zh_CN/element/string.json b/common/resources/src/main/resources/zh_CN/element/string.json index 5220352..d8cc164 100644 --- a/common/resources/src/main/resources/zh_CN/element/string.json +++ b/common/resources/src/main/resources/zh_CN/element/string.json @@ -159,18 +159,6 @@ { "name": "restore", "value": "已恢复" - }, - { - "name": "per_read_media", - "value": "是否允许备忘录访问媒体资源" - }, - { - "name": "per_get_bundleInfo", - "value": "是否允许备忘录打开图库资源" - }, - { - "name": "per_dis_dataSync", - "value": "是否允许备忘录流转到其它设备" } ] } \ No newline at end of file diff --git a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets index 8b2f934..8d78324 100644 --- a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets @@ -30,7 +30,6 @@ const FileMaxSize: number = 20 * 1024 * 1024 /** * db instance */ -var rdbStore = undefined export default { /** @@ -40,27 +39,27 @@ export default { ohosDataRdb.getRdbStore(context, SysDefData.dbInfo.db_name, SysDefData.dbInfo.db_verison) .then(async (store) => { LogUtil.info(TAG, "createRdbStore, store is " + store) - rdbStore = store + globalThis.rdbStore = store // create table - await rdbStore.executeSql(TableSql.FolderTableSQL, null) - await rdbStore.executeSql(TableSql.NoteTableSQL, null) - await rdbStore.executeSql(TableSql.AttachmentTableSQL, null) - await rdbStore.executeSql(TableSql.FormTableSQL, null) + await globalThis.rdbStore.executeSql(TableSql.FolderTableSQL, null) + await globalThis.rdbStore.executeSql(TableSql.NoteTableSQL, null) + await globalThis.rdbStore.executeSql(TableSql.AttachmentTableSQL, null) + await globalThis.rdbStore.executeSql(TableSql.FormTableSQL, null) LogUtil.info(TAG, "create table success") // insert system defined folder - await rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_allNotes) - await rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_unClassified) - await rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_myFavorites) - await rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_recentDeletes) - await rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_personal) - await rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_life) - await rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_work) + await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_allNotes) + await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_unClassified) + await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_myFavorites) + await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_recentDeletes) + await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_personal) + await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_life) + await globalThis.rdbStore.insert(TableName.FolderTable, SysDefData.sys_def_work) LogUtil.info(TAG, "insert system defined folder success") // insert system defined note and attachment - await rdbStore.insert(TableName.NoteTable, SysDefData.sys_def_note1) - await rdbStore.insert(TableName.NoteTable, SysDefData.sys_def_note2) - await rdbStore.insert(TableName.NoteTable, SysDefData.sys_def_note3) - await rdbStore.insert(TableName.NoteTable, SysDefData.sys_def_note4) + await globalThis.rdbStore.insert(TableName.NoteTable, SysDefData.sys_def_note1) + await globalThis.rdbStore.insert(TableName.NoteTable, SysDefData.sys_def_note2) + await globalThis.rdbStore.insert(TableName.NoteTable, SysDefData.sys_def_note3) + await globalThis.rdbStore.insert(TableName.NoteTable, SysDefData.sys_def_note4) LogUtil.info(TAG, "insert system defined note and attachment success") // add sys-def folder and note to AppStorage @@ -172,11 +171,11 @@ export default { ohosDataRdb.getRdbStore(context, SysDefData.dbInfo.db_name, SysDefData.dbInfo.db_verison) .then(async (store) => { LogUtil.info(TAG, "initAppStorage, store is " + store) - rdbStore = store + globalThis.rdbStore = store // query folder let columns_folder = [] let predicates_folder = new ohosDataRdb.RdbPredicates(TableName.FolderTable) - let resultSet_folder = await rdbStore.query(predicates_folder, columns_folder) + let resultSet_folder = await globalThis.rdbStore.query(predicates_folder, columns_folder) while (resultSet_folder.goToNextRow()) { let id = resultSet_folder.getLong(resultSet_folder.getColumnIndex(FolderTableColumn.Id)) let name = resultSet_folder.getString(resultSet_folder.getColumnIndex(FolderTableColumn.Name)) @@ -193,7 +192,7 @@ export default { // query note let columns_note = [] let predicates_note = new ohosDataRdb.RdbPredicates(TableName.NoteTable) - let resultSet_note = await rdbStore.query(predicates_note, columns_note) + let resultSet_note = await globalThis.rdbStore.query(predicates_note, columns_note) while (resultSet_note.goToNextRow()) { let id = resultSet_note.getLong(resultSet_note.getColumnIndex(NoteTableColumn.Id)) let title = resultSet_note.getString(resultSet_note.getColumnIndex(NoteTableColumn.Title)) @@ -286,7 +285,7 @@ export default { LogUtil.info(TAG, "initAppStorage, set DBQueryFinished 1") }) .catch((err) => { - LogUtil.warn(TAG, "initAppStorage, error : " + err) + LogUtil.error(TAG, "initAppStorage, error : " + err) }) }, @@ -381,7 +380,7 @@ export default { * @param callback */ insert(tableName, valueBucket, callback) { - rdbStore.insert(tableName, valueBucket).then((rowId) => { + globalThis.rdbStore.insert(tableName, valueBucket).then((rowId) => { LogUtil.info(TAG, "insert success, rowId is " + rowId) if (callback != null) { callback(rowId) @@ -397,7 +396,7 @@ export default { * @param callback */ delete(predicates, callback) { - rdbStore.delete(predicates).then((affectedRowCount) => { + globalThis.rdbStore.delete(predicates).then((affectedRowCount) => { LogUtil.info(TAG, "delete success, affectedRowCount is " + affectedRowCount) if (callback != null) { callback(affectedRowCount) @@ -414,10 +413,10 @@ export default { * @param callback */ update(valueBucket, predicates, callback) { - if (!rdbStore) { + if (!globalThis.rdbStore) { return; } - rdbStore.update(valueBucket, predicates).then((affectedRowCount) => { + globalThis.rdbStore.update(valueBucket, predicates).then((affectedRowCount) => { LogUtil.info(TAG, "update success, affectedRowCount is " + affectedRowCount) if (callback != null) { callback(affectedRowCount) @@ -434,7 +433,7 @@ export default { * @param callback */ query(columns, predicates, callback) { - rdbStore.query(predicates, columns).then((resultSet) => { + globalThis.rdbStore.query(predicates, columns).then((resultSet) => { LogUtil.info(TAG, "query success, row count : " + resultSet.rowCount) if (callback != null) { callback(resultSet) diff --git a/product/pc/src/main/resources/base/element/color.json b/product/pc/src/main/resources/base/element/color.json deleted file mode 100644 index 02771c3..0000000 --- a/product/pc/src/main/resources/base/element/color.json +++ /dev/null @@ -1,184 +0,0 @@ -{ - "color": [ - { - "name": "color_ffffff", - "value": "#ffffff" - }, - { - "name": "delete_color_fa2a2d", - "value": "#fa2a2d" - }, - { - "name": "cancel_color_4fb4e3", - "value": "#4fb4e3" - }, - { - "name": "divider_color_e4e4e4", - "value": "#cce4e4e4" - }, - { - "name": "divider_color_182431", - "value": "#182431" - }, - { - "name": "button_color_419fff", - "value": "#419fff" - }, - { - "name": "button_color_fb4447", - "value": "#fb4447" - }, - { - "name": "text_color_3f97e9", - "value": "#3f97e9" - }, - { - "name": "text_color_f86d05", - "value": "#f86d05" - }, - { - "name": "folder_color_182431", - "value": "#182431" - }, - { - "name": "folder_color_f86d05", - "value": "#f86d05" - }, - { - "name": "folder_color_ffffff", - "value": "#ffffff" - }, - { - "name": "folder_color_19ffffff", - "value": "#19ffffff" - }, - { - "name": "folder_color_19182431", - "value": "#19182431" - }, - { - "name": "notecontent_color_ffffff", - "value": "#ffffff" - }, - { - "name": "notecontent_color_000000", - "value": "#000000" - }, - { - "name": "folderlist_bgcolor_f1f3f5", - "value": "#f1f3f5" - }, - { - "name": "notelist_bgcolor_f1f3f5", - "value": "#f1f3f5" - }, - { - "name": "notelist_bgcolor_000000", - "value": "#000000" - }, - { - "name": "New_folder_input_box_color", - "value": "#ffffff" - }, - { - "name": "category_already_exist_font_color", - "value": "#FA2A2D" - }, - { - "name": "create_folder_bg_color", - "value": "#FFFFFF" - }, - { - "name": "delete_note_bg_color", - "value": "#FFFFFF" - }, - { - "name": "choose_folder_bg_color", - "value": "#FFFFFF" - }, - { - "name": "title_input_bg_color", - "value": "#FFFFFF" - }, - { - "name": "Edit_title_bg_color", - "value": "#FFFFFF" - }, - { - "name": "press_folder_bg_color", - "value": "#FFFFFF" - }, - { - "name": "modified_time_font_color", - "value": "#A3A7AD" - }, - { - "name": "delete_font_color", - "value": "#182431" - }, - { - "name": "recover_font_color", - "value": "#182431" - }, - { - "name": "list_font_color", - "value": "#182431" - }, - { - "name": "style_font_color", - "value": "#182431" - }, - { - "name": "photo_font_color", - "value": "#182431" - }, - { - "name": "all_notes_font_color", - "value": "#182431" - }, - { - "name": "num_of_notes_font_color", - "value": "#A3A7AD" - }, - { - "name": "note_selected_font_color", - "value": "#182431" - }, - { - "name": "note_title_font_color", - "value": "#182431" - }, - { - "name": "note_title_font_color_blue", - "value": "#0000ff" - }, - { - "name": "list_modified_time_font_color", - "value": "#99182431" - }, - { - "name": "Recently_delete_prompt_font_color", - "value": "#18181A" - }, - { - "name": "Empty_page_font_color", - "value": "#A3A7AD" - }, - { - "name": "search_note_caret_color", - "value": "#F86D05" - }, - { - "name": "set_top_font_color", - "value": "#182431" - }, - { - "name": "move_font_color", - "value": "#182431" - }, - { - "name": "check_all_font_color", - "value": "#182431" - } - ] -} \ No newline at end of file diff --git a/product/pc/src/main/resources/base/element/string.json b/product/pc/src/main/resources/base/element/string.json deleted file mode 100644 index 8ed957f..0000000 --- a/product/pc/src/main/resources/base/element/string.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "备忘录" - }, - { - "name": "description_mainability", - "value": "ETS_Empty Ability" - }, - { - "name": "note", - "value": "笔记" - }, - { - "name": "allNotes", - "value": "全部笔记" - }, - { - "name": "unClassified", - "value": "未分类" - }, - { - "name": "recentDeletes", - "value": "最近删除" - }, - { - "name": "myFavorites", - "value": "我的收藏" - }, - { - "name": "create", - "value": "新建" - }, - { - "name": "createFolder", - "value": "新建文件夹" - }, - { - "name": "editFolder", - "value": "编辑文件夹" - }, - { - "name": "deleteFolder", - "value": "删除文件夹" - }, - { - "name": "createNote", - "value": "新建笔记" - }, - { - "name": "cancel", - "value": "取消" - }, - { - "name": "save", - "value": "保存" - }, - { - "name": "delete", - "value": "删除" - }, - { - "name": "delete_tips", - "value": "是否删除此文件夹及其中的内容？" - }, - { - "name": "deleteNote", - "value": "是否删除此笔记？" - }, - { - "name": "deleteNoteComplete", - "value": "此笔记将被永久删除，无法恢复。是否删除？" - }, - { - "name": "deleteAllNote", - "value": "是否删除全部笔记？" - }, - { - "name": "deletePartNote", - "value": "是否删除%d条笔记？" - }, - { - "name": "selected", - "value": "已选择%d项" - }, - { - "name": "none_selected", - "value": "未选择" - }, - { - "name": "noteslist", - "value": "条笔记" - }, - { - "name": "Empty_page", - "value": "没有笔记" - }, - { - "name": "searchNote", - "value": "搜索笔记..." - }, - { - "name": "chooseFolder", - "value": "请选择文件夹" - }, - { - "name": "category_already_exist", - "value": "文件夹名称已存在" - }, - { - "name": "input_placeholder", - "value": "名称" - }, - { - "name": "permanently_delete_tips", - "value": "笔记删除前会显示剩余天数（最长30天），之后将永久删除" - }, - { - "name": "set_top", - "value": "置顶" - }, - { - "name": "move", - "value": "移到" - }, - { - "name": "recover", - "value": "恢复" - }, - { - "name": "check_all", - "value": "多选" - }, - { - "name": "editNoteTitle", - "value": "修改标题" - }, - { - "name": "list", - "value": "清单" - }, - { - "name": "style", - "value": "样式" - }, - { - "name": "photo", - "value": "相册" - }, - { - "name": "title", - "value": "标题" - }, - { - "name": "empty_note", - "value": "笔记内容为空" - }, - { - "name": "restore", - "value": "已恢复" - } - ] -} \ No newline at end of file diff --git a/product/pc/src/main/resources/en_US/element/string.json b/product/pc/src/main/resources/en_US/element/string.json deleted file mode 100644 index 8529f1b..0000000 --- a/product/pc/src/main/resources/en_US/element/string.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "Notepad" - }, - { - "name": "description_mainability", - "value": "ETS_Empty Ability" - }, - { - "name": "note", - "value": "Notes" - }, - { - "name": "allNotes", - "value": "All notes" - }, - { - "name": "unClassified", - "value": "No category" - }, - { - "name": "recentDeletes", - "value": "Recently deleted" - }, - { - "name": "myFavorites", - "value": "My favourites" - }, - { - "name": "create", - "value": "NEW" - }, - { - "name": "createFolder", - "value": "New Folder" - }, - { - "name": "editFolder", - "value": "Edit Folder" - }, - { - "name": "deleteFolder", - "value": "Delete Folder" - }, - { - "name": "createNote", - "value": "New note" - }, - { - "name": "cancel", - "value": "CANCEL" - }, - { - "name": "save", - "value": "SAVE" - }, - { - "name": "delete", - "value": "DELETE" - }, - { - "name": "delete_tips", - "value": "Do you want to delete this folder and its contents?" - }, - { - "name": "deleteNote", - "value": "Delete this note?" - }, - { - "name": "deleteNoteComplete", - "value": "Permanently delete this note?" - }, - { - "name": "deleteAllNote", - "value": "Delete all note?" - }, - { - "name": "deletePartNote", - "value": "Delete %d notes?" - }, - { - "name": "selected", - "value": "%d item selected" - }, - { - "name": "none_selected", - "value": "None selected" - }, - { - "name": "noteslist", - "value": "notes" - }, - { - "name": "Empty_page", - "value": "No notes" - }, - { - "name": "searchNote", - "value": "Search notes" - }, - { - "name": "chooseFolder", - "value": "Select folder" - }, - { - "name": "category_already_exist", - "value": "The folder name already exists." - }, - { - "name": "input_placeholder", - "value": "Name" - }, - { - "name": "permanently_delete_tips", - "value": "notes will be permanently deleted after the number of days shown (up to 30 days)." - }, - { - "name": "set_top", - "value": "Top" - }, - { - "name": "move", - "value": "Move" - }, - { - "name": "recover", - "value": "Restore" - }, - { - "name": "check_all", - "value": "Select all" - }, - { - "name": "editNoteTitle", - "value": "Modify the title" - }, - { - "name": "list", - "value": "Checklist" - }, - { - "name": "style", - "value": "Style" - }, - { - "name": "photo", - "value": "Gallery" - }, - { - "name": "title", - "value": "Title" - }, - { - "name": "empty_note", - "value": "The note content is empty." - }, - { - "name": "restore", - "value": "Note Restored" - } - ] -} \ No newline at end of file diff --git a/product/pc/src/main/resources/zh_CN/element/string.json b/product/pc/src/main/resources/zh_CN/element/string.json deleted file mode 100644 index 8ed957f..0000000 --- a/product/pc/src/main/resources/zh_CN/element/string.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "备忘录" - }, - { - "name": "description_mainability", - "value": "ETS_Empty Ability" - }, - { - "name": "note", - "value": "笔记" - }, - { - "name": "allNotes", - "value": "全部笔记" - }, - { - "name": "unClassified", - "value": "未分类" - }, - { - "name": "recentDeletes", - "value": "最近删除" - }, - { - "name": "myFavorites", - "value": "我的收藏" - }, - { - "name": "create", - "value": "新建" - }, - { - "name": "createFolder", - "value": "新建文件夹" - }, - { - "name": "editFolder", - "value": "编辑文件夹" - }, - { - "name": "deleteFolder", - "value": "删除文件夹" - }, - { - "name": "createNote", - "value": "新建笔记" - }, - { - "name": "cancel", - "value": "取消" - }, - { - "name": "save", - "value": "保存" - }, - { - "name": "delete", - "value": "删除" - }, - { - "name": "delete_tips", - "value": "是否删除此文件夹及其中的内容？" - }, - { - "name": "deleteNote", - "value": "是否删除此笔记？" - }, - { - "name": "deleteNoteComplete", - "value": "此笔记将被永久删除，无法恢复。是否删除？" - }, - { - "name": "deleteAllNote", - "value": "是否删除全部笔记？" - }, - { - "name": "deletePartNote", - "value": "是否删除%d条笔记？" - }, - { - "name": "selected", - "value": "已选择%d项" - }, - { - "name": "none_selected", - "value": "未选择" - }, - { - "name": "noteslist", - "value": "条笔记" - }, - { - "name": "Empty_page", - "value": "没有笔记" - }, - { - "name": "searchNote", - "value": "搜索笔记..." - }, - { - "name": "chooseFolder", - "value": "请选择文件夹" - }, - { - "name": "category_already_exist", - "value": "文件夹名称已存在" - }, - { - "name": "input_placeholder", - "value": "名称" - }, - { - "name": "permanently_delete_tips", - "value": "笔记删除前会显示剩余天数（最长30天），之后将永久删除" - }, - { - "name": "set_top", - "value": "置顶" - }, - { - "name": "move", - "value": "移到" - }, - { - "name": "recover", - "value": "恢复" - }, - { - "name": "check_all", - "value": "多选" - }, - { - "name": "editNoteTitle", - "value": "修改标题" - }, - { - "name": "list", - "value": "清单" - }, - { - "name": "style", - "value": "样式" - }, - { - "name": "photo", - "value": "相册" - }, - { - "name": "title", - "value": "标题" - }, - { - "name": "empty_note", - "value": "笔记内容为空" - }, - { - "name": "restore", - "value": "已恢复" - } - ] -} \ No newline at end of file diff --git a/product/phone/src/main/ets/MainAbility/MainAbility.ts b/product/phone/src/main/ets/MainAbility/MainAbility.ts index a950d37..ada4b82 100644 --- a/product/phone/src/main/ets/MainAbility/MainAbility.ts +++ b/product/phone/src/main/ets/MainAbility/MainAbility.ts @@ -17,7 +17,7 @@ import Ability from '@ohos.application.Ability' import AbilityConstant from '@ohos.application.AbilityConstant' import fileio from '@ohos.fileio' import inputMethod from '@ohos.inputmethod' - +globalThis.rdbStore = undefined export default class MainAbility extends Ability { private Tag = "MainAbility_Phone" diff --git a/product/tablet/src/main/ets/MainAbility/MainAbility.ts b/product/tablet/src/main/ets/MainAbility/MainAbility.ts index 746b8cf..c60c19e 100644 --- a/product/tablet/src/main/ets/MainAbility/MainAbility.ts +++ b/product/tablet/src/main/ets/MainAbility/MainAbility.ts @@ -17,7 +17,7 @@ import Ability from '@ohos.application.Ability' import AbilityConstant from '@ohos.application.AbilityConstant' import fileio from '@ohos.fileio' import inputMethod from '@ohos.inputmethod'; - +globalThis.rdbStore = undefined export default class MainAbility extends Ability { private Tag = "MainAbility_Tablet" diff --git a/product/tablet/src/main/ets/pages/NoteHome.ets b/product/tablet/src/main/ets/pages/NoteHome.ets index 1e086b5..b800fa2 100644 --- a/product/tablet/src/main/ets/pages/NoteHome.ets +++ b/product/tablet/src/main/ets/pages/NoteHome.ets @@ -62,13 +62,6 @@ export struct NoteHomeComp { } } - narrowWinListener = mediaquery.matchMediaSync('(width < 2000)') - onWinSizeChange(mediaQueryResult) { - if (this.sectionStatus != 1) { - this.sectionStatus = (mediaQueryResult.matches) ? 2 : 3 - } - } - build() { Flex({ justifyContent: FlexAlign.Start }) { // Folder list display area diff --git a/product/tablet/src/main/module.json5 b/product/tablet/src/main/module.json5 index 4199e51..3bba09c 100644 --- a/product/tablet/src/main/module.json5 +++ b/product/tablet/src/main/module.json5 @@ -23,6 +23,20 @@ "deviceTypes": [ "tablet" ], + "requestPermissions": [ + { + "name": "ohos.permission.READ_MEDIA" + }, + { + "name": "ohos.permission.WRITE_MEDIA" + }, + { + "name": "ohos.permission.MEDIA_LOCATION" + }, + { + "name": "ohos.permission.DISTRIBUTED_DATASYNC" + }, + ], "deliveryWithInstall": true, "installationFree": false, "pages": "$profile:main_pages",