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

!568 修复切换用户+开机出现jscash

Browse Source 
Merge pull request !568 from zhengyongjie/master
This commit is contained in:
openharmony_ci 2024-09-07 08:27:47 +00:00 committed by Gitee
commit 73fc1a163b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/ets/default/layoutconfig/LayoutConfigManager.ts
View File

@ -138,9 +138,11 @@ class LayoutConfigManager {
private getTargetTypeConfigs(configType: number) {
let configArr = new Array<ILayoutConfig>();
configArr = configArr.concat(this.mProductConfig[configType]);
configArr = configArr.concat(this.mFeatureConfig[configType]);
configArr = configArr.concat(this.mCommonConfig[configType]);
if (this.mProductConfig[configType] && this.mFeatureConfig[configType] && this.mCommonConfig[configType]) {
configArr = configArr.concat(this.mProductConfig[configType]);
configArr = configArr.concat(this.mFeatureConfig[configType]);
configArr = configArr.concat(this.mCommonConfig[configType]);
}
return configArr;
}
}

28
product/pad/src/main/ets/MainAbility/MainAbility.ts
View File

@ -87,13 +87,14 @@ export default class MainAbility extends ServiceExtension {
}
private registerInputConsumer(): void {
// register/unregister HOME inputConsumer
inputConsumer.on('key', {
let onKeyCodeHome = {
preKeys: [],
finalKey: KeyCode.KEYCODE_HOME,
finalKeyDownDuration: 0,
isFinalKeyDown: true
}, () => {
}
// register/unregister HOME inputConsumer
inputConsumer.on('key', onKeyCodeHome, () => {
Log.showInfo(TAG, 'HOME inputConsumer homeEvent start');
globalThis.desktopContext.startAbility({
bundleName: CommonConstants.LAUNCHER_BUNDLE,
@ -106,33 +107,36 @@ export default class MainAbility extends ServiceExtension {
Log.showDebug(TAG, 'HOME inputConsumer startAbility Promise in service failed.');
});
});
// register/unregister RECENT inputConsumer
inputConsumer.on('key', {
let onKeyCodeFunction = {
preKeys: [],
finalKey: KeyCode.KEYCODE_FUNCTION,
finalKeyDownDuration: 0,
isFinalKeyDown: true
}, () => {
}
// register/unregister RECENT inputConsumer
inputConsumer.on('key', onKeyCodeFunction, () => {
Log.showInfo(TAG, 'RECENT inputConsumer recentEvent start');
windowManager.createWindowWithName(windowManager.RECENT_WINDOW_NAME, windowManager.RECENT_RANK);
});
}
private unregisterInputConsumer(): void {
// unregister HOME inputConsumer
inputConsumer.off('key', {
let offKeyCodeHome = {
preKeys: [],
finalKey: KeyCode.KEYCODE_HOME,
finalKeyDownDuration: 0,
isFinalKeyDown: true
});
// unregister RECENT inputConsumer
inputConsumer.off('key', {
}
// unregister HOME inputConsumer
inputConsumer.off('key', offKeyCodeHome);
let offKeyCodeFunction = {
preKeys: [],
finalKey: KeyCode.KEYCODE_FUNCTION,
finalKeyDownDuration: 0,
isFinalKeyDown: true
});
}
// unregister RECENT inputConsumer
inputConsumer.off('key', offKeyCodeFunction);
}
private initGlobalConst(): void {

28
product/phone/src/main/ets/MainAbility/MainAbility.ts
View File

@ -89,13 +89,14 @@ export default class MainAbility extends ServiceExtension {
}
private registerInputConsumer(): void {
// register/unregister HOME inputConsumer
inputConsumer.on('key', {
let onKeyCodeHome = {
preKeys: [],
finalKey: KeyCode.KEYCODE_HOME,
finalKeyDownDuration: 0,
isFinalKeyDown: true
}, () => {
}
// register/unregister HOME inputConsumer
inputConsumer.on('key', onKeyCodeHome, () => {
Log.showInfo(TAG, 'HOME inputConsumer homeEvent start');
globalThis.desktopContext.startAbility({
bundleName: CommonConstants.LAUNCHER_BUNDLE,
@ -108,33 +109,36 @@ export default class MainAbility extends ServiceExtension {
Log.showDebug(TAG, 'HOME inputConsumer startAbility Promise in service failed.');
});
});
// register/unregister RECENT inputConsumer
inputConsumer.on('key', {
let onKeyCodeFunction = {
preKeys: [],
finalKey: KeyCode.KEYCODE_FUNCTION,
finalKeyDownDuration: 0,
isFinalKeyDown: true
}, () => {
}
// register/unregister RECENT inputConsumer
inputConsumer.on('key', onKeyCodeFunction, () => {
Log.showInfo(TAG, 'RECENT inputConsumer recentEvent start');
windowManager.createWindowWithName(windowManager.RECENT_WINDOW_NAME, windowManager.RECENT_RANK);
});
}
private unregisterInputConsumer(): void {
// unregister HOME inputConsumer
inputConsumer.off('key', {
let offKeyCodeHome = {
preKeys: [],
finalKey: KeyCode.KEYCODE_HOME,
finalKeyDownDuration: 0,
isFinalKeyDown: true
});
// unregister RECENT inputConsumer
inputConsumer.off('key', {
}
// unregister HOME inputConsumer
inputConsumer.off('key', offKeyCodeHome);
let offKeyCodeFunction = {
preKeys: [],
finalKey: KeyCode.KEYCODE_FUNCTION,
finalKeyDownDuration: 0,
isFinalKeyDown: true
});
}
// unregister RECENT inputConsumer
inputConsumer.off('key', offKeyCodeFunction);
}
private initGlobalConst(): void {