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

arkts适配

Browse Source 
Signed-off-by: gengzhengxing <gengzhengxing1@h-partners.com>
This commit is contained in:
gengzhengxing 2023-11-06 20:45:50 +08:00
parent 147db2eb82
commit 1f3c56bc20
2 changed files with 48 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
feature/pagedesktop/src/main/ets/default/common/components/AppItem.ets
View File

@ -28,7 +28,8 @@ import {
StyleConstants,
PresetStyleConstants,
ResourceManager,
CommonConstants
CommonConstants,
MenuInfo
} from '@ohos/common';
import { PageDesktopDragHandler } from '../PageDesktopDragHandler';
import { PageDesktopViewModel } from '../../viewmodel/PageDesktopViewModel';
@ -38,6 +39,17 @@ const DOUBLE_CLICK_COUNT = 2
const TAG = "AppItem";
interface StartAppItemInfo {
bundleName?: string;
abilityName?: string;
moduleName?: string;
appIconSize: number;
appIconId?: number;
icon: ResourceStr;
row?: number;
column?: number;
}
@Component
export default struct AppItem {
@StorageLink('dragItemInfo') pageDesktopDragItemInfo: LauncherDragItemInfo = new LauncherDragItemInfo();
@ -53,14 +65,14 @@ export default struct AppItem {
mIconNameMargin: number = PresetStyleConstants.DEFAULT_ICON_NAME_GAP;
private mMargin: number = 0;
private mMarginVertical: number = 0;
private mGridSpaceWidth : number;
private mGridSpaceHeight : number;
private mGridSpaceWidth : number = 0;
private mGridSpaceHeight : number = 0;
private isSwappingPage = false;
private item: any;
private mPageDesktopViewModel: PageDesktopViewModel;
private item: LauncherDragItemInfo = new LauncherDragItemInfo();
private mPageDesktopViewModel?: PageDesktopViewModel;
private isPad: boolean = false;
private mPageDesktopDragHandler: PageDesktopDragHandler;
private mPageDesktopStartAppHandler: PageDesktopStartAppHandler;
private mPageDesktopDragHandler: PageDesktopDragHandler = PageDesktopDragHandler.getInstance();
private mPageDesktopStartAppHandler: PageDesktopStartAppHandler = PageDesktopStartAppHandler.getInstance();
private mouseClick: number = 0;
private dialogName: string = '';
private clearForm = () => {};
@ -70,12 +82,12 @@ export default struct AppItem {
cancel: () => {},
confirm: () => {
if (this.isPad) {
this.mPageDesktopViewModel.deleteAppItem({
this.mPageDesktopViewModel?.deleteAppItem({
bundleName: undefined,
keyName: this.appInfo.keyName
});
} else {
this.mPageDesktopViewModel.uninstallApp(this.appInfo.bundleName, this.appInfo.isUninstallAble);
this.mPageDesktopViewModel?.uninstallApp(this.appInfo.bundleName, this.appInfo.isUninstallAble);
}
},
dialogName: this.dialogName,
@ -91,16 +103,16 @@ export default struct AppItem {
*/
formManagerDialogController: CustomDialogController | null = new CustomDialogController({
builder: FormManagerDialog({
cancel: (callback?) => {
cancel: (callback?: () => void) => {
// delete all form
if (callback != undefined) {
this.clearForm = callback;
}
},
confirm: (formCardItem) => {
confirm: (formCardItem: CardItemInfo) => {
// add form to desktop
Log.showInfo(TAG, `createCardToDeskTop formCardItem: ${JSON.stringify(formCardItem)}`);
this.mPageDesktopViewModel.createCardToDeskTop(formCardItem);
this.mPageDesktopViewModel?.createCardToDeskTop(formCardItem);
// delete other form
},
bundleName: this.formAppInfo.bundleName,
@ -121,6 +133,7 @@ export default struct AppItem {
}
aboutToAppear(): void {
this.mPageDesktopViewModel = PageDesktopViewModel.getInstance();
this.mPageDesktopDragHandler = PageDesktopDragHandler.getInstance();
this.mPageDesktopStartAppHandler = PageDesktopStartAppHandler.getInstance();
this.isPad = this.mPageDesktopViewModel.getDevice();
@ -145,9 +158,9 @@ export default struct AppItem {
this.formManagerDialogController = null;
}
getMenuInfoList() {
const menuInfo = this.mPageDesktopViewModel.buildMenuInfoList(this.item,
this.dialogController, this.formManagerDialogController)
getMenuInfoList = (): MenuInfo[] => {
const menuInfo = this.mPageDesktopViewModel?.buildMenuInfoList(this.item,
this.dialogController, this.formManagerDialogController) as MenuInfo[];
return menuInfo;
}
@ -164,7 +177,7 @@ export default struct AppItem {
iconSize: this.mIconSize,
nameSize: this.mAppNameSize,
nameHeight: this.mAppNameHeight,
nameFontColor: this.mPageDesktopViewModel.getPageDesktopStyleConfig().mNameFontColor,
nameFontColor: this.mPageDesktopViewModel?.getPageDesktopStyleConfig().mNameFontColor as string,
appName: this.item.appName,
bundleName: this.item.bundleName,
abilityName: this.item.abilityName,
@ -173,11 +186,11 @@ export default struct AppItem {
appLabelId: this.item.appLabelId,
badgeNumber: this.item.badgeNumber,
isSelect: this.selectDesktopAppItem == this.item.keyName,
getMenuInfoList: this.getMenuInfoList.bind(this),
getMenuInfoList: this.getMenuInfoList,
mPaddingTop: this.mMarginVertical,
nameLines: this.mNameLines,
mIconNameMargin: this.mIconNameMargin,
dragStart: this.dragStart.bind(this)
dragStart: this.dragStart
})
}
.visibility(this.dragItemType === CommonConstants.DRAG_FROM_DESKTOP && this.pageDesktopDragItemInfo.keyName === this.item.keyName ?
@ -198,7 +211,7 @@ export default struct AppItem {
this.mouseClick = 0;
this.launchApp();
} else {
this.mPageDesktopViewModel.onAppClick(this.item.abilityName, this.item.bundleName, this.item.moduleName);
this.mPageDesktopViewModel?.onAppClick(this.item.abilityName, this.item.bundleName, this.item.moduleName);
setTimeout(() => {
this.mouseClick = 0;
}, 300)
@ -211,7 +224,7 @@ export default struct AppItem {
.onTouch((event: TouchEvent) => {
Log.showDebug(TAG, `onTouch event type: ${event.type}, x: ${event.touches[0].windowX}, y: ${event.touches[0].windowY}`);
if (event.type === CommonConstants.TOUCH_TYPE_UP && this.pageDesktopDragItemInfo.isDragging) {
let mIsDragEffectArea = globalThis.PageDesktopDragHandler.isDragEffectArea(event.touches[0].windowX, event.touches[0].windowY);
let mIsDragEffectArea = PageDesktopDragHandler.getInstance().isDragEffectArea(event.touches[0].windowX, event.touches[0].windowY);
Log.showInfo(TAG, `onTouch mIsDragEffectArea: ${mIsDragEffectArea}`);
if (!mIsDragEffectArea) {
this.pageDesktopDragItemInfo = new LauncherDragItemInfo();
@ -229,15 +242,16 @@ export default struct AppItem {
private launchApp() {
Trace.start(Trace.CORE_METHOD_START_APP_ANIMATION);
this.setStartAppInfo();
this.mPageDesktopViewModel.onAppDoubleClick(this.item.abilityName, this.item.bundleName, this.item.moduleName);
this.mPageDesktopViewModel?.onAppDoubleClick(this.item.abilityName, this.item.bundleName, this.item.moduleName);
}
dragStart(event: DragEvent): CustomBuilder {
dragStart = (event: DragEvent): CustomBuilder => {
ContextMenu.close();
this.dragItemType = CommonConstants.DRAG_FROM_DESKTOP;
this.pageDesktopDragItemInfo = Object.assign(new LauncherDragItemInfo(true), this.item);
this.item.isDragging = true;
this.pageDesktopDragItemInfo = this.item;
Log.showInfo(TAG, `pageDesktopDragItemInfo: ${JSON.stringify(this.pageDesktopDragItemInfo)}`);
globalThis.PageDesktopDragHandler.onDragStart(event.getWindowX(), event.getWindowY());
PageDesktopDragHandler.getInstance().onDragStart(event.getWindowX(), event.getWindowY());
}
/**
@ -246,7 +260,7 @@ export default struct AppItem {
private setStartAppInfo() {
Log.showInfo(TAG, `app setStartAppInfo ${this.mIconSize}`);
Trace.start("setStartAppInfo");
const appInfo = {
const appInfo: StartAppItemInfo = {
bundleName: this.item.bundleName,
abilityName: this.item.abilityName,
moduleName: this.item.moduleName,

19
feature/pagedesktop/src/main/ets/default/common/components/FolderItem.ets
View File

@ -58,34 +58,33 @@ export default struct FolderItem {
private mAppNameHeight: number = StyleConstants.DEFAULT_APP_NAME_HEIGHT;
private mAppNameSize: number = StyleConstants.DEFAULT_APP_NAME_SIZE;
private folderItem: LauncherDragItemInfo = new LauncherDragItemInfo();
// private isSwappingPage = false;
// private mAppItemWidth: number = 0;
private isSwappingPage = false;
private mAppItemWidth: number = 0;
private mPageDesktopViewModel?: PageDesktopViewModel;
private mBigFolderViewModel?: BigFolderViewModel;
private mMargin: number = 0;
// private mGridSpaceWidth: number = 0;
// private mGridSpaceHeight: number = 0;
private mGridSpaceWidth: number = 0;
private mGridSpaceHeight: number = 0;
private mIconMarginVertical: number = StyleConstants.DEFAULT_10;
// private mPageDesktopDragHandler: PageDesktopDragHandler = PageDesktopDragHandler.getInstance();
private mPageDesktopDragHandler: PageDesktopDragHandler = PageDesktopDragHandler.getInstance();
private mPageDesktopStartAppHandler: PageDesktopStartAppHandler = PageDesktopStartAppHandler.getInstance();
private mFolderStyleConfig: BigFolderStyleConfig = BigFolderViewModel.getInstance().getFolderStyleConfig();
mNameLines: number = PresetStyleConstants.DEFAULT_APP_NAME_LINES;
aboutToAppear(): void {
// this.mPageDesktopDragHandler = PageDesktopDragHandler.getInstance();
this.mPageDesktopDragHandler = PageDesktopDragHandler.getInstance();
this.mPageDesktopStartAppHandler = PageDesktopStartAppHandler.getInstance();
this.mBigFolderViewModel = BigFolderViewModel.getInstance();
this.mFolderStyleConfig = this.mBigFolderViewModel.getFolderStyleConfig();
this.mPageDesktopViewModel = PageDesktopViewModel.getInstance();
// let mGridConfig = this.mPageDesktopViewModel.getGridConfig();
let styleConfig = this.mPageDesktopViewModel.getPageDesktopStyleConfig();
// this.mAppItemWidth = styleConfig.mIconSize;
this.mAppItemWidth = styleConfig.mIconSize;
this.mAppNameHeight = styleConfig.mNameHeight;
this.mAppNameSize = styleConfig.mNameSize;
this.mIconMarginVertical = styleConfig.mIconMarginVertical;
this.mMargin = styleConfig.mMargin;
// this.mGridSpaceWidth = Number(this.mPageDesktopViewModel.getWorkSpaceWidth()) - this.mMargin;
// this.mGridSpaceHeight = Number(this.mPageDesktopViewModel.getWorkSpaceHeight());
this.mGridSpaceWidth = Number(this.mPageDesktopViewModel.getWorkSpaceWidth()) - this.mMargin;
this.mGridSpaceHeight = Number(this.mPageDesktopViewModel.getWorkSpaceHeight());
this.openFolderStatus = AppStorage.get('openFolderStatus') != 'undefined' ? (AppStorage.get('openFolderStatus') as number) : BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE;
this.formatFolderInfo();
}