diff --git a/common/utils/src/main/ets/default/baseUtil/NoteUtil.ets b/common/utils/src/main/ets/default/baseUtil/NoteUtil.ets index 8b477f9..8d16763 100644 --- a/common/utils/src/main/ets/default/baseUtil/NoteUtil.ets +++ b/common/utils/src/main/ets/default/baseUtil/NoteUtil.ets @@ -301,7 +301,7 @@ export class NoteUtil { initContent = inputBuffer.toString('base64'); } return initContent; - }; + } } let noteUtil = new NoteUtil(); diff --git a/features/src/main/ets/components/NoteContent.ets b/features/src/main/ets/components/NoteContent.ets index 3f17804..5b70e68 100644 --- a/features/src/main/ets/components/NoteContent.ets +++ b/features/src/main/ets/components/NoteContent.ets @@ -101,7 +101,7 @@ export struct NoteContent { 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/NoteListComp.ets b/features/src/main/ets/components/NoteListComp.ets index 37c7446..25fd24b 100644 --- a/features/src/main/ets/components/NoteListComp.ets +++ b/features/src/main/ets/components/NoteListComp.ets @@ -69,96 +69,93 @@ abstract class BasicDataSource implements IDataSource { public getData(index: number): T | void { LogUtil.info(TAG, 'getDataindex: ' + index); - }; + } registerDataChangeListener(listener: DataChangeListener): void { if (this.listeners.indexOf(listener) < 0) { this.listeners.push(listener); } - ; - }; + } unregisterDataChangeListener(listener: DataChangeListener): void { const pos = this.listeners.indexOf(listener); if (pos >= 0) { this.listeners.splice(pos, 1); } - ; - }; + } notifyDataReload(): void { this.listeners.forEach((listener: DataChangeListener) => { listener.onDataReloaded(); }); - }; + } notifyDataAdd(index: number): void { this.listeners.forEach((listener: DataChangeListener) => { listener.onDataAdd(index); }); - }; + } notifyDataChange(index: number): void { this.listeners.forEach((listener: DataChangeListener) => { listener.onDataChange(index); }); - }; + } notifyDataDelete(index: number): void { this.listeners.forEach((listener: DataChangeListener) => { listener.onDataDelete(index); }); - }; + } notifyDataMove(from: number, to: number): void { this.listeners.forEach((listener: DataChangeListener) => { listener.onDataMove(from, to); }); - }; + } } -; class noteListData extends BasicDataSource { private noteList: Array = []; public totalCount(): number { return this.noteList.length; - }; + } public getData(index: number): NoteData { LogUtil.info(TAG, 'getData, index=' + index); return this.noteList[index]; - }; + } public addData(index: number, data: NoteData): void { this.noteList.splice(index, 0, data); this.notifyDataAdd(index); - }; + } public pushData(data: NoteData): void { this.noteList.push(data); this.notifyDataAdd(this.noteList.length - 1); - }; + } // 查找列表中对象的index public indexOf(data: NoteData): number { LogUtil.info(TAG, `indexOf data , id = ${data.id} , name = ${data.title}`); return this.noteList.indexOf(data); - }; + } // 删除列表中处于index位置的对象 public deleteDataByIndex(index: number): void { LogUtil.info(TAG, `delete data , index = ${index}}`); this.noteList.splice(index, 1); this.notifyDataDelete(index); - }; + } // 删除列表中的对象 public deleteData(data: NoteData): void { LogUtil.info(TAG, `delete data , data = ${data.id}}`); let index = this.indexOf(data); this.deleteDataByIndex(index); - }; + } // 修改列表中所有对象 public modifyAllData(data: NoteData[]): void { @@ -167,7 +164,6 @@ class noteListData extends BasicDataSource { this.notifyDataReload(); } } -; // Note list component @Component @@ -559,7 +555,6 @@ export struct NoteItemListComp { this.setNoteListLazy() return; } - ; SearchModel.search(NoteUtil.getNoteDataArray(AppStorage.get('AllNoteArray')!, this.selectedFolderData.uuid), this.inputKeyword) .then((result: NoteData[]) => { diff --git a/product/default/oh-package.json5 b/product/default/oh-package.json5 index 2ed8e33..4eaed81 100644 --- a/product/default/oh-package.json5 +++ b/product/default/oh-package.json5 @@ -3,7 +3,6 @@ "devDependencies": {}, "name": "default", "description": "example description", - "repository": {}, "version": "1.0.0", "dependencies": { "@ohos/utils": "file:../../common/utils", diff --git a/product/default/src/main/ets/MainAbility/MainAbility.ts b/product/default/src/main/ets/MainAbility/MainAbility.ts index 16eb395..20ed46d 100644 --- a/product/default/src/main/ets/MainAbility/MainAbility.ts +++ b/product/default/src/main/ets/MainAbility/MainAbility.ts @@ -80,10 +80,11 @@ export default class MainAbility extends UIAbility { LogUtil.info(this.Tag, " getMainWindow"); let windowClass = data; try { - windowClass.on('windowSizeChange', (data) => { - LogUtil.info(this.Tag, " --------------- windowSizeChange ---------------"); - this.screenBreakPoints(data.width); - }) + // 窗口尺寸改变时改变页面布局,可能导致freeze,暂时注释代码进行规避,验证freeze问题后删除。 + // windowClass.on('windowSizeChange', (data) => { + // LogUtil.info(this.Tag, " --------------- windowSizeChange ---------------"); + // this.screenBreakPoints(data.width); + // }) // 窗口规避区域 windowClass.on('avoidAreaChange', ({ type, area }) => { if (type === window.AvoidAreaType.TYPE_SYSTEM) {