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

!187 优化卸载问题

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

6
product/phone/src/main/ets/MainAbility/controller/application/ApplicationInfoController.ts
View File

@ -29,9 +29,9 @@ export default class ApplicationInfoController extends BaseSettingsController {
*/
uninstall(bundleName: string) {
LogUtil.info(ConfigData.TAG + "start uninstall in controller");
AppManagementModel.uninstall(bundleName, (data) => {
LogUtil.info(ConfigData.TAG + 'uninstall in controller' + ' bundleName: ' + bundleName +
' data: ' + JSON.stringify(data));
AppManagementModel.uninstall(bundleName, (err, data) => {
LogUtil.info(ConfigData.TAG + 'uninstall in controller' + ' bundleName: ' + bundleName
+' err: ' + JSON.stringify(err) +' data: ' + JSON.stringify(data));
});
LogUtil.info(ConfigData.TAG + "end uninstall in controller");
}

21
product/phone/src/main/ets/MainAbility/model/appManagementImpl/AppManagementModel.ts
View File

@ -16,7 +16,8 @@ import BaseModel from '../../../../../../../../common/utils/src/main/ets/default
import LogUtil from '../../../../../../../../common/utils/src/main/ets/default/baseUtil/LogUtil';
import Bundle from '@ohos.bundle';
import ResMgr from '@ohos.resourceManager';
import appManager from '@ohos.application.appManager'
import appManager from '@ohos.application.appManager';
import osAccount from '@ohos.account.osAccount';
import ConfigData from '../../../../../../../../common/utils/src/main/ets/default/baseUtil/ConfigData';
import {LogAll} from '../../../../../../../../common/utils/src/main/ets/default/baseUtil/LogDecorator';
@ -39,6 +40,7 @@ export class AppManagementModel extends BaseModel {
*/
setAppManagementListener() {
LogUtil.info('settings AppManagementModel getIconItem ResMgr:' + JSON.stringify(ResMgr));
this.mBundleInfoList = [];
Bundle.getAllBundleInfo(IS_INCLUDE_ABILITY_INFO)
.then((data) => {
LogUtil.info('settings AppManagementModel setAppManagementListener getBundleInfos() start ');
@ -148,7 +150,7 @@ export class AppManagementModel extends BaseModel {
AppStorage.SetOrCreate('appManagementList', this.distinct(AppStorage.Get('appManagementList')));
});
} catch (error) {
LogUtil.info('settings AppManagementModel catch error:' + error);
LogUtil.error('settings AppManagementModel catch error:' + error);
}
LogUtil.info('settings appManagement AppManagementModel getIconItem end');
}
@ -188,11 +190,22 @@ export class AppManagementModel extends BaseModel {
* Uninstall an application.
* @param bundleName bundle name
*/
async uninstall(bundleName: string, callback) {
async uninstall(bundleName: string, callback) {
LogUtil.info(ConfigData.TAG + "start uninstall in model");
const bundlerInstaller = await Bundle.getBundleInstaller();
const accountManager = await osAccount.getAccountManager();
const mUserID = await accountManager.getOsAccountLocalIdFromProcess();
LogUtil.info(ConfigData.TAG + "get bundlerInstaller : " + typeof bundlerInstaller);
bundlerInstaller.uninstall(bundleName, { userId: 0, installFlag: 0, isKeepData: false }, (result) => { callback(result); });
bundlerInstaller.uninstall(bundleName,
{
userId: mUserID,
installFlag: 0,
isKeepData: false
}, (err, result) => {
AppStorage.SetOrCreate('appManagementList', []);
this.setAppManagementListener();
callback(err, result);
});
LogUtil.info(ConfigData.TAG + "end uninstall in model");
}