diff --git a/Shell/Install.bat b/Shell/Install.bat new file mode 100644 index 0000000000000000000000000000000000000000..a4197d13c44340735e509d6e6cddbb5ef998b5dc --- /dev/null +++ b/Shell/Install.bat @@ -0,0 +1,19 @@ +set launcher_folder=product\pad\build\default\outputs\default\pad_launcher-default-signed.hap + +set launcher_settings_folder=feature\settings\build\default\outputs\default\launcher_settings-pad_launcher-default-signed.hap + +cd .. + +set hdc=hdc.exe + +%hdc% shell "mount -o remount,rw /" + +%hdc% shell "rm -rf /data/*" + +%hdc% file send %launcher_folder% /system/app/com.ohos.launcher/Launcher.hap + +%hdc% file send %launcher_settings_folder% /system/app/com.ohos.launcher/Launcher_Settings.hap + +%hdc% shell "reboot" + +Pause \ No newline at end of file diff --git a/Shell/hdc.exe b/Shell/hdc.exe new file mode 100644 index 0000000000000000000000000000000000000000..218b48562e03288ed54ad76b0e3a7206e82081ef --- /dev/null +++ b/Shell/hdc.exe @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72e816987c290eaed47389255f4798ba1e445688ce9027c7e4dd6ca8866b3030 +size 4919808 diff --git a/build-profile.json5 b/build-profile.json5 index 16b292c5f260998564de2632affee564eed38fcf..8960094f99c268c1b88aea5fc52340932674fd70 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -4,7 +4,7 @@ { "name": "default", "signingConfig": "default", - "compileSdkVersion": 10, + "compileSdkVersion": 11, "compatibleSdkVersion": 10 } ], diff --git a/common/BuildProfile.ets b/common/BuildProfile.ets new file mode 100644 index 0000000000000000000000000000000000000000..0c1667374739293a4cf580336a164c4d23c820b5 --- /dev/null +++ b/common/BuildProfile.ets @@ -0,0 +1,8 @@ +export default class BuildProfile { + static readonly BUNDLE_NAME = 'com.ohos.launcher'; + static readonly VERSION_CODE = 1000000; + static readonly VERSION_NAME = '1.0.0'; + static readonly HAR_VERSION = '1.0.0'; + static readonly BUILD_MODE_NAME = 'Debug'; + static readonly DEBUG = true; +} \ No newline at end of file diff --git a/feature/appcenter/BuildProfile.ets b/feature/appcenter/BuildProfile.ets new file mode 100644 index 0000000000000000000000000000000000000000..0c1667374739293a4cf580336a164c4d23c820b5 --- /dev/null +++ b/feature/appcenter/BuildProfile.ets @@ -0,0 +1,8 @@ +export default class BuildProfile { + static readonly BUNDLE_NAME = 'com.ohos.launcher'; + static readonly VERSION_CODE = 1000000; + static readonly VERSION_NAME = '1.0.0'; + static readonly HAR_VERSION = '1.0.0'; + static readonly BUILD_MODE_NAME = 'Debug'; + static readonly DEBUG = true; +} \ No newline at end of file diff --git a/feature/appcenter/src/main/ets/default/common/AppCenterStartAppHandler.ts b/feature/appcenter/src/main/ets/default/common/AppCenterStartAppHandler.ts index 1379c6d0bece315935a5e5ecff9d24e388c7f52f..f1efa3e2e670be674f23dd2438db772ef93b0da9 100644 --- a/feature/appcenter/src/main/ets/default/common/AppCenterStartAppHandler.ts +++ b/feature/appcenter/src/main/ets/default/common/AppCenterStartAppHandler.ts @@ -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) { diff --git a/feature/appcenter/src/main/ets/default/layout/AppGridLayout.ets b/feature/appcenter/src/main/ets/default/layout/AppGridLayout.ets index 27b6d3ff6ec8a79cbb056d0572ad136f8be130f7..3ed01672089d16ef67c79f2746c8aca713ef064f 100644 --- a/feature/appcenter/src/main/ets/default/layout/AppGridLayout.ets +++ b/feature/appcenter/src/main/ets/default/layout/AppGridLayout.ets @@ -162,7 +162,7 @@ export struct AppGridLayout { } this.mSelectItem = appInfo; this.mDialogController?.open(); - AppStorage.setOrCreate('uninstallAppInfo', appInfo); + AppStorage.SetOrCreate('uninstallAppInfo', appInfo); }; uninstallMenu.menuEnabled = appInfo.isUninstallAble as boolean; menuInfoList.push(uninstallMenu); @@ -216,9 +216,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(); } diff --git a/feature/appcenter/src/main/ets/default/viewmodel/AppListViewModel.ts b/feature/appcenter/src/main/ets/default/viewmodel/AppListViewModel.ts index b1cf3ad2ed5057536dc345401e7b1534aa04c008..6419e1b1f5ea1026b2ba96b3982ba8f2216b0fa3 100644 --- a/feature/appcenter/src/main/ets/default/viewmodel/AppListViewModel.ts +++ b/feature/appcenter/src/main/ets/default/viewmodel/AppListViewModel.ts @@ -71,25 +71,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, @@ -99,7 +99,7 @@ export class AppListViewModel extends BaseViewModel { appScaleX: 1.0, appScaleY: 1.0 } - AppStorage.setOrCreate('animationInfo_scale', scale_finish); + AppStorage.SetOrCreate('animationInfo_scale', scale_finish); }) } @@ -131,13 +131,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 { 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) { @@ -165,7 +165,7 @@ export class AppListViewModel extends BaseViewModel { onFinish: () => { } }, () => { - AppStorage.setOrCreate('listInfo', callbackList); + AppStorage.SetOrCreate('listInfo', callbackList); }) } diff --git a/feature/bigfolder/BuildProfile.ets b/feature/bigfolder/BuildProfile.ets new file mode 100644 index 0000000000000000000000000000000000000000..0c1667374739293a4cf580336a164c4d23c820b5 --- /dev/null +++ b/feature/bigfolder/BuildProfile.ets @@ -0,0 +1,8 @@ +export default class BuildProfile { + static readonly BUNDLE_NAME = 'com.ohos.launcher'; + static readonly VERSION_CODE = 1000000; + static readonly VERSION_NAME = '1.0.0'; + static readonly HAR_VERSION = '1.0.0'; + static readonly BUILD_MODE_NAME = 'Debug'; + static readonly DEBUG = true; +} \ No newline at end of file diff --git a/feature/bigfolder/src/main/ets/default/common/BigFolderStartAppHandler.ts b/feature/bigfolder/src/main/ets/default/common/BigFolderStartAppHandler.ts index c8fc8ba6a559ed96d9d88b5684cf46dd46ccef4e..86af9a1867559b346e9c2d61f71c2e9b5b14a3e4 100644 --- a/feature/bigfolder/src/main/ets/default/common/BigFolderStartAppHandler.ts +++ b/feature/bigfolder/src/main/ets/default/common/BigFolderStartAppHandler.ts @@ -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) { diff --git a/feature/bigfolder/src/main/ets/default/common/uicomponents/FolderAppListDialog.ets b/feature/bigfolder/src/main/ets/default/common/uicomponents/FolderAppListDialog.ets index 8fd67379fe83139482f60ce610f500429ff36a56..5c4ecab4e65b7bfee179d4ac550c5831cbcdc718 100644 --- a/feature/bigfolder/src/main/ets/default/common/uicomponents/FolderAppListDialog.ets +++ b/feature/bigfolder/src/main/ets/default/common/uicomponents/FolderAppListDialog.ets @@ -73,7 +73,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() { @@ -145,7 +145,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); }) } } diff --git a/feature/bigfolder/src/main/ets/default/view/FolderOpenComponent.ets b/feature/bigfolder/src/main/ets/default/view/FolderOpenComponent.ets index ec02fce5f472270c04c1f1fd4d359aa3e897ce62..082b5d35bb29728dc94c62c7a3c6e9e67849ff3b 100644 --- a/feature/bigfolder/src/main/ets/default/view/FolderOpenComponent.ets +++ b/feature/bigfolder/src/main/ets/default/view/FolderOpenComponent.ets @@ -129,8 +129,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`); } @@ -285,10 +285,10 @@ export struct FolderOpenComponent { mBigFolderViewModel.modifyFolderName(this.mFolderInfo) } } else { - const contextFlag: boolean = AppStorage.get('contextMenuState') as boolean; + const contextFlag: boolean = AppStorage.Get('contextMenuState') as boolean; Log.showInfo(TAG, 'saveText contextFlag: ' + contextFlag); if (contextFlag) { - AppStorage.setOrCreate('contextMenuState', false); + AppStorage.SetOrCreate('contextMenuState', false); } else { mBigFolderViewModel.closeFolder(); } @@ -348,7 +348,7 @@ struct FolderSwiperPage { mBigFolderViewModel.closeFolder(); } }, - folderItem: AppStorage.get('openFolderData'), + folderItem: AppStorage.Get('openFolderData'), mBigFolderViewModel: $mBigFolderViewModel }), customStyle: true, @@ -437,10 +437,10 @@ struct FolderSwiperPage { mBigFolderViewModel.modifyFolderName(this.mFolderInfo); } } else { - const contextFlag: boolean = AppStorage.get('contextMenuState') as boolean; + const contextFlag: boolean = AppStorage.Get('contextMenuState') as boolean; Log.showInfo(TAG, 'saveText contextFlag: ' + contextFlag); if (contextFlag) { - AppStorage.setOrCreate('contextMenuState', false); + AppStorage.SetOrCreate('contextMenuState', false); } else { mBigFolderViewModel.closeFolder(); } @@ -590,7 +590,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( @@ -632,10 +632,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(); } diff --git a/feature/bigfolder/src/main/ets/default/viewmodel/BigFolderViewModel.ts b/feature/bigfolder/src/main/ets/default/viewmodel/BigFolderViewModel.ts index 91bd226e1c9b3e719cafc7823519a556162161af..74990cb6001f273843bcd4130633a8016cebcfe8 100644 --- a/feature/bigfolder/src/main/ets/default/viewmodel/BigFolderViewModel.ts +++ b/feature/bigfolder/src/main/ets/default/viewmodel/BigFolderViewModel.ts @@ -53,9 +53,9 @@ 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: FolderData = AppStorage.get('openFolderData'); + const openFolderData: FolderData = AppStorage.Get('openFolderData'); this.updateBadge(openFolderData, params); } else if (event === EventConstants.EVENT_FOLDER_PACKAGE_REMOVED) { this.deleteAppFromFolderByUninstall(params); @@ -253,7 +253,7 @@ export class BigFolderViewModel extends BaseViewModel { folderAppList.pop(); } const folderLayoutInfo = this.filterFolderPage(folderAppList); - const openFolderData: FolderData = AppStorage.get('openFolderData'); + const openFolderData: FolderData = AppStorage.Get('openFolderData'); const removeAppInfos = [dragAppInfo]; const folderIndex = gridLayoutInfo.layoutInfo.findIndex(item => { return item.typeId === CommonConstants.TYPE_FOLDER && item.folderId === openFolderData.folderId; @@ -322,7 +322,7 @@ export class BigFolderViewModel extends BaseViewModel { * @param {AppItemInfo} appInfo. */ deleteAppFromOpenFolder(appInfo: AppItemInfo): FolderData { - let openFolderData: FolderData = AppStorage.get('openFolderData'); + let openFolderData: FolderData = AppStorage.Get('openFolderData'); const folderLayoutInfo = this.getFolderLayoutInfo(openFolderData, appInfo); // Delete app from the folder @@ -624,7 +624,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; } @@ -647,7 +647,7 @@ export class BigFolderViewModel extends BaseViewModel { folderList.push(gridLayoutInfo.layoutInfo[i]); } } - AppStorage.setOrCreate('allFolderList', folderList); + AppStorage.SetOrCreate('allFolderList', folderList); return folderList; } @@ -704,7 +704,7 @@ export class BigFolderViewModel extends BaseViewModel { } } if (!this.getIsPad()) { - let bottomAppList: AppItemInfo[] = AppStorage.get('residentList') as AppItemInfo[]; + let bottomAppList: AppItemInfo[] = AppStorage.Get('residentList') as AppItemInfo[]; if (!CheckEmptyUtils.isEmptyArr(bottomAppList)) { for (let i = 0; i < bottomAppList.length; i++) { allAppList = allAppList.filter((item) => { @@ -716,7 +716,7 @@ export class BigFolderViewModel extends BaseViewModel { } } } - AppStorage.setOrCreate('allAppListForFolder', allAppList); + AppStorage.SetOrCreate('allAppListForFolder', allAppList); return allAppList; } @@ -788,10 +788,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'); } @@ -802,8 +802,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); } /** @@ -824,7 +824,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'); } /** @@ -961,7 +961,7 @@ export class BigFolderViewModel extends BaseViewModel { */ changeIndex(idx): void { this.mPageIndex = idx; - AppStorage.setOrCreate('openFolderPageIndex', this.mPageIndex); + AppStorage.SetOrCreate('openFolderPageIndex', this.mPageIndex); } /** @@ -1063,7 +1063,7 @@ export class BigFolderViewModel extends BaseViewModel { * @param {AppItemInfo} appInfo. */ removeAppOutOfFolder(appInfo: AppItemInfo): void { - let openFolderData: FolderData = AppStorage.get('openFolderData'); + let openFolderData: FolderData = AppStorage.Get('openFolderData'); const folderAppList = this.getAppListInFolder(openFolderData); this.deleteAppFromFolderAppList(appInfo, folderAppList); @@ -1119,11 +1119,11 @@ export class BigFolderViewModel extends BaseViewModel { * @param openFolderData */ private updateOpenFolderStatus(openFolderData: FolderData): 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); } } diff --git a/feature/form/BuildProfile.ets b/feature/form/BuildProfile.ets new file mode 100644 index 0000000000000000000000000000000000000000..0c1667374739293a4cf580336a164c4d23c820b5 --- /dev/null +++ b/feature/form/BuildProfile.ets @@ -0,0 +1,8 @@ +export default class BuildProfile { + static readonly BUNDLE_NAME = 'com.ohos.launcher'; + static readonly VERSION_CODE = 1000000; + static readonly VERSION_NAME = '1.0.0'; + static readonly HAR_VERSION = '1.0.0'; + static readonly BUILD_MODE_NAME = 'Debug'; + static readonly DEBUG = true; +} \ No newline at end of file diff --git a/feature/form/src/main/ets/default/view/FormServiceComponent.ets b/feature/form/src/main/ets/default/view/FormServiceComponent.ets index 918252ff665d0d32248b1a0390afa34aaee7880a..421218ab0b014bb82daf161d7c88cacfb85176a7 100644 --- a/feature/form/src/main/ets/default/view/FormServiceComponent.ets +++ b/feature/form/src/main/ets/default/view/FormServiceComponent.ets @@ -142,7 +142,7 @@ export struct FormServiceComponent { let formAppInfo: AppItemInfo = clickedFormAppInfos[0]; if (SettingsModel.getInstance().getDevice() == CommonConstants.DEFAULT_DEVICE_TYPE) { this.mFormModel.doBeforeJumpToFormManager(formAppInfo.bundleName).then(() => { - AppStorage.setOrCreate('formAppInfo', formAppInfo); + AppStorage.SetOrCreate('formAppInfo', formAppInfo); windowManager.createWindowWithName(windowManager.FORM_MANAGER_WINDOW_NAME, windowManager.RECENT_RANK); }) } else { @@ -183,7 +183,7 @@ export struct FormServiceComponent { formAppClick = (event: ClickEvent, appItem: AppItemInfo): void => { if (SettingsModel.getInstance().getDevice() == CommonConstants.DEFAULT_DEVICE_TYPE) { this.mFormModel.doBeforeJumpToFormManager(appItem.bundleName).then(() => { - AppStorage.setOrCreate('formAppInfo', appItem); + AppStorage.SetOrCreate('formAppInfo', appItem); windowManager.createWindowWithName(windowManager.FORM_MANAGER_WINDOW_NAME, windowManager.RECENT_RANK); }) } else { diff --git a/feature/form/src/main/ets/default/viewmodel/FormViewModel.ts b/feature/form/src/main/ets/default/viewmodel/FormViewModel.ts index 0d883b48278f8a2952f7d65d04c970169e8ef626..5ccf2b8b6739830a18a101b13c01f76f4a725ff5 100644 --- a/feature/form/src/main/ets/default/viewmodel/FormViewModel.ts +++ b/feature/form/src/main/ets/default/viewmodel/FormViewModel.ts @@ -97,7 +97,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); } /** diff --git a/feature/gesturenavigation/BuildProfile.ets b/feature/gesturenavigation/BuildProfile.ets new file mode 100644 index 0000000000000000000000000000000000000000..0c1667374739293a4cf580336a164c4d23c820b5 --- /dev/null +++ b/feature/gesturenavigation/BuildProfile.ets @@ -0,0 +1,8 @@ +export default class BuildProfile { + static readonly BUNDLE_NAME = 'com.ohos.launcher'; + static readonly VERSION_CODE = 1000000; + static readonly VERSION_NAME = '1.0.0'; + static readonly HAR_VERSION = '1.0.0'; + static readonly BUILD_MODE_NAME = 'Debug'; + static readonly DEBUG = true; +} \ No newline at end of file diff --git a/feature/gesturenavigation/src/main/ets/default/common/GestureNavigationManager.ts b/feature/gesturenavigation/src/main/ets/default/common/GestureNavigationManager.ts index f31cdfb6cc934f57997eb6dcca1fc226190ad9be..31d6f553df757729419d4f98b56b851897f7cbaf 100644 --- a/feature/gesturenavigation/src/main/ets/default/common/GestureNavigationManager.ts +++ b/feature/gesturenavigation/src/main/ets/default/common/GestureNavigationManager.ts @@ -83,7 +83,7 @@ export class GestureNavigationManager { this.handleEventSwitches(gestureNavigationStatus); // 初始化时保持弹窗的距离底部的位置和（打开/关闭）三键时的位置一致 - AppStorage.setOrCreate('NavigationBarStatusValue', gestureNavigationStatus === '0' ? true : false); + AppStorage.SetOrCreate('NavigationBarStatusValue', gestureNavigationStatus === '0' ? true : false); this.registerListenForDataChanges(this.dataChangesCallback.bind(this)); } catch (error) { @@ -95,7 +95,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); localEventManager.sendLocalEventSticky(EventConstants.EVENT_NAVIGATOR_BAR_STATUS_CHANGE, getRetValue); } diff --git a/feature/numbadge/BuildProfile.ets b/feature/numbadge/BuildProfile.ets new file mode 100644 index 0000000000000000000000000000000000000000..0c1667374739293a4cf580336a164c4d23c820b5 --- /dev/null +++ b/feature/numbadge/BuildProfile.ets @@ -0,0 +1,8 @@ +export default class BuildProfile { + static readonly BUNDLE_NAME = 'com.ohos.launcher'; + static readonly VERSION_CODE = 1000000; + static readonly VERSION_NAME = '1.0.0'; + static readonly HAR_VERSION = '1.0.0'; + static readonly BUILD_MODE_NAME = 'Debug'; + static readonly DEBUG = true; +} \ No newline at end of file diff --git a/feature/pagedesktop/BuildProfile.ets b/feature/pagedesktop/BuildProfile.ets new file mode 100644 index 0000000000000000000000000000000000000000..0c1667374739293a4cf580336a164c4d23c820b5 --- /dev/null +++ b/feature/pagedesktop/BuildProfile.ets @@ -0,0 +1,8 @@ +export default class BuildProfile { + static readonly BUNDLE_NAME = 'com.ohos.launcher'; + static readonly VERSION_CODE = 1000000; + static readonly VERSION_NAME = '1.0.0'; + static readonly HAR_VERSION = '1.0.0'; + static readonly BUILD_MODE_NAME = 'Debug'; + static readonly DEBUG = true; +} \ No newline at end of file diff --git a/feature/pagedesktop/src/main/ets/default/common/PageDesktopCloseAppHandler.ts b/feature/pagedesktop/src/main/ets/default/common/PageDesktopCloseAppHandler.ts index 29be7d449b7d5df7c4361bc52151176848692705..afb864c27a1a47d1ad7b45812f4c83849407e02e 100644 --- a/feature/pagedesktop/src/main/ets/default/common/PageDesktopCloseAppHandler.ts +++ b/feature/pagedesktop/src/main/ets/default/common/PageDesktopCloseAppHandler.ts @@ -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`); diff --git a/feature/pagedesktop/src/main/ets/default/common/PageDesktopDragHandler.ts b/feature/pagedesktop/src/main/ets/default/common/PageDesktopDragHandler.ts index 5f13848ed3cfe3d2bd4412a887f6d961509373fc..e5375741747db5793245981c0f4f885616854680 100644 --- a/feature/pagedesktop/src/main/ets/default/common/PageDesktopDragHandler.ts +++ b/feature/pagedesktop/src/main/ets/default/common/PageDesktopDragHandler.ts @@ -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 { } 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,7 +222,7 @@ 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); } @@ -231,13 +231,13 @@ export class PageDesktopDragHandler extends BaseDragHandler { 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); @@ -405,13 +405,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); diff --git a/feature/pagedesktop/src/main/ets/default/common/PageDesktopStartAppHandler.ts b/feature/pagedesktop/src/main/ets/default/common/PageDesktopStartAppHandler.ts index 80f7e3f5da4ca06b649894ae6fd0ac98da898feb..a5bc71eb6ff6d8bb58fc0be11ce9fe021ddbc47e 100644 --- a/feature/pagedesktop/src/main/ets/default/common/PageDesktopStartAppHandler.ts +++ b/feature/pagedesktop/src/main/ets/default/common/PageDesktopStartAppHandler.ts @@ -63,8 +63,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); @@ -83,7 +83,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; diff --git a/feature/pagedesktop/src/main/ets/default/common/components/AppItem.ets b/feature/pagedesktop/src/main/ets/default/common/components/AppItem.ets index 0d81dcc561347094fecb22566ecec04f73db741d..4d81e63c4b32a287469823cdf86b4a3cbbc00629 100644 --- a/feature/pagedesktop/src/main/ets/default/common/components/AppItem.ets +++ b/feature/pagedesktop/src/main/ets/default/common/components/AppItem.ets @@ -199,7 +199,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) => { @@ -228,7 +228,7 @@ export default struct AppItem { Log.showInfo(TAG, `onTouch mIsDragEffectArea: ${mIsDragEffectArea}`); if (!mIsDragEffectArea) { this.pageDesktopDragItemInfo = new LauncherDragItemInfo(); - AppStorage.setOrCreate('selectAppIndex', null); + AppStorage.SetOrCreate('selectAppIndex', null); } } }) @@ -271,8 +271,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"); diff --git a/feature/pagedesktop/src/main/ets/default/common/components/FolderItem.ets b/feature/pagedesktop/src/main/ets/default/common/components/FolderItem.ets index 5dfbb57f23d1b46f237450292f2d4bc362eaad86..4886af4bc341ea2092e2f60ade173ece02092b88 100644 --- a/feature/pagedesktop/src/main/ets/default/common/components/FolderItem.ets +++ b/feature/pagedesktop/src/main/ets/default/common/components/FolderItem.ets @@ -86,7 +86,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') as number) : BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE; + this.openFolderStatus = AppStorage.Get('openFolderStatus') != 'undefined' ? (AppStorage.Get('openFolderStatus') as number) : BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE; this.formatFolderInfo(); } @@ -118,12 +118,12 @@ 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 as FolderData); } private getOpenFolder(): string { - let openFolderData: FolderData = AppStorage.get('openFolderData') as FolderData; + let openFolderData: FolderData = AppStorage.Get('openFolderData') as FolderData; return openFolderData.folderId; } @@ -136,7 +136,7 @@ export default struct FolderItem { const selectAppIndex = PageDesktopDragHandler.getInstance().getItemIndex(event.getWindowX(), event.getWindowY()); const startPosition = PageDesktopDragHandler.getInstance().getTouchPosition(event.getWindowX(), event.getWindowY()) PageDesktopDragHandler.getInstance().mStartPosition = startPosition; - AppStorage.setOrCreate('selectAppIndex', selectAppIndex); + AppStorage.SetOrCreate('selectAppIndex', selectAppIndex); Log.showInfo(TAG, `onDragStart event: [${event.getWindowX()}, ${event.getWindowY()}], selectAppIndex: ${selectAppIndex}`); } @@ -179,8 +179,8 @@ export default struct FolderItem { Log.showInfo(TAG, `onTouch mIsDragEffectArea: ${mIsDragEffectArea}`); if (!mIsDragEffectArea) { PageDesktopDragHandler.getInstance().deleteBlankPageOutsideEffect(); - AppStorage.setOrCreate('dragItemInfo', new LauncherDragItemInfo()); - AppStorage.setOrCreate('selectAppIndex', null); + AppStorage.SetOrCreate('dragItemInfo', new LauncherDragItemInfo()); + AppStorage.SetOrCreate('selectAppIndex', null); } } }, @@ -208,7 +208,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( @@ -230,9 +230,9 @@ export default struct FolderItem { * set start app info */ private setStartAppInfo(appItem: AppItemInfo) { - 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(); } diff --git a/feature/pagedesktop/src/main/ets/default/common/components/FormItem.ets b/feature/pagedesktop/src/main/ets/default/common/components/FormItem.ets index ec9a2d17762075e056f5b432e24013d76f8e9748..2ee33c848ec762f6cd913a7b3301c05358761157 100644 --- a/feature/pagedesktop/src/main/ets/default/common/components/FormItem.ets +++ b/feature/pagedesktop/src/main/ets/default/common/components/FormItem.ets @@ -122,7 +122,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); @@ -160,7 +160,7 @@ export default struct FormItem { cancel: () => {}, confirm: () => { // delete form - AppStorage.setOrCreate('isRemoveForm', true); + AppStorage.SetOrCreate('isRemoveForm', true); }, dialogName: this.getDialogName(), }), @@ -225,7 +225,7 @@ export default struct FormItem { const selectAppIndex = PageDesktopDragHandler.getInstance().getItemIndex(event.getWindowX(), event.getWindowY()); const startPosition = PageDesktopDragHandler.getInstance().getTouchPosition(event.getWindowX(), event.getWindowY()) PageDesktopDragHandler.getInstance().mStartPosition = startPosition; - AppStorage.setOrCreate('selectAppIndex', selectAppIndex); + AppStorage.SetOrCreate('selectAppIndex', selectAppIndex); Log.showInfo(TAG, `onDragStart event: [${event.getWindowX()}, ${event.getWindowY()}], selectAppIndex: ${selectAppIndex}`); } @@ -277,7 +277,7 @@ export default struct FormItem { if (!mIsDragEffectArea) { PageDesktopDragHandler.getInstance().deleteBlankPageOutsideEffect(); this.pageDesktopDragItemInfo = new LauncherDragItemInfo(); - AppStorage.setOrCreate('selectAppIndex', null); + AppStorage.SetOrCreate('selectAppIndex', null); } } }) @@ -294,8 +294,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(); } diff --git a/feature/pagedesktop/src/main/ets/default/common/components/GridSwiper.ets b/feature/pagedesktop/src/main/ets/default/common/components/GridSwiper.ets index 864c58fda4849aed98b1a1e53b15ef489f0a3de2..09aa589dc3d57d1ae33921b9e6f371b9cb200973 100644 --- a/feature/pagedesktop/src/main/ets/default/common/components/GridSwiper.ets +++ b/feature/pagedesktop/src/main/ets/default/common/components/GridSwiper.ets @@ -84,7 +84,7 @@ export default struct GridSwiper { } private buildLog(): boolean { - let isDesktopLoadFinished = AppStorage.get('isDesktopLoadFinished') as boolean; + let isDesktopLoadFinished = AppStorage.Get('isDesktopLoadFinished') as boolean; Log.showDebug(TAG, `build start ${isDesktopLoadFinished} page ${this.pageIndex}`); return isDesktopLoadFinished == true; } @@ -128,7 +128,7 @@ export default struct GridSwiper { if (this.desktopLoadFinished) { Swiper(this.swiperController) { ForEach(this.pageList, (item: number, index: number) => { - if (AppStorage.get('deviceType') == CommonConstants.DEFAULT_DEVICE_TYPE) { + if (AppStorage.Get('deviceType') == CommonConstants.DEFAULT_DEVICE_TYPE) { Column() { SwiperPage({ appListInfo: $appListInfo, diff --git a/feature/pagedesktop/src/main/ets/default/common/components/SwiperPage.ets b/feature/pagedesktop/src/main/ets/default/common/components/SwiperPage.ets index a36fe500230c04e67f3b54fa446e0a2c7f529366..9d9a322629ff33d64eb00a8af6c574fa9bc1b8c0 100644 --- a/feature/pagedesktop/src/main/ets/default/common/components/SwiperPage.ets +++ b/feature/pagedesktop/src/main/ets/default/common/components/SwiperPage.ets @@ -81,10 +81,10 @@ export default struct SwiperPage { * eg：应用角标更新时，大文件内的应用角标同步更新。 */ updateOpenFolderData() { - const openFolderData = AppStorage.get('openFolderData') as FolderData; + const openFolderData = AppStorage.Get('openFolderData') as FolderData; if (openFolderData?.folderId && this.mAppListInfo?.length) { let temp = this.mAppListInfo.find((item: LauncherDragItemInfo) => item?.folderId === openFolderData.folderId); - AppStorage.setOrCreate('openFolderData', temp as FolderData); + AppStorage.SetOrCreate('openFolderData', temp as FolderData); } } @@ -131,11 +131,11 @@ export default struct SwiperPage { } itemMove(moveX: number, moveY: number): void { - const isSwappingPage: boolean = AppStorage.get('isSwappingPage') as boolean; + const isSwappingPage: boolean = AppStorage.Get('isSwappingPage') as boolean; if (isSwappingPage) { return; } - let curPageIndex: number = AppStorage.get('pageIndex') as number; + let curPageIndex: number = AppStorage.Get('pageIndex') as number; if ((moveX - this.mIconSize / 2) < this.mMargin && curPageIndex > 0 && moveY < this.mGridSpaceHeight) { this.mPageDesktopViewModel?.showPrevious(); this.movingIconSwapPageDelay(); @@ -154,9 +154,9 @@ export default struct SwiperPage { * 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); } @@ -236,7 +236,7 @@ export default struct SwiperPage { }) .onMouse((event: MouseEvent) => { if (event.button === MouseButton.Right || event.button === MouseButton.Left) { - AppStorage.setOrCreate('selectDesktopAppItem', ''); + AppStorage.SetOrCreate('selectDesktopAppItem', ''); } }) .onDragEnter((event: DragEvent, extraParams: string) => { @@ -246,9 +246,9 @@ export default struct SwiperPage { Log.showInfo(TAG, `onDragMove event: [${event.getWindowX()}, ${event.getWindowY()}]`); const dragItemInfo: LauncherDragItemInfo = AppStorage.get('dragItemInfo') as LauncherDragItemInfo; 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)) { + 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()); } }) @@ -256,23 +256,23 @@ export default struct SwiperPage { Log.showInfo(TAG, `onDragLeave event: [${event.getWindowX()}, ${event.getWindowY()}]`); }) .onDrop((event: DragEvent, extraParams: string) => { - const dragItemType: number = AppStorage.get('dragItemType') as number; + const dragItemType: number = AppStorage.Get('dragItemType') as number; 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)) { + || (dragItemType === CommonConstants.DRAG_FROM_DOCK && AppStorage.Get('deviceType') === CommonConstants.DEFAULT_DEVICE_TYPE)) { const dragResult = PageDesktopDragHandler.getInstance().onDragDrop(event.getWindowX(), event.getWindowY()); Log.showInfo(TAG, `onDrop dragResult: ${dragResult}`); - AppStorage.setOrCreate('selectAppIndex', null); - const dragItemInfo: LauncherDragItemInfo = AppStorage.get('dragItemInfo') as LauncherDragItemInfo; + AppStorage.SetOrCreate('selectAppIndex', null); + const dragItemInfo: LauncherDragItemInfo = AppStorage.Get('dragItemInfo') as LauncherDragItemInfo; if (dragItemInfo.bundleName) { BadgeManager.getInstance().updateBadgeNumber(dragItemInfo.bundleName, dragItemInfo.badgeNumber); } if (!dragResult) { - AppStorage.setOrCreate('dragItemInfo', new LauncherDragItemInfo()); + AppStorage.SetOrCreate('dragItemInfo', new LauncherDragItemInfo()); } else { // Wait for the UI rendering to end. setTimeout(() => { - AppStorage.setOrCreate('dragItemInfo', new LauncherDragItemInfo()); + AppStorage.SetOrCreate('dragItemInfo', new LauncherDragItemInfo()); }, 50); } } diff --git a/feature/pagedesktop/src/main/ets/default/layout/PageDesktopLayout.ets b/feature/pagedesktop/src/main/ets/default/layout/PageDesktopLayout.ets index 77c307460fd6eefe48d080c9603445638e147e96..cd7e50af706e2a51a71fea1acbfb4580ee23523d 100644 --- a/feature/pagedesktop/src/main/ets/default/layout/PageDesktopLayout.ets +++ b/feature/pagedesktop/src/main/ets/default/layout/PageDesktopLayout.ets @@ -59,7 +59,7 @@ export struct PageDesktopLayout { } aboutToAppear(): void { - this.deviceType = AppStorage.get('deviceType') as string; + this.deviceType = AppStorage.Get('deviceType') as string; this.mPageDesktopDragHandler = PageDesktopDragHandler.getInstance(); mPageDesktopViewModel = PageDesktopViewModel.getInstance(); this.gridConfig = mPageDesktopViewModel.getGridConfig().layout; diff --git a/feature/pagedesktop/src/main/ets/default/viewmodel/PageDesktopViewModel.ts b/feature/pagedesktop/src/main/ets/default/viewmodel/PageDesktopViewModel.ts index b29af934869c131b61fc0eb171bc59bc2a0f2e02..87d7339ae8c8138f531cfdc5c620fbaaebc6e7f9 100644 --- a/feature/pagedesktop/src/main/ets/default/viewmodel/PageDesktopViewModel.ts +++ b/feature/pagedesktop/src/main/ets/default/viewmodel/PageDesktopViewModel.ts @@ -223,7 +223,7 @@ export class PageDesktopViewModel extends BaseViewModel { async updateDesktopInfo(): Promise { await this.mAppModel.getAppListAsync(); this.getGridList(); - AppStorage.setOrCreate('formRefresh', String(new Date())); + AppStorage.SetOrCreate('formRefresh', String(new Date())); } async updateForms(): Promise { @@ -290,7 +290,7 @@ export class PageDesktopViewModel extends BaseViewModel { // update pageDesktop app config this.mSettingsModel.setAppListInfo(pageDesktopInfo); - AppStorage.setOrCreate('isDesktopLoadFinished', true); + AppStorage.SetOrCreate('isDesktopLoadFinished', true); return pageDesktopInfo; } @@ -587,8 +587,8 @@ export 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) { @@ -816,7 +816,7 @@ export 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) { @@ -841,10 +841,10 @@ export 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 @@ -862,7 +862,7 @@ export 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]); @@ -1063,8 +1063,8 @@ export 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); }; @@ -1077,8 +1077,8 @@ export 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); @@ -1097,7 +1097,7 @@ export 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 { @@ -1158,7 +1158,7 @@ export class PageDesktopViewModel extends BaseViewModel { if (appName != null) { appInfo.appName = appName; } - AppStorage.setOrCreate('uninstallAppInfo', appInfo); + AppStorage.SetOrCreate('uninstallAppInfo', appInfo); dialog.open(); }; uninstallMenu.menuEnabled = appInfo.isUninstallAble; @@ -1191,7 +1191,7 @@ export 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 { @@ -1222,7 +1222,7 @@ export 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); @@ -1254,14 +1254,14 @@ export 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'); } /** @@ -1283,7 +1283,7 @@ export 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); } /** @@ -1293,7 +1293,7 @@ export 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); } @@ -1399,7 +1399,7 @@ export 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++) { @@ -1444,7 +1444,7 @@ export class PageDesktopViewModel extends BaseViewModel { * set start app info */ private setStartAppInfo() { - AppStorage.setOrCreate('startAppIconInfo', { + AppStorage.SetOrCreate('startAppIconInfo', { appIconSize: 0, appIconHeight: 0, appIconPositionX: 0, diff --git a/feature/recents/BuildProfile.ets b/feature/recents/BuildProfile.ets new file mode 100644 index 0000000000000000000000000000000000000000..0c1667374739293a4cf580336a164c4d23c820b5 --- /dev/null +++ b/feature/recents/BuildProfile.ets @@ -0,0 +1,8 @@ +export default class BuildProfile { + static readonly BUNDLE_NAME = 'com.ohos.launcher'; + static readonly VERSION_CODE = 1000000; + static readonly VERSION_NAME = '1.0.0'; + static readonly HAR_VERSION = '1.0.0'; + static readonly BUILD_MODE_NAME = 'Debug'; + static readonly DEBUG = true; +} \ No newline at end of file diff --git a/feature/recents/src/main/ets/default/common/RecentMissionStartAppHandler.ts b/feature/recents/src/main/ets/default/common/RecentMissionStartAppHandler.ts index 28a2696ac842623cec0a579d1daa9f27c6117fc7..23561907d7a5844ae6ea71152a7ddcec768c8768 100644 --- a/feature/recents/src/main/ets/default/common/RecentMissionStartAppHandler.ts +++ b/feature/recents/src/main/ets/default/common/RecentMissionStartAppHandler.ts @@ -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 ; diff --git a/feature/recents/src/main/ets/default/common/uicomponents/RecentMissionCard.ets b/feature/recents/src/main/ets/default/common/uicomponents/RecentMissionCard.ets index 0c9bfd16c53c0a1389199ed48864042f54110d61..5aa3e50a738c4c8bf00f1f7f72b49fb228c642e1 100644 --- a/feature/recents/src/main/ets/default/common/uicomponents/RecentMissionCard.ets +++ b/feature/recents/src/main/ets/default/common/uicomponents/RecentMissionCard.ets @@ -223,7 +223,7 @@ export default struct RecentMissionCard { * set start app info */ private setStartAppInfo(position?: Position) { - AppStorage.setOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_APP_ICON); + AppStorage.SetOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_APP_ICON); let appParams: AppParams = { bundleName: this.bundleName, moduleName: this.moduleName, @@ -234,7 +234,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(); } diff --git a/feature/recents/src/main/ets/default/viewmodel/RecentMissionsViewModel.ts b/feature/recents/src/main/ets/default/viewmodel/RecentMissionsViewModel.ts index b67256ce67a52635b26223c7a9cc248105a7963c..829df9e677979bdb292c6116740454bafd6fd829 100644 --- a/feature/recents/src/main/ets/default/viewmodel/RecentMissionsViewModel.ts +++ b/feature/recents/src/main/ets/default/viewmodel/RecentMissionsViewModel.ts @@ -88,7 +88,7 @@ export class RecentMissionsViewModel { }); } Log.showDebug(TAG, `getRecentMissionsList length: ${this.mRecentMissionsList.length}`); - AppStorage.setOrCreate('recentMissionsList', this.mRecentMissionsList); + AppStorage.SetOrCreate('recentMissionsList', this.mRecentMissionsList); } /** @@ -101,13 +101,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; }); @@ -126,7 +126,7 @@ export class RecentMissionsViewModel { onFinish: () => { } }, () => { - AppStorage.setOrCreate('recentMissionsList', this.mRecentMissionsList); + AppStorage.SetOrCreate('recentMissionsList', this.mRecentMissionsList); }); if (this.mRecentMissionsList.length == 0) { this.terminateRecentIfAllClear(); diff --git a/feature/settings/src/main/ets/common/presenter/SettingsPresenter.ts b/feature/settings/src/main/ets/common/presenter/SettingsPresenter.ts index 5306b2944c382482b4b3115390eaf9763a49e63c..9cbee8779d0f28664cbc6ce5b9eb0a7f5c1a7f97 100644 --- a/feature/settings/src/main/ets/common/presenter/SettingsPresenter.ts +++ b/feature/settings/src/main/ets/common/presenter/SettingsPresenter.ts @@ -217,7 +217,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()}`); } diff --git a/feature/settings/src/main/ets/pages/Settings.ets b/feature/settings/src/main/ets/pages/Settings.ets index d328b565ca43fb19d0c08079635925b65dc5c446..653955b0e1b59f1c468a19098a3aa51a50267851 100644 --- a/feature/settings/src/main/ets/pages/Settings.ets +++ b/feature/settings/src/main/ets/pages/Settings.ets @@ -217,8 +217,8 @@ struct SettingItem { } .onClick(() => { AppStorage.setOrCreate('ida', this.ida); - AppStorage.setOrCreate('valueList', this.valueList); - AppStorage.setOrCreate('settingValue', this.settingValue); + AppStorage.SetOrCreate('valueList', this.valueList); + AppStorage.SetOrCreate('settingValue', this.settingValue); if (this.dialogController) { this.dialogController.open(); } diff --git a/feature/smartdock/BuildProfile.ets b/feature/smartdock/BuildProfile.ets new file mode 100644 index 0000000000000000000000000000000000000000..0c1667374739293a4cf580336a164c4d23c820b5 --- /dev/null +++ b/feature/smartdock/BuildProfile.ets @@ -0,0 +1,8 @@ +export default class BuildProfile { + static readonly BUNDLE_NAME = 'com.ohos.launcher'; + static readonly VERSION_CODE = 1000000; + static readonly VERSION_NAME = '1.0.0'; + static readonly HAR_VERSION = '1.0.0'; + static readonly BUILD_MODE_NAME = 'Debug'; + static readonly DEBUG = true; +} \ No newline at end of file diff --git a/feature/smartdock/src/main/ets/default/common/SmartDockCloseAppHandler.ts b/feature/smartdock/src/main/ets/default/common/SmartDockCloseAppHandler.ts index 40dc495a4a3e24f4fa0fdca818fd1b9b74a2107c..dd573cdfae43c39e3316fbc81035933013e560b8 100644 --- a/feature/smartdock/src/main/ets/default/common/SmartDockCloseAppHandler.ts +++ b/feature/smartdock/src/main/ets/default/common/SmartDockCloseAppHandler.ts @@ -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; diff --git a/feature/smartdock/src/main/ets/default/common/SmartDockDragHandler.ts b/feature/smartdock/src/main/ets/default/common/SmartDockDragHandler.ts index 82a1224d50009722693d1affecc85f5f3c117897..10ec4a9db587d4cccdc305087978ab17045bc6fe 100644 --- a/feature/smartdock/src/main/ets/default/common/SmartDockDragHandler.ts +++ b/feature/smartdock/src/main/ets/default/common/SmartDockDragHandler.ts @@ -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; } @@ -152,15 +152,15 @@ export default class SmartDockDragHandler extends BaseDragHandler { 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; diff --git a/feature/smartdock/src/main/ets/default/common/SmartDockStartAppHandler.ts b/feature/smartdock/src/main/ets/default/common/SmartDockStartAppHandler.ts index c2a7136815847c896b119f53e40dea78060d76eb..0d73eefa1a2daaaf9edec2bbb4e2cd884d152c06 100644 --- a/feature/smartdock/src/main/ets/default/common/SmartDockStartAppHandler.ts +++ b/feature/smartdock/src/main/ets/default/common/SmartDockStartAppHandler.ts @@ -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 diff --git a/feature/smartdock/src/main/ets/default/layout/RecentLayout.ets b/feature/smartdock/src/main/ets/default/layout/RecentLayout.ets index 513df6bc13e19e0b9ffc6afdb13cef7e0aaa5a49..2e897425ef1c380067fbf898819bb0ea018e2cee 100644 --- a/feature/smartdock/src/main/ets/default/layout/RecentLayout.ets +++ b/feature/smartdock/src/main/ets/default/layout/RecentLayout.ets @@ -143,7 +143,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, @@ -157,8 +157,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(); @@ -177,14 +177,14 @@ export default struct RecentLayout { }) .onClick((event: ClickEvent) => { this.onItemClick(event, item); - this.onClickWithPopup = AppStorage.get('recentShowPopup') as boolean; + this.onClickWithPopup = AppStorage.Get('recentShowPopup') as boolean; Log.showInfo(TAG, `onClick this.onClickWithPopup: ${this.onClickWithPopup}`); if (this.onClickWithPopup) { this.autoCancel = true; this.showPopup = true this.onHoverItem = item.bundleName as string; } - AppStorage.setOrCreate('recentShowPopup', false); + AppStorage.SetOrCreate('recentShowPopup', false); }) }, (item: DockItemInfo) => JSON.stringify(item)) } @@ -203,7 +203,7 @@ export default struct RecentLayout { getListWidth(): number { let mRecentMaxNum = this.mSmartDockStyleConfig?.mMaxRecentNum as number; 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) { @@ -240,7 +240,7 @@ struct AppItem { } private getLongPress(): boolean { - return AppStorage.get('isLongPress') as boolean; + return AppStorage.Get('isLongPress') as boolean; } @Builder MenuBuilder() { @@ -280,7 +280,7 @@ struct AppItem { LongPressGesture({ repeat: false }) .onAction((event: GestureEvent) => { this.isShow = true; - AppStorage.setOrCreate('isLongPress', true); + AppStorage.SetOrCreate('isLongPress', true); }) ) .bindPopup(this.isShow, { @@ -293,13 +293,13 @@ 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('dragItemInfo') as LauncherDragItemInfo; if (dragItemInfo.isDragging) { @@ -310,7 +310,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; } }) diff --git a/feature/smartdock/src/main/ets/default/layout/ResidentLayout.ets b/feature/smartdock/src/main/ets/default/layout/ResidentLayout.ets index 94e3b3aaa02fb23bfb3fad7fc836c65cda1a39cb..2364b72becc88b2138255d515fb4128a11663ea7 100644 --- a/feature/smartdock/src/main/ets/default/layout/ResidentLayout.ets +++ b/feature/smartdock/src/main/ets/default/layout/ResidentLayout.ets @@ -60,7 +60,7 @@ export default struct ResidentLayout { 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}`); @@ -122,17 +122,17 @@ export default struct ResidentLayout { .onDrop((event: DragEvent, extraParams: string) => { Log.showInfo(TAG, `onDrop event: [${event.getWindowX()}, ${event.getWindowY()}]`); const dragResult = SmartDockDragHandler.getInstance().onDragDrop(event.getWindowX(), event.getWindowY()); - AppStorage.setOrCreate('selectAppIndex', null); - const dragItemInfo: LauncherDragItemInfo = AppStorage.get('dragItemInfo') as LauncherDragItemInfo; + AppStorage.SetOrCreate('selectAppIndex', null); + const dragItemInfo: LauncherDragItemInfo = AppStorage.Get('dragItemInfo') as LauncherDragItemInfo; if (dragItemInfo.bundleName) { BadgeManager.getInstance().updateBadgeNumber(dragItemInfo.bundleName, dragItemInfo.badgeNumber); } if (!dragResult) { - AppStorage.setOrCreate('dragItemInfo', new LauncherDragItemInfo()); + AppStorage.SetOrCreate('dragItemInfo', new LauncherDragItemInfo()); } else { // Wait for the UI rendering to end. setTimeout(() => { - AppStorage.setOrCreate('dragItemInfo', new LauncherDragItemInfo()); + AppStorage.SetOrCreate('dragItemInfo', new LauncherDragItemInfo()); }, 50); } }) @@ -160,7 +160,7 @@ struct AppItem { } private getLongPress(): boolean { - return AppStorage.get('isLongPress') as boolean; + return AppStorage.Get('isLongPress') as boolean; } @Builder MenuBuilder() { @@ -201,21 +201,21 @@ 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 + arrowOffset: AppStorage.Get('deviceType') == CommonConstants.DEFAULT_DEVICE_TYPE ? null : 3 * ((mSmartDockStyleConfig?.mIconSize as number) / 2) + (mSmartDockStyleConfig?.mListItemGap as number), // 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 }) @@ -224,10 +224,10 @@ struct AppItem { if (event.type === CommonConstants.TOUCH_TYPE_UP && this.smartDragItemInfo.isDragging) { let mIsDragEffectArea = SmartDockDragHandler.getInstance().isDragEffectArea(event.touches[0].windowX, event.touches[0].windowY); if (!mIsDragEffectArea) { - AppStorage.setOrCreate('dragItemInfo', new LauncherDragItemInfo()); - AppStorage.setOrCreate('selectAppIndex', null); + AppStorage.SetOrCreate('dragItemInfo', new LauncherDragItemInfo()); + AppStorage.SetOrCreate('selectAppIndex', null); } - AppStorage.setOrCreate('isLongPress', false); + AppStorage.SetOrCreate('isLongPress', false); } if (this.smartDragItemInfo.isDragging) { this.isShow = false; @@ -240,7 +240,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; } }) @@ -251,11 +251,11 @@ struct AppItem { this.smartDragItemInfo = this.appInfo as LauncherDragItemInfo; Log.showInfo(TAG, `smartDragItemInfo: ${JSON.stringify(this.smartDragItemInfo)}`); const selectAppIndex = SmartDockDragHandler.getInstance().getDragItemIndexByCoordinates(event.getWindowX(), event.getWindowY()); - AppStorage.setOrCreate('selectAppIndex', selectAppIndex); + AppStorage.SetOrCreate('selectAppIndex', selectAppIndex); }) .onDragEnd((event: DragEvent, extraParams: string) => { Log.showInfo(TAG, `onDragEnd event: [${event.getWindowX()}, ${event.getWindowY()}]` + event.getResult()); - AppStorage.setOrCreate('dragItemInfo', new LauncherDragItemInfo()); + AppStorage.SetOrCreate('dragItemInfo', new LauncherDragItemInfo()); }) } } \ No newline at end of file diff --git a/feature/smartdock/src/main/ets/default/layout/SmartDock.ets b/feature/smartdock/src/main/ets/default/layout/SmartDock.ets index 34a8ea907c20f781a500df1a01dc9cca2bb7179e..d5afabe6e930e7a72af5d8a7afdbc07ff16e78ce 100644 --- a/feature/smartdock/src/main/ets/default/layout/SmartDock.ets +++ b/feature/smartdock/src/main/ets/default/layout/SmartDock.ets @@ -53,7 +53,7 @@ export struct SmartDock { aboutToAppear(): void { Log.showInfo(TAG, 'aboutToAppear start!'); - this.deviceType = AppStorage.get('deviceType') as string; + this.deviceType = AppStorage.Get('deviceType') as string; try { this.mSmartDockViewModel = SmartDockViewModel.getInstance(); this.mSmartDockStyleConfig = this.mSmartDockViewModel.getStyleConfig() as SmartDockStyleConfig; @@ -118,8 +118,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; } @@ -196,6 +196,6 @@ export struct SmartDock { recentOnClickWithPopup(item: DockItemInfo) { this.onHoverEvent(true, item.bundleName); - AppStorage.setOrCreate('recentShowPopup', true); + AppStorage.SetOrCreate('recentShowPopup', true); } } \ No newline at end of file diff --git a/feature/smartdock/src/main/ets/default/model/SmartDockModel.ts b/feature/smartdock/src/main/ets/default/model/SmartDockModel.ts index 05af591b2761014c9238cf6ac911d9a371edd327..7ba8365ea2ec8d894d9cdaac492896a789c3229c 100644 --- a/feature/smartdock/src/main/ets/default/model/SmartDockModel.ts +++ b/feature/smartdock/src/main/ets/default/model/SmartDockModel.ts @@ -64,7 +64,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) { @@ -149,7 +149,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); } @@ -167,7 +167,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[] = []; @@ -188,11 +188,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}`); } @@ -220,7 +220,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; @@ -246,7 +246,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; @@ -316,7 +316,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); @@ -327,7 +327,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); } @@ -376,7 +376,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) { @@ -397,13 +397,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++) { @@ -425,7 +425,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); } } } @@ -479,7 +479,7 @@ export default class SmartDockModel { } }); } - AppStorage.setOrCreate('recentMissionsList', mRecentMissionsList); + AppStorage.SetOrCreate('recentMissionsList', mRecentMissionsList); } onMissionCreatedCallback(missionId: number): void { @@ -579,15 +579,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 => { @@ -607,7 +607,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)}`); } @@ -616,7 +616,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 => { @@ -626,7 +626,7 @@ export default class SmartDockModel { return dockItem.keyName != item.keyName; } }) - AppStorage.setOrCreate('recentList', this.mRecentDataList); + AppStorage.SetOrCreate('recentList', this.mRecentDataList); res = true; } return res; @@ -634,7 +634,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) { @@ -654,7 +654,7 @@ export default class SmartDockModel { dockItemInfo.isUninstallAble = appInfo.isUninstallAble; dockItemInfo.badgeNumber = appInfo.badgeNumber; resistDockItem[i] = dockItemInfo; - AppStorage.setOrCreate('residentList', resistDockItem); + AppStorage.SetOrCreate('residentList', resistDockItem); } } } diff --git a/feature/smartdock/src/main/ets/default/viewmodel/SmartDockViewModel.ts b/feature/smartdock/src/main/ets/default/viewmodel/SmartDockViewModel.ts index bd3b33d44421a90cc85a070a143d530b3c58316e..bef3ddd249ef86e73e8fae17fefaa5db415ed3b6 100644 --- a/feature/smartdock/src/main/ets/default/viewmodel/SmartDockViewModel.ts +++ b/feature/smartdock/src/main/ets/default/viewmodel/SmartDockViewModel.ts @@ -82,7 +82,7 @@ export default class SmartDockViewModel extends BaseViewModel { */ residentOnClick(event: ClickEvent | null, item: DockItemInfo, callback?: () => void) { // 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; @@ -104,9 +104,9 @@ export default class SmartDockViewModel extends BaseViewModel { * @param item */ public recentOnClick(event: ClickEvent | null, item: DockItemInfo, callback?: () => void) { - AppStorage.setOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_APP_RECENT); + AppStorage.SetOrCreate('startAppTypeFromPageDesktop', CommonConstants.OVERLAY_TYPE_APP_RECENT); let missionInfoList: RecentBundleMissionInfo[] = []; - 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++) { @@ -140,25 +140,25 @@ export default class SmartDockViewModel extends BaseViewModel { * update drag effective area when dockList changed */ async updateDockParams() { - const screenWidth: number = AppStorage.get('screenWidth') as number; - const screenHeight: number = AppStorage.get('screenHeight') as number; - const sysUIBottomHeight: number = AppStorage.get('sysUIBottomHeight') as number; - const dockHeight: number = AppStorage.get('dockHeight') as number; - let mResidentWidth: number = this.getListWidth(AppStorage.get('residentList')); - if ((AppStorage.get('deviceType') as string) === CommonConstants.DEFAULT_DEVICE_TYPE) { + const screenWidth: number = AppStorage.Get('screenWidth') as number; + const screenHeight: number = AppStorage.Get('screenHeight') as number; + const sysUIBottomHeight: number = AppStorage.Get('sysUIBottomHeight') as number; + const dockHeight: number = AppStorage.Get('dockHeight') as number; + let mResidentWidth: number = this.getListWidth(AppStorage.Get('residentList')); + if ((AppStorage.Get('deviceType') as string) === 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') as string) == CommonConstants.DEFAULT_DEVICE_TYPE) { + if ((AppStorage.Get('deviceType') as string) == CommonConstants.DEFAULT_DEVICE_TYPE) { left = (screenWidth - mResidentWidth) / 2; right = screenWidth - left; } @@ -173,8 +173,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}`); @@ -220,7 +220,7 @@ export default class SmartDockViewModel extends BaseViewModel { menuInfoList.push(open); if (appInfo.itemType != CommonConstants.TYPE_FUNCTION) { - this.mDevice = AppStorage.get('deviceType') as string; + this.mDevice = AppStorage.Get('deviceType') as string; if (this.mDevice === CommonConstants.PAD_DEVICE_TYPE && dockType === SmartDockConstants.RESIDENT_DOCK_TYPE) { const addToWorkSpaceMenu = new MenuInfo(); addToWorkSpaceMenu.menuType = CommonConstants.MENU_TYPE_FIXED; @@ -248,7 +248,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; @@ -313,7 +313,7 @@ export default class SmartDockViewModel extends BaseViewModel { return; } item.icon = ResourceManager.getInstance().getCachedAppIcon(item.appIconId, item.bundleName, item.moduleName) - AppStorage.setOrCreate('startAppItemInfo', item); + AppStorage.SetOrCreate('startAppItemInfo', item); this.mSmartDockStartAppHandler.setAppIconSize(this.mSmartDockStyleConfig.mIconSize); this.mSmartDockStartAppHandler.setAppIconInfo(); } diff --git a/hvigor/hvigor-config.json5 b/hvigor/hvigor-config.json5 index 122677b194bc767301ef00a87a4b93c45562fe31..64655e6970c2acdf5708226c4d5a584ca52b6f37 100644 --- a/hvigor/hvigor-config.json5 +++ b/hvigor/hvigor-config.json5 @@ -1,6 +1,6 @@ { - "hvigorVersion": "3.0.9", + "hvigorVersion": "3.2.4", "dependencies": { - "@ohos/hvigor-ohos-plugin": "3.0.9" + "@ohos/hvigor-ohos-plugin": "3.2.4" } } \ No newline at end of file diff --git a/local.properties b/local.properties index 5ce895d24453cb504a8e7aa924b733c9c32cccba..9ebf2559893097831f03dedb17dbe8f9a58f2555 100755 --- a/local.properties +++ b/local.properties @@ -1,25 +1,14 @@ -/* - * Copyright (c) 2021 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -## This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Thu Mar 18 17:01:34 CST 2021 -hwsdk.dir=XXX +# This file is automatically generated by DevEco Studio. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file should *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# For customization when using a Version Control System, please read the header note. native.dir=XXX -nodejs.dir=XXX +sdk.dir=C:/Users/shangyuechao/AppData/Local/OpenHarmony/Sdk +*/= +nodejs.dir=D:/soft/Deveco Studio-node-18.14.1 +*=limitations under the License. +/*= +hwsdk.dir=XXX \ No newline at end of file diff --git a/product/pad/src/main/ets/MainAbility/MainAbility.ts b/product/pad/src/main/ets/MainAbility/MainAbility.ts index 7c18983d62eb7424d659f27c562521813bda1bb2..b7f8facbb69e07b6f05db35aee1bd6572d5e7d7f 100644 --- a/product/pad/src/main/ets/MainAbility/MainAbility.ts +++ b/product/pad/src/main/ets/MainAbility/MainAbility.ts @@ -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() { diff --git a/product/pad/src/main/ets/pages/AppCenterView.ets b/product/pad/src/main/ets/pages/AppCenterView.ets index 56cef6b8efc31f842b40da2348b8e0bb0b4ffdcd..c52a9dc6f0410a23c354f9f575b0f9332b7c3c53 100644 --- a/product/pad/src/main/ets/pages/AppCenterView.ets +++ b/product/pad/src/main/ets/pages/AppCenterView.ets @@ -46,7 +46,7 @@ struct AppCenterView { aboutToAppear(): void { Log.showInfo(TAG, 'aboutToAppear'); - AppStorage.setOrCreate('deviceType', this.device); + AppStorage.SetOrCreate('deviceType', this.device); this.mLayoutViewModel = LayoutViewModel.getInstance(); } @@ -76,7 +76,7 @@ struct AppCenterView { onBackPress(): boolean { Log.showInfo(TAG, `onBackPress`); - AppStorage.setOrCreate('selectDesktopAppItem', ''); + AppStorage.SetOrCreate('selectDesktopAppItem', ''); windowManager.destroyWindow(windowManager.APP_CENTER_WINDOW_NAME); return true; } @@ -115,10 +115,10 @@ struct AppCenterView { .height('100%') .onClick(() => { Log.showInfo(TAG, 'click appcenter area'); - const contextFlag: boolean = AppStorage.get('contextMenuState') as boolean; + const contextFlag: boolean = AppStorage.Get('contextMenuState') as boolean; Log.showInfo(TAG, 'onClick contextFlag: ' + contextFlag); if (contextFlag && !ContextMenu.close()) { - AppStorage.setOrCreate('contextMenuState', false); + AppStorage.SetOrCreate('contextMenuState', false); }else { this.onBackPress(); } diff --git a/product/pad/src/main/ets/pages/EntryView.ets b/product/pad/src/main/ets/pages/EntryView.ets index 76ce788ab31a674b25588e0f2790e5e10426103a..bee84e95d59a7d6a12eb97c456918456c803aa09 100644 --- a/product/pad/src/main/ets/pages/EntryView.ets +++ b/product/pad/src/main/ets/pages/EntryView.ets @@ -61,18 +61,18 @@ struct EntryView { async onPortrait(mediaQueryResult: mediaquery.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); } let dis: display.Display | null = null; try { dis = display.getDefaultDisplaySync(); 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')}`); } catch (err) { Log.showError(TAG, `display.getDefaultDisplaySync err: ${JSON.stringify(err)}`) } @@ -162,8 +162,8 @@ struct EntryView { try { this.screenWidth = px2vp(windowManager.getWindowWidth()); this.screenHeight = px2vp(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}`); } @@ -173,9 +173,9 @@ struct EntryView { this.workSpaceWidth = this.screenWidth; this.workSpaceHeight = LayoutViewModel.getInstance().getWorkSpaceHeight() as number; this.dockHeight = LayoutViewModel.getInstance().getDockHeight() as number; - 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}`); } @@ -187,16 +187,16 @@ struct EntryView { onBackPress(): boolean { Log.showInfo(TAG, 'onBackPress'); ContextMenu.close(); - AppStorage.setOrCreate('overlayMode', CommonConstants.OVERLAY_TYPE_HIDE); - AppStorage.setOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE); - AppStorage.setOrCreate('selectDesktopAppItem', ''); + 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') as number; - AppStorage.setOrCreate('sysUiRecentOnClickEvent', ++num); + let num: number = AppStorage.Get('sysUiRecentOnClickEvent') as number; + AppStorage.SetOrCreate('sysUiRecentOnClickEvent', ++num); } private buildLog(): boolean { diff --git a/product/pad/src/main/ets/pages/RecentView.ets b/product/pad/src/main/ets/pages/RecentView.ets index e44e658db252c8a4256468094dfe115a2e096e4d..227df4215dcc13944329929c2ed965a4f0a02d33 100644 --- a/product/pad/src/main/ets/pages/RecentView.ets +++ b/product/pad/src/main/ets/pages/RecentView.ets @@ -59,11 +59,11 @@ struct RecentView { } private closeRecentDockPopup(): void { - let num: number = AppStorage.get('sysUiRecentOnClickEvent') as number; + let num: number = AppStorage.Get('sysUiRecentOnClickEvent') as number; if (!num) { num = 0; } - AppStorage.setOrCreate('sysUiRecentOnClickEvent', ++num); + AppStorage.SetOrCreate('sysUiRecentOnClickEvent', ++num); Log.showDebug(TAG, `closeRecentDockPopup sysUiRecentOnClickEvent closeRecentDockPopup num: ${num}`); } diff --git a/product/phone/src/main/ets/MainAbility/MainAbility.ts b/product/phone/src/main/ets/MainAbility/MainAbility.ts index f96c45843e05587c2b5a7b1b7b10b4463801efac..d72088469e8f67a171c9677d910a134e2a2aa413 100644 --- a/product/phone/src/main/ets/MainAbility/MainAbility.ts +++ b/product/phone/src/main/ets/MainAbility/MainAbility.ts @@ -174,11 +174,11 @@ export default class MainAbility extends ServiceExtension { onConfigurationUpdate(config): void { 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(): void { diff --git a/product/phone/src/main/ets/common/constants/PhonePresetStyleConstants.ts b/product/phone/src/main/ets/common/constants/PhonePresetStyleConstants.ts index 16caa17a927ce6d2f476ef543703a73230dae2a3..3a36cddebf4ff37e7acf496abfc1eb4d698fe67e 100644 --- a/product/phone/src/main/ets/common/constants/PhonePresetStyleConstants.ts +++ b/product/phone/src/main/ets/common/constants/PhonePresetStyleConstants.ts @@ -35,7 +35,7 @@ export default class PhonePresetStyleConstants { /** * desktop item size */ - static readonly DEFAULT_APP_LAYOUT_SIZE = 80; + static readonly DEFAULT_APP_LAYOUT_SIZE = 90; /** * desktop container margin @@ -61,7 +61,7 @@ export default class PhonePresetStyleConstants { /** * desktop item name size */ - static readonly DEFAULT_APP_NAME_TEXT_SIZE = 12; + static readonly DEFAULT_APP_NAME_TEXT_SIZE = 16; /** * desktop item icon and name gap @@ -186,7 +186,7 @@ export default class PhonePresetStyleConstants { /** * icon size of dock */ - static readonly DEFAULT_DOCK_ICON_SIZE = 54; + static readonly DEFAULT_DOCK_ICON_SIZE = 65; /** * padding of dock diff --git a/product/phone/src/main/ets/pages/EntryView.ets b/product/phone/src/main/ets/pages/EntryView.ets index 8729f8169f8b1d3f6feabf9b3bf9054a28e4189b..d47885aa0c4aae32c1834d2ea1e3d5eb8b9f7300 100644 --- a/product/phone/src/main/ets/pages/EntryView.ets +++ b/product/phone/src/main/ets/pages/EntryView.ets @@ -118,8 +118,8 @@ struct EntryView { onBackPress(): boolean { Log.showInfo(TAG, 'onBackPress'); ContextMenu.close(); - AppStorage.setOrCreate('overlayMode', CommonConstants.OVERLAY_TYPE_HIDE); - AppStorage.setOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE); + AppStorage.SetOrCreate('overlayMode', CommonConstants.OVERLAY_TYPE_HIDE); + AppStorage.SetOrCreate('openFolderStatus', BigFolderConstants.OPEN_FOLDER_STATUS_CLOSE); return true; } @@ -139,8 +139,8 @@ struct EntryView { try { this.screenWidth = px2vp(windowManager.getWindowWidth()); this.screenHeight = px2vp(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}`); } @@ -150,9 +150,9 @@ struct EntryView { this.workSpaceWidth = this.screenWidth; this.workSpaceHeight = LayoutViewModel.getInstance().getWorkSpaceHeight() as number; this.dockHeight = LayoutViewModel.getInstance().getDockHeight() as number; - 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}`); } diff --git a/product/phone/src/main/ets/pages/RecentView.ets b/product/phone/src/main/ets/pages/RecentView.ets index ce5c6f668b382f4269bd176d2e225949752c7eb6..c090f85323f1e61266209a3759e6a79cf7bc735b 100644 --- a/product/phone/src/main/ets/pages/RecentView.ets +++ b/product/phone/src/main/ets/pages/RecentView.ets @@ -42,7 +42,7 @@ struct RecentView { this.mRecentMissionsViewModel = RecentMissionsViewModel.getInstance(); this.mRecentMissionsRowType = this.mRecentMissionsViewModel.getRecentMissionsRowType(); this.mRecentMissionsViewModel.getRecentMissionsList(); - AppStorage.setOrCreate('recentIdx', 0); + AppStorage.SetOrCreate('recentIdx', 0); this.recentLoadedCompleted = true; }