openharmony/applications_mms
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_mms synced 2024-11-22 23:29:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!163 jscrash of close\id\touchend

Browse Source 
Merge pull request !163 from zhouhongli2023/master
This commit is contained in:
openharmony_ci 2024-11-19 08:18:37 +00:00 committed by Gitee
commit 8072d2bf01
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
entry/src/main/ets/pages/conversation/conversationController.ets
View File

@ -1495,8 +1495,8 @@ export default class ConversationController {
let tempWeekId = item.week?.id;
if (list.length > 0) {
item.dateShow =
(tempDateId != (list[list.length-1]).date.id)
&& (tempWeekId != (list[list.length-1]).week.id)
(tempDateId != (list[list.length-1]).date?.id)
&& (tempWeekId != (list[list.length-1]).week?.id)
}
}

21
entry/src/main/ets/pages/conversationlist/conversationListController.ets
View File

@ -367,18 +367,23 @@ export default class ConversationListController {
}
touchEnd(event: GestureEvent, index: number) {
HiLog.i(TAG, 'touchEnd, index: ' + index);
if (this.isMultipleSelectState) {
return;
}
// offsetX indicates the offset. The value range is [-operateBtnW, 0].
let offsetX = event.offsetX;
let item = this.messageList[this.itemTouchedIdx];
if (offsetX + (this.operateBtnW / 2) >= 0) {
this.setListItemTransX(0);
item.isDelShow = false;
} else {
this.setListItemTransX(0 - this.operateBtnW);
item.isDelShow = true;
try {
let offsetX = event.offsetX;
let item = this.messageList[this.itemTouchedIdx];
if (offsetX + (this.operateBtnW / 2) >= 0) {
this.setListItemTransX(0);
item.isDelShow = false;
} else {
this.setListItemTransX(0 - this.operateBtnW);
item.isDelShow = true;
}
} catch (error) {
HiLog.e(TAG, 'touchEnd: ' + JSON.stringify(error));
}
}

2
entry/src/main/ets/workers/base/WorkerWrapper.ts
View File

@ -112,7 +112,7 @@ export abstract class WorkerWrapper {
HiLog.i(TAG, `${this.getWorkerType()} worker close!`);
if (this.mWorker != null) {
HiLog.i(TAG, 'this mWorker is right');
this.mWorker.terminate();
this.mWorker?.terminate();
}
this.mWorker = null;
this.callBacks.clear();