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

!334 解决静音响铃切换不生效问题master

Browse Source 
Merge pull request !334 from fangzheng24/master
This commit is contained in:
openharmony_ci 2023-01-06 06:40:28 +00:00 committed by Gitee
commit f9060dc70a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
product/phone/src/main/ets/model/volumeControlImpl/VolumeControlModel.ts
View File

@ -17,6 +17,7 @@ import LogUtil from '../../../../../../../common/utils/src/main/ets/default/base
import Log from '../../../../../../../common/utils/src/main/ets/default/baseUtil/LogDecorator';
import ConfigData from '../../../../../../../common/utils/src/main/ets/default/baseUtil/ConfigData';
import Audio from '@ohos.multimedia.audio';
const groupId = Audio.DEFAULT_VOLUME_GROUP_ID;
function getAudioManager() {
if (!globalThis['audioManager']) {
@ -25,9 +26,17 @@ function getAudioManager() {
return globalThis['audioManager'];
}
export function registerObserver(){
function audioVolumeGroupManager() {
if (!globalThis['audioVolumeGroupManager']) {
globalThis['audioVolumeGroupManager'] = getAudioManager().getVolumeManager().getVolumeGroupManager(groupId);
}
return globalThis['audioVolumeGroupManager'];
}
export async function registerObserver(){
let audioManager = getAudioManager();
audioManager.on('ringerModeChange', (mode)=>{
let getaudioVolumeGroupManager = await audioVolumeGroupManager();
getaudioVolumeGroupManager.on('ringerModeChange', (mode)=>{
AppStorage.SetOrCreate('ringerModeSilent', mode === Audio.AudioRingMode.RINGER_MODE_SILENT);
AppStorage.SetOrCreate('ringerModeNormal', mode === Audio.AudioRingMode.RINGER_MODE_NORMAL);
})
@ -97,12 +106,10 @@ export class VolumeModel extends BaseModel{
export class RingerModel extends BaseModel{
private modeTag;
private audioManager;
private TAG = ConfigData.TAG + 'RingerModel ';
constructor(mode){
super();
this.audioManager = getAudioManager();
this.modeTag = mode;
this.initState();
}
@ -111,8 +118,9 @@ export class RingerModel extends BaseModel{
* Update ringer Mode
*/
@Log
public initState(){
this.audioManager.getRingerMode((error, action) => {
public async initState(){
let getaudioVolumeGroupManager = await audioVolumeGroupManager();
getaudioVolumeGroupManager.getRingerMode((error, action) => {
LogUtil.info(`${this.TAG} updateMode.`);
if (error) {
return;
@ -127,8 +135,9 @@ export class RingerModel extends BaseModel{
* Set ringer mode
*/
@Log
public setRingerMode(): void{
this.audioManager.setRingerMode(this.modeTag, (err, data) => {
public async setRingerMode(){
let getaudioVolumeGroupManager = await audioVolumeGroupManager();
getaudioVolumeGroupManager.setRingerMode(this.modeTag, (err, data) => {
LogUtil.info(`${this.TAG} setRingerMode.`);
LogUtil.info(`${this.TAG} setRingerMode sucess.`);
});