openharmony/applications_launcher
1
0
Fork 0
mirror of https://github.com/openharmony/applications_launcher.git synced 2026-07-01 05:35:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

!384 组件销毁时变量置空，防止内存泄露

Browse Source 
Merge pull request !384 from gengzhengxing/gzx072503
This commit is contained in:
openharmony_ci
2023-07-26 08:17:28 +00:00
committed by Gitee
parent 27d39a9fc6 fd45afb879
commit 5546207b6e
59 changed files with 442 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/ets/default/animation/remoteanimation/WindowAnimationControllerImpl.ts
+4 -4
View File
@@ -95,18 +95,18 @@ class WindowAnimationControllerImpl implements windowAnimationManager.WindowAnim
finishCallback: windowAnimationManager.WindowAnimationFinishedCallback,
remoteAnimationType: number): void {
if (!CheckEmptyUtils.isEmpty(startingWindowTarget)) {
AppStorage.SetOrCreate('startingWindowTarget', startingWindowTarget);
AppStorage.setOrCreate('startingWindowTarget', startingWindowTarget);
}
if (!CheckEmptyUtils.isEmpty(closingWindowTarget)) {
AppStorage.SetOrCreate('closingWindowTarget', closingWindowTarget);
AppStorage.setOrCreate('closingWindowTarget', closingWindowTarget);
}
if (!CheckEmptyUtils.isEmpty(finishCallback)) {
AppStorage.SetOrCreate('remoteAnimationFinishCallback', finishCallback);
AppStorage.setOrCreate('remoteAnimationFinishCallback', finishCallback);
}
AppStorage.SetOrCreate('remoteAnimationType', remoteAnimationType);
AppStorage.setOrCreate('remoteAnimationType', remoteAnimationType);
}
}
common/src/main/ets/default/base/BaseCloseAppHandler.ts
+1 -1
View File
@@ -42,7 +42,7 @@ export abstract class BaseCloseAppHandler extends BaseRemoteAnimationHandler {
*/
public setAppIconInfo(): void {
super.setAppIconInfo();
AppStorage.SetOrCreate('closeAppIconInfo', {
AppStorage.setOrCreate('closeAppIconInfo', {
appIconSize: this.mAppIconSize,
appIconHeight: this.mAppIconHeight,
appIconPositionX: this.mAppIconPositionX,
common/src/main/ets/default/base/BaseDragHandler.ts
+4 -4
View File
@@ -79,7 +79,7 @@ export abstract class BaseDragHandler {
*/
protected setDragItemInfo(dragItemInfo: LauncherDragItemInfo): void {
Log.showDebug(TAG, `setDragItemInfo dragItemInfo: ${JSON.stringify(dragItemInfo)}`);
AppStorage.SetOrCreate<LauncherDragItemInfo>('dragItemInfo', dragItemInfo);
AppStorage.setOrCreate<LauncherDragItemInfo>('dragItemInfo', dragItemInfo);
}
/**
@@ -88,7 +88,7 @@ export abstract class BaseDragHandler {
* @return dragItemInfo
*/
protected getDragItemInfo() {
const dragItemInfo: LauncherDragItemInfo = AppStorage.Get<LauncherDragItemInfo>('dragItemInfo');
const dragItemInfo: LauncherDragItemInfo = AppStorage.get<LauncherDragItemInfo>('dragItemInfo');
// avoid dragItemInfo from AppStorage is undefined
return dragItemInfo;
}
@@ -99,7 +99,7 @@ export abstract class BaseDragHandler {
* @return isLongPress
*/
protected getIsLongPress(): boolean {
const isLongPress: boolean = AppStorage.Get('isLongPress');
const isLongPress: boolean = AppStorage.get('isLongPress');
return isLongPress;
}
@@ -108,7 +108,7 @@ export abstract class BaseDragHandler {
*/
protected setIsLongPress(isLongPress): void {
Log.showDebug(TAG, `setIsLongPress isLongPress: ${isLongPress}`);
AppStorage.SetOrCreate('isLongPress', isLongPress);
AppStorage.setOrCreate('isLongPress', isLongPress);
}
protected isDragEffectArea(x: number, y: number): boolean {
common/src/main/ets/default/base/BaseStartAppHandler.ts
+1 -1
View File
@@ -27,7 +27,7 @@ export abstract class BaseStartAppHandler extends BaseRemoteAnimationHandler {
*/
public setAppIconInfo(): void {
super.setAppIconInfo();
AppStorage.SetOrCreate('startAppIconInfo', {
AppStorage.setOrCreate('startAppIconInfo', {
appIconSize: this.mAppIconSize,
appIconHeight: this.mAppIconHeight,
appIconPositionX: this.mAppIconPositionX,
common/src/main/ets/default/manager/AmsMissionManager.ts
+1 -1
View File
@@ -212,7 +212,7 @@ class AmsMissionManager {
}
});
}
AppStorage.SetOrCreate('recentMissionsList', mRecentMissionsList);
AppStorage.setOrCreate('recentMissionsList', mRecentMissionsList);
};
/**
common/src/main/ets/default/manager/RdbStoreManager.ts
+1 -1
View File
@@ -315,7 +315,7 @@ export class RdbStoreManager {
let result = false;
try {
// get deviceType
let deviceType = AppStorage.Get('deviceType');
let deviceType = AppStorage.get('deviceType');
// init default settings config
if (CheckEmptyUtils.isEmpty(key) || CheckEmptyUtils.isEmpty(value)) {
common/src/main/ets/default/manager/WindowManager.ts
+5 -5
View File
@@ -370,10 +370,10 @@ class WindowManager {
public async onPortrait(mediaQueryResult) {
if (mediaQueryResult.matches) {
Log.showInfo(TAG, 'screen change to landscape');
AppStorage.SetOrCreate('isPortrait', false);
AppStorage.setOrCreate('isPortrait', false);
} else {
Log.showInfo(TAG, 'screen change to portrait');
AppStorage.SetOrCreate('isPortrait', true);
AppStorage.setOrCreate('isPortrait', true);
}
display.getDefaultDisplay()
.then((dis: {
@@ -383,9 +383,9 @@ class WindowManager {
refreshRate: number
}) => {
Log.showInfo(TAG, `change to display: ${JSON.stringify(dis)}`);
AppStorage.SetOrCreate('screenWidth', px2vp(dis.width));
AppStorage.SetOrCreate('screenHeight', px2vp(dis.height));
Log.showDebug(TAG, `screenWidth and screenHeight: ${AppStorage.Get('screenWidth')},${AppStorage.Get('screenHeight')}`);
AppStorage.setOrCreate('screenWidth', px2vp(dis.width));
AppStorage.setOrCreate('screenHeight', px2vp(dis.height));
Log.showDebug(TAG, `screenWidth and screenHeight: ${AppStorage.get('screenWidth')},${AppStorage.get('screenHeight')}`);
});
}
common/src/main/ets/default/model/AppModel.ts
+1 -1
View File
@@ -180,7 +180,7 @@ export class AppModel {
}
if (event === EventConstants.EVENT_PACKAGE_CHANGED) {
await this.getAppListAsync();
AppStorage.SetOrCreate('formRefresh', String(new Date()));
AppStorage.setOrCreate('formRefresh', String(new Date()));
localEventManager.sendLocalEventSticky(EventConstants.EVENT_REQUEST_PAGEDESK_ITEM_UPDATE, null);
localEventManager.sendLocalEventSticky(EventConstants.EVENT_REQUEST_RESIDENT_DOCK_ITEM_UPDATE, abilityInfos[0]);
}
common/src/main/ets/default/model/FormModel.ts
+1 -1
View File
@@ -88,7 +88,7 @@ export class FormModel {
.catch(err => {
Log.showError(TAG, `getFormsInfoByBundleName err: ${JSON.stringify(err)}`);
});
AppStorage.SetOrCreate('formMgrItem', currentBundleFormsInfo);
AppStorage.setOrCreate('formMgrItem', currentBundleFormsInfo);
return currentBundleFormsInfo;
}
common/src/main/ets/default/model/PageDesktopModel.ts
+2 -2
View File
@@ -239,13 +239,13 @@ export class PageDesktopModel {
*/
setPageIndex(idx: number): void {
Log.showInfo(TAG, 'setPageIndex: ' + idx);
AppStorage.SetOrCreate('pageIndex', idx);
AppStorage.setOrCreate('pageIndex', idx);
}
/**
* Get the Desktop Page Number.
*/
getPageIndex(): number {
return AppStorage.Get('pageIndex');
return AppStorage.get('pageIndex');
}
}
common/src/main/ets/default/model/SettingsModel.ts
+2 -2
View File
@@ -291,8 +291,8 @@ export class SettingsModel {
}
private updateMenuId(): void {
let currentId: number = AppStorage.Get('menuId') as number ?? 0;
let currentId: number = AppStorage.get('menuId') as number ?? 0;
currentId++;
AppStorage.SetOrCreate('menuId', currentId % 100);
AppStorage.setOrCreate('menuId', currentId % 100);
}
}
common/src/main/ets/default/uicomponents/AppBubble.ets
+10 -4
View File
@@ -47,13 +47,19 @@ export struct AppBubble {
shortCutEnabled: boolean = false;
dragStart: Function;
aboutToDisappear(): void {
this.getMenuInfoList = null;
this.dragStart = null;
this.menuInfo = null;
}
@Builder MenuBuilder() {
Column() {
AppMenu({
menuInfoList: this.menuInfo,
getMenuInfoList: this.getMenuInfoList,
closeMenu: () => {
AppStorage.SetOrCreate('contextMenuState', false);
AppStorage.setOrCreate('contextMenuState', false);
}
})
}
@@ -82,7 +88,7 @@ export struct AppBubble {
})
.bindContextMenu(this.MenuBuilder, ResponseType.LongPress)
.onDragEnd((event: DragEvent, extraParams: string) => {
AppStorage.SetOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
AppStorage.setOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
})
AppName({
@@ -112,9 +118,9 @@ export struct AppBubble {
Log.showInfo(TAG, `long press source ${event.source}`);
if (event.source == SourceType.Mouse) {
Log.showDebug(TAG, `Mouse keyName ${this.bundleName + this.abilityName + this.moduleName}`);
AppStorage.SetOrCreate('selectDesktopAppItem', this.bundleName + this.abilityName + this.moduleName);
AppStorage.setOrCreate('selectDesktopAppItem', this.bundleName + this.abilityName + this.moduleName);
} else {
AppStorage.SetOrCreate('selectDesktopAppItem', '');
AppStorage.setOrCreate('selectDesktopAppItem', '');
}
})
)
common/src/main/ets/default/uicomponents/AppGrid.ets
+5
View File
@@ -29,6 +29,11 @@ export struct AppGrid {
buildMenu: Function = null;
@State isScroll: boolean = false;
aboutToDisappear(): void {
this.buildMenu = null;
this.onItemClick = null;
}
private getColumnsTemplate() {
let columnsTemplate = '';
for (let i = 0; i < this.appGridStyleConfig.mColumns; i++) {
common/src/main/ets/default/uicomponents/AppMenu.ets
+7 -1
View File
@@ -46,13 +46,15 @@ export struct AppMenu {
}
}
this.isBothTypeMenuExist = this.fixedMenuList.length > 0 && this.dynamicMenuList.length > 0;
AppStorage.SetOrCreate('contextMenuState', true);
AppStorage.setOrCreate('contextMenuState', true);
}
aboutToDisappear(): void {
Log.showInfo(TAG, 'aboutToDisappear start');
this.fixedMenuList = null;
this.dynamicMenuList = null;
this.closeMenu = null;
this.getMenuInfoList = null;
}
build() {
@@ -115,6 +117,10 @@ struct HorizontalMenuItem {
this.updateName();
}
aboutToDisappear(): void {
this.closeMenu = null;
}
public shortcutIconLoadCallback(image) {
this.shortcutIcon = image;
}
common/src/main/ets/default/uicomponents/FolderComponent.ets
+17 -8
View File
@@ -77,6 +77,15 @@ export struct FolderComponent {
}
}
aboutToDisappear(): void {
this.onAppIconClick = null;
this.onOpenFolderClick = null;
this.onFolderTouch = null;
this.onGetPosition = null;
this.buildMenu = null;
this.dragStart = null;
}
updateShowList(): void {
if (this.mFolderItem.layoutInfo[0].length > CommonConstants.FOLDER_STATIC_SHOW_LENGTH) {
this.mShowAppList = this.mFolderItem.layoutInfo[0].slice(0, CommonConstants.FOLDER_STATIC_SHOW_LENGTH);
@@ -123,14 +132,14 @@ export struct FolderComponent {
private updateFolderAnimate() {
Log.showInfo(TAG, `updateFolderAnimate start`);
if (this.openFolderStatus == 0) {
this.folderAnimateData = AppStorage.Get('folderAnimateData');
this.folderAnimateData = AppStorage.get('folderAnimateData');
if (this.mFolderItem.folderId === this.folderAnimateData.folderId &&
this.folderAnimateData.isOpenFolder &&
this.folderAnimateData.folderId != '' &&
this.animateOpacity != 1.0 &&
this.animateScale != 1.0) {
this.folderAnimateData.isOpenFolder = false;
AppStorage.SetOrCreate('folderAnimateData', this.folderAnimateData);
AppStorage.setOrCreate('folderAnimateData', this.folderAnimateData);
Log.showInfo(TAG, `updateFolderAnimate show`);
this.showAnimate(1.0, 1.0, false);
}
@@ -168,8 +177,8 @@ export struct FolderComponent {
public getPosition(x: number, y: number): void {
this.folderItemPositionX = x;
this.folderItemPositionY = y;
let screenWidth: number = AppStorage.Get('screenWidth');
let screenHeight: number = AppStorage.Get('screenHeight');
let screenWidth: number = AppStorage.get('screenWidth');
let screenHeight: number = AppStorage.get('screenHeight');
this.animateFolderPositionX = (screenWidth - this.folderGridSize * 1.5) / 2 - this.folderItemPositionX;
this.animateFolderPositionY = (screenHeight - this.folderGridSize * 1.5) / 2 - this.folderItemPositionY;
Log.showInfo(TAG, `getPosition animatePosition x: ${this.animateFolderPositionX}, y: ${this.animateFolderPositionY}`);
@@ -272,7 +281,7 @@ export struct FolderComponent {
if (this.onOpenFolderClick) {
this.folderAnimateData.folderId = this.mFolderItem.folderId;
this.folderAnimateData.isOpenFolder = true;
AppStorage.SetOrCreate('folderAnimateData', this.folderAnimateData);
AppStorage.setOrCreate('folderAnimateData', this.folderAnimateData);
this.onOpenFolderClick(event, this.mFolderItem);
}
})
@@ -289,7 +298,7 @@ export struct FolderComponent {
if (this.onOpenFolderClick) {
this.folderAnimateData.folderId = this.mFolderItem.folderId;
this.folderAnimateData.isOpenFolder = true;
AppStorage.SetOrCreate('folderAnimateData', this.folderAnimateData);
AppStorage.setOrCreate('folderAnimateData', this.folderAnimateData);
this.onOpenFolderClick(event, this.mFolderItem);
}
})
@@ -312,8 +321,8 @@ export struct FolderComponent {
return this.dragStart(event);
})
.onDragEnd((event: DragEvent, extraParams: string) => {
Log.showInfo(TAG, `onDragEnd event: [${event.getX()}, ${event.getY()}]` + event.getResult());
AppStorage.SetOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
Log.showInfo(TAG, `onDragEnd event: [${event.getWindowX()}, ${event.getWindowY()}]` + event.getResult());
AppStorage.setOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
})
}
.height(this.folderGridSize)
common/src/main/ets/default/uicomponents/FormItemComponent.ets
+8 -2
View File
@@ -52,6 +52,12 @@ export struct FormItemComponent {
this.mFormModel = FormModel.getInstance();
}
aboutToDisappear(): void {
this.getFormId = null;
this.clickForm = null;
this.dragStart = null;
}
@Builder MenuBuilder() {
Column() {
AppMenu({
@@ -102,8 +108,8 @@ export struct FormItemComponent {
return this.dragStart(event);
})
.onDragEnd((event: DragEvent, extraParams: string) => {
Log.showInfo(TAG, `onDragEnd event: [${event.getX()}, ${event.getY()}]` + event.getResult());
AppStorage.SetOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
Log.showInfo(TAG, `onDragEnd event: [${event.getWindowX()}, ${event.getWindowY()}]` + event.getResult());
AppStorage.setOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
})
Column() {
common/src/main/ets/default/uicomponents/OverlayAppIcon.ets
+1 -1
View File
@@ -36,7 +36,7 @@ export default struct OverlayAppIcon {
.onComplete(() => {
Log.showInfo(TAG, 'OverlayAppIcon complete');
this.overlaySize = 1;
AppStorage.SetOrCreate('isOverlayComplete', true);
AppStorage.setOrCreate('isOverlayComplete', true);
})
}
.width(this.iconSize)
common/src/main/ets/default/uicomponents/RemoteWindowWrapper.ets
+22 -22
View File
@@ -236,9 +236,9 @@ export struct RemoteWindowWrapper {
control.onStartAppFromLauncher = (startingWindowTarget, finishCallback) => {
Log.showInfo(TAG, `remote window animaion onStartAppFromLauncher`);
const remoteWindowKey = startingWindowTarget.bundleName + startingWindowTarget.abilityName + startingWindowTarget.missionId;
const startAppTypeFromPageDesktop: number = AppStorage.Get('startAppTypeFromPageDesktop');
const appItemInfo: any = AppStorage.Get('startAppItemInfo');
const startAppIconInfo: any = AppStorage.Get('startAppIconInfo');
const startAppTypeFromPageDesktop: number = AppStorage.get('startAppTypeFromPageDesktop');
const appItemInfo: any = AppStorage.get('startAppItemInfo');
const startAppIconInfo: any = AppStorage.get('startAppIconInfo');
let remoteVo: RemoteVo | null = this.getRemoteWindowVo(remoteWindowKey);
if (remoteVo) {
remoteVo.remoteAnimationType = RemoteConstants.TYPE_START_APP_FROM_LAUNCHER;
@@ -260,16 +260,16 @@ export struct RemoteWindowWrapper {
this.mLastRemoteVo = remoteVo;
}
this.pushRemoteVoIntoList(remoteVo);
AppStorage.SetOrCreate(remoteWindowKey, remoteVo.count);
AppStorage.setOrCreate(remoteWindowKey, remoteVo.count);
this.calculateAppProperty(remoteVo, finishCallback);
}
control.onStartAppFromRecent = (startingWindowTarget, finishCallback) => {
Log.showInfo(TAG, `remote window animaion onStartAppFromRecent`);
const remoteWindowKey = startingWindowTarget.bundleName + startingWindowTarget.abilityName + startingWindowTarget.missionId;
const startAppTypeFromPageDesktop: number = AppStorage.Get('startAppTypeFromPageDesktop');
const appItemInfo: any = AppStorage.Get('startAppItemInfo');
const startAppIconInfo: any = AppStorage.Get('startAppIconInfo');
const startAppTypeFromPageDesktop: number = AppStorage.get('startAppTypeFromPageDesktop');
const appItemInfo: any = AppStorage.get('startAppItemInfo');
const startAppIconInfo: any = AppStorage.get('startAppIconInfo');
let remoteVo: RemoteVo | null = this.getRemoteWindowVo(remoteWindowKey);
if (remoteVo) {
remoteVo.remoteAnimationType = RemoteConstants.TYPE_START_APP_FROM_LAUNCHER;
@@ -291,16 +291,16 @@ export struct RemoteWindowWrapper {
this.mLastRemoteVo = remoteVo;
}
this.pushRemoteVoIntoList(remoteVo);
AppStorage.SetOrCreate(remoteWindowKey, remoteVo.count);
AppStorage.setOrCreate(remoteWindowKey, remoteVo.count);
this.calculateAppProperty(remoteVo, finishCallback);
}
control.onStartAppFromOther = (startingWindowTarget, finishCallback) => {
Log.showInfo(TAG, `remote window animaion onStartAppFromOther`);
const remoteWindowKey = startingWindowTarget.bundleName + startingWindowTarget.abilityName + startingWindowTarget.missionId;
const startAppTypeFromPageDesktop: number = AppStorage.Get('startAppTypeFromPageDesktop');
const appItemInfo: any = AppStorage.SetOrCreate('startAppItemInfo', {});
const startAppIconInfo: any = AppStorage.SetOrCreate('startAppIconInfo', {});
const startAppTypeFromPageDesktop: number = AppStorage.get('startAppTypeFromPageDesktop');
const appItemInfo: any = AppStorage.setOrCreate('startAppItemInfo', {});
const startAppIconInfo: any = AppStorage.setOrCreate('startAppIconInfo', {});
let remoteVo: RemoteVo | null = this.getRemoteWindowVo(remoteWindowKey);
if (remoteVo) {
remoteVo.remoteAnimationType = RemoteConstants.TYPE_START_APP_FROM_LAUNCHER;
@@ -322,14 +322,14 @@ export struct RemoteWindowWrapper {
this.mLastRemoteVo = remoteVo;
}
this.pushRemoteVoIntoList(remoteVo);
AppStorage.SetOrCreate(remoteWindowKey, remoteVo.count);
AppStorage.setOrCreate(remoteWindowKey, remoteVo.count);
this.calculateAppProperty(remoteVo, finishCallback);
}
control.onAppTransition = (fromWindowTarget, toWindowTarget, finishCallback) => {
Log.showInfo(TAG, `remote window animaion onAppTransition`);
const remoteWindowKey = toWindowTarget.bundleName + toWindowTarget.abilityName + toWindowTarget.missionId;
const startAppTypeFromPageDesktop: number = AppStorage.Get('startAppTypeFromPageDesktop');
const startAppTypeFromPageDesktop: number = AppStorage.get('startAppTypeFromPageDesktop');
const remoteVo = new RemoteVo(
RemoteConstants.TYPE_APP_TRANSITION,
startAppTypeFromPageDesktop,
@@ -346,12 +346,12 @@ export struct RemoteWindowWrapper {
control.onMinimizeWindow = (minimizingWindowTarget, finishCallback) => {
Log.showInfo(TAG, `remote window animaion onMinimizeWindow`);
const startAppTypeFromPageDesktop: number = AppStorage.Get('startAppTypeFromPageDesktop');
const startAppTypeFromPageDesktop: number = AppStorage.get('startAppTypeFromPageDesktop');
const appInfo: {iconInfo: any, appItemInfo: any} = this.mCloseAppManager.getAppInfo(minimizingWindowTarget);
const remoteWindowKey = minimizingWindowTarget.bundleName + minimizingWindowTarget.abilityName + minimizingWindowTarget.missionId;
let remoteVo: RemoteVo | null = this.getRemoteWindowVo(remoteWindowKey);
if (appInfo.appItemInfo?.page) {
AppStorage.SetOrCreate('pageIndex', appInfo.appItemInfo?.page);
AppStorage.setOrCreate('pageIndex', appInfo.appItemInfo?.page);
}
if (remoteVo) {
remoteVo.remoteAnimationType = RemoteConstants.TYPE_MINIMIZE_WINDOW;
@@ -373,13 +373,13 @@ export struct RemoteWindowWrapper {
this.mLastRemoteVo = remoteVo;
}
this.pushRemoteVoIntoList(remoteVo);
AppStorage.SetOrCreate(remoteWindowKey, remoteVo.count);
AppStorage.setOrCreate(remoteWindowKey, remoteVo.count);
this.calculateAppProperty(remoteVo, finishCallback);
}
control.onCloseWindow = (closingWindowTarget, finishCallback) => {
Log.showInfo(TAG, `remote window animaion onCloseWindow`);
const startAppTypeFromPageDesktop: number = AppStorage.Get('startAppTypeFromPageDesktop');
const startAppTypeFromPageDesktop: number = AppStorage.get('startAppTypeFromPageDesktop');
const appInfo: {iconInfo: any, appItemInfo: any} = this.mCloseAppManager.getAppInfo(closingWindowTarget);
const remoteWindowKey = closingWindowTarget.bundleName + closingWindowTarget.abilityName + closingWindowTarget.missionId;
let remoteVo: RemoteVo | null = this.getRemoteWindowVo(remoteWindowKey);
@@ -402,7 +402,7 @@ export struct RemoteWindowWrapper {
this.mLastRemoteVo = remoteVo;
}
this.pushRemoteVoIntoList(remoteVo);
AppStorage.SetOrCreate(remoteWindowKey, remoteVo.count);
AppStorage.setOrCreate(remoteWindowKey, remoteVo.count);
this.calculateAppProperty(remoteVo, finishCallback);
}
}
@@ -442,11 +442,11 @@ export struct RemoteWindowWrapper {
onFinish: () => {
callback.onAnimationFinish();
Trace.end(Trace.CORE_METHOD_START_APP_ANIMATION);
const startCount: number = AppStorage.Get(remoteVo.remoteWindowKey);
const startCount: number = AppStorage.get(remoteVo.remoteWindowKey);
Log.showDebug(TAG, `calculateAppProperty ${remoteVo.remoteAnimationType}, count: ${count}, startCount: ${startCount}`);
if (startCount === count) {
this.removeRemoteWindowFromList(remoteVo.remoteWindowKey);
AppStorage.SetOrCreate(remoteVo.remoteWindowKey, 0);
AppStorage.setOrCreate(remoteVo.remoteWindowKey, 0);
}
}
}, () => {
@@ -478,11 +478,11 @@ export struct RemoteWindowWrapper {
onFinish: () => {
callback.onAnimationFinish();
Trace.end(Trace.CORE_METHOD_CLOSE_APP_ANIMATION);
const startCount: number = AppStorage.Get(remoteVo.remoteWindowKey);
const startCount: number = AppStorage.get(remoteVo.remoteWindowKey);
Log.showDebug(TAG, `calculateAppProperty ${remoteVo.remoteAnimationType}, count: ${count}, startCount: ${startCount}`);
if (startCount === count) {
this.removeRemoteWindowFromList(remoteVo.remoteWindowKey);
AppStorage.SetOrCreate(remoteVo.remoteWindowKey, 0);
AppStorage.setOrCreate(remoteVo.remoteWindowKey, 0);
}
}
}, () => {
common/src/main/ets/default/uicomponents/ScrollerComponent.ets
+5
View File
@@ -33,6 +33,11 @@ export struct ScrollerComponent {
popupHide: Function= null;
updateData: Function= null;
aboutToDisappear(): void {
this.popupHide = null;
this.updateData = null;
}
build() {
Row() {
Column() {
common/src/main/ets/default/viewmodel/LayoutViewModel.ts
+5 -5
View File
@@ -74,8 +74,8 @@ export class LayoutViewModel {
* @param navigationBarStatus
*/
initScreen(navigationBarStatus?: string): void {
this.mScreenWidth = AppStorage.Get('screenWidth');
this.mScreenHeight = AppStorage.Get('screenHeight');
this.mScreenWidth = AppStorage.get('screenWidth');
this.mScreenHeight = AppStorage.get('screenHeight');
Log.showDebug(TAG, `initScreen screenWidth: ${this.mScreenWidth}, screenHeight: ${this.mScreenHeight}`);
this.mSysUITopHeight = this.mLauncherLayoutStyleConfig.mSysTopHeight;
this.mNavigationBarStatus = navigationBarStatus === '0' ? true : false;
@@ -89,7 +89,7 @@ export class LayoutViewModel {
} else {
this.mSysUIBottomHeight = 0;
}
AppStorage.SetOrCreate('sysUIBottomHeight', this.mSysUIBottomHeight);
AppStorage.setOrCreate('sysUIBottomHeight', this.mSysUIBottomHeight);
this.mIndicatorHeight = this.mLauncherLayoutStyleConfig.mIndicatorHeight;
Log.showDebug(TAG, `initScreen SysUIBottomHeight: ${this.mSysUIBottomHeight},
IndicatorHeight: ${this.mIndicatorHeight}, SysUITopHeight: ${this.mSysUITopHeight},
@@ -104,7 +104,7 @@ export class LayoutViewModel {
*/
setDevice(deviceType: string): void {
this.mIsPad = deviceType === CommonConstants.PAD_DEVICE_TYPE;
AppStorage.SetOrCreate('isPad', this.mIsPad);
AppStorage.setOrCreate('isPad', this.mIsPad);
}
/**
@@ -215,7 +215,7 @@ export class LayoutViewModel {
let iconMarginVertical = ratio * itemSize;
let iconHeight = itemSize - 2 * iconMarginVertical - nameHeight - iconNameMargin;
let iconMarginHorizontal = (itemSize - iconHeight) / 2;
if (AppStorage.Get('isPortrait') ) {
if (AppStorage.get('isPortrait') ) {
row = 11;
column = 5;
}
feature/appcenter/src/main/ets/default/common/AppCenterStartAppHandler.ts
+2 -2
View File
@@ -50,7 +50,7 @@ export default class AppCenterStartAppHandler extends BaseStartAppHandler {
return;
}
const appItemInfo = AppStorage.Get('startAppItemInfo');
const appItemInfo = AppStorage.get('startAppItemInfo');
const index: number = this.getIndexInAppList(appItemInfo);
const appCenterMarginLeft = this.mAppCenterGridStyleConfig.mAppCenterMarginLeft;
const appCenterMarginTop = this.mAppCenterGridStyleConfig.mIconMarginVertical;
@@ -84,7 +84,7 @@ export default class AppCenterStartAppHandler extends BaseStartAppHandler {
private getIndexInAppList(appItemInfo): number {
let index: number = 0;
let listInfo: AppItemInfo[] = AppStorage.Get('listInfo');
let listInfo: AppItemInfo[] = AppStorage.get('listInfo');
for (var i = 0; i < listInfo.length; i++) {
if (typeof listInfo[i] !== 'undefined') {
if (appItemInfo.bundleName === listInfo[i].bundleName) {
feature/appcenter/src/main/ets/default/layout/AppGridLayout.ets
+3 -3
View File
@@ -154,7 +154,7 @@ export struct AppGridLayout {
}
this.mSelectItem = appInfo;
this.mDialogController.open();
AppStorage.SetOrCreate('uninstallAppInfo', appInfo);
AppStorage.setOrCreate('uninstallAppInfo', appInfo);
};
uninstallMenu.menuEnabled = appInfo.isUninstallAble;
menuInfoList.push(uninstallMenu);
@@ -208,9 +208,9 @@ export struct AppGridLayout {
Log.showError(TAG, `setStartAppInfo with item`)
return;
}
AppStorage.SetOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_APP_ICON);
AppStorage.setOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_APP_ICON);
item.icon = ResourceManager.getInstance().getCachedAppIcon(item.appIconId, item.bundleName, item.moduleName);
AppStorage.SetOrCreate('startAppItemInfo', item);
AppStorage.setOrCreate('startAppItemInfo', item);
this.mAppCenterStartAppHandler.setAppIconSize(this.mAppCenterGridStyleConfig.mIconSize);
this.mAppCenterStartAppHandler.setAppIconInfo();
}
feature/appcenter/src/main/ets/default/viewmodel/AppListViewModel.ets
+8 -8
View File
@@ -66,25 +66,25 @@ export class AppListViewModel extends BaseViewModel {
appScaleX: 0.97,
appScaleY: 0.97
}
AppStorage.SetOrCreate('animationInfo_scale', animationInfo);
AppStorage.setOrCreate('animationInfo_scale', animationInfo);
})
}
private closeAppAnimation() {
AppStorage.SetOrCreate('animationInfo_alpha', 0.0);
AppStorage.setOrCreate('animationInfo_alpha', 0.0);
animateTo({
duration: 140,
delay: 210,
curve: Curve.Linear,
}, () => {
AppStorage.SetOrCreate('animationInfo_alpha', 1.0);
AppStorage.setOrCreate('animationInfo_alpha', 1.0);
})
let scale = {
appScaleX: 0.9,
appScaleY: 0.9
}
AppStorage.SetOrCreate('animationInfo_scale', scale);
AppStorage.setOrCreate('animationInfo_scale', scale);
animateTo({
duration: 490,
delay: 210,
@@ -94,7 +94,7 @@ export class AppListViewModel extends BaseViewModel {
appScaleX: 1.0,
appScaleY: 1.0
}
AppStorage.SetOrCreate('animationInfo_scale', scale_finish);
AppStorage.setOrCreate('animationInfo_scale', scale_finish);
})
}
@@ -126,13 +126,13 @@ export class AppListViewModel extends BaseViewModel {
appItem.badgeNumber = badgeInfo.badgeNumber;
appList.sort(this.mPinyinSort.sortByAppName.bind(this.mPinyinSort));
AppStorage.SetOrCreate('listInfo', appList);
AppStorage.setOrCreate('listInfo', appList);
}
public async getAppList(): Promise<void> {
let appList = await this.mAppModel.getAppList();
appList.sort(this.mPinyinSort.sortByAppName.bind(this.mPinyinSort));
AppStorage.SetOrCreate('listInfo', appList);
AppStorage.setOrCreate('listInfo', appList);
}
public async regroupDataAppListChange(callbackList) {
@@ -160,7 +160,7 @@ export class AppListViewModel extends BaseViewModel {
onFinish: () => {
}
}, () => {
AppStorage.SetOrCreate('listInfo', callbackList);
AppStorage.setOrCreate('listInfo', callbackList);
})
}
feature/bigfolder/src/main/ets/default/common/BigFolderStartAppHandler.ts
+4 -4
View File
@@ -52,9 +52,9 @@ export default class BigFolderStartAppHandler extends BaseStartAppHandler {
return;
}
const appItemInfo = AppStorage.Get('startAppItemInfo');
const screenWidth: number = AppStorage.Get('screenWidth');
const screenHeight: number = AppStorage.Get('screenHeight');
const appItemInfo = AppStorage.get('startAppItemInfo');
const screenWidth: number = AppStorage.get('screenWidth');
const screenHeight: number = AppStorage.get('screenHeight');
const appGridWidth: number = this.mBigFolderStyleConfig.mOpenFolderGridWidth;
const appGridHeight: number = this.mBigFolderStyleConfig.mOpenFolderGridHeight;
const swiperHeight: number = this.mBigFolderStyleConfig.mOpenFolderSwiperHeight;
@@ -94,7 +94,7 @@ export default class BigFolderStartAppHandler extends BaseStartAppHandler {
enterEditing: boolean,
folderName: string,
folderId: string
} = AppStorage.Get('openFolderData');
} = AppStorage.get('openFolderData');
for (var i = 0; i < folderInfo.layoutInfo.length; i++) {
for (var j = 0; j < folderInfo.layoutInfo[i].length; j++) {
if (appItemInfo.bundleName === folderInfo.layoutInfo[i][j]?.bundleName) {
feature/bigfolder/src/main/ets/default/common/uicomponents/FolderAppListDialog.ets
+2 -2
View File
@@ -72,7 +72,7 @@ export default struct FolderAppListDialog {
private onAppListChecked() {
this.titleDescription = `${this.addToString}${this.folderItem.folderName}(${this.appListChecked.length}/${this.allAppInfoList.length})`;
AppStorage.SetOrCreate('titleDescription', this.titleDescription);
AppStorage.setOrCreate('titleDescription', this.titleDescription);
}
private getColumnsTemplate() {
@@ -142,7 +142,7 @@ export default struct FolderAppListDialog {
let index = this.appListChecked.indexOf(item);
this.appListChecked.splice(index, 1);
}
AppStorage.SetOrCreate('appListChecked', this.appListChecked);
AppStorage.setOrCreate('appListChecked', this.appListChecked);
})
}
}
feature/bigfolder/src/main/ets/default/view/FolderOpenComponent.ets
+12 -11
View File
@@ -122,8 +122,8 @@ export struct FolderOpenComponent {
this.mFolderInfo = mBigFolderViewModel.addAddIcon(this.mFolderInfo);
this.showOpenFolder();
}
AppStorage.SetOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_STATIC);
AppStorage.SetOrCreate('isDraging', false);
AppStorage.setOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_STATIC);
AppStorage.setOrCreate('isDraging', false);
Log.showDebug(TAG, `updateFolderData end`);
}
@@ -286,10 +286,10 @@ export struct FolderOpenComponent {
mBigFolderViewModel.modifyFolderName(this.mFolderInfo)
}
} else {
const contextFlag: boolean = AppStorage.Get('contextMenuState');
const contextFlag: boolean = AppStorage.get('contextMenuState');
Log.showInfo(TAG, 'saveText contextFlag: ' + contextFlag);
if (contextFlag) {
AppStorage.SetOrCreate('contextMenuState', false);
AppStorage.setOrCreate('contextMenuState', false);
} else {
mBigFolderViewModel.closeFolder();
}
@@ -350,7 +350,7 @@ struct FolderSwiperPage {
mBigFolderViewModel.closeFolder();
}
},
folderItem: AppStorage.Get('openFolderData')
folderItem: AppStorage.get('openFolderData')
}),
customStyle: true,
alignment: DialogAlignment.Center,
@@ -436,10 +436,10 @@ struct FolderSwiperPage {
mBigFolderViewModel.modifyFolderName(this.mFolderInfo);
}
} else {
const contextFlag: boolean = AppStorage.Get('contextMenuState');
const contextFlag: boolean = AppStorage.get('contextMenuState');
Log.showInfo(TAG, 'saveText contextFlag: ' + contextFlag);
if (contextFlag) {
AppStorage.SetOrCreate('contextMenuState', false);
AppStorage.setOrCreate('contextMenuState', false);
} else {
mBigFolderViewModel.closeFolder();
}
@@ -475,6 +475,7 @@ struct FolderAppItem {
this.uninstallDialogController = null;
delete this.formManagerDialogController;
this.formManagerDialogController = null;
this.clearForm = null;
}
uninstallDialogController: CustomDialogController = new CustomDialogController({
@@ -582,7 +583,7 @@ struct FolderAppItem {
if (event.button == MouseButton.Right) {
event.stopPropagation();
Log.showDebug(TAG, `FolderAppItem onMouse MouseButton Right keyName: ${this.item.keyName}`);
AppStorage.SetOrCreate('selectDesktopAppItem', this.item.keyName);
AppStorage.setOrCreate('selectDesktopAppItem', this.item.keyName);
}
})
.gesture(
@@ -624,10 +625,10 @@ struct FolderAppItem {
return;
}
Log.showInfo(TAG, `app setStartAppInfo`);
if (AppStorage.Get('deviceType') === CommonConstants.PAD_DEVICE_TYPE) {
AppStorage.SetOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE);
if (AppStorage.get('deviceType') === CommonConstants.PAD_DEVICE_TYPE) {
AppStorage.setOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE);
}
AppStorage.SetOrCreate('startAppItemInfo', this.item);
AppStorage.setOrCreate('startAppItemInfo', this.item);
mBigFolderStartAppHandler.setAppIconSize(mBigFolderStyleConfig.mOpenFolderIconSize);
mBigFolderStartAppHandler.setAppIconInfo();
}
feature/bigfolder/src/main/ets/default/viewmodel/BigFolderViewModel.ts
+19 -19
View File
@@ -45,11 +45,11 @@ export class BigFolderViewModel extends BaseViewModel {
private readonly mLocalEventListener = {
onReceiveEvent: (event, params) => {
Log.showDebug(TAG, `onReceiveEvent receive event: ${event}, params: ${JSON.stringify(params)}`);
const openStatus = AppStorage.Get('openFolderStatus');
const openStatus = AppStorage.get('openFolderStatus');
if (event === EventConstants.EVENT_BADGE_UPDATE && (openStatus == BigFolderConstants.OPEN_FOLDER_STATUS_OPEN || openStatus == BigFolderConstants.OPEN_FOLDER_STATUS_STATIC)) {
const openFolderData: {
layoutInfo: [[]]
} = AppStorage.Get('openFolderData');
} = AppStorage.get('openFolderData');
this.updateBadge(openFolderData, params);
} else if (event === EventConstants.EVENT_FOLDER_PACKAGE_REMOVED) {
this.deleteAppFromFolderByUninstall(params);
@@ -248,7 +248,7 @@ export class BigFolderViewModel extends BaseViewModel {
const openFolderData: {
folderId: string,
layoutInfo: any
} = AppStorage.Get('openFolderData');
} = AppStorage.get('openFolderData');
const removeAppInfos = [dragAppInfo];
const folderIndex = gridLayoutInfo.layoutInfo.findIndex(item => {
return item.typeId === CommonConstants.TYPE_FOLDER && item.folderId === openFolderData.folderId;
@@ -321,7 +321,7 @@ export class BigFolderViewModel extends BaseViewModel {
let openFolderData: {
folderId: string,
layoutInfo: any
} = AppStorage.Get('openFolderData');
} = AppStorage.get('openFolderData');
const folderLayoutInfo = this.getFolderLayoutInfo(openFolderData, appInfo);
// Delete app from the folder
@@ -623,7 +623,7 @@ export class BigFolderViewModel extends BaseViewModel {
if (folderAppList.length > 0 && folderAppList[folderAppList.length - 1].typeId == CommonConstants.TYPE_ADD) {
folderAppList.pop();
}
AppStorage.SetOrCreate('folderAppList', folderAppList);
AppStorage.setOrCreate('folderAppList', folderAppList);
return folderAppList;
}
@@ -646,7 +646,7 @@ export class BigFolderViewModel extends BaseViewModel {
folderList.push(gridLayoutInfo.layoutInfo[i]);
}
}
AppStorage.SetOrCreate('allFolderList', folderList);
AppStorage.setOrCreate('allFolderList', folderList);
return folderList;
}
@@ -703,7 +703,7 @@ export class BigFolderViewModel extends BaseViewModel {
}
}
if (!this.getIsPad()) {
let bottomAppList: any = AppStorage.Get('residentList');
let bottomAppList: any = AppStorage.get('residentList');
if (!CheckEmptyUtils.isEmptyArr(bottomAppList)) {
for (let i = 0; i < bottomAppList.length; i++) {
allAppList = allAppList.filter((item) => {
@@ -715,7 +715,7 @@ export class BigFolderViewModel extends BaseViewModel {
}
}
}
AppStorage.SetOrCreate('allAppListForFolder', allAppList);
AppStorage.setOrCreate('allAppListForFolder', allAppList);
return allAppList;
}
@@ -790,10 +790,10 @@ export class BigFolderViewModel extends BaseViewModel {
Log.showDebug(TAG, 'openFolder start');
folderItem.enterEditing = isRename;
AppStorage.SetOrCreate('openFolderData', folderItem);
AppStorage.setOrCreate('openFolderData', folderItem);
this.mPageIndex = 0;
AppStorage.SetOrCreate('openFolderPageIndex', this.mPageIndex);
AppStorage.SetOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_OPEN);
AppStorage.setOrCreate('openFolderPageIndex', this.mPageIndex);
AppStorage.setOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_OPEN);
Log.showDebug(TAG, 'openFolder end');
}
@@ -804,8 +804,8 @@ export class BigFolderViewModel extends BaseViewModel {
Log.showDebug(TAG, 'closeFolder start');
this.mPageIndex = 0;
AppStorage.SetOrCreate('openFolderPageIndex', this.mPageIndex);
AppStorage.SetOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE);
AppStorage.setOrCreate('openFolderPageIndex', this.mPageIndex);
AppStorage.setOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE);
}
/**
@@ -826,7 +826,7 @@ export class BigFolderViewModel extends BaseViewModel {
* @return {boolean} isPad.
*/
getIsPad(): boolean {
return CommonConstants.PAD_DEVICE_TYPE == AppStorage.Get('deviceType');
return CommonConstants.PAD_DEVICE_TYPE == AppStorage.get('deviceType');
}
/**
@@ -962,7 +962,7 @@ export class BigFolderViewModel extends BaseViewModel {
*/
changeIndex(idx): void {
this.mPageIndex = idx;
AppStorage.SetOrCreate('openFolderPageIndex', this.mPageIndex);
AppStorage.setOrCreate('openFolderPageIndex', this.mPageIndex);
}
/**
@@ -1067,7 +1067,7 @@ export class BigFolderViewModel extends BaseViewModel {
let openFolderData: {
folderId: string,
layoutInfo: any
} = AppStorage.Get('openFolderData');
} = AppStorage.get('openFolderData');
const folderAppList = this.getAppListInFolder(openFolderData);
this.deleteAppFromFolderAppList(appInfo, folderAppList);
@@ -1123,11 +1123,11 @@ export class BigFolderViewModel extends BaseViewModel {
* @param openFolderData
*/
private updateOpenFolderStatus(openFolderData): void {
AppStorage.SetOrCreate('openFolderData', openFolderData);
AppStorage.setOrCreate('openFolderData', openFolderData);
if (openFolderData.folderId == '') {
AppStorage.SetOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE);
AppStorage.setOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE);
} else {
AppStorage.SetOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_REFRESH);
AppStorage.setOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_REFRESH);
}
}
feature/form/src/main/ets/default/viewmodel/FormViewModel.ts
+1 -1
View File
@@ -92,7 +92,7 @@ export class FormViewModel {
async getForms() {
Log.showDebug(TAG, 'getForms start');
this.mAllFormsInfo = await this.mFormModel.getAllFormsInfo();
AppStorage.SetOrCreate('allFormsInfo', this.mAllFormsInfo);
AppStorage.setOrCreate('allFormsInfo', this.mAllFormsInfo);
}
/**
feature/gesturenavigation/src/main/ets/default/common/GestureNavigationManager.ts
+1 -1
View File
@@ -80,7 +80,7 @@ export class GestureNavigationManager {
Log.showInfo(TAG, "dataChangesCallback data:" + data);
const getRetValue = this.getValue();
this.handleEventSwitches(getRetValue);
AppStorage.SetOrCreate('NavigationBarStatusValue', getRetValue == '0' ? true : false);
AppStorage.setOrCreate('NavigationBarStatusValue', getRetValue == '0' ? true : false);
}
private turnOnTouchEventCallback() {
feature/pagedesktop/src/main/ets/default/common/PageDesktopCloseAppHandler.ts
+5 -5
View File
@@ -102,8 +102,8 @@ export class PageDesktopCloseAppHandler extends BaseCloseAppHandler {
let iconLeftMargin: number = (columnSize - this.mPageDesktopStyleConfig.mIconSize) / 2;
this.mAppIconPositionX = this.mPageDesktopStyleConfig.mMargin + iconLeftMargin + appItem.column * (gridItemWidth);
if (CommonConstants.OVERLAY_TYPE_CARD !== AppStorage.Get('startAppTypeFromPageDesktop') && appItem.page != AppStorage.Get('pageIndex')) {
AppStorage.SetOrCreate('pageIndex', appItem.page);
if (CommonConstants.OVERLAY_TYPE_CARD !== AppStorage.get('startAppTypeFromPageDesktop') && appItem.page != AppStorage.get('pageIndex')) {
AppStorage.setOrCreate('pageIndex', appItem.page);
}
} else {
let folderItem: any = this.mFolderItem;
@@ -134,8 +134,8 @@ export class PageDesktopCloseAppHandler extends BaseCloseAppHandler {
this.mAppIconPositionX = this.mPageDesktopStyleConfig.mMargin + folderItem.column * (gridItemWidth) + folderLeftMargin
+ folderLeftPadding + (column - 1) * (folderGridGap + folderAppSize);
if (folderItem.page != AppStorage.Get('pageIndex')) {
AppStorage.SetOrCreate('pageIndex', folderItem.page);
if (folderItem.page != AppStorage.get('pageIndex')) {
AppStorage.setOrCreate('pageIndex', folderItem.page);
}
}
this.mFindPagedesktopPosition = true;
@@ -162,7 +162,7 @@ export class PageDesktopCloseAppHandler extends BaseCloseAppHandler {
Log.showDebug(TAG, `getCloseAppItemInfo called!`);
let appListInfo: {
appGridInfo: [[]]
} = AppStorage.Get('appListInfo')
} = AppStorage.get('appListInfo')
let appGridInfo = appListInfo.appGridInfo;
if (CheckEmptyUtils.isEmptyArr(appGridInfo)) {
Log.showError(TAG, `getCloseAppItemInfo appGridInfo is null`);
feature/pagedesktop/src/main/ets/default/common/PageDesktopDragHandler.ts
+14 -14
View File
@@ -75,7 +75,7 @@ export class PageDesktopDragHandler extends BaseDragHandler {
setDragEffectArea(effectArea): void {
Log.showDebug(TAG, `setDragEffectArea:${JSON.stringify(effectArea)}`)
AppStorage.SetOrCreate('pageDesktopDragEffectArea', effectArea);
AppStorage.setOrCreate('pageDesktopDragEffectArea', effectArea);
super.setDragEffectArea(effectArea);
this.updateGridParam(effectArea);
}
@@ -83,8 +83,8 @@ export class PageDesktopDragHandler extends BaseDragHandler {
isDragEffectArea(x: number, y: number): boolean {
const isInEffectArea = super.isDragEffectArea(x, y);
Log.showDebug(TAG, `isDragEffectArea x: ${x}, y: ${y}, isInEffectArea: ${isInEffectArea}`);
const deviceType: string = AppStorage.Get('deviceType');
const smartDockDragEffectArea: DragArea = AppStorage.Get('smartDockDragEffectArea');
const deviceType: string = AppStorage.get('deviceType');
const smartDockDragEffectArea: DragArea = AppStorage.get('smartDockDragEffectArea');
Log.showDebug(TAG, `isDragEffectArea smartDockDragEffectArea: ${JSON.stringify(smartDockDragEffectArea)}`);
if (smartDockDragEffectArea) {
if (deviceType == CommonConstants.DEFAULT_DEVICE_TYPE) {
@@ -135,7 +135,7 @@ export class PageDesktopDragHandler extends BaseDragHandler {
protected getDragRelativeData(): any {
const desktopDataInfo: {
appGridInfo: [[]]
} = AppStorage.Get('appListInfo');
} = AppStorage.get('appListInfo');
return desktopDataInfo.appGridInfo;
}
@@ -165,7 +165,7 @@ export class PageDesktopDragHandler extends BaseDragHandler {
protected getItemByIndex(index: number): any {
const column = index % this.mGridConfig.column;
const row = Math.floor(index / this.mGridConfig.column);
const pageIndex: number = AppStorage.Get('pageIndex');
const pageIndex: number = AppStorage.get('pageIndex');
const appGridInfo = this.getDragRelativeData();
Log.showInfo(TAG, `getItemByIndex pageIndex: ${pageIndex}, appGridInfo length: ${appGridInfo.length},
column: ${column}, row: ${row}`);
@@ -190,7 +190,7 @@ export class PageDesktopDragHandler extends BaseDragHandler {
}
private getTouchPosition(x: number, y: number): DragItemPosition {
const pageIndex: number = AppStorage.Get('pageIndex');
const pageIndex: number = AppStorage.get('pageIndex');
Log.showDebug(TAG, `getTouchPosition pageIndex: ${pageIndex}`);
const position: DragItemPosition = {
page: pageIndex,
@@ -222,22 +222,22 @@ export class PageDesktopDragHandler extends BaseDragHandler {
this.mStartPosition = null;
Log.showInfo(TAG, `onDragStart start`);
const selectAppIndex = this.getItemIndex(x, y);
AppStorage.SetOrCreate('selectAppIndex', selectAppIndex);
AppStorage.setOrCreate('selectAppIndex', selectAppIndex);
this.mStartPosition = this.getTouchPosition(x, y);
}
onDragDrop(x: number, y: number): boolean {
const dragItemInfo: LauncherDragItemInfo = AppStorage.Get<LauncherDragItemInfo>('dragItemInfo');
const dragItemInfo: LauncherDragItemInfo = AppStorage.get<LauncherDragItemInfo>('dragItemInfo');
if (!dragItemInfo.isDragging) {
return false;
}
const dragItemType: number = AppStorage.Get('dragItemType');
const deviceType: string = AppStorage.Get('deviceType')
const dragItemType: number = AppStorage.get('dragItemType');
const deviceType: string = AppStorage.get('deviceType')
// dock appInfo has no location information.
if (dragItemType === CommonConstants.DRAG_FROM_DOCK && deviceType == CommonConstants.DEFAULT_DEVICE_TYPE) {
dragItemInfo.typeId = CommonConstants.TYPE_APP;
dragItemInfo.area = [1, 1];
dragItemInfo.page = AppStorage.Get('pageIndex');
dragItemInfo.page = AppStorage.get('pageIndex');
}
Log.showDebug(TAG, `onDragEnd dragItemInfo: ${JSON.stringify(dragItemInfo)}`);
const endIndex = this.getItemIndex(x, y);
@@ -403,13 +403,13 @@ export class PageDesktopDragHandler extends BaseDragHandler {
}
if (CheckEmptyUtils.isEmpty(endPosition) || JSON.stringify(startPosition) === JSON.stringify(endPosition)) {
Log.showDebug(TAG, `pageIndex: ${JSON.stringify(startPosition) === JSON.stringify(endPosition)}`);
AppStorage.SetOrCreate('pageIndex', startPosition.page);
AppStorage.setOrCreate('pageIndex', startPosition.page);
} else if (deleteStartFlag) {
if (startPosition.page > endPosition.page) {
AppStorage.SetOrCreate('pageIndex', endPosition.page);
AppStorage.setOrCreate('pageIndex', endPosition.page);
} else if (endPosition.page > startPosition.page &&
endPosition.page < layoutInfo.layoutDescription.pageCount) {
AppStorage.SetOrCreate('pageIndex', endPosition.page - 1);
AppStorage.setOrCreate('pageIndex', endPosition.page - 1);
}
}
this.mPageDesktopModel.setAddByDragging(false);
feature/pagedesktop/src/main/ets/default/common/PageDesktopStartAppHandler.ts
+3 -3
View File
@@ -61,8 +61,8 @@ export class PageDesktopStartAppHandler extends BaseStartAppHandler {
const rowGap: number = this.mPageDesktopStyleConfig.mRowsGap;
const gridItemHeight: number = row > 0 ? (gridHeight + rowGap) / row : 0;
const gridItemWidth: number = column > 0 ? (gridWidth + columnsGap) / column : 0;
let appItem: any = AppStorage.Get('startAppItemInfo');
const startAppTypeFromPageDesktop: number = AppStorage.Get('startAppTypeFromPageDesktop');
let appItem: any = AppStorage.get('startAppItemInfo');
const startAppTypeFromPageDesktop: number = AppStorage.get('startAppTypeFromPageDesktop');
if (startAppTypeFromPageDesktop === CommonConstants.OVERLAY_TYPE_APP_ICON) {
let paddingTop = Math.floor(gridHeight / row) - this.mPageDesktopStyleConfig.mAppItemSize;
this.mAppIconPositionY = this.mPageDesktopStyleConfig.mDesktopMarginTop + paddingTop + appItem.row * (gridItemHeight);
@@ -81,7 +81,7 @@ export class PageDesktopStartAppHandler extends BaseStartAppHandler {
this.mAppIconPositionX = this.mPageDesktopStyleConfig.mMargin + iconLeftMargin + appItem.column * (gridItemWidth);
} else if (startAppTypeFromPageDesktop === CommonConstants.OVERLAY_TYPE_FOLDER) {
let folderItem: any = AppStorage.Get('startAppFromFolderItemInfo');
let folderItem: any = AppStorage.get('startAppFromFolderItemInfo');
const folderGridSize: number = this.mFolderStyleConfig.mGridSize;
const folderGridGap: number = this.mFolderStyleConfig.mFolderGridGap;
const folderAppSize: number = this.mFolderStyleConfig.mFolderAppSize;
feature/pagedesktop/src/main/ets/default/common/components/AppItem.ets
+8 -7
View File
@@ -138,6 +138,7 @@ export default struct AppItem {
this.dialogController = null;
delete this.formManagerDialogController;
this.formManagerDialogController = null;
this.clearForm = null;
}
getMenuInfoList() {
@@ -181,7 +182,7 @@ export default struct AppItem {
if (event.button == MouseButton.Right) {
event.stopPropagation();
Log.showInfo(TAG, 'onMouse mouse button right');
AppStorage.SetOrCreate('selectDesktopAppItem', this.item.keyName);
AppStorage.setOrCreate('selectDesktopAppItem', this.item.keyName);
}
})
.onClick((event) => {
@@ -204,13 +205,13 @@ export default struct AppItem {
}
})
.onTouch((event: TouchEvent) => {
Log.showDebug(TAG, `onTouch event type: ${event.type}, x: ${event.touches[0].screenX}, y: ${event.touches[0].screenY}`);
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].screenX, event.touches[0].screenY);
let mIsDragEffectArea = globalThis.PageDesktopDragHandler.isDragEffectArea(event.touches[0].windowX, event.touches[0].windowY);
Log.showInfo(TAG, `onTouch mIsDragEffectArea: ${mIsDragEffectArea}`);
if (!mIsDragEffectArea) {
this.pageDesktopDragItemInfo = new LauncherDragItemInfo();
AppStorage.SetOrCreate('selectAppIndex', null);
AppStorage.setOrCreate('selectAppIndex', null);
}
}
})
@@ -232,7 +233,7 @@ export default struct AppItem {
this.dragItemType = CommonConstants.DRAG_FROM_DESKTOP;
this.pageDesktopDragItemInfo = Object.assign(new LauncherDragItemInfo(true), this.item);
Log.showInfo(TAG, `pageDesktopDragItemInfo: ${JSON.stringify(this.pageDesktopDragItemInfo)}`);
globalThis.PageDesktopDragHandler.onDragStart(event.getX(), event.getY());
globalThis.PageDesktopDragHandler.onDragStart(event.getWindowX(), event.getWindowY());
}
/**
@@ -252,8 +253,8 @@ export default struct AppItem {
row: this.item.row,
column: this.item.column
}
AppStorage.SetOrCreate('startAppItemInfo', appInfo);
AppStorage.SetOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_APP_ICON);
AppStorage.setOrCreate('startAppItemInfo', appInfo);
AppStorage.setOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_APP_ICON);
this.mPageDesktopStartAppHandler.setAppIconSize(this.mIconSize);
this.mPageDesktopStartAppHandler.setAppIconInfo();
Trace.end("setStartAppInfo");
feature/pagedesktop/src/main/ets/default/common/components/FolderItem.ets
+14 -14
View File
@@ -68,7 +68,7 @@ export default struct FolderItem {
this.mMargin = styleConfig.mMargin;
this.mGridSpaceWidth = Number(this.mPageDesktopViewModel.getWorkSpaceWidth()) - this.mMargin;
this.mGridSpaceHeight = Number(this.mPageDesktopViewModel.getWorkSpaceHeight());
this.openFolderStatus = AppStorage.Get('openFolderStatus') != 'undefined' ? AppStorage.Get('openFolderStatus') : BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE;
this.openFolderStatus = AppStorage.get('openFolderStatus') != 'undefined' ? AppStorage.get('openFolderStatus') : BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE;
this.formatFolderInfo();
}
@@ -99,7 +99,7 @@ export default struct FolderItem {
*/
private renameClick() {
Log.showInfo(TAG, 'click menu folder rename');
AppStorage.SetOrCreate('overlayMode', CommonConstants.OVERLAY_TYPE_HIDE);
AppStorage.setOrCreate('overlayMode', CommonConstants.OVERLAY_TYPE_HIDE);
this.mBigFolderViewModel.openFolder(true, this.folderItem);
}
@@ -107,7 +107,7 @@ export default struct FolderItem {
let openFolderData: {
folderId: string,
layoutInfo: any
} = AppStorage.Get('openFolderData');
} = AppStorage.get('openFolderData');
return openFolderData.folderId;
}
@@ -116,11 +116,11 @@ export default struct FolderItem {
ContextMenu.close();
this.dragItemType = CommonConstants.DRAG_FROM_DESKTOP;
this.pageDesktopDragItemInfo = Object.assign(new LauncherDragItemInfo(true), this.folderItem);
const selectAppIndex = globalThis.PageDesktopDragHandler.getItemIndex(event.getX(), event.getY());
const startPosition = globalThis.PageDesktopDragHandler.getTouchPosition(event.getX(), event.getY())
const selectAppIndex = globalThis.PageDesktopDragHandler.getItemIndex(event.getWindowX(), event.getWindowY());
const startPosition = globalThis.PageDesktopDragHandler.getTouchPosition(event.getWindowX(), event.getWindowY())
globalThis.PageDesktopDragHandler.mStartPosition = startPosition;
AppStorage.SetOrCreate('selectAppIndex', selectAppIndex);
Log.showInfo(TAG, `onDragStart event: [${event.getX()}, ${event.getY()}], selectAppIndex: ${selectAppIndex}`);
AppStorage.setOrCreate('selectAppIndex', selectAppIndex);
Log.showInfo(TAG, `onDragStart event: [${event.getWindowX()}, ${event.getWindowY()}], selectAppIndex: ${selectAppIndex}`);
}
build() {
@@ -158,12 +158,12 @@ export default struct FolderItem {
},
onFolderTouch: (event, folderItem) => {
if (event.type === CommonConstants.TOUCH_TYPE_UP && this.pageDesktopDragItemInfo.isDragging) {
let mIsDragEffectArea = globalThis.PageDesktopDragHandler.isDragEffectArea(event.touches[0].screenX, event.touches[0].screenY);
let mIsDragEffectArea = globalThis.PageDesktopDragHandler.isDragEffectArea(event.touches[0].windowX, event.touches[0].windowY);
Log.showInfo(TAG, `onTouch mIsDragEffectArea: ${mIsDragEffectArea}`);
if (!mIsDragEffectArea) {
globalThis.PageDesktopDragHandler.deleteBlankPageOutsideEffect();
AppStorage.SetOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
AppStorage.SetOrCreate('selectAppIndex', null);
AppStorage.setOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
AppStorage.setOrCreate('selectAppIndex', null);
}
}
},
@@ -190,7 +190,7 @@ export default struct FolderItem {
if (event.button == MouseButton.Right) {
event.stopPropagation();
Log.showInfo(TAG, 'onMouse mouse button right');
AppStorage.SetOrCreate('selectDesktopAppItem', this.folderItem.folderId);
AppStorage.setOrCreate('selectDesktopAppItem', this.folderItem.folderId);
}
})
.gesture(
@@ -212,9 +212,9 @@ export default struct FolderItem {
* set start app info
*/
private setStartAppInfo(appItem) {
AppStorage.SetOrCreate('startAppItemInfo', appItem);
AppStorage.SetOrCreate('startAppFromFolderItemInfo', this.folderItem);
AppStorage.SetOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_FOLDER);
AppStorage.setOrCreate('startAppItemInfo', appItem);
AppStorage.setOrCreate('startAppFromFolderItemInfo', this.folderItem);
AppStorage.setOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_FOLDER);
this.mPageDesktopStartAppHandler.setAppIconSize(this.mFolderStyleConfig.mFolderAppSize);
this.mPageDesktopStartAppHandler.setAppIconInfo();
}
feature/pagedesktop/src/main/ets/default/common/components/FormItem.ets
+11 -10
View File
@@ -95,6 +95,7 @@ export default struct FormItem {
this.dialogController = null;
delete this.formManagerDialogController;
this.formManagerDialogController = null;
this.clearForm = null;
}
/**
@@ -114,7 +115,7 @@ export default struct FormItem {
playMode: PlayMode.Normal,
onFinish: () => {
Log.showInfo(TAG, `showAnimate onFinish`);
AppStorage.SetOrCreate('isRemoveForm', false);
AppStorage.setOrCreate('isRemoveForm', false);
this.formAnimateData.cardId = 0;
this.formAnimateData.isOpenRemoveFormDialog = false;
this.mFormViewModel.deleteForm(this.formItem.cardId);
@@ -152,7 +153,7 @@ export default struct FormItem {
cancel: () => {},
confirm: () => {
// delete form
AppStorage.SetOrCreate('isRemoveForm', true);
AppStorage.setOrCreate('isRemoveForm', true);
},
dialogName: this.getDialogName(),
}),
@@ -206,11 +207,11 @@ export default struct FormItem {
ContextMenu.close();
this.dragItemType = CommonConstants.DRAG_FROM_DESKTOP;
this.pageDesktopDragItemInfo = Object.assign(new LauncherDragItemInfo(true), this.formItem);
const selectAppIndex = globalThis.PageDesktopDragHandler.getItemIndex(event.getX(), event.getY());
const startPosition = globalThis.PageDesktopDragHandler.getTouchPosition(event.getX(), event.getY())
const selectAppIndex = globalThis.PageDesktopDragHandler.getItemIndex(event.getWindowX(), event.getWindowY());
const startPosition = globalThis.PageDesktopDragHandler.getTouchPosition(event.getWindowX(), event.getWindowY())
globalThis.PageDesktopDragHandler.mStartPosition = startPosition;
AppStorage.SetOrCreate('selectAppIndex', selectAppIndex);
Log.showInfo(TAG, `onDragStart event: [${event.getX()}, ${event.getY()}], selectAppIndex: ${selectAppIndex}`);
AppStorage.setOrCreate('selectAppIndex', selectAppIndex);
Log.showInfo(TAG, `onDragStart event: [${event.getWindowX()}, ${event.getWindowY()}], selectAppIndex: ${selectAppIndex}`);
}
build() {
@@ -256,12 +257,12 @@ export default struct FormItem {
)
.onTouch((event: TouchEvent) => {
if (event.type === CommonConstants.TOUCH_TYPE_UP && this.pageDesktopDragItemInfo.isDragging) {
let mIsDragEffectArea = globalThis.PageDesktopDragHandler.isDragEffectArea(event.touches[0].screenX, event.touches[0].screenY);
let mIsDragEffectArea = globalThis.PageDesktopDragHandler.isDragEffectArea(event.touches[0].windowX, event.touches[0].windowY);
Log.showInfo(TAG, `onTouch mIsDragEffectArea: ${mIsDragEffectArea}`);
if (!mIsDragEffectArea) {
globalThis.PageDesktopDragHandler.deleteBlankPageOutsideEffect();
this.pageDesktopDragItemInfo = new LauncherDragItemInfo();
AppStorage.SetOrCreate('selectAppIndex', null);
AppStorage.setOrCreate('selectAppIndex', null);
}
}
})
@@ -278,8 +279,8 @@ export default struct FormItem {
*/
private setStartAppInfo() {
Log.showInfo(TAG, `app setStartAppInfo`);
AppStorage.SetOrCreate('startAppItemInfo', this.formItem);
AppStorage.SetOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_CARD);
AppStorage.setOrCreate('startAppItemInfo', this.formItem);
AppStorage.setOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_CARD);
this.mPageDesktopStartAppHandler.setAppIconSize(this.mFormItemWidth, this.mFormItemHeight);
this.mPageDesktopStartAppHandler.setAppIconInfo();
}
feature/pagedesktop/src/main/ets/default/common/components/GridSwiper.ets
+16 -16
View File
@@ -68,12 +68,12 @@ export default struct GridSwiper {
aboutToDisappear(): void {
Log.showInfo(TAG, 'aboutToDisappear');
delete this.swiperController;
this.swiperController = null;
delete this.dialogController;
this.dialogController = null;
}
private buildLog(): boolean {
let isDesktopLoadFinished = AppStorage.Get('isDesktopLoadFinished');
let isDesktopLoadFinished = AppStorage.get('isDesktopLoadFinished');
Log.showDebug(TAG, `build start ${isDesktopLoadFinished} page ${this.pageIndex}`);
return isDesktopLoadFinished == true;
}
@@ -113,13 +113,13 @@ export default struct GridSwiper {
itemMove(moveX: number, moveY: number){
const hotArea: number = 12;
let screenWidth: number = AppStorage.Get('screenWidth') ?? 0;
let screenHeight: number = AppStorage.Get('screenHeight') ?? 0;
const isSwappingPage: boolean = AppStorage.Get('isSwappingPage');
let screenWidth: number = AppStorage.get('screenWidth') ?? 0;
let screenHeight: number = AppStorage.get('screenHeight') ?? 0;
const isSwappingPage: boolean = AppStorage.get('isSwappingPage');
if (isSwappingPage || !screenWidth || !screenHeight) {
return;
}
let curPageIndex: number = AppStorage.Get('pageIndex');
let curPageIndex: number = AppStorage.get('pageIndex');
if (moveX < hotArea && curPageIndex > 0 && moveY < screenHeight) {
this.mPageDesktopViewModel.showPrevious();
this.movingIconSwapPageDelay();
@@ -139,9 +139,9 @@ export default struct GridSwiper {
* Increase delay when dragging app to other page.
*/
movingIconSwapPageDelay() {
AppStorage.SetOrCreate('isSwappingPage', true);
AppStorage.setOrCreate('isSwappingPage', true);
setTimeout(() => {
AppStorage.SetOrCreate('isSwappingPage', false);
AppStorage.setOrCreate('isSwappingPage', false);
}, APP_INFO_REFRESH_DELAY);
}
@@ -151,7 +151,7 @@ export default struct GridSwiper {
if (this.desktopLoadFinished) {
Swiper(this.swiperController) {
ForEach(this.pageList, (item, index: number) => {
if (AppStorage.Get('deviceType') == CommonConstants.DEFAULT_DEVICE_TYPE) {
if (AppStorage.get('deviceType') == CommonConstants.DEFAULT_DEVICE_TYPE) {
Column() {
SwiperPage({
appListInfo: $appListInfo,
@@ -222,13 +222,13 @@ export default struct GridSwiper {
.height(StyleConstants.PERCENTAGE_100)
.width(StyleConstants.PERCENTAGE_100)
.onDragMove((event: DragEvent, extraParams: string) => {
Log.showInfo(TAG, `onDragMove event: [${event.getX()}, ${event.getY()}]`);
const dragItemInfo: LauncherDragItemInfo = AppStorage.Get<LauncherDragItemInfo>('dragItemInfo');
Log.showInfo(TAG, `onDragMove event: [${event.getWindowX()}, ${event.getWindowY()}]`);
const dragItemInfo: LauncherDragItemInfo = AppStorage.get<LauncherDragItemInfo>('dragItemInfo');
if (!dragItemInfo.isDragging) return;
if (AppStorage.Get('deviceType') === CommonConstants.DEFAULT_DEVICE_TYPE
|| (AppStorage.Get('deviceType') !== CommonConstants.DEFAULT_DEVICE_TYPE
&& AppStorage.Get('dragItemType') === CommonConstants.DRAG_FROM_DESKTOP)) {
this.itemMove(event.getX(), event.getY());
if (AppStorage.get('deviceType') === CommonConstants.DEFAULT_DEVICE_TYPE
|| (AppStorage.get('deviceType') !== CommonConstants.DEFAULT_DEVICE_TYPE
&& AppStorage.get('dragItemType') === CommonConstants.DRAG_FROM_DESKTOP)) {
this.itemMove(event.getWindowX(), event.getWindowY());
}
})
}
feature/pagedesktop/src/main/ets/default/common/components/SwiperPage.ets
+11 -11
View File
@@ -146,32 +146,32 @@ export default struct SwiperPage {
})
.onMouse((event: MouseEvent) => {
if (event.button == MouseButton.Right) {
AppStorage.SetOrCreate('selectDesktopAppItem', '');
AppStorage.setOrCreate('selectDesktopAppItem', '');
}
})
.onClick(() => {
AppStorage.SetOrCreate('selectDesktopAppItem', '')
AppStorage.setOrCreate('selectDesktopAppItem', '')
})
.onDragEnter((event: DragEvent, extraParams: string) => {
Log.showInfo(TAG, `onDragEnter extraParams: ${extraParams}, event: [${event.getX()}, ${event.getY()}]`);
Log.showInfo(TAG, `onDragEnter extraParams: ${extraParams}, event: [${event.getWindowX()}, ${event.getWindowY()}]`);
})
.onDragLeave((event: DragEvent, extraParams: string) => {
Log.showInfo(TAG, `onDragLeave event: [${event.getX()}, ${event.getY()}]`);
Log.showInfo(TAG, `onDragLeave event: [${event.getWindowX()}, ${event.getWindowY()}]`);
})
.onDrop((event: DragEvent, extraParams: string) => {
const dragItemType: number = AppStorage.Get('dragItemType');
Log.showInfo(TAG, `onDrop event: [${event.getX()}, ${event.getY()}]`);
const dragItemType: number = AppStorage.get('dragItemType');
Log.showInfo(TAG, `onDrop event: [${event.getWindowX()}, ${event.getWindowY()}]`);
if (dragItemType === CommonConstants.DRAG_FROM_DESKTOP
|| (dragItemType === CommonConstants.DRAG_FROM_DOCK && AppStorage.Get('deviceType') === CommonConstants.DEFAULT_DEVICE_TYPE)) {
const dragResult = globalThis.PageDesktopDragHandler.onDragDrop(event.getX(), event.getY());
|| (dragItemType === CommonConstants.DRAG_FROM_DOCK && AppStorage.get('deviceType') === CommonConstants.DEFAULT_DEVICE_TYPE)) {
const dragResult = globalThis.PageDesktopDragHandler.onDragDrop(event.getWindowX(), event.getWindowY());
Log.showInfo(TAG, `onDrop dragResult: ${dragResult}`);
AppStorage.SetOrCreate('selectAppIndex', null);
AppStorage.setOrCreate('selectAppIndex', null);
if (!dragResult) {
AppStorage.SetOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
AppStorage.setOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
} else {
// Wait for the UI rendering to end.
setTimeout(() => {
AppStorage.SetOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
AppStorage.setOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
}, 50);
}
}
feature/pagedesktop/src/main/ets/default/layout/PageDesktopLayout.ets
+1 -1
View File
@@ -59,7 +59,7 @@ export struct PageDesktopLayout {
}
aboutToAppear(): void {
this.deviceType = AppStorage.Get('deviceType');
this.deviceType = AppStorage.get('deviceType');
this.mPageDesktopDragHandler = PageDesktopDragHandler.getInstance();
mPageDesktopViewModel = PageDesktopViewModel.getInstance();
this.gridConfig = mPageDesktopViewModel.getGridConfig().layout;
feature/pagedesktop/src/main/ets/default/viewmodel/PageDesktopViewModel.ts
+23 -23
View File
@@ -219,7 +219,7 @@ export default class PageDesktopViewModel extends BaseViewModel {
async updateDesktopInfo(): Promise<void> {
await this.mAppModel.getAppListAsync();
this.getGridList();
AppStorage.SetOrCreate('formRefresh', String(new Date()));
AppStorage.setOrCreate('formRefresh', String(new Date()));
}
private async getAppList() {
@@ -258,7 +258,7 @@ export default class PageDesktopViewModel extends BaseViewModel {
// update pageDesktop app config
this.mSettingsModel.setAppListInfo(pageDesktopInfo);
AppStorage.SetOrCreate('isDesktopLoadFinished', true);
AppStorage.setOrCreate('isDesktopLoadFinished', true);
return pageDesktopInfo;
}
@@ -555,8 +555,8 @@ export default class PageDesktopViewModel extends BaseViewModel {
}
appInfo.appGridInfo = this.integrateSwiper(appListInfo);
Log.showInfo(TAG, 'pagingFiltering appListInfo length:' + appListInfo.length);
AppStorage.SetOrCreate('selectDesktopAppItem', '');
AppStorage.SetOrCreate(KEY_APP_LIST, appInfo);
AppStorage.setOrCreate('selectDesktopAppItem', '');
AppStorage.setOrCreate(KEY_APP_LIST, appInfo);
}
private integrateSwiper(list) {
@@ -784,7 +784,7 @@ export default class PageDesktopViewModel extends BaseViewModel {
'row': row,
'column': column
};
if (AppStorage.Has('isPortrait') && AppStorage.Get('isPortrait')) {
if (AppStorage.has('isPortrait') && AppStorage.get('isPortrait')) {
let cardInfoHorizontal: any[] = [];
for (let i = 0; i < info.layoutInfo.length; i++) {
if (info.layoutInfo[i].typeId == CommonConstants.TYPE_FOLDER) {
@@ -809,10 +809,10 @@ export default class PageDesktopViewModel extends BaseViewModel {
}
}
}
AppStorage.SetOrCreate('isPortraitCard', cardInfoHorizontal);
AppStorage.setOrCreate('isPortraitCard', cardInfoHorizontal);
}
if (AppStorage.Has('isPortrait') && !AppStorage.Get('isPortrait')) {
if (AppStorage.has('isPortrait') && !AppStorage.get('isPortrait')) {
for (let i = 0; i < info.layoutInfo.length; i++) {
if (info.layoutInfo[i].typeId == CommonConstants.TYPE_FOLDER) {
let tt = info.layoutInfo[i].column
@@ -830,7 +830,7 @@ export default class PageDesktopViewModel extends BaseViewModel {
info.layoutInfo[i].row = tt;
newLayoutInfo.layoutInfo.push(info.layoutInfo[i]);
} else {
let cardInfoOld: [] = AppStorage.Get('isPortraitCard');
let cardInfoOld: [] = AppStorage.get('isPortraitCard');
Log.showInfo(TAG, 'cardInfoOld:' + JSON.stringify(cardInfoOld));
if (!cardInfoOld.find(item => JSON.parse(item).cardId === info.layoutInfo[i].cardId)) {
this.mPageDesktopModel.updatePageDesktopLayoutInfo(newLayoutInfo, info.layoutInfo[i]);
@@ -846,7 +846,7 @@ export default class PageDesktopViewModel extends BaseViewModel {
}
}
if (!AppStorage.Has('isPortrait')) {
if (!AppStorage.has('isPortrait')) {
newLayoutInfo.layoutDescription = {
'pageCount': pageNum,
'row': row,
@@ -1031,8 +1031,8 @@ export default class PageDesktopViewModel extends BaseViewModel {
if (openClickCallback) {
openClickCallback();
}
if (AppStorage.Get('openFolderStatus') != 0) {
AppStorage.SetOrCreate('openFolderStatus', 0);
if (AppStorage.get('openFolderStatus') != 0) {
AppStorage.setOrCreate('openFolderStatus', 0);
}
this.jumpTo(value.wants[0].targetClass, value.wants[0].targetBundle, value.wants[0].targetModule);
};
@@ -1045,8 +1045,8 @@ export default class PageDesktopViewModel extends BaseViewModel {
open.menuImgSrc = '/common/pics/ic_public_add_norm.svg';
open.menuText = $r('app.string.app_menu_open');
open.onMenuClick = () => {
if (AppStorage.Get('openFolderStatus') != 0 && AppStorage.Get('deviceType') === CommonConstants.PAD_DEVICE_TYPE) {
AppStorage.SetOrCreate('openFolderStatus', 0);
if (AppStorage.get('openFolderStatus') != 0 && AppStorage.get('deviceType') === CommonConstants.PAD_DEVICE_TYPE) {
AppStorage.setOrCreate('openFolderStatus', 0);
}
this.setStartAppInfo()
this.jumpTo(appInfo.abilityName, appInfo.bundleName, appInfo.moduleName);
@@ -1065,7 +1065,7 @@ export default class PageDesktopViewModel extends BaseViewModel {
if (appName != null) {
appInfo.appName = appName;
}
AppStorage.SetOrCreate('formAppInfo', appInfo);
AppStorage.setOrCreate('formAppInfo', appInfo);
if (!this.isPad) {
this.showFormManager(appInfo);
} else {
@@ -1114,7 +1114,7 @@ export default class PageDesktopViewModel extends BaseViewModel {
if (appName != null) {
appInfo.appName = appName;
}
AppStorage.SetOrCreate('uninstallAppInfo', appInfo);
AppStorage.setOrCreate('uninstallAppInfo', appInfo);
dialog.open();
};
uninstallMenu.menuEnabled = appInfo.isUninstallAble;
@@ -1147,7 +1147,7 @@ export default class PageDesktopViewModel extends BaseViewModel {
if (appName != null) {
formInfo.appName = appName;
}
AppStorage.SetOrCreate('formAppInfo', formInfo);
AppStorage.setOrCreate('formAppInfo', formInfo);
if (!this.isPad) {
this.showFormManager(formInfo);
} else {
@@ -1165,7 +1165,7 @@ export default class PageDesktopViewModel extends BaseViewModel {
cardId: number,
isOpenRemoveFormDialog: boolean,
} = { cardId: formInfo.cardId, isOpenRemoveFormDialog: true };
AppStorage.SetOrCreate('formAnimateData', formAnimateData);
AppStorage.setOrCreate('formAnimateData', formAnimateData);
dialog.open();
};
menuInfoList.push(deleteFormFromDeskTop);
@@ -1197,14 +1197,14 @@ export default class PageDesktopViewModel extends BaseViewModel {
* Get workSpaceWidth.
*/
getWorkSpaceWidth() {
return AppStorage.Get('workSpaceWidth');
return AppStorage.get('workSpaceWidth');
}
/**
* Get workSpaceHeight.
*/
getWorkSpaceHeight() {
return AppStorage.Get('workSpaceHeight');
return AppStorage.get('workSpaceHeight');
}
/**
@@ -1226,7 +1226,7 @@ export default class PageDesktopViewModel extends BaseViewModel {
return;
}
Log.showDebug(TAG, `onAppClick keyName ${bundleName + abilityName + moduleName}`);
AppStorage.SetOrCreate('selectDesktopAppItem', bundleName + abilityName + moduleName);
AppStorage.setOrCreate('selectDesktopAppItem', bundleName + abilityName + moduleName);
}
/**
@@ -1236,7 +1236,7 @@ export default class PageDesktopViewModel extends BaseViewModel {
* @param bundleName bundle name
*/
onAppDoubleClick(abilityName: string, bundleName: string, moduleName: string): void {
AppStorage.SetOrCreate('selectDesktopAppItem', '');
AppStorage.setOrCreate('selectDesktopAppItem', '');
this.jumpTo(abilityName, bundleName, moduleName);
}
@@ -1342,7 +1342,7 @@ export default class PageDesktopViewModel extends BaseViewModel {
private removeBottomBarInfo(pageDesktopInfo) {
let bottomAppList = [];
bottomAppList = AppStorage.Get('residentList');
bottomAppList = AppStorage.get('residentList');
Log.showDebug(TAG, `removeBottomBarInfo bottomAppList length: ${bottomAppList.length}`);
if (!CheckEmptyUtils.isEmptyArr(bottomAppList)) {
for (let i = 0; i < bottomAppList.length; i++) {
@@ -1387,7 +1387,7 @@ export default class PageDesktopViewModel extends BaseViewModel {
* set start app info
*/
private setStartAppInfo() {
AppStorage.SetOrCreate('startAppIconInfo', {
AppStorage.setOrCreate('startAppIconInfo', {
appIconSize: 0,
appIconHeight: 0,
appIconPositionX: 0,
feature/recents/src/main/ets/default/common/RecentMissionStartAppHandler.ts
+1 -1
View File
@@ -35,7 +35,7 @@ export class RecentMissionStartAppHandler extends BaseStartAppHandler {
}
protected calculateAppIconPosition(): void {
const RecentMissionInfo = AppStorage.Get('startAppItemInfo');
const RecentMissionInfo = AppStorage.get('startAppItemInfo');
Log.showInfo(TAG, `recentMission_CalculateAppIconPosition:${JSON.stringify(RecentMissionInfo)} `);
const isSingleLayout = RecentMissionInfo['isSingleLayout'];
// this.mAppIconSize = RecentsStyleConstants.SINGLE_LIST_DEFAULT_APP_ICON_SIZE_NEW ;
feature/recents/src/main/ets/default/common/uicomponents/RecentMissionCard.ets
+2 -2
View File
@@ -203,7 +203,7 @@ export default struct RecentMissionCard {
* set start app info
*/
private setStartAppInfo(position) {
AppStorage.SetOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_APP_ICON);
AppStorage.setOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_APP_ICON);
let appParams = {
bundleName: this.bundleName,
moduleName: this.moduleName,
@@ -214,7 +214,7 @@ export default struct RecentMissionCard {
appIconHeight: this.mIsSingleLayout ? RecentsStyleConstants.SINGLE_LIST_MISSION_HEIGHT : RecentsStyleConstants.DOUBLE_LIST_MISSION_HEIGHT,
position:position
}
AppStorage.SetOrCreate('startAppItemInfo', appParams);
AppStorage.setOrCreate('startAppItemInfo', appParams);
this.mRecentMissionStartAppHandler.setAppIconSize(appParams.appIconSize, appParams.appIconHeight);
this.mRecentMissionStartAppHandler.setAppIconInfo();
}
feature/recents/src/main/ets/default/viewmodel/RecentMissionsViewModel.ets
+4 -4
View File
@@ -90,7 +90,7 @@ export class RecentMissionsViewModel {
});
}
Log.showDebug(TAG, `getRecentMissionsList length: ${this.mRecentMissionsList.length}`);
AppStorage.SetOrCreate('recentMissionsList', this.mRecentMissionsList);
AppStorage.setOrCreate('recentMissionsList', this.mRecentMissionsList);
}
/**
@@ -103,13 +103,13 @@ export class RecentMissionsViewModel {
Log.showDebug(TAG, `deleteRecentMissions missionId: ${missionId}`);
if (!isClickDelBtn && missionId != -1) {
await amsMissionManager.clearMission(missionId);
this.mRecentMissionsList = AppStorage.Get('recentMissionsList');
this.mRecentMissionsList = AppStorage.get('recentMissionsList');
this.mRecentMissionsList = this.mRecentMissionsList == null ? this.mRecentMissionsList : this.mRecentMissionsList.filter((item) => {
return item.missionId != missionId;
});
} else {
await this.deleteRecentMissions();
this.mRecentMissionsList = AppStorage.Get('recentMissionsList');
this.mRecentMissionsList = AppStorage.get('recentMissionsList');
this.mRecentMissionsList = this.mRecentMissionsList == null ? this.mRecentMissionsList : this.mRecentMissionsList.filter((item) => {
return item.lockedState === true;
});
@@ -128,7 +128,7 @@ export class RecentMissionsViewModel {
onFinish: () => {
}
}, () => {
AppStorage.SetOrCreate('recentMissionsList', this.mRecentMissionsList);
AppStorage.setOrCreate('recentMissionsList', this.mRecentMissionsList);
});
if (this.mRecentMissionsList.length == 0) {
this.terminateRecentIfAllClear();
feature/settings/src/main/ets/common/presenter/SettingsPresenter.ts
+1 -1
View File
@@ -221,7 +221,7 @@ export default class SettingsPresenter {
const initValue = this.mSettingsModel.getValue();
const navigationBarStatusValue = initValue == '0' ? true : false;
Log.showDebug(TAG, `initNavigationBarStatusValue initValue:${initValue}, navigationBarStatusValue:${navigationBarStatusValue}`);
AppStorage.SetOrCreate('NavigationBarStatusValue', navigationBarStatusValue);
AppStorage.setOrCreate('NavigationBarStatusValue', navigationBarStatusValue);
} catch (e) {
Log.showError(TAG, `initNavigationBarStatusValue error: ${e.toString()}`);
}
feature/settings/src/main/ets/pages/Settings.ets
+3 -3
View File
@@ -220,9 +220,9 @@ struct SettingItem {
}
}
.onClick(() => {
AppStorage.SetOrCreate('ida', this.ida);
AppStorage.SetOrCreate('valueList', this.valueList);
AppStorage.SetOrCreate('settingValue', this.settingValue);
AppStorage.setOrCreate('ida', this.ida);
AppStorage.setOrCreate('valueList', this.valueList);
AppStorage.setOrCreate('settingValue', this.settingValue);
this.dialogController.open();
})
} else {
feature/smartdock/src/main/ets/default/common/SmartDockCloseAppHandler.ts
+6 -6
View File
@@ -68,7 +68,7 @@ export default class SmartDockCloseAppHandler extends BaseCloseAppHandler {
appIconPositionX: this.mAppIconPositionX,
appIconPositionY: this.mAppIconPositionY
};
let recentList: AppItemInfo[] = AppStorage.Get('recentList');
let recentList: AppItemInfo[] = AppStorage.get('recentList');
CloseAppManager.getInstance().addSmartDockClosePosition(appCloseIconInfo, recentList[0]);
Log.showInfo(TAG, `getAppIconInfo addSmartDockClosePosition ${JSON.stringify(appCloseIconInfo)}`);
@@ -82,16 +82,16 @@ export default class SmartDockCloseAppHandler extends BaseCloseAppHandler {
this.mAppIconPositionX = 0;
this.mAppIconPositionY = 0;
const residentList: AppItemInfo[] = AppStorage.Get('residentList');
const recentList: AppItemInfo[] = AppStorage.Get('recentList');
const screenWidth: number = AppStorage.Get('screenWidth');
const residentList: AppItemInfo[] = AppStorage.get('residentList');
const recentList: AppItemInfo[] = AppStorage.get('recentList');
const screenWidth: number = AppStorage.get('screenWidth');
const workSpaceHeight: number = LayoutViewModel.getInstance().getWorkSpaceHeight();
this.mAppIconPositionY = workSpaceHeight + (this.mSmartDockStyleConfig.mDockHeight - this.mSmartDockStyleConfig.mIconSize) / 2;
const smartDockWidth: number = this.getListWidth(residentList) +
(recentList.length > 0 ? this.mSmartDockStyleConfig.mDockGap + this.getListWidth(recentList) : 0);
const smartDockStartPositionX: number = (screenWidth - smartDockWidth) / 2;
const startAppTypeFromPageDesktop: number = AppStorage.Get('startAppTypeFromPageDesktop');
const startAppTypeFromPageDesktop: number = AppStorage.get('startAppTypeFromPageDesktop');
this.mAppIconPositionX = smartDockStartPositionX + this.getListWidth(residentList) + this.mSmartDockStyleConfig.mDockGap
+ this.mSmartDockStyleConfig.mDockPadding;
// if (startAppTypeFromPageDesktop === CommonConstants.OVERLAY_TYPE_APP_RECENT) {
@@ -118,7 +118,7 @@ export default class SmartDockCloseAppHandler extends BaseCloseAppHandler {
for (var i = 0; i < list.length; i++) {
if (this.mAppItemBundleName === list[i].bundleName) {
AppStorage.SetOrCreate('closeAppItemInfo', list[i]);
AppStorage.setOrCreate('closeAppItemInfo', list[i]);
Log.showInfo(TAG, `getIndexInList closeAppItemInfo ${JSON.stringify(list[i])} index ${index}`)
index = i;
break;
feature/smartdock/src/main/ets/default/common/SmartDockDragHandler.ts
+9 -9
View File
@@ -53,7 +53,7 @@ export default class SmartDockDragHandler extends BaseDragHandler {
setDragEffectArea(effectArea): void {
Log.showDebug(TAG, `setDragEffectArea: ${JSON.stringify(effectArea)}`);
AppStorage.SetOrCreate('smartDockDragEffectArea', effectArea);
AppStorage.setOrCreate('smartDockDragEffectArea', effectArea);
super.setDragEffectArea(effectArea);
this.updateDockParam(effectArea);
}
@@ -61,8 +61,8 @@ export default class SmartDockDragHandler extends BaseDragHandler {
isDragEffectArea(x: number, y: number): boolean {
const isInEffectArea = super.isDragEffectArea(x, y);
Log.showDebug(TAG, `isDragEffectArea x: ${x}, y: ${y}, isInEffectArea: ${isInEffectArea}`);
const deviceType = AppStorage.Get('deviceType');
const pageDesktopDragEffectArea: DragArea = AppStorage.Get('pageDesktopDragEffectArea');
const deviceType = AppStorage.get('deviceType');
const pageDesktopDragEffectArea: DragArea = AppStorage.get('pageDesktopDragEffectArea');
Log.showDebug(TAG, `isDragEffectArea pageDesktopDragEffectArea: ${JSON.stringify(pageDesktopDragEffectArea)}`);
if (pageDesktopDragEffectArea) {
if (deviceType == CommonConstants.DEFAULT_DEVICE_TYPE) {
@@ -82,7 +82,7 @@ export default class SmartDockDragHandler extends BaseDragHandler {
const dockWidth = effectArea.right - effectArea.left;
const dockData: [] = this.getDragRelativeData();
const dataCount = dockData.length;
const dockPadding: {right: number, left: number, top: number, bottom: number} = AppStorage.Get('dockPadding');
const dockPadding: {right: number, left: number, top: number, bottom: number} = AppStorage.get('dockPadding');
const itemSize = this.mSmartDockStyleConfig.mListItemWidth;
const itemGap = this.mSmartDockStyleConfig.mListItemGap;
if (dataCount > 0) {
@@ -100,7 +100,7 @@ export default class SmartDockDragHandler extends BaseDragHandler {
}
protected getDragRelativeData(): any {
const dockData: [] = AppStorage.Get('residentList');
const dockData: [] = AppStorage.get('residentList');
return dockData;
}
@@ -148,19 +148,19 @@ export default class SmartDockDragHandler extends BaseDragHandler {
}
protected onDragDrop(x: number, y: number): boolean {
const dragItemInfo: LauncherDragItemInfo = AppStorage.Get<LauncherDragItemInfo>('dragItemInfo');
const dragItemInfo: LauncherDragItemInfo = AppStorage.get<LauncherDragItemInfo>('dragItemInfo');
if (!dragItemInfo.isDragging) {
return false;
}
const dragItemType: number = AppStorage.Get('dragItemType');
const dragItemType: number = AppStorage.get('dragItemType');
const insertIndex = this.getItemIndex(x, y);
if (dragItemType === CommonConstants.DRAG_FROM_DOCK) {
const selectAppIndex: number = AppStorage.Get('selectAppIndex');
const selectAppIndex: number = AppStorage.get('selectAppIndex');
globalThis.SmartDockDragHandler.layoutAdjustment(insertIndex, selectAppIndex);
return true;
}
if (dragItemType === CommonConstants.DRAG_FROM_DESKTOP
&& AppStorage.Get('deviceType') == CommonConstants.DEFAULT_DEVICE_TYPE) {
&& AppStorage.get('deviceType') == CommonConstants.DEFAULT_DEVICE_TYPE) {
Log.showInfo(TAG, `onDrop insertIndex: ${insertIndex}`);
this.addItemToSmartDock(dragItemInfo, insertIndex);
return true;
feature/smartdock/src/main/ets/default/common/SmartDockStartAppHandler.ts
+5 -5
View File
@@ -49,16 +49,16 @@ export default class SmartDockStartAppHandler extends BaseStartAppHandler {
Log.showError(TAG, `calculateAppIconPosition with invalid config`)
return;
}
const appItemInfo = AppStorage.Get('startAppItemInfo');
const residentList: AppItemInfo[] = AppStorage.Get('residentList');
const recentList: AppItemInfo[] = AppStorage.Get('recentList');
const screenWidth: number = AppStorage.Get('screenWidth');
const appItemInfo = AppStorage.get('startAppItemInfo');
const residentList: AppItemInfo[] = AppStorage.get('residentList');
const recentList: AppItemInfo[] = AppStorage.get('recentList');
const screenWidth: number = AppStorage.get('screenWidth');
const workSpaceHeight: number = LayoutViewModel.getInstance().getWorkSpaceHeight();
this.mAppIconPositionY = workSpaceHeight + this.mSmartDockStyleConfig.mListItemGap;
const smartDockWidth: number = this.getListWidth(residentList) +
(recentList.length > 0 ? this.mSmartDockStyleConfig.mDockGap + this.getListWidth(recentList) : 0);
const smartDockStartPositionX: number = (screenWidth - smartDockWidth) / 2;
const startAppTypeFromPageDesktop: number = AppStorage.Get('startAppTypeFromPageDesktop');
const startAppTypeFromPageDesktop: number = AppStorage.get('startAppTypeFromPageDesktop');
if (startAppTypeFromPageDesktop === CommonConstants.OVERLAY_TYPE_APP_RECENT) {
const indexInRecentList: number = this.getIndexInList(appItemInfo, recentList);
this.mAppIconPositionX = smartDockStartPositionX + this.getListWidth(residentList) + this.mSmartDockStyleConfig.mDockGap
feature/smartdock/src/main/ets/default/layout/RecentLayout.ets
+33 -13
View File
@@ -54,10 +54,23 @@ export default struct RecentLayout {
private updateData: Function = null;
aboutToAppear(): void {
mSmartDockStyleConfig = this.mSmartDockStyleConfig;
}
aboutToDisappear(): void {
this.buildMenu = null;
this.isHover = false;
this.showPopup = false;
this.onHoverItem = '';
this.onItemClick = null;
this.onHoverEvent = null;
this.onDockListChangeFunc = null;
this.isScrollHover = false;
this.onClickWithPopup = false;
this.autoCancel = false;
this.updateData = null;
}
private sysUiRecentOnClick() {
this.showPopup = false;
this.popup = { show: false, showItem: '', popup: null };
@@ -123,7 +136,7 @@ export default struct RecentLayout {
buildMenu: this.buildMenu
})
}
.bindPopup(this.showPopup && item.bundleName == this.onHoverItem && !AppStorage.Get('smartDockShowMenu') as boolean, {
.bindPopup(this.showPopup && item.bundleName == this.onHoverItem && !AppStorage.get('smartDockShowMenu') as boolean, {
builder: this.popupBuilder,
placement: Placement.Top,
enableArrow: true,
@@ -137,8 +150,8 @@ export default struct RecentLayout {
this.onClickWithPopup = false;
this.autoCancel = false;
this.showPopup = false;
AppStorage.SetOrCreate('snapshotList', []);
AppStorage.SetOrCreate('recentShowPopup', false);
AppStorage.setOrCreate('snapshotList', []);
AppStorage.setOrCreate('recentShowPopup', false);
}
if (this.updateData) {
this.updateData();
@@ -157,14 +170,14 @@ export default struct RecentLayout {
})
.onClick((event: ClickEvent) => {
this.onItemClick(event, item);
this.onClickWithPopup = AppStorage.Get('recentShowPopup');
this.onClickWithPopup = AppStorage.get('recentShowPopup');
Log.showInfo(TAG, `onClick this.onClickWithPopup: ${this.onClickWithPopup}`);
if (this.onClickWithPopup) {
this.autoCancel = true;
this.showPopup = true
this.onHoverItem = item.bundleName;
}
AppStorage.SetOrCreate('recentShowPopup', false);
AppStorage.setOrCreate('recentShowPopup', false);
})
}, (item) => JSON.stringify(item))
}
@@ -181,7 +194,7 @@ export default struct RecentLayout {
getListWidth(): number {
let mRecentMaxNum = this.mSmartDockStyleConfig.mMaxRecentNum;
let width = 0;
if (AppStorage.Get("deviceType") == CommonConstants.DEFAULT_DEVICE_TYPE) {
if (AppStorage.get("deviceType") == CommonConstants.DEFAULT_DEVICE_TYPE) {
return width;
}
if (typeof this.appList === 'undefined' || this.appList == null || this.appList.length === 0) {
@@ -211,8 +224,15 @@ struct AppItem {
this.menuInfo = this.buildMenu(this.appInfo);
}
aboutToDisappear(): void {
this.isShow = false;
this.appInfo = null;
this.buildMenu = null;
this.menuInfo = null;
}
private getLongPress(): boolean {
return AppStorage.Get('isLongPress');
return AppStorage.get('isLongPress');
}
@Builder MenuBuilder() {
@@ -252,7 +272,7 @@ struct AppItem {
LongPressGesture({ repeat: false })
.onAction((event: GestureEvent) => {
this.isShow = true;
AppStorage.SetOrCreate('isLongPress', true);
AppStorage.setOrCreate('isLongPress', true);
})
)
.bindPopup(this.isShow, {
@@ -265,15 +285,15 @@ struct AppItem {
if (!e.isVisible) {
this.isShow = false;
}
AppStorage.SetOrCreate('smartDockShowMenu', e.isVisible)
AppStorage.setOrCreate('smartDockShowMenu', e.isVisible)
},
autoCancel: true
})
.onTouch((event: TouchEvent) => {
if (event.type == CommonConstants.TOUCH_TYPE_UP) {
AppStorage.SetOrCreate('isLongPress', false);
AppStorage.setOrCreate('isLongPress', false);
}
const dragItemInfo: LauncherDragItemInfo = AppStorage.Get<LauncherDragItemInfo>('dragItemInfo');
const dragItemInfo: LauncherDragItemInfo = AppStorage.get<LauncherDragItemInfo>('dragItemInfo');
if (dragItemInfo.isDragging) {
this.isShow = false;
}
@@ -282,7 +302,7 @@ struct AppItem {
Log.showInfo(TAG, `onMouse MouseType: ${event.button}`);
if (event.button == MouseButton.Right) {
event.stopPropagation();
AppStorage.SetOrCreate('selectDesktopAppItem', '');
AppStorage.setOrCreate('selectDesktopAppItem', '');
this.isShow = true;
}
})
feature/smartdock/src/main/ets/default/layout/ResidentLayout.ets
+36 -22
View File
@@ -48,10 +48,16 @@ export default struct ResidentLayout {
this.onDockListChange();
}
aboutToDisappear(): void {
this.onItemClick = null;
this.buildMenu = null;
this.onDockListChangeFunc = null;
}
getListWidth(): number {
let residentMaxNum = this.mSmartDockStyleConfig.mMaxDockNum;
let width = 0.0;
if (AppStorage.Get("deviceType") == CommonConstants.DEFAULT_DEVICE_TYPE) {
if (AppStorage.get("deviceType") == CommonConstants.DEFAULT_DEVICE_TYPE) {
Log.showDebug(TAG, `getListWidth mDockPadding: ${this.mSmartDockStyleConfig.mDockPadding}, mMaxNum: ${residentMaxNum}`);
width = this.mSmartDockStyleConfig.mDockPadding * 2 + residentMaxNum * (this.mSmartDockStyleConfig.mListItemWidth) + (residentMaxNum - 1) * (this.mSmartDockStyleConfig.mListItemGap);
Log.showDebug(TAG, `getListWidth width: ${width}`);
@@ -101,24 +107,24 @@ export default struct ResidentLayout {
.height(this.mSmartDockStyleConfig.mDockHeight)
.justifyContent(FlexAlign.Center)
.onDragEnter((event: DragEvent, extraParams: string) => {
Log.showDebug(TAG, `onDragEnter extraParams: ${extraParams}, event: [${event.getX()}, ${event.getY()}]`);
Log.showDebug(TAG, `onDragEnter extraParams: ${extraParams}, event: [${event.getWindowX()}, ${event.getWindowY()}]`);
})
.onDragMove((event: DragEvent, extraParams: string) => {
Log.showDebug(TAG, `onDragMove event: [${event.getX()}, ${event.getY()}]`);
Log.showDebug(TAG, `onDragMove event: [${event.getWindowX()}, ${event.getWindowY()}]`);
})
.onDragLeave((event: DragEvent, extraParams: string) => {
Log.showDebug(TAG, `onDragLeave event: [${event.getX()}, ${event.getY()}]`);
Log.showDebug(TAG, `onDragLeave event: [${event.getWindowX()}, ${event.getWindowY()}]`);
})
.onDrop((event: DragEvent, extraParams: string) => {
Log.showInfo(TAG, `onDrop event: [${event.getX()}, ${event.getY()}]`);
const dragResult = globalThis.SmartDockDragHandler.onDragDrop(event.getX(), event.getY());
AppStorage.SetOrCreate('selectAppIndex', null);
Log.showInfo(TAG, `onDrop event: [${event.getWindowX()}, ${event.getWindowY()}]`);
const dragResult = globalThis.SmartDockDragHandler.onDragDrop(event.getWindowX(), event.getWindowY());
AppStorage.setOrCreate('selectAppIndex', null);
if (!dragResult) {
AppStorage.SetOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
AppStorage.setOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
} else {
// Wait for the UI rendering to end.
setTimeout(() => {
AppStorage.SetOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
AppStorage.setOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
}, 50);
}
})
@@ -140,8 +146,16 @@ struct AppItem {
this.menuInfo = this.buildMenu(this.appInfo);
}
aboutToDisappear(): void {
this.buildMenu = null;
this.onItemClick = null;
this.isShow = false;
this.appInfo = null;
this.menuInfo = null;
}
private getLongPress(): boolean {
return AppStorage.Get('isLongPress');
return AppStorage.get('isLongPress');
}
@Builder MenuBuilder() {
@@ -182,31 +196,31 @@ struct AppItem {
.onAction((event: GestureEvent) => {
Log.showInfo(TAG, 'onAction start');
this.isShow = true;
AppStorage.SetOrCreate('isLongPress', true);
AppStorage.setOrCreate('isLongPress', true);
})
)
.bindPopup(this.isShow, {
builder: this.MenuBuilder,
placement: Placement.Top,
popupColor: Color.White,
arrowOffset: AppStorage.Get('deviceType') == CommonConstants.DEFAULT_DEVICE_TYPE ? null : 3 * (mSmartDockStyleConfig.mIconSize / 2) + mSmartDockStyleConfig.mListItemGap, // Avoid the popup offset problem in phone form
arrowOffset: AppStorage.get('deviceType') == CommonConstants.DEFAULT_DEVICE_TYPE ? null : 3 * (mSmartDockStyleConfig.mIconSize / 2) + mSmartDockStyleConfig.mListItemGap, // Avoid the popup offset problem in phone form
onStateChange: (e) => {
if (!e.isVisible) {
this.isShow = false;
}
AppStorage.SetOrCreate('smartDockShowMenu', e.isVisible)
AppStorage.setOrCreate('smartDockShowMenu', e.isVisible)
},
autoCancel: true
})
.onTouch((event: TouchEvent) => {
Log.showInfo(TAG, `onTouch event type: ${event.type}`);
if (event.type === CommonConstants.TOUCH_TYPE_UP && this.smartDragItemInfo.isDragging) {
let mIsDragEffectArea = globalThis.SmartDockDragHandler.isDragEffectArea(event.touches[0].screenX, event.touches[0].screenY);
let mIsDragEffectArea = globalThis.SmartDockDragHandler.isDragEffectArea(event.touches[0].windowX, event.touches[0].windowY);
if (!mIsDragEffectArea) {
AppStorage.SetOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
AppStorage.SetOrCreate('selectAppIndex', null);
AppStorage.setOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
AppStorage.setOrCreate('selectAppIndex', null);
}
AppStorage.SetOrCreate('isLongPress', false);
AppStorage.setOrCreate('isLongPress', false);
}
if (this.smartDragItemInfo.isDragging) {
this.isShow = false;
@@ -219,7 +233,7 @@ struct AppItem {
Log.showInfo(TAG, `onMouse MouseType: ${event.button}`);
if (event.button == MouseButton.Right) {
event.stopPropagation();
AppStorage.SetOrCreate('selectDesktopAppItem', '');
AppStorage.setOrCreate('selectDesktopAppItem', '');
this.isShow = true;
}
})
@@ -228,12 +242,12 @@ struct AppItem {
this.dragItemType = CommonConstants.DRAG_FROM_DOCK;
this.smartDragItemInfo = Object.assign(new LauncherDragItemInfo(true), this.appInfo);
Log.showInfo(TAG, `smartDragItemInfo: ${JSON.stringify(this.smartDragItemInfo)}`);
const selectAppIndex = globalThis.SmartDockDragHandler.getDragItemIndexByCoordinates(event.getX(), event.getY());
AppStorage.SetOrCreate('selectAppIndex', selectAppIndex);
const selectAppIndex = globalThis.SmartDockDragHandler.getDragItemIndexByCoordinates(event.getWindowX(), event.getWindowY());
AppStorage.setOrCreate('selectAppIndex', selectAppIndex);
})
.onDragEnd((event: DragEvent, extraParams: string) => {
Log.showInfo(TAG, `onDragEnd event: [${event.getX()}, ${event.getY()}]` + event.getResult());
AppStorage.SetOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
Log.showInfo(TAG, `onDragEnd event: [${event.getWindowX()}, ${event.getWindowY()}]` + event.getResult());
AppStorage.setOrCreate<LauncherDragItemInfo>('dragItemInfo', new LauncherDragItemInfo());
})
}
}
feature/smartdock/src/main/ets/default/layout/SmartDock.ets
+5 -4
View File
@@ -46,7 +46,7 @@ export struct SmartDock {
aboutToAppear(): void {
Log.showInfo(TAG, 'aboutToAppear start!');
this.deviceType = AppStorage.Get('deviceType');
this.deviceType = AppStorage.get('deviceType');
try {
this.mSmartDockViewModel = SmartDockViewModel.getInstance();
} catch (error) {
@@ -62,6 +62,7 @@ export struct SmartDock {
Log.showInfo(TAG, 'aboutToDisappear!');
delete this.mDialogController;
this.mDialogController = null;
this.showAppCenter = null;
}
private mDialogController: CustomDialogController = new CustomDialogController({
@@ -111,8 +112,8 @@ export struct SmartDock {
let list = this.missionInfoList.filter(it => it.bundleName == bundleName);
if (list.length <= 0) {
AppStorage.SetOrCreate('snapshotList', []);
AppStorage.SetOrCreate('snapShotWidth', 0);
AppStorage.setOrCreate('snapshotList', []);
AppStorage.setOrCreate('snapShotWidth', 0);
this.popup = { show: false, showItem: '', popup: null };
return;
}
@@ -169,6 +170,6 @@ export struct SmartDock {
recentOnClickWithPopup(item) {
this.onHoverEvent(true, item.bundleName);
AppStorage.SetOrCreate('recentShowPopup', true);
AppStorage.setOrCreate('recentShowPopup', true);
}
}
feature/smartdock/src/main/ets/default/model/SmartDockModel.ts
+22 -22
View File
@@ -63,7 +63,7 @@ export default class SmartDockModel {
this.mAppModel = AppModel.getInstance();
this.mResourceManager = ResourceManager.getInstance();
this.registerDockListener();
this.mDevice = AppStorage.Get('deviceType');
this.mDevice = AppStorage.get('deviceType');
Log.showDebug(TAG, `dockDevice: ${this.mDevice}`);
this.getResidentList().then(() => {}, () => {});
if (this.mDevice === CommonConstants.PAD_DEVICE_TYPE) {
@@ -145,7 +145,7 @@ export default class SmartDockModel {
}
// trigger component update
AppStorage.SetOrCreate('residentList', residentList);
AppStorage.setOrCreate('residentList', residentList);
if (this.mDevice) {
localEventManager.sendLocalEventSticky(EventConstants.EVENT_SMARTDOCK_INIT_FINISHED, residentList);
}
@@ -163,7 +163,7 @@ export default class SmartDockModel {
const recentList = await amsMissionManager.getRecentBundleMissionsList();
if (CheckEmptyUtils.isEmptyArr(recentList)) {
Log.showDebug(TAG, 'getRecentDataList empty');
AppStorage.SetOrCreate('recentList', recentList);
AppStorage.setOrCreate('recentList', recentList);
return;
}
let recents: RecentBundleMissionInfo[] = [];
@@ -184,11 +184,11 @@ export default class SmartDockModel {
if (recents.length > this.mSmartDockStyleConfig.mMaxRecentNum) {
recents = recents.slice(0, this.mSmartDockStyleConfig.mMaxRecentNum);
}
AppStorage.SetOrCreate('recentList', recents);
AppStorage.setOrCreate('recentList', recents);
missionInfos = missionInfos.slice(0,20);
AppStorage.SetOrCreate('missionInfoList', missionInfos);
AppStorage.setOrCreate('missionInfoList', missionInfos);
Log.showDebug(TAG, `getRecentDataList end, recentList.length: ${recents.length}`);
}
@@ -216,7 +216,7 @@ export default class SmartDockModel {
if (appInfo.typeId != CommonConstants.TYPE_APP) {
return false;
}
this.mResidentList = AppStorage.Get('residentList');
this.mResidentList = AppStorage.get('residentList');
const dockItemCount = this.mResidentList.length;
if (this.checkDockNum(dockItemCount)) {
return false;
@@ -241,7 +241,7 @@ export default class SmartDockModel {
} else {
this.mResidentList.splice(index, 0, dockItemInfo);
}
AppStorage.SetOrCreate('residentList', this.mResidentList);
AppStorage.setOrCreate('residentList', this.mResidentList);
globalThis.RdbStoreManagerInstance.insertIntoSmartdock(this.mResidentList);
Log.showDebug(TAG, `addToSmartdock appInfo: ${appInfo.keyName}`);
return true;
@@ -311,7 +311,7 @@ export default class SmartDockModel {
});
return;
}
this.mResidentList = AppStorage.Get('residentList');
this.mResidentList = AppStorage.get('residentList');
if (itemIndex < insertIndex) {
const selectItem = this.mResidentList[itemIndex];
this.mResidentList.splice(insertIndex, 0, selectItem);
@@ -322,7 +322,7 @@ export default class SmartDockModel {
this.mResidentList.splice(itemIndex, 1);
this.mResidentList.splice(insertIndex, 0, selectItem);
}
AppStorage.SetOrCreate('residentList', this.mResidentList);
AppStorage.setOrCreate('residentList', this.mResidentList);
globalThis.RdbStoreManagerInstance.insertIntoSmartdock(this.mResidentList);
}
@@ -371,7 +371,7 @@ export default class SmartDockModel {
private updateBadgeNum(badgeInfo) {
Log.showInfo(TAG, `updateBadgeNum badgeInfo is ${JSON.stringify(badgeInfo)}`);
let residentListTemp: DockItemInfo[] = AppStorage.Get('residentList');
let residentListTemp: DockItemInfo[] = AppStorage.get('residentList');
if (!CheckEmptyUtils.isEmptyArr(residentListTemp)) {
for (var i = 0; i < residentListTemp.length; i++) {
if (badgeInfo.bundleName === residentListTemp[i].bundleName) {
@@ -392,13 +392,13 @@ export default class SmartDockModel {
dockItemInfo.badgeNumber = badgeInfo.badgeNumber;
residentListTemp[i] = dockItemInfo;
Log.showDebug(TAG, `updateBadgeNum dockItemInfo is ${JSON.stringify(dockItemInfo)}`);
AppStorage.SetOrCreate('residentList', residentListTemp);
AppStorage.setOrCreate('residentList', residentListTemp);
}
}
}
if (this.mDevice === CommonConstants.PAD_DEVICE_TYPE) {
this.mRecentDataList = AppStorage.Get('recentList');
this.mRecentDataList = AppStorage.get('recentList');
Log.showDebug(TAG, `updateBadgeNum recent `);
if (!CheckEmptyUtils.isEmptyArr(this.mRecentDataList)) {
for (var i = 0; i < this.mRecentDataList.length; i++) {
@@ -420,7 +420,7 @@ export default class SmartDockModel {
recentBundleMission.badgeNumber = badgeInfo.badgeNumber;
this.mRecentDataList[i] = recentBundleMission;
Log.showDebug(TAG, `updateBadgeNum dockItemInfo is ${JSON.stringify(recentBundleMission)}`);
AppStorage.SetOrCreate('recentList', this.mRecentDataList);
AppStorage.setOrCreate('recentList', this.mRecentDataList);
}
}
}
@@ -474,7 +474,7 @@ export default class SmartDockModel {
}
});
}
AppStorage.SetOrCreate('recentMissionsList', mRecentMissionsList);
AppStorage.setOrCreate('recentMissionsList', mRecentMissionsList);
}
onMissionCreatedCallback(missionId: number): void {
@@ -574,15 +574,15 @@ export default class SmartDockModel {
snapshotList.push(pixelMap);
snapShotWidth += pixelMap.boxSize + pixelMap.left;
}
AppStorage.SetOrCreate('snapshotList', snapshotList);
AppStorage.SetOrCreate('snapShotWidth', snapShotWidth);
AppStorage.setOrCreate('snapshotList', snapshotList);
AppStorage.setOrCreate('snapShotWidth', snapShotWidth);
}
Log.showDebug(TAG, 'getSnapshot update snapshotList');
return snapshotList;
}
private deleteResistDockItem(dockItem: {bundleName: string | undefined, keyName: string | undefined}): boolean {
this.mResidentList = AppStorage.Get('residentList');
this.mResidentList = AppStorage.get('residentList');
Log.showError(TAG, `deleteResistDockItem residentList length ${this.mResidentList.length}`);
if (!CheckEmptyUtils.isEmptyArr(this.mResidentList)) {
const findResidentList = this.mResidentList.find(item => {
@@ -602,7 +602,7 @@ export default class SmartDockModel {
return dockItem.keyName != item.keyName;
}
})
AppStorage.SetOrCreate('residentList', this.mResidentList);
AppStorage.setOrCreate('residentList', this.mResidentList);
globalThis.RdbStoreManagerInstance.insertIntoSmartdock(this.mResidentList);
Log.showDebug(TAG, `deleteResistDockItem resist dockItem: ${JSON.stringify(dockItem)}`);
}
@@ -611,7 +611,7 @@ export default class SmartDockModel {
private deleteRecentDockItem(dockItem: {bundleName: string | undefined, keyName: string | undefined}): boolean {
let res = false;
this.mRecentDataList = AppStorage.Get('recentList');
this.mRecentDataList = AppStorage.get('recentList');
Log.showDebug(TAG, `deleteRecentDockItem recent dockItem: ${JSON.stringify(dockItem)}`);
if (!CheckEmptyUtils.isEmptyArr(this.mRecentDataList)) {
this.mRecentDataList = this.mRecentDataList.filter(item => {
@@ -621,7 +621,7 @@ export default class SmartDockModel {
return dockItem.keyName != item.keyName;
}
})
AppStorage.SetOrCreate('recentList', this.mRecentDataList);
AppStorage.setOrCreate('recentList', this.mRecentDataList);
res = true;
}
return res;
@@ -629,7 +629,7 @@ export default class SmartDockModel {
updateResistDockItem(appInfo: AppItemInfo): void{
Log.showDebug(TAG, `updateResistDockItem appInfo: ${JSON.stringify(appInfo)}`);
let resistDockItem: DockItemInfo[] = AppStorage.Get('residentList');
let resistDockItem: DockItemInfo[] = AppStorage.get('residentList');
if (!CheckEmptyUtils.isEmptyArr(resistDockItem)) {
for (let i = 0; i < resistDockItem.length; i++) {
if (appInfo.bundleName === resistDockItem[i].bundleName) {
@@ -648,7 +648,7 @@ export default class SmartDockModel {
dockItemInfo.isSystemApp = appInfo.isSystemApp;
dockItemInfo.isUninstallAble = appInfo.isUninstallAble;
resistDockItem[i] = dockItemInfo;
AppStorage.SetOrCreate('residentList', resistDockItem);
AppStorage.setOrCreate('residentList', resistDockItem);
}
}
}
feature/smartdock/src/main/ets/default/viewmodel/SmartDockViewModel.ts
+18 -18
View File
@@ -78,7 +78,7 @@ export default class SmartDockViewModel extends BaseViewModel {
*/
residentOnClick(event, item, callback?) {
// AppCenter entry
AppStorage.SetOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_APP_RESIDENTIAL);
AppStorage.setOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_APP_RESIDENTIAL);
if (item.abilityName == CommonConstants.APPCENTER_ABILITY && callback != null) {
callback();
return;
@@ -100,9 +100,9 @@ export default class SmartDockViewModel extends BaseViewModel {
* @param item
*/
public recentOnClick(event, item, callback?) {
AppStorage.SetOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_APP_RECENT);
AppStorage.setOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_APP_RECENT);
let missionInfoList = [];
missionInfoList = AppStorage.Get('missionInfoList');
missionInfoList = AppStorage.get('missionInfoList');
Log.showDebug(TAG, `recentOnClick missionInfoList.length: ${missionInfoList.length}`);
if (!CheckEmptyUtils.isEmptyArr(missionInfoList)) {
for (let i = 0; i < missionInfoList.length; i++) {
@@ -136,23 +136,23 @@ export default class SmartDockViewModel extends BaseViewModel {
* update drag effective area when dockList changed
*/
async updateDockParams() {
const screenWidth: number = AppStorage.Get('screenWidth');
const screenHeight: number = AppStorage.Get('screenHeight');
const sysUIBottomHeight: number = AppStorage.Get('sysUIBottomHeight');
const dockHeight: number = AppStorage.Get('dockHeight');
let mResidentWidth: number = this.getListWidth(AppStorage.Get('residentList'));
if (AppStorage.Get("deviceType") === CommonConstants.DEFAULT_DEVICE_TYPE) {
const screenWidth: number = AppStorage.get('screenWidth');
const screenHeight: number = AppStorage.get('screenHeight');
const sysUIBottomHeight: number = AppStorage.get('sysUIBottomHeight');
const dockHeight: number = AppStorage.get('dockHeight');
let mResidentWidth: number = this.getListWidth(AppStorage.get('residentList'));
if (AppStorage.get("deviceType") === CommonConstants.DEFAULT_DEVICE_TYPE) {
const maxDockNum = this.getStyleConfig().mMaxDockNum;
mResidentWidth = this.mSmartDockStyleConfig.mDockPadding * 2 + maxDockNum * (this.mSmartDockStyleConfig.mListItemWidth) + (maxDockNum - 1) * (this.mSmartDockStyleConfig.mListItemGap);
}
AppStorage.SetOrCreate('residentWidth', mResidentWidth);
AppStorage.SetOrCreate("dockPadding", this.getDockPadding(mResidentWidth));
const mRecentWidth: number = this.getListWidth(AppStorage.Get('recentList'));
AppStorage.setOrCreate('residentWidth', mResidentWidth);
AppStorage.setOrCreate("dockPadding", this.getDockPadding(mResidentWidth));
const mRecentWidth: number = this.getListWidth(AppStorage.get('recentList'));
Log.showDebug(TAG, `updateDockParams screenWidth:${screenWidth}, screenHeight:${screenHeight}, sysUIBottomHeight:${sysUIBottomHeight}, dockHeight:${dockHeight}, mResidentWidth:${mResidentWidth}, mRecentWidth:${mRecentWidth}`);
if (typeof (this.mSmartDockDragHandler) != 'undefined') {
let left = mResidentWidth === 0 ? 0 : (screenWidth - mResidentWidth - (mRecentWidth === 0 ? 0 : (this.mSmartDockStyleConfig.mDockGap + mRecentWidth))) / 2;
let right = mResidentWidth === 0 ? screenWidth : (screenWidth - mResidentWidth - (mRecentWidth === 0 ? 0 : (this.mSmartDockStyleConfig.mDockGap + mRecentWidth))) / 2 + mResidentWidth;
if (AppStorage.Get('deviceType') == CommonConstants.DEFAULT_DEVICE_TYPE) {
if (AppStorage.get('deviceType') == CommonConstants.DEFAULT_DEVICE_TYPE) {
left = (screenWidth - mResidentWidth) / 2;
right = screenWidth - left;
}
@@ -167,8 +167,8 @@ export default class SmartDockViewModel extends BaseViewModel {
private getDockPadding(residentWidth: number): {right: number, left: number, top: number, bottom: number} {
let paddingNum: number = this.mSmartDockStyleConfig.mDockPadding;
const residentList: [] = AppStorage.Get('residentList');
if (AppStorage.Get("deviceType") === CommonConstants.DEFAULT_DEVICE_TYPE) {
const residentList: [] = AppStorage.get('residentList');
if (AppStorage.get("deviceType") === CommonConstants.DEFAULT_DEVICE_TYPE) {
paddingNum = (residentWidth - (residentList.length * this.mSmartDockStyleConfig.mListItemWidth + (residentList.length - 1) * (this.mSmartDockStyleConfig.mListItemGap))) / 2;
}
Log.showDebug(TAG, `getDockPadding paddingNum: ${paddingNum}`);
@@ -213,7 +213,7 @@ export default class SmartDockViewModel extends BaseViewModel {
menuInfoList.push(open);
if (appInfo.itemType != CommonConstants.TYPE_FUNCTION) {
this.mDevice = AppStorage.Get('deviceType');
this.mDevice = AppStorage.get('deviceType');
if (this.mDevice === CommonConstants.PAD_DEVICE_TYPE && dockType === SmartDockConstants.RESIDENT_DOCK_TYPE) {
const addToWorkSpaceMenu = new MenuInfo();
addToWorkSpaceMenu.menuType = CommonConstants.MENU_TYPE_FIXED;
@@ -241,7 +241,7 @@ export default class SmartDockViewModel extends BaseViewModel {
}
this.mSelectedItem = appInfo;
this.mSelectedDockType = dockType;
AppStorage.SetOrCreate('uninstallAppInfo', appInfo);
AppStorage.setOrCreate('uninstallAppInfo', appInfo);
callback();
};
removeMenu.menuEnabled = appInfo.isUninstallAble;
@@ -306,7 +306,7 @@ export default class SmartDockViewModel extends BaseViewModel {
return;
}
item.icon = globalThis.ResourceManager.getCachedAppIcon(item.appIconId, item.bundleName, item.moduleName)
AppStorage.SetOrCreate('startAppItemInfo', item);
AppStorage.setOrCreate('startAppItemInfo', item);
this.mSmartDockStartAppHandler.setAppIconSize(this.mSmartDockStyleConfig.mIconSize);
this.mSmartDockStartAppHandler.setAppIconInfo();
}
product/pad/src/main/ets/MainAbility/MainAbility.ts
+6 -6
View File
@@ -175,22 +175,22 @@ export default class MainAbility extends ServiceExtension {
}
private closeFolder(): void {
AppStorage.SetOrCreate('openFolderPageIndex', StyleConstants.DEFAULT_NUMBER_0);
AppStorage.SetOrCreate('openFolderStatus', StyleConstants.DEFAULT_NUMBER_0);
AppStorage.setOrCreate('openFolderPageIndex', StyleConstants.DEFAULT_NUMBER_0);
AppStorage.setOrCreate('openFolderStatus', StyleConstants.DEFAULT_NUMBER_0);
}
private closeRecentDockPopup(): void {
let num: number = AppStorage.Get('sysUiRecentOnClickEvent');
AppStorage.SetOrCreate('sysUiRecentOnClickEvent', ++num);
let num: number = AppStorage.get('sysUiRecentOnClickEvent');
AppStorage.setOrCreate('sysUiRecentOnClickEvent', ++num);
}
async onConfigurationUpdated(config) {
Log.showInfo(TAG, 'onConfigurationUpdated, config:' + JSON.stringify(config));
const systemLanguage = AppStorage.Get('systemLanguage');
const systemLanguage = AppStorage.get('systemLanguage');
if(systemLanguage !== config.language) {
this.clearCacheWhenLanguageChange();
}
AppStorage.SetOrCreate("systemLanguage", config.language);
AppStorage.setOrCreate("systemLanguage", config.language);
}
private clearCacheWhenLanguageChange() {
product/pad/src/main/ets/pages/AppCenterView.ets
+4 -4
View File
@@ -44,7 +44,7 @@ struct AppCenterView {
aboutToAppear(): void {
Log.showInfo(TAG, 'aboutToAppear');
AppStorage.SetOrCreate('deviceType', this.device);
AppStorage.setOrCreate('deviceType', this.device);
this.mLayoutViewModel = LayoutViewModel.getInstance();
}
@@ -74,7 +74,7 @@ struct AppCenterView {
onBackPress(): boolean {
Log.showInfo(TAG, `onBackPress`);
AppStorage.SetOrCreate('selectDesktopAppItem', '');
AppStorage.setOrCreate('selectDesktopAppItem', '');
windowManager.destroyWindow(windowManager.APP_CENTER_WINDOW_NAME);
return true;
}
@@ -113,10 +113,10 @@ struct AppCenterView {
.height('100%')
.onClick(() => {
Log.showInfo(TAG, 'click appcenter area');
const contextFlag: boolean = AppStorage.Get('contextMenuState');
const contextFlag: boolean = AppStorage.get('contextMenuState');
Log.showInfo(TAG, 'onClick contextFlag: ' + contextFlag);
if (contextFlag && !ContextMenu.close()) {
AppStorage.SetOrCreate('contextMenuState', false);
AppStorage.setOrCreate('contextMenuState', false);
}else {
this.onBackPress();
}
product/pad/src/main/ets/pages/EntryView.ets
+11 -11
View File
@@ -137,8 +137,8 @@ struct EntryView {
try {
this.screenWidth = await windowManager.getWindowWidth();
this.screenHeight = await windowManager.getWindowHeight();
AppStorage.SetOrCreate('screenWidth', this.screenWidth);
AppStorage.SetOrCreate('screenHeight', this.screenHeight);
AppStorage.setOrCreate('screenWidth', this.screenWidth);
AppStorage.setOrCreate('screenHeight', this.screenHeight);
} catch (error) {
Log.showError(TAG, `getWindowWidth or getWindowHeight error: ${error}`);
}
@@ -148,9 +148,9 @@ struct EntryView {
this.workSpaceWidth = this.screenWidth;
this.workSpaceHeight = this.mLayoutViewModel.getWorkSpaceHeight();
this.dockHeight = this.mLayoutViewModel.getDockHeight();
AppStorage.SetOrCreate('workSpaceWidth', this.workSpaceWidth);
AppStorage.SetOrCreate('workSpaceHeight', this.workSpaceHeight);
AppStorage.SetOrCreate('dockHeight', this.dockHeight);
AppStorage.setOrCreate('workSpaceWidth', this.workSpaceWidth);
AppStorage.setOrCreate('workSpaceHeight', this.workSpaceHeight);
AppStorage.setOrCreate('dockHeight', this.dockHeight);
Log.showDebug(TAG, `updateScreenSize product: ${this.deviceType}, screenWidth: ${this.screenWidth}, screenHeight: ${this.screenHeight}, workSpaceWidth: ${this.workSpaceWidth}, workSpaceHeight: ${this.workSpaceHeight}, dockHeight: ${this.dockHeight}`);
}
@@ -162,17 +162,17 @@ struct EntryView {
onBackPress(): boolean {
Log.showInfo(TAG, 'onBackPress');
ContextMenu.close();
AppStorage.SetOrCreate('dialogControllerStatus', !AppStorage.Get('dialogControllerStatus'));
AppStorage.SetOrCreate('overlayMode', CommonConstants.OVERLAY_TYPE_HIDE);
AppStorage.SetOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE);
AppStorage.SetOrCreate('selectDesktopAppItem', '');
AppStorage.setOrCreate('dialogControllerStatus', !AppStorage.get('dialogControllerStatus'));
AppStorage.setOrCreate('overlayMode', CommonConstants.OVERLAY_TYPE_HIDE);
AppStorage.setOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE);
AppStorage.setOrCreate('selectDesktopAppItem', '');
this.closeRecentDockPopup();
return true;
}
private closeRecentDockPopup(): void {
let num: number = AppStorage.Get('sysUiRecentOnClickEvent');
AppStorage.SetOrCreate('sysUiRecentOnClickEvent', ++num);
let num: number = AppStorage.get('sysUiRecentOnClickEvent');
AppStorage.setOrCreate('sysUiRecentOnClickEvent', ++num);
}
private buildLog(): boolean {
product/pad/src/main/ets/pages/RecentView.ets
+2 -2
View File
@@ -55,11 +55,11 @@ struct RecentView {
}
private closeRecentDockPopup(): void {
let num: number = AppStorage.Get('sysUiRecentOnClickEvent');
let num: number = AppStorage.get('sysUiRecentOnClickEvent');
if (!num) {
num = 0;
}
AppStorage.SetOrCreate('sysUiRecentOnClickEvent', ++num);
AppStorage.setOrCreate('sysUiRecentOnClickEvent', ++num);
Log.showDebug(TAG, `closeRecentDockPopup sysUiRecentOnClickEvent closeRecentDockPopup num: ${num}`);
}
product/phone/src/main/ets/MainAbility/MainAbility.ts
+4 -4
View File
@@ -172,17 +172,17 @@ export default class MainAbility extends ServiceExtension {
}
private closeFolder(): void {
AppStorage.SetOrCreate('openFolderPageIndex', StyleConstants.DEFAULT_NUMBER_0);
AppStorage.SetOrCreate('openFolderStatus', StyleConstants.DEFAULT_NUMBER_0);
AppStorage.setOrCreate('openFolderPageIndex', StyleConstants.DEFAULT_NUMBER_0);
AppStorage.setOrCreate('openFolderStatus', StyleConstants.DEFAULT_NUMBER_0);
}
async onConfigurationUpdated(config) {
Log.showInfo(TAG, 'onConfigurationUpdated, config:' + JSON.stringify(config));
const systemLanguage = AppStorage.Get('systemLanguage');
const systemLanguage = AppStorage.get('systemLanguage');
if(systemLanguage !== config.language) {
this.clearCacheWhenLanguageChange();
}
AppStorage.SetOrCreate("systemLanguage", config.language);
AppStorage.setOrCreate("systemLanguage", config.language);
}
private clearCacheWhenLanguageChange() {
product/phone/src/main/ets/pages/EntryView.ets
+8 -8
View File
@@ -85,9 +85,9 @@ struct EntryView {
onBackPress(): boolean {
Log.showInfo(TAG, 'onBackPress');
ContextMenu.close();
AppStorage.SetOrCreate('dialogControllerStatus', !AppStorage.Get('dialogControllerStatus'));
AppStorage.SetOrCreate('overlayMode', CommonConstants.OVERLAY_TYPE_HIDE);
AppStorage.SetOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE);
AppStorage.setOrCreate('dialogControllerStatus', !AppStorage.get('dialogControllerStatus'));
AppStorage.setOrCreate('overlayMode', CommonConstants.OVERLAY_TYPE_HIDE);
AppStorage.setOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE);
return true;
}
@@ -107,8 +107,8 @@ struct EntryView {
try {
this.screenWidth = await windowManager.getWindowWidth();
this.screenHeight = await windowManager.getWindowHeight();
AppStorage.SetOrCreate('screenWidth', this.screenWidth);
AppStorage.SetOrCreate('screenHeight', this.screenHeight);
AppStorage.setOrCreate('screenWidth', this.screenWidth);
AppStorage.setOrCreate('screenHeight', this.screenHeight);
} catch (error) {
Log.showError(TAG, `getWindowWidth or getWindowHeight error: ${error}`);
}
@@ -118,9 +118,9 @@ struct EntryView {
this.workSpaceWidth = this.screenWidth;
this.workSpaceHeight = this.mLayoutViewModel.getWorkSpaceHeight();
this.dockHeight = this.mLayoutViewModel.getDockHeight();
AppStorage.SetOrCreate('workSpaceWidth', this.workSpaceWidth);
AppStorage.SetOrCreate('workSpaceHeight', this.workSpaceHeight);
AppStorage.SetOrCreate('dockHeight', this.dockHeight);
AppStorage.setOrCreate('workSpaceWidth', this.workSpaceWidth);
AppStorage.setOrCreate('workSpaceHeight', this.workSpaceHeight);
AppStorage.setOrCreate('dockHeight', this.dockHeight);
Log.showDebug(TAG, `updateScreenSize product: ${this.deviceType}, screenWidth: ${this.screenWidth}, screenHeight: ${this.screenHeight},
workSpaceWidth: ${this.workSpaceWidth}, workSpaceHeight: ${this.workSpaceHeight}, dockHeight: ${this.dockHeight}`);
}
product/phone/src/main/ets/pages/RecentView.ets
+1 -1
View File
@@ -39,7 +39,7 @@ struct RecentView {
this.mRecentMissionsStage.onCreate();
this.mRecentMissionsViewModel = RecentMissionsViewModel.getInstance();
this.mRecentMissionsViewModel.getRecentMissionsList();
AppStorage.SetOrCreate('recentIdx', 0);
AppStorage.setOrCreate('recentIdx', 0);
}
onPageHide(): void {