diff --git a/permissionmanager/src/main/ets/GlobalExtAbility/GlobalExtAbility.ts b/permissionmanager/src/main/ets/GlobalExtAbility/GlobalExtAbility.ts index 07b7b6203d8a584a5626b66c083967b7c2adabfb..c134fb06bf8968908c19576880002f3666bf2807 100644 --- a/permissionmanager/src/main/ets/GlobalExtAbility/GlobalExtAbility.ts +++ b/permissionmanager/src/main/ets/GlobalExtAbility/GlobalExtAbility.ts @@ -31,7 +31,8 @@ export default class GlobalExtensionAbility extends extension { globalThis.globalState = want.parameters['ohos.sensitive.resource'] console.info(TAG + "want: " + JSON.stringify(want)) - display.getDefaultDisplay().then(dis => { + try { + let dis = display.getDefaultDisplaySync(); let navigationBarRect = { left: 0, top: 0, @@ -39,7 +40,9 @@ export default class GlobalExtensionAbility extends extension { height: dis.height } this.createWindow("globalDialog", window.WindowType.TYPE_KEYGUARD, navigationBarRect) - }) + } catch (exception) { + console.error(TAG + 'Failed to obtain the default display object. Code: ' + JSON.stringify(exception)); + }; } /** @@ -60,13 +63,13 @@ export default class GlobalExtensionAbility extends extension { private async createWindow(name: string, windowType: number, rect) { console.info(TAG + "create window") try { - const win = await window.create(globalThis.globalContext, name, windowType) + const win = await window.createWindow({ ctx: globalThis.globalContext, name, windowType }) globalThis.globalWin = win - await win.moveTo(rect.left, rect.top) - await win.resetSize(rect.width, rect.height) - await win.loadContent('pages/globalSwitch') - await win.setBackgroundColor(BG_COLOR) - await win.show() + await win.moveWindowTo(rect.left, rect.top) + await win.resize(rect.width, rect.height) + await win.setUIContent('pages/globalSwitch') + await win.setWindowBackgroundColor(BG_COLOR) + await win.showWindow() } catch { console.info(TAG + "window create failed!") } diff --git a/permissionmanager/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/permissionmanager/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index 2c873542275861b2ed30ecf3cea45b8d72a2fb1d..9e146015a45f91ed8a8f4dab749eff6c144f21f1 100644 --- a/permissionmanager/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/permissionmanager/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -39,7 +39,8 @@ export default class ServiceExtensionAbility extends extension { console.info(TAG + "ServiceExtensionAbility onRequest. start id is " + startId); console.info(TAG + "want: " + JSON.stringify(want)) - display.getDefaultDisplay().then(dis => { + try { + let dis = display.getDefaultDisplaySync(); let navigationBarRect = { left: 0, top: 0, @@ -47,7 +48,9 @@ export default class ServiceExtensionAbility extends extension { height: dis.height } this.createWindow("permissionDialog" + startId, window.WindowType.TYPE_DIALOG, navigationBarRect) - }) + } catch (exception) { + console.error(TAG + 'Failed to obtain the default display object. Code: ' + JSON.stringify(exception)); + }; } /** @@ -60,18 +63,18 @@ export default class ServiceExtensionAbility extends extension { private async createWindow(name: string, windowType: number, rect) { console.info(TAG + "create window") try { - const win = await window.create(globalThis.extensionContext, name, windowType) + const win = await window.createWindow({ ctx: globalThis.extensionContext, name, windowType }) globalThis.extensionWin = win await win.bindDialogTarget(globalThis.abilityWant.parameters['ohos.ability.params.token'].value, () => { - win.destroy() + win.destroyWindow() globalThis.windowNum -- if(globalThis.windowNum == 0) this.context.terminateSelf() }) - await win.moveTo(rect.left, rect.top) - await win.resetSize(rect.width, rect.height) - await win.loadContent('pages/dialogPlus') - await win.setBackgroundColor(BG_COLOR) - await win.show() + await win.moveWindowTo(rect.left, rect.top) + await win.resize(rect.width, rect.height) + await win.setUIContent('pages/dialogPlus') + await win.setWindowBackgroundColor(BG_COLOR) + await win.showWindow() globalThis.windowNum ++ } catch { console.info(TAG + "window create failed!") diff --git a/permissionmanager/src/main/ets/common/components/alphabeticalIndex.ets b/permissionmanager/src/main/ets/common/components/alphabeticalIndex.ets index a8270d1ee12efdd89d161aa4d2e22996c56c815d..f6108cd440918c8bcfe17ab8acf001a4c346f9e6 100644 --- a/permissionmanager/src/main/ets/common/components/alphabeticalIndex.ets +++ b/permissionmanager/src/main/ets/common/components/alphabeticalIndex.ets @@ -61,7 +61,7 @@ export struct alphabetIndexerComponent { .popupFont({ size: Constants.ALPHABETINDEXER_POPUPFONT_SIZE, weight: FontWeight.Bolder }) // Demo of the popup .itemSize(Constants.ALPHABETINDEXER_ITEMSIZE) // size square of each item .alignStyle(IndexerAlign.Left) // Align left - .onSelected((index: number) => { + .onSelect((index: number) => { this.index = index; if (this.value[index] === '#' || this.value[index] === '☆') { this.applicationItem = this.oldApplicationItem; diff --git a/permissionmanager/src/main/ets/common/components/backBar.ets b/permissionmanager/src/main/ets/common/components/backBar.ets index 4520c800e9fafee218f45a52c05c671d7afe34b8..01367416370b42a56725f3be7b74f8dff2b1aa0f 100644 --- a/permissionmanager/src/main/ets/common/components/backBar.ets +++ b/permissionmanager/src/main/ets/common/components/backBar.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import router from '@system.router'; +import router from '@ohos.router'; import Constants from '../utils/constant'; @Component @@ -55,7 +55,7 @@ export struct backBar { { value: this.record, action: () => { - router.push({ uri: 'pages/permission-access-record' }) + router.pushUrl({ url: 'pages/permission-access-record' }) } } ]) diff --git a/permissionmanager/src/main/ets/common/components/dialog.ets b/permissionmanager/src/main/ets/common/components/dialog.ets index 7491db0d6354f0560d4d26507a78e831edc49e26..4115af952732d4df1c9720d67acd37814902f186 100644 --- a/permissionmanager/src/main/ets/common/components/dialog.ets +++ b/permissionmanager/src/main/ets/common/components/dialog.ets @@ -107,9 +107,13 @@ export struct globalDialog { }) }else { var audioManager = audio.getAudioManager(); - audioManager.setMicrophoneMute(true).then(() => { - this.globalIsOn = false - this.controller.close() + let audioVolumeManager = audioManager.getVolumeManager(); + let groupid = audio.DEFAULT_VOLUME_GROUP_ID; + audioVolumeManager.getVolumeGroupManager(groupid).then(audioVolumeGroupManager => { + audioVolumeGroupManager.setMicrophoneMute(true).then(() => { + this.globalIsOn = false + this.controller.close() + }) }) } } diff --git a/permissionmanager/src/main/ets/common/components/search.ets b/permissionmanager/src/main/ets/common/components/search.ets index 0fffe805a0ba042c4646284787d43cf1e6c39dfc..fd0156d51514af9439bc2be25b34b89c1a4f168d 100644 --- a/permissionmanager/src/main/ets/common/components/search.ets +++ b/permissionmanager/src/main/ets/common/components/search.ets @@ -48,10 +48,6 @@ export struct textInput { this.searchResult = false; } }) - .onSubmit((enterKey) => { - }) - .onEditChanged((isEditing) => { - }) Image($r('app.media.ic_public_search_filled')) .objectFit(ImageFit.Contain) .width(Constants.TEXTINPUT_IMAGE_WIDTH) diff --git a/permissionmanager/src/main/ets/common/utils/utils.ets b/permissionmanager/src/main/ets/common/utils/utils.ets index 69cde31bbc6edb6d44333c60624161d393297b0a..0e939777b50f744b1eede9d61466d2bf3da9f42e 100644 --- a/permissionmanager/src/main/ets/common/utils/utils.ets +++ b/permissionmanager/src/main/ets/common/utils/utils.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -import Resmgr from '@ohos.resourceManager'; import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; import { permissionGroups, groups } from "../model/permissionGroup"; diff --git a/permissionmanager/src/main/ets/pages/application-secondary.ets b/permissionmanager/src/main/ets/pages/application-secondary.ets index 447dafbbda44717e1b9b01f94de882acc19d0222..48940094edad65daa1c0423c0ce5a1233ecd5eb5 100644 --- a/permissionmanager/src/main/ets/pages/application-secondary.ets +++ b/permissionmanager/src/main/ets/pages/application-secondary.ets @@ -14,7 +14,7 @@ */ import { backBar } from "../common/components/backBar"; -import router from '@system.router'; +import router from '@ohos.router'; import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; import { groups } from "../common/model/permissionGroup"; import Constants from '../common/utils/constant'; @@ -40,7 +40,7 @@ class permissionObj { struct appNamePlusPage { @State allowedListItem: permissionObj[] = []; // Array of allowed permissions @State bannedListItem: permissionObj[] = []; // array of forbidden permissions - private routerData: any = router.getParams().routerData; // Routing jump data + private routerData: any = router.getParams()['routerData']; // Routing jump data @Builder ListItemLayout(item, index, status) { ListItem() { @@ -73,8 +73,8 @@ struct appNamePlusPage { globalThis.currentPermissionGroup = item.group if (status === 'allow') { if (item.group == "OTHER") { - router.push({ - uri: 'pages/other-permissions', + router.pushUrl({ + url: 'pages/other-permissions', params: { routerData: this.routerData.bundleName, backTitle: item.groupName, @@ -84,8 +84,8 @@ struct appNamePlusPage { } }); } else { - router.push({ - uri: 'pages/application-tertiary', + router.pushUrl({ + url: 'pages/application-tertiary', params: { routerData: this.routerData.bundleName, backTitle: item.groupName, @@ -97,8 +97,8 @@ struct appNamePlusPage { } else if (status === 'banned') { if (item.group == "OTHER") { - router.push({ - uri: 'pages/other-permissions', + router.pushUrl({ + url: 'pages/other-permissions', params: { routerData: this.routerData.bundleName, backTitle: item.groupName, @@ -108,8 +108,8 @@ struct appNamePlusPage { } }); } else { - router.push({ - uri: 'pages/application-tertiary', + router.pushUrl({ + url: 'pages/application-tertiary', params: { routerData: this.routerData.bundleName, backTitle: item.groupName, diff --git a/permissionmanager/src/main/ets/pages/application-tertiary.ets b/permissionmanager/src/main/ets/pages/application-tertiary.ets index ebcd1cb47a2d0a764e807a47f5e98def7d07243c..be6d89e554220f90fed3186fcaf29e8ea769a8b4 100644 --- a/permissionmanager/src/main/ets/pages/application-tertiary.ets +++ b/permissionmanager/src/main/ets/pages/application-tertiary.ets @@ -14,21 +14,21 @@ */ import { backBar } from "../common/components/backBar"; -import router from '@system.router'; +import router from '@ohos.router'; import bundle from "@ohos.bundle"; import bundleManager from '@ohos.bundle.bundleManager'; import { getAppLabel, getAppIcon } from "../common/utils/utils"; import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; import { authorizeDialog } from "../common/components/dialog"; -import { permissionGroups, showSubpermissionsGrop, polymorphismGroup } from "../common/model/permissionGroup"; +import { showSubpermissionsGrop } from "../common/model/permissionGroup"; import Constants from '../common/utils/constant'; var TAG = 'PermissionManager_MainAbility:' -let routerData: any = router.getParams().routerData; // Routing jump data -let backTitle: any = router.getParams().backTitle; // return title name -let status = router.getParams().status; // Status: Allowed, Forbidden -let permissions: any = router.getParams().permission; // permissions name +let routerData: any = router.getParams()['routerData']; // Routing jump data +let backTitle: any = router.getParams()['backTitle']; // return title name +let status = router.getParams()['status']; // Status: Allowed, Forbidden +let permissions: any = router.getParams()['permission']; // permissions name let nowGrantResult = Constants.PERMISSION_NUM; // Authorization results now let nowRevokeResult = Constants.PERMISSION_NUM; // Now deauthorize results let GrantResultFlag = []; // Authorization result Flag @@ -145,7 +145,7 @@ struct mediaDocumentItem { */ grantUserGrantedPermission(accessTokenId, permission) { abilityAccessCtrl.createAtManager().grantUserGrantedPermission( - accessTokenId, permission, Constants.PERMISSION_FLAG).then((result) => { + accessTokenId, permission, Constants.PERMISSION_FLAG).then(() => { nowGrantResult = Constants.PERMISSION_INDEX; }) .catch((error) => { @@ -160,7 +160,7 @@ struct mediaDocumentItem { */ revokeUserGrantedPermission(accessTokenId, permission) { abilityAccessCtrl.createAtManager().revokeUserGrantedPermission( - accessTokenId, permission, Constants.PERMISSION_FLAG).then((result) => { + accessTokenId, permission, Constants.PERMISSION_FLAG).then(() => { nowRevokeResult = Constants.PERMISSION_INDEX; }) .catch((error) => { @@ -439,7 +439,7 @@ struct mediaDocumentItem { var acManager = abilityAccessCtrl.createAtManager() if (isOn) { acManager.grantUserGrantedPermission(bundleInfo.appInfo.accessTokenId, PRECISE_LOCATION_PERMISSION, Constants.PERMISSION_FLAG) - .then((res) => { this.accurateIsOn = true }) + .then(() => { this.accurateIsOn = true }) } else { acManager.revokeUserGrantedPermission(bundleInfo.appInfo.accessTokenId, PRECISE_LOCATION_PERMISSION, Constants.PERMISSION_FLAG) .then(() => { this.accurateIsOn = false }) diff --git a/permissionmanager/src/main/ets/pages/authority-management.ets b/permissionmanager/src/main/ets/pages/authority-management.ets index 3e9f8add6aa32fb2a2416b20cc6ffc2d09262376..95724a1dc64bcd782f0327baa31b82a13237b7cc 100644 --- a/permissionmanager/src/main/ets/pages/authority-management.ets +++ b/permissionmanager/src/main/ets/pages/authority-management.ets @@ -16,7 +16,7 @@ import { backBar } from "../common/components/backBar"; import { alphabetIndexerComponent } from "../common/components/alphabeticalIndex"; import { textInput } from "../common/components/search"; -import router from '@system.router'; +import router from '@ohos.router'; import bundle from "@ohos.bundle"; import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; import audio from '@ohos.multimedia.audio' @@ -98,8 +98,8 @@ struct authorityManagementPage { } }.onClick(() => { if (item.group === 'OTHER' || showSubpermissionsGrop.indexOf(item.group) !== -1) { - router.push({ - uri: 'pages/authority-secondary', + router.pushUrl({ + url: 'pages/authority-secondary', params: { routerData: this.allPermissionApplications, backTitle: item.groupName, group: item.group } }) } else { @@ -109,24 +109,24 @@ struct authorityManagementPage { globalThis.currentPermissionGroup = item.group if(globalGroup.indexOf(item.group) == -1) { - router.push({ - uri: 'pages/authority-tertiary-groups', + router.pushUrl({ + url: 'pages/authority-tertiary-groups', params: { routerData: dataList, backTitle: item.groupName } }) }else { if(item.group == 'MICROPHONE') { var audioManager = audio.getAudioManager(); audioManager.isMicrophoneMute().then(value => { - router.push({ - uri: 'pages/authority-tertiary-groups', + router.pushUrl({ + url: 'pages/authority-tertiary-groups', params: { routerData: dataList, backTitle: item.groupName, globalIsOn: !value } }) }) }else { camera.getCameraManager(globalThis.context).then(cameraManager => { let mute = cameraManager.isCameraMuted() - router.push({ - uri: 'pages/authority-tertiary-groups', + router.pushUrl({ + url: 'pages/authority-tertiary-groups', params: { routerData: dataList, backTitle: item.groupName, globalIsOn: !mute } }) }) @@ -625,8 +625,8 @@ struct applicationItem { } } }.onClick(() => { - router.push({ - uri: 'pages/application-secondary', + router.pushUrl({ + url: 'pages/application-secondary', params: { routerData: item } }); }) diff --git a/permissionmanager/src/main/ets/pages/authority-secondary.ets b/permissionmanager/src/main/ets/pages/authority-secondary.ets index e828f3c25a324481b2ae4ec3cd5c8f380131c542..3c7c9bdea98ae45a71dd033ceb8188879fbdaabf 100644 --- a/permissionmanager/src/main/ets/pages/authority-secondary.ets +++ b/permissionmanager/src/main/ets/pages/authority-secondary.ets @@ -15,7 +15,7 @@ import { backBar } from "../common/components/backBar"; import { permissionGroups, groups } from "../common/model/permissionGroup"; -import router from '@system.router'; +import router from '@ohos.router'; import Constants from '../common/utils/constant'; @@ -35,7 +35,7 @@ class CalendarObj { @Entry @Component struct appNamePage { - private backTitle = router.getParams().backTitle; // return title name + private backTitle = router.getParams()['backTitle']; // return title name build() { GridContainer({ gutter: Constants.GUTTER, margin: Constants.GRID_MARGIN }) { @@ -88,9 +88,8 @@ struct appNamePage { @Component struct appNameItem { @State calendarListItem: CalendarObj[] = []; // Permission management secondary interface data array - private routerData: any = router.getParams().routerData; // Routing jump data - private backTitle = router.getParams().backTitle; // return title name - private group = router.getParams().group; + private routerData: any = router.getParams()['routerData']; // Routing jump data + private group = router.getParams()['group']; @Builder ListItemLayout(item, index) { ListItem() { @@ -123,8 +122,8 @@ struct appNameItem { var dataList = this.routerData.filter((ele) => { return ele.groupName === item.groupName; }) - router.push({ - uri: 'pages/authority-tertiary', + router.pushUrl({ + url: 'pages/authority-tertiary', params: { routerData: dataList[item.index] ? [dataList[item.index]] : [], backTitle: item.label } }); }) diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets index 7650f1d2186a14cdf39b362295d78f28e04b9e0f..d674dad47e445b3c51ed78012b5fd84877975261 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets @@ -16,7 +16,7 @@ import { backBar } from "../common/components/backBar"; import { alphabetIndexerComponent } from "../common/components/alphabeticalIndex"; import { textInput } from "../common/components/search"; -import router from '@system.router'; +import router from '@ohos.router'; import bundle from "@ohos.bundle"; import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; import audio from '@ohos.multimedia.audio' @@ -35,11 +35,11 @@ var TAG = 'PermissionManager_MainAbility:' .height(height) } -let routerData: any = router.getParams().routerData; // Routing jump data -let backTitle = router.getParams().backTitle; // return title name +let routerData: any = router.getParams()['routerData']; // Routing jump data +let backTitle = router.getParams()['backTitle']; // return title name const FUZZY_LOCATION_PERMISSION = 'ohos.permission.APPROXIMATELY_LOCATION' const PRECISE_LOCATION_PERMISSION = 'ohos.permission.LOCATION' -let globalIsOn: any = router.getParams().globalIsOn; // return title name +let globalIsOn: any = router.getParams()['globalIsOn']; // return title name class ApplicationObj { labelId: string @@ -282,8 +282,8 @@ struct applicationItem { routerData.forEach(item => { permissions.push(item.permission) }) - router.push({ - uri: 'pages/application-tertiary', + router.pushUrl({ + url: 'pages/application-tertiary', params: { routerData: this.bundleNameGroup[item.index], backTitle, @@ -463,8 +463,12 @@ struct applicationItem { }) }else { var audioManager = audio.getAudioManager(); - audioManager.setMicrophoneMute(false).then(() => { - this.globalIsOn = isOn + let audioVolumeManager = audioManager.getVolumeManager(); + let groupid = audio.DEFAULT_VOLUME_GROUP_ID; + audioVolumeManager.getVolumeGroupManager(groupid).then(audioVolumeGroupManager => { + audioVolumeGroupManager.setMicrophoneMute(false).then(() => { + this.globalIsOn = isOn + }) }) } } diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary.ets b/permissionmanager/src/main/ets/pages/authority-tertiary.ets index e3543c2fa8a6b27969e7b28de11bc81adceac61f..bf7b767775d88478b0848808fa4d7f6617198ec7 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary.ets @@ -16,7 +16,7 @@ import { backBar } from "../common/components/backBar"; import { alphabetIndexerComponent } from "../common/components/alphabeticalIndex"; import { textInput } from "../common/components/search"; -import router from '@system.router'; +import router from '@ohos.router'; import bundle from "@ohos.bundle"; import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; import { getAppLabel, getAppIcon, verifyAccessToken } from "../common/utils/utils"; @@ -32,8 +32,8 @@ var TAG = 'PermissionManager_MainAbility:' .height(height) } -let routerData: any = router.getParams().routerData; // Routing jump data -let backTitle = router.getParams().backTitle; // return title name +let routerData: any = router.getParams()['routerData']; // Routing jump data +let backTitle = router.getParams()['backTitle']; // return title name class ApplicationObj { labelId: string iconId: string @@ -182,7 +182,7 @@ struct applicationItem { */ grantUserGrantedPermission(accessTokenId, permission, index) { abilityAccessCtrl.createAtManager().grantUserGrantedPermission( - accessTokenId, permission, Constants.PERMISSION_FLAG).then(result => { + accessTokenId, permission, Constants.PERMISSION_FLAG).then(() => { // result: 0 Authorization succeeded; result: -1 Authorization failed this.toggleIsOn[index] = true; let num = Constants.PERMISSION_NUM; @@ -210,7 +210,7 @@ struct applicationItem { */ revokeUserGrantedPermission(accessTokenId, permission, index) { abilityAccessCtrl.createAtManager().revokeUserGrantedPermission( - accessTokenId, permission, Constants.PERMISSION_FLAG).then(result => { + accessTokenId, permission, Constants.PERMISSION_FLAG).then(() => { // result: 0 successfully cancel the authorization; result: -1 cancel the authorization failed this.toggleIsOn[index] = false; let num = Constants.PERMISSION_NUM; @@ -220,7 +220,7 @@ struct applicationItem { } } this.permissionNum = num; - }).catch(error => { + }).catch(() => { this.authorizeDialogController.open(); this.toggleIsOn[index] = true; setTimeout(()=> { diff --git a/permissionmanager/src/main/ets/pages/dialogPlus.ets b/permissionmanager/src/main/ets/pages/dialogPlus.ets index 1b3b2e0101360bdff3774aa65c55bff6e5e9d07e..83451e3505f8e90c969f05cdd024ee60b1d3be0b 100644 --- a/permissionmanager/src/main/ets/pages/dialogPlus.ets +++ b/permissionmanager/src/main/ets/pages/dialogPlus.ets @@ -201,8 +201,8 @@ struct PermissionDialog { results.push(result) }) let option = new rpc.MessageOption() - let data = new rpc.MessageParcel() - let reply = new rpc.MessageParcel() + let data = new rpc.MessageSequence() + let reply = new rpc.MessageSequence() Promise.all([data.writeInterfaceToken(Constants.ACCESS_TOKEN), data.writeStringArray(perms), data.writeIntArray(results) diff --git a/permissionmanager/src/main/ets/pages/globalSwitch.ets b/permissionmanager/src/main/ets/pages/globalSwitch.ets index 25e0f5e05ffee321707c3eb19fc9ebc05a083b7f..1d2f36644834322135b2d9f3204e41f8326eaa67 100644 --- a/permissionmanager/src/main/ets/pages/globalSwitch.ets +++ b/permissionmanager/src/main/ets/pages/globalSwitch.ets @@ -104,8 +104,12 @@ struct globalDialog { Log.info('global accept') if(globalThis.globalState == MICROPHONE) { var audioManager = audio.getAudioManager(); - audioManager.setMicrophoneMute(false).then(() => { - globalThis.globalContext.terminateSelf() + let audioVolumeManager = audioManager.getVolumeManager(); + let groupid = audio.DEFAULT_VOLUME_GROUP_ID; + audioVolumeManager.getVolumeGroupManager(groupid).then(audioVolumeGroupManager => { + audioVolumeGroupManager.setMicrophoneMute(false).then(() => { + globalThis.globalContext.terminateSelf() + }) }) }else if(globalThis.globalState == CAMERA) { camera.getCameraManager(globalThis.globalContext).then(cameraManager => { @@ -116,8 +120,12 @@ struct globalDialog { camera.getCameraManager(globalThis.globalContext).then(cameraManager => { cameraManager.muteCamera(false) var audioManager = audio.getAudioManager(); - audioManager.setMicrophoneMute(false).then(() => { - globalThis.globalContext.terminateSelf() + let audioVolumeManager = audioManager.getVolumeManager(); + let groupid = audio.DEFAULT_VOLUME_GROUP_ID; + audioVolumeManager.getVolumeGroupManager(groupid).then(audioVolumeGroupManager => { + audioVolumeGroupManager.setMicrophoneMute(false).then(() => { + globalThis.globalContext.terminateSelf() + }) }) }) } diff --git a/permissionmanager/src/main/ets/pages/other-permissions.ets b/permissionmanager/src/main/ets/pages/other-permissions.ets index aa34c23e86a5ccf9fed149416c3b235fc943a075..21dc3b942f69474923b01b2dcf711395490c9bae 100644 --- a/permissionmanager/src/main/ets/pages/other-permissions.ets +++ b/permissionmanager/src/main/ets/pages/other-permissions.ets @@ -14,18 +14,18 @@ */ import { backBar } from "../common/components/backBar"; -import router from '@system.router'; +import router from '@ohos.router'; import Constants from '../common/utils/constant'; import { permissionGroups } from '../common/model/permissionGroup' import abilityAccessCtrl from '@ohos.abilityAccessCtrl' var TAG = 'PermissionManager_MainAbility:' -let routerData = router.getParams().routerData; // Routing jump data -let tokenId: any = router.getParams().tokenId; // tokenId for verify permission -let backTitle = router.getParams().backTitle; // return title name -let status = router.getParams().status; // Status: Allowed, Forbidden -let permissions: any = router.getParams().permission; // permissions name +let routerData = router.getParams()['routerData']; // Routing jump data +let tokenId: any = router.getParams()['tokenId']; // tokenId for verify permission +let backTitle = router.getParams()['backTitle']; // return title name +let status = router.getParams()['status']; // Status: Allowed, Forbidden +let permissions: any = router.getParams()['permission']; // permissions name let otherPermissionList = []; // otherPermission List for (let i = 0; i < permissions.length; i++) { otherPermissionList.push({ @@ -130,8 +130,8 @@ struct appNameItem { } } }.onClick(() => { - router.push({ - uri: 'pages/application-tertiary', + router.pushUrl({ + url: 'pages/application-tertiary', params: { routerData: routerData, backTitle: item.permissionLabel, diff --git a/permissionmanager/src/main/ets/pages/permission-access-record.ets b/permissionmanager/src/main/ets/pages/permission-access-record.ets index 328468df1abb85aaec0e5223d64cb97545457f1c..49069ed812973f3e870085561237bef9ed63c5c8 100644 --- a/permissionmanager/src/main/ets/pages/permission-access-record.ets +++ b/permissionmanager/src/main/ets/pages/permission-access-record.ets @@ -14,7 +14,7 @@ */ import bundle from '@ohos.bundle'; -import router from '@system.router'; +import router from '@ohos.router'; import abilityAccessCtrl from '@ohos.abilityAccessCtrl'; import privacyManager from '@ohos.privacyManager' import { backBar } from "../common/components/backBar"; @@ -153,8 +153,8 @@ struct permissionRecordPage { } }.height(Constants.LISTITEM_HEIGHT_APPLICATION) .onClick(() => { - router.push({ - uri: 'pages/application-secondary', + router.pushUrl({ + url: 'pages/application-secondary', params: { routerData: { 'bundleName': permissionApplication.name, 'tokenId': permissionApplication.accessTokenId, @@ -196,8 +196,8 @@ struct permissionRecordPage { } }.height(Constants.LISTITEM_HEIGHT_PERMISSION) .onClick(() => { - router.push({ - uri: 'pages/application-secondary', + router.pushUrl({ + url: 'pages/application-secondary', params: { routerData: { 'bundleName': item.name, 'tokenId': item.accessTokenId,