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

sync launcher code

Browse Source 
Signed-off-by: zhoujing <zhoujing96@huawei.com>
This commit is contained in:
zhoujing 2022-05-18 16:21:08 +08:00
parent c4ab9e2368
commit 79f110f422
3 changed files with 85 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/ets/default/manager/AmsMissionManager.ts
View File

@ -68,7 +68,7 @@ class AmsMissionManager {
recentMissionInfo.bundleName = recentItem.want.bundleName;
recentMissionInfo.abilityName = recentItem.want.abilityName;
recentMissionInfo.lockedState = recentItem.lockedState;
const appInfo = await launcherAbilityManager.getAppInfoByBundleName(recentMissionInfo.bundleName);
const appInfo = await launcherAbilityManager.getAppInfoByBundleAndAbility(recentMissionInfo.bundleName, recentMissionInfo.abilityName);
if (appInfo == undefined) {
continue;
}
@ -103,6 +103,7 @@ class AmsMissionManager {
for (let i = 0; i < missionInfos.length; i++) {
let missionInfo = missionInfos[i];
let bundleName = missionInfo.want.bundleName!;
let abilityName = missionInfo.want.abilityName!;
let localMissionInfo = recentMissionsList.find((item) => item.bundleName === bundleName);
if (localMissionInfo) {
let missionInfoAdd = new MissionInfo();
@ -111,7 +112,7 @@ class AmsMissionManager {
} else {
let recentTaskInfo = new RecentBundleMissionInfo();
recentTaskInfo.bundleName = bundleName;
const appInfo = await launcherAbilityManager.getAppInfoByBundleName(bundleName);
const appInfo = await launcherAbilityManager.getAppInfoByBundleAndAbility(bundleName, abilityName);
if (appInfo == undefined) {
continue;
}

36
common/src/main/ets/default/manager/LauncherAbilityManager.ts
View File

@ -323,6 +323,42 @@ class LauncherAbilityManager {
});
Log.showInfo(TAG, `startLauncherAbilityByUri AceApplication : startAbility : ${result}`);
}
/**
* get AppItemInfo from BMS with bundleName and abilityName
* @params bundleName
* @params abilityName
* @return AppItemInfo
*/
async getAppInfoByBundleAndAbility(bundleName: string, abilityName: string): Promise<AppItemInfo | undefined> {
let appItemInfo: AppItemInfo | undefined = undefined;
// get from system
let abilityInfos = new Array<LauncherAbilityInfo>();
await launcherBundleMgr.getLauncherAbilityInfos(bundleName, LauncherAbilityManager.CURRENT_USER_ID)
.then((res)=>{
if (res != undefined) {
Log.showInfo(TAG, `getAppInfoByBundleAndAbility res length: ${res.length}`);
abilityInfos = res;
}
})
.catch((err)=>{
Log.showInfo(TAG, `getAppInfoByBundleName launcherBundleMgr getLauncherAbilityInfos error: ${JSON.stringify(err)}`);
});
if (CheckEmptyUtils.isEmptyArr(abilityInfos)) {
Log.showInfo(TAG, `bundleName: ${bundleName} abilityName: ${abilityName} get appInfo from BMS empty!`);
return undefined;
}
let appInfo = abilityInfos.find(item => {
return item.elementName.abilityName === abilityName;
});
Log.showInfo(TAG, `getAppInfoByBundleAndAbility appInfo: ${JSON.stringify(appInfo)}`);
const data = await this.convertToAppItemInfo(appInfo);
Log.showInfo(TAG, `getAppInfoByBundleAndAbility from BMS: ${JSON.stringify(data)}`);
return data;
}
}
const launcherAbilityManager = LauncherAbilityManager.getInstance();

61
feature/pagedesktop/src/main/ets/default/common/PageDesktopDragHandler.ts
View File

@ -285,10 +285,13 @@ export default class PageDesktopDragHandler extends BaseDragHandler {
console.info('Launcher PageDesktop onDragDrop insertIndex: ' + insertIndex + ' ,mIsInEffectArea: ' + this.mIsInEffectArea);
AppStorage.SetOrCreate('overlayMode', CommonConstants.OVERLAY_TYPE_HIDE);
let isDragSuccess = false;
const startPosition = this.copyPosition(this.mStartPosition);
let endPosition = null;
if (this.mIsInEffectArea) {
const moveAppX = event.touches[0].screenX;
const moveAppY = event.touches[0].screenY;
this.mEndPosition = this.getTouchPosition(moveAppX, moveAppY);
endPosition = this.copyPosition(this.mEndPosition);
const dragItemInfo = this.getDragItemInfo();
const info = this.mPageDesktopViewModel.getLayoutInfo();
const layoutInfo = info.layoutInfo;
@ -299,7 +302,7 @@ export default class PageDesktopDragHandler extends BaseDragHandler {
} else if(dragItemInfo.type === CommonConstants.TYPE_APP) {
// end position is the same as start position
if (this.isMoveToSamePosition(dragItemInfo)) {
this.deleteBlankPageAfterDragging();
this.deleteBlankPageAfterDragging(startPosition, endPosition);
return true;
}
const endLayoutInfo = this.getEndLayoutInfo(layoutInfo);
@ -308,15 +311,16 @@ export default class PageDesktopDragHandler extends BaseDragHandler {
const appInfo = this.createNewAppInfo(dragItemInfo);
// add app to folder
this.mFolderViewModel.addOneAppToFolder(appInfo, endLayoutInfo.folderId);
this.deleteBlankPageAfterDragging();
this.deleteBlankPageAfterDragging(startPosition, endPosition);
return true;
} else if (endLayoutInfo.type === CommonConstants.TYPE_APP) {
// create a new folder
const appListInfo = [endLayoutInfo];
const startLayoutInfo = this.getStartLayoutInfo(layoutInfo, dragItemInfo);
appListInfo.push(startLayoutInfo);
this.mFolderViewModel.addNewFolder(appListInfo);
this.deleteBlankPageAfterDragging();
this.mFolderViewModel.addNewFolder(appListInfo).then(()=> {
this.deleteBlankPageAfterDragging(startPosition, endPosition);
});
return true;
}
}
@ -331,7 +335,7 @@ export default class PageDesktopDragHandler extends BaseDragHandler {
console.info('Launcher PageDesktop onDragEnd not selfDrag');
}
}
this.deleteBlankPageAfterDragging();
this.deleteBlankPageAfterDragging(startPosition, endPosition);
return isDragSuccess;
}
@ -348,26 +352,53 @@ export default class PageDesktopDragHandler extends BaseDragHandler {
}
/**
* delete blank page after dragging
* copy a new position object by original position
*
* @param position - original position
*/
private deleteBlankPageAfterDragging(): void {
private copyPosition(position) {
if (CheckEmptyUtils.isEmpty(position)) {
return null;
}
const directionPosition = {
page: position.page,
row: position.row,
column: position.column,
X: position.X,
Y: position.Y
};
return directionPosition;
}
/**
* delete blank page after dragging
*
* @param startPosition - drag start position
* @param endPosition - drag end position
*/
private deleteBlankPageAfterDragging(startPosition, endPosition): void {
const layoutInfo = this.mPageDesktopViewModel.getLayoutInfo();
const pageCount = layoutInfo.layoutDescription.pageCount;
const isAddByDraggingFlag = this.mPageDesktopViewModel.isAddByDragging();
let deleteLastFlag = false;
if (isAddByDraggingFlag && (CheckEmptyUtils.isEmpty(this.mEndPosition) ||
!CheckEmptyUtils.isEmpty(this.mEndPosition) && this.mEndPosition.page != pageCount - 1 )) {
if (isAddByDraggingFlag && (CheckEmptyUtils.isEmpty(endPosition) ||
!CheckEmptyUtils.isEmpty(endPosition) && endPosition.page != pageCount - 1 )) {
layoutInfo.layoutDescription.pageCount = pageCount - 1;
deleteLastFlag = true;
}
let deleteStartFlag = false;
if (!CheckEmptyUtils.isEmpty(this.mStartPosition)) {
deleteStartFlag = this.mPageDesktopViewModel.deleteBlankPageFromLayoutInfo(layoutInfo, this.mStartPosition.page);
if (!CheckEmptyUtils.isEmpty(startPosition)) {
deleteStartFlag = this.mPageDesktopViewModel.deleteBlankPageFromLayoutInfo(layoutInfo, startPosition.page);
}
if (CheckEmptyUtils.isEmpty(this.mEndPosition)) {
this.mPageDesktopViewModel.changeIndex(this.mStartPosition.page);
} else if (deleteStartFlag && this.mStartPosition.page > this.mEndPosition.page) {
this.mPageDesktopViewModel.changeIndex(this.mEndPosition.page);
if (CheckEmptyUtils.isEmpty(endPosition)) {
this.mPageDesktopViewModel.changeIndex(startPosition.page);
} else if (deleteStartFlag) {
if (startPosition.page > endPosition.page) {
this.mPageDesktopViewModel.changeIndex(endPosition.page);
} else if (endPosition.page > startPosition.page &&
endPosition.page < layoutInfo.layoutDescription.pageCount) {
this.mPageDesktopViewModel.changeIndex(endPosition.page - 1);
}
}
if (deleteLastFlag || deleteStartFlag) {
this.mPageDesktopViewModel.setLayoutInfo(layoutInfo);