From de88ae127e305e0b153c327b073645f9353cace5 Mon Sep 17 00:00:00 2001
From: 单军华 <WindShan@danjunhuas-MacBook-Pro.local>
Date: Wed, 18 Apr 2018 16:51:07 +0800
Subject: [PATCH] 新功能修改
---
pregnancy_guard/BaseProject/Utility/AudioTool/CSAudioManager.m | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/pregnancy_guard/BaseProject/Utility/AudioTool/CSAudioManager.m b/pregnancy_guard/BaseProject/Utility/AudioTool/CSAudioManager.m
index 3d353bb..2c1fcb8 100644
--- a/pregnancy_guard/BaseProject/Utility/AudioTool/CSAudioManager.m
+++ b/pregnancy_guard/BaseProject/Utility/AudioTool/CSAudioManager.m
@@ -114,12 +114,14 @@
AVAudioPlayer *player = self.musicPlayers[playID]; //������������������������������
player.delegate = self;
+ player.numberOfLoops = -1;//������������������������ -1���������������
if (!player) {
NSError *error = nil;
player = [[AVAudioPlayer alloc] initWithData:musicData error:&error];
player.delegate = self;
+ player.numberOfLoops = -1;//������������������������ -1���������������
if (![player prepareToPlay]){
NSLog(@"���������������������");
@@ -184,6 +186,7 @@
AVAudioPlayer *player=self.musicPlayers[playID];
[player stop];
+ [self.musicPlayers removeObjectForKey:playID];
if (_blockPlayerStopPlay) {
_blockPlayerStopPlay();
}
@@ -228,6 +231,7 @@
NSLog(@"���������playID");
return ;
}
+
AVAudioPlayer *player = self.musicPlayers[playID];
[player stop];
@@ -272,11 +276,24 @@
self.soundIDs[playID] = @(soundID);
}
+ // ������������������������
+ AudioServicesAddSystemSoundCompletion(soundID, NULL, NULL, soundCompleteCallback, NULL);
+ AudioServicesPlaySystemSound(kSystemSoundID_Vibrate);
// ������
AudioServicesPlaySystemSound(soundID);
}
-
+//������������������������������������������
+void soundCompleteCallback(SystemSoundID soundID,void* sample)
+{
+ AudioServicesPlaySystemSound(kSystemSoundID_Vibrate); //������
+ AudioServicesPlaySystemSound(soundID);
+
+ /*��������������������������������������������� */
+// AudioServicesDisposeSystemSoundID(sample);
+// CFRelease(sample);
+// CFRunLoopStop(CFRunLoopGetCurrent());
+}
//������������
- (void)disposeSoundWithPlayID:(NSString *)playID
--
Gitblit v1.8.0