openharmony/applications_launcher
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_launcher synced 2024-11-23 06:50:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!449 fix：修复拖动图标结束后，取消通知，数字角标未及时更新的问题

Browse Source 
Merge pull request !449 from giteewzp/master2023121401
This commit is contained in:
openharmony_ci 2023-12-14 14:10:13 +00:00 committed by Gitee
commit 599ff1603d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
feature/pagedesktop/src/main/ets/default/common/components/SwiperPage.ets
View File

@ -21,7 +21,8 @@ import {
localEventManager, localEventManager,
EventConstants, EventConstants,
CardItemInfo, CardItemInfo,
FolderData FolderData,
BadgeManager
} from '@ohos/common'; } from '@ohos/common';
import AppItem from './AppItem'; import AppItem from './AppItem';
import FormItem from './FormItem'; import FormItem from './FormItem';
@ -262,6 +263,10 @@ export default struct SwiperPage {
const dragResult = PageDesktopDragHandler.getInstance().onDragDrop(event.getWindowX(), event.getWindowY()); const dragResult = PageDesktopDragHandler.getInstance().onDragDrop(event.getWindowX(), event.getWindowY());
Log.showInfo(TAG, `onDrop dragResult: ${dragResult}`); Log.showInfo(TAG, `onDrop dragResult: ${dragResult}`);
AppStorage.setOrCreate('selectAppIndex', null); AppStorage.setOrCreate('selectAppIndex', null);
const dragItemInfo: LauncherDragItemInfo = AppStorage.get('dragItemInfo') as LauncherDragItemInfo;
if (dragItemInfo.bundleName) {
BadgeManager.getInstance().updateBadgeNumber(dragItemInfo.bundleName, dragItemInfo.badgeNumber);
}
if (!dragResult) { if (!dragResult) {
AppStorage.setOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo()); AppStorage.setOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
} else { } else {

7
feature/smartdock/src/main/ets/default/layout/ResidentLayout.ets
View File

@ -24,7 +24,8 @@ import {
StyleConstants, StyleConstants,
ResourceManager, ResourceManager,
Log, Log,
MenuInfo MenuInfo,
BadgeManager
} from '@ohos/common'; } from '@ohos/common';
import { SmartDockStyleConfig } from '../config/SmartDockStyleConfig'; import { SmartDockStyleConfig } from '../config/SmartDockStyleConfig';
import SmartDockDragHandler from '../common/SmartDockDragHandler'; import SmartDockDragHandler from '../common/SmartDockDragHandler';
@ -122,6 +123,10 @@ export default struct ResidentLayout {
Log.showInfo(TAG, `onDrop event: [${event.getWindowX()}, ${event.getWindowY()}]`); Log.showInfo(TAG, `onDrop event: [${event.getWindowX()}, ${event.getWindowY()}]`);
const dragResult = SmartDockDragHandler.getInstance().onDragDrop(event.getWindowX(), event.getWindowY()); const dragResult = SmartDockDragHandler.getInstance().onDragDrop(event.getWindowX(), event.getWindowY());
AppStorage.setOrCreate('selectAppIndex', null); AppStorage.setOrCreate('selectAppIndex', null);
const dragItemInfo: LauncherDragItemInfo = AppStorage.get('dragItemInfo') as LauncherDragItemInfo;
if (dragItemInfo.bundleName) {
BadgeManager.getInstance().updateBadgeNumber(dragItemInfo.bundleName, dragItemInfo.badgeNumber);
}
if (!dragResult) { if (!dragResult) {
AppStorage.setOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo()); AppStorage.setOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
} else { } else {