From f9334ba01edc7ad742b7fa03123477c90eabf095 Mon Sep 17 00:00:00 2001 From: wangzhiyusss Date: Sat, 8 Apr 2023 10:49:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=87=E5=BF=98=E5=BD=95js?= =?UTF-8?q?crash?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangzhiyusss --- .../utils/src/main/ets/default/baseUtil/DateUtil.ets | 1 - .../src/main/ets/default/baseUtil/FolderUtil.ets | 1 - .../src/main/ets/default/baseUtil/LayoutUtil.ets | 9 +-------- .../utils/src/main/ets/default/baseUtil/NoteUtil.ets | 5 +---- .../src/main/ets/default/baseUtil/RdbStoreUtil.ets | 12 ++++++------ .../ets/default/model/databaseModel/SysDefData.ets | 4 +++- .../ets/default/model/searchModel/SearchModel.ets | 5 ----- features/src/main/ets/components/FolderListComp.ets | 1 - features/src/main/ets/components/NoteContent.ets | 5 +---- .../main/ets/components/NoteContentCompPortrait.ets | 1 - features/src/main/ets/components/NoteListComp.ets | 2 -- product/default/src/main/ets/pages/MyNoteHome.ets | 2 -- product/default/src/main/ets/pages/NoteHome.ets | 3 --- .../default/src/main/ets/pages/NoteHomePortrait.ets | 4 ---- 14 files changed, 12 insertions(+), 43 deletions(-) diff --git a/common/utils/src/main/ets/default/baseUtil/DateUtil.ets b/common/utils/src/main/ets/default/baseUtil/DateUtil.ets index 3d97ea6..75a1864 100644 --- a/common/utils/src/main/ets/default/baseUtil/DateUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/DateUtil.ets @@ -14,7 +14,6 @@ */ import {LogUtil} from './LogUtil' -import GlobalResourceManager from './GlobalResourceManager' const TAG = "DateUtil" diff --git a/common/utils/src/main/ets/default/baseUtil/FolderUtil.ets b/common/utils/src/main/ets/default/baseUtil/FolderUtil.ets index f6365a7..0ba8279 100644 --- a/common/utils/src/main/ets/default/baseUtil/FolderUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/FolderUtil.ets @@ -18,7 +18,6 @@ import FolderData from '../model/databaseModel/FolderData' import NoteData from '../model/databaseModel/NoteData' import {SysDefFolderUuid, FolderType, Favorite, Delete} from '../model/databaseModel/EnumData' import GlobalResourceManager from './GlobalResourceManager' -import StyleConstants from '../constants/StyleConstants' import {LogUtil} from './LogUtil' const TAG = "FolderUtil" diff --git a/common/utils/src/main/ets/default/baseUtil/LayoutUtil.ets b/common/utils/src/main/ets/default/baseUtil/LayoutUtil.ets index 872aac9..29e5799 100644 --- a/common/utils/src/main/ets/default/baseUtil/LayoutUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/LayoutUtil.ets @@ -13,15 +13,8 @@ * limitations under the License. */ -import {WidthWeightMessage, unSelectedNoteBgColorMap, selectedNoteBgColorMap, folderTextMap, widthWeightMessageMap} from '../model/NoteBaseData' -import FolderData from '../model/databaseModel/FolderData' -import NoteData from '../model/databaseModel/NoteData' -import {SysDefFolderUuid, FolderType, Favorite, Delete} from '../model/databaseModel/EnumData' -import GlobalResourceManager from './GlobalResourceManager' -import StyleConstants from '../constants/StyleConstants' +import {WidthWeightMessage, widthWeightMessageMap} from '../model/NoteBaseData' import {LogUtil} from './LogUtil' -import FolderUtil from './FolderUtil' -import NoteUtil from './NoteUtil' const TAG = "LayoutUtil" diff --git a/common/utils/src/main/ets/default/baseUtil/NoteUtil.ets b/common/utils/src/main/ets/default/baseUtil/NoteUtil.ets index 26dbb62..df10ebb 100644 --- a/common/utils/src/main/ets/default/baseUtil/NoteUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/NoteUtil.ets @@ -13,18 +13,15 @@ * limitations under the License. */ -import {WidthWeightMessage, unSelectedNoteBgColorMap, selectedNoteBgColorMap, folderTextMap, widthWeightMessageMap -} from '../model/NoteBaseData' +import {unSelectedNoteBgColorMap, selectedNoteBgColorMap} from '../model/NoteBaseData' import FolderData from '../model/databaseModel/FolderData' import NoteData from '../model/databaseModel/NoteData' import {SysDefFolderUuid, FolderType, Favorite, Delete, TableName, NoteTableColumn, } from '../model/databaseModel/EnumData' -import GlobalResourceManager from './GlobalResourceManager' import StyleConstants from '../constants/StyleConstants' import {LogUtil} from './LogUtil' import FolderUtil from './FolderUtil' import RdbStoreUtil from './RdbStoreUtil' -import prompt from '@system.prompt' const TAG = "NoteUtil" diff --git a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets index 5b06d8e..5d3e9a4 100644 --- a/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/RdbStoreUtil.ets @@ -14,7 +14,6 @@ */ import { atob } from 'js-base64' -import ohosDataRdb from '@ohos.data.rdb' import fileio from '@ohos.fileio' import { LogUtil } from './LogUtil' import FolderUtil from './FolderUtil' @@ -24,6 +23,7 @@ import FolderData from '../model/databaseModel/FolderData' import NoteData from '../model/databaseModel/NoteData' import { TableSql, TableName, FolderTableColumn, NoteTableColumn, SysDefFolderUuid } from '../model/databaseModel/EnumData' +import relationalStore from '@ohos.data.relationalStore' const TAG = "RdbStoreUtil" @@ -38,7 +38,7 @@ export default { * create db and table */ createRdbStore(context) { - ohosDataRdb.getRdbStore(context, SysDefData.dbInfo.db_name, SysDefData.dbInfo.db_verison) + relationalStore.getRdbStore(context, SysDefData.dbInfo.db_name) .then(async (store) => { LogUtil.info(TAG, "createRdbStore, store is " + store) globalThis.rdbStore = store @@ -170,13 +170,13 @@ export default { initAppStorage(context) { let folderDataArray = [] let noteDataArray = [] - ohosDataRdb.getRdbStore(context, SysDefData.dbInfo.db_name, SysDefData.dbInfo.db_verison) + relationalStore.getRdbStore(context, SysDefData.dbInfo.db_name) .then(async (store) => { LogUtil.info(TAG, "initAppStorage, store is " + store) globalThis.rdbStore = store // query folder let columns_folder = [] - let predicates_folder = new ohosDataRdb.RdbPredicates(TableName.FolderTable) + let predicates_folder = new relationalStore.RdbPredicates(TableName.FolderTable) 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)) @@ -194,7 +194,7 @@ export default { LogUtil.info(TAG, "folderDataArray[query] : " + folderDataArray.length) // query note let columns_note = [] - let predicates_note = new ohosDataRdb.RdbPredicates(TableName.NoteTable) + let predicates_note = new relationalStore.RdbPredicates(TableName.NoteTable) 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)) @@ -478,7 +478,7 @@ export default { * @param tableName */ getRdbPredicates(tableName) { - return new ohosDataRdb.RdbPredicates(tableName) + return new relationalStore.RdbPredicates(tableName) }, updataNoteImage(noteData: NoteData): string { 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 ef10817..68fe7be 100644 --- a/common/utils/src/main/ets/default/model/databaseModel/SysDefData.ets +++ b/common/utils/src/main/ets/default/model/databaseModel/SysDefData.ets @@ -14,6 +14,7 @@ */ import {SysDefFolder, SysDefFolderUuid, FolderType, NoteType, Favorite, Top, Delete} from './EnumData' +import relationalStore from '@ohos.data.relationalStore' export default { /** @@ -21,7 +22,8 @@ export default { */ dbInfo: { db_name: { - name: "note.db" // 数据库名称 + name: "note.db", // 数据库名称 + securityLevel: relationalStore.SecurityLevel.S1 }, db_verison: 1 // 数据库版本 }, diff --git a/common/utils/src/main/ets/default/model/searchModel/SearchModel.ets b/common/utils/src/main/ets/default/model/searchModel/SearchModel.ets index dfc5b62..7fba116 100644 --- a/common/utils/src/main/ets/default/model/searchModel/SearchModel.ets +++ b/common/utils/src/main/ets/default/model/searchModel/SearchModel.ets @@ -15,11 +15,6 @@ import {LogUtil} from '../../baseUtil/LogUtil' import NoteData from '../../model/databaseModel/NoteData' -import ohosDataRdb from '@ohos.data.rdb'; -import {TableName, NoteTableColumn} from '../../model/databaseModel/EnumData' -import NoteUtil from '../../baseUtil/NoteUtil' -import RdbStoreUtil from '../../baseUtil/RdbStoreUtil' -import SysDefData from '../../model/databaseModel/SysDefData' import util from '@ohos.util' const TAG = "SearchModel" diff --git a/features/src/main/ets/components/FolderListComp.ets b/features/src/main/ets/components/FolderListComp.ets index cc351b3..9ccc36d 100644 --- a/features/src/main/ets/components/FolderListComp.ets +++ b/features/src/main/ets/components/FolderListComp.ets @@ -25,7 +25,6 @@ import { DeleteFileType } from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' import { NewOrEditFolderDialog, DeleteDialog } from './CusDialogComp' -import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants' import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil' import FolderUtil from '@ohos/utils/src/main/ets/default/baseUtil/FolderUtil' import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil' diff --git a/features/src/main/ets/components/NoteContent.ets b/features/src/main/ets/components/NoteContent.ets index 2b56d2d..aefe438 100644 --- a/features/src/main/ets/components/NoteContent.ets +++ b/features/src/main/ets/components/NoteContent.ets @@ -26,14 +26,11 @@ import { Delete } from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants' -import { EditContentDialog, DeleteDialog, EditTitleDialog } from './CusDialogComp' +import { EditContentDialog, EditTitleDialog } from './CusDialogComp' import FolderUtil from '@ohos/utils/src/main/ets/default/baseUtil/FolderUtil' import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil' -import prompt from '@system.prompt' -import featureAbility from '@ohos.ability.featureAbility' import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' import OperationUtils from '@ohos/utils/src/main/ets/default/baseUtil/OperationUtils' -import mediaquery from '@ohos.mediaquery' import router from '@system.router'; import inputMethod from '@ohos.inputMethod'; import { folderTextMap } from '@ohos/utils/src/main/ets/default/model/NoteBaseData' diff --git a/features/src/main/ets/components/NoteContentCompPortrait.ets b/features/src/main/ets/components/NoteContentCompPortrait.ets index e60b0b6..35a179f 100644 --- a/features/src/main/ets/components/NoteContentCompPortrait.ets +++ b/features/src/main/ets/components/NoteContentCompPortrait.ets @@ -35,7 +35,6 @@ import OperationUtils from '@ohos/utils/src/main/ets/default/baseUtil/OperationU import router from '@system.router' import inputMethod from '@ohos.inputMethod'; import { folderTextMap } from '@ohos/utils/src/main/ets/default/model/NoteBaseData' -import rs from '@ohos.resourceManager' import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; var time_id: number diff --git a/features/src/main/ets/components/NoteListComp.ets b/features/src/main/ets/components/NoteListComp.ets index 1cb218c..73c4ac6 100644 --- a/features/src/main/ets/components/NoteListComp.ets +++ b/features/src/main/ets/components/NoteListComp.ets @@ -30,11 +30,9 @@ import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil import prompt from '@system.prompt' import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil' import FolderUtil from '@ohos/utils/src/main/ets/default/baseUtil/FolderUtil' -import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants' import SearchModel from '@ohos/utils/src/main/ets/default/model/searchModel/SearchModel' import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' import router from '@system.router'; -import rs from '@ohos.resourceManager' import inputMethod from '@ohos.inputMethod'; const TAG = "NoteListComp" diff --git a/product/default/src/main/ets/pages/MyNoteHome.ets b/product/default/src/main/ets/pages/MyNoteHome.ets index eb899da..a5dc32d 100644 --- a/product/default/src/main/ets/pages/MyNoteHome.ets +++ b/product/default/src/main/ets/pages/MyNoteHome.ets @@ -14,12 +14,10 @@ */ import fileio from '@ohos.fileio' -import deviceInfo from '@ohos.deviceInfo'; import { NoteHomeComp } from './NoteHome' import { NoteHomePortraitComp } from './NoteHomePortrait' import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' import RdbStoreUtil from '@ohos/utils/src/main/ets/default/baseUtil/RdbStoreUtil' -import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData' import inputMethod from '@ohos.inputMethod'; import router from '@system.router'; import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; diff --git a/product/default/src/main/ets/pages/NoteHome.ets b/product/default/src/main/ets/pages/NoteHome.ets index d35941a..0dcbb1e 100644 --- a/product/default/src/main/ets/pages/NoteHome.ets +++ b/product/default/src/main/ets/pages/NoteHome.ets @@ -21,10 +21,7 @@ import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' import { circleColorArray } from '@ohos/utils/src/main/ets/default/model/NoteBaseData' import FolderData from '@ohos/utils/src/main/ets/default/model/databaseModel/FolderData' import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData' -import { SysDefFolderUuid } from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' import LayoutUtil from '@ohos/utils/src/main/ets/default/baseUtil/LayoutUtil' -import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil' -import mediaquery from '@ohos.mediaquery' @Entry @Component diff --git a/product/default/src/main/ets/pages/NoteHomePortrait.ets b/product/default/src/main/ets/pages/NoteHomePortrait.ets index 66e9356..37d9867 100644 --- a/product/default/src/main/ets/pages/NoteHomePortrait.ets +++ b/product/default/src/main/ets/pages/NoteHomePortrait.ets @@ -15,15 +15,11 @@ import { FolderListComp } from '@ohos/component/src/main/ets/components/FolderListComp' import { NoteListComp } from '@ohos/component/src/main/ets/components/NoteListComp' -import { NoteContentCompPortrait } from '@ohos/component/src/main/ets/components/NoteContentCompPortrait' import StyleConstants from '@ohos/utils/src/main/ets/default/constants/StyleConstants' import { LogUtil } from '@ohos/utils/src/main/ets/default/baseUtil/LogUtil' import { circleColorArray } from '@ohos/utils/src/main/ets/default/model/NoteBaseData' import FolderData from '@ohos/utils/src/main/ets/default/model/databaseModel/FolderData' import NoteData from '@ohos/utils/src/main/ets/default/model/databaseModel/NoteData' -import { SysDefFolderUuid } from '@ohos/utils/src/main/ets/default/model/databaseModel/EnumData' -import LayoutUtil from '@ohos/utils/src/main/ets/default/baseUtil/LayoutUtil' -import NoteUtil from '@ohos/utils/src/main/ets/default/baseUtil/NoteUtil' @Entry @Component -- Gitee