openharmony/applications_settings
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_settings synced 2024-11-27 08:30:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!185 js crash 问题

Browse Source 
Merge pull request !185 from weiyunxing/master
This commit is contained in:
openharmony_ci 2022-06-07 09:37:39 +00:00 committed by Gitee
commit 9b4abb8091
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
product/phone/src/main/ets/MainAbility/model/usersAndAccounts/SystemAccountController.ts
View File

@ -18,12 +18,20 @@ import account_osAccount from '@ohos.account.osAccount';
import featureAbility from '@ohos.ability.featureAbility';
import LogUtil from '../../../../../../../../common/utils/src/main/ets/default/baseUtil/LogUtil';
import GlobalResourceManager from '../../../../../../../../common/utils/src/main/ets/default/baseUtil/GlobalResourceManager';
import {TYPE_ADMIN, TYPE_NORMAL, TYPE_GUEST, MAX_ACCOUNT} from './systemAccountModel'
import SystemAccountModel from './systemAccountModel'
import {TYPE_ADMIN, TYPE_NORMAL, TYPE_GUEST, MAX_ACCOUNT} from './systemAccountModel';
import SystemAccountModel from './systemAccountModel';
export class SystemAccountController {
private currentAccount: account_osAccount.OsAccountInfo;
private accountList: account_osAccount.OsAccountInfo[] = [];
private static instance: SystemAccountController;
public static getInstance(): SystemAccountController {
if (!SystemAccountController.instance) {
SystemAccountController.instance = new SystemAccountController();
}
return SystemAccountController.instance;
}
constructor() {
}
@ -233,5 +241,5 @@ export class SystemAccountController {
}
}
let systemAccountController = new SystemAccountController();
let systemAccountController = SystemAccountController.getInstance();
export default systemAccountController as SystemAccountController;

1
product/phone/src/main/ets/MainAbility/pages/aboutDevice.ets
View File

@ -157,7 +157,6 @@ struct Index {
onBackPress() {
LogUtil.info(ConfigData.TAG + 'settings get device onBackPress in');
Navigator().active(true);
LogUtil.info(ConfigData.TAG + 'settings get device onBackPress out');
}

2
product/phone/src/main/ets/MainAbility/pages/multipleUsers.ets
View File

@ -239,7 +239,7 @@ struct MultipleUsers {
LogUtil.info("Cancel dialog.")
}
})
})).bind(this);
}));
}
aboutToAppear(): void {
if (deviceTypeInfo === 'phone') {