Commit 4583f834 cgx

修复均衡呼吸法与4-7-8振动与文字不同步、舒眠课程播放按钮点击无反应、白噪音页面间距bug

1 个父辈 f1c2ed4b
...@@ -1902,7 +1902,7 @@ ...@@ -1902,7 +1902,7 @@
CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepDebug.entitlements; CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = SPH85C3TWU; DEVELOPMENT_TEAM = SPH85C3TWU;
EXCLUDED_ARCHS = ""; EXCLUDED_ARCHS = "";
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
...@@ -1968,7 +1968,7 @@ ...@@ -1968,7 +1968,7 @@
CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements; CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
...@@ -2095,7 +2095,7 @@ ...@@ -2095,7 +2095,7 @@
CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepBeta.entitlements; CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepBeta.entitlements;
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = 4NDZ6UX8PW; DEVELOPMENT_TEAM = 4NDZ6UX8PW;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
......
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
- (void)timerAction:(NSTimer *)timer { - (void)timerAction:(NSTimer *)timer {
self.playDuration--; self.playDuration--;
if (self.playDuration % 5 == 0 && self.playDuration >= 0) { if (self.playDuration % 4 == 0 && self.playDuration >= 0) {
AudioServicesPlaySystemSound(1520); AudioServicesPlaySystemSound(1520);
} }
if (self.playDuration == 0) { if (self.playDuration == 0) {
......
...@@ -100,6 +100,7 @@ ...@@ -100,6 +100,7 @@
}]; }];
self.pleyerBtn = [UIButton new]; self.pleyerBtn = [UIButton new];
self.pleyerBtn.userInteractionEnabled = NO;
[self.bigView addSubview:self.pleyerBtn]; [self.bigView addSubview:self.pleyerBtn];
[self.pleyerBtn mas_makeConstraints:^(MASConstraintMaker *make) { [self.pleyerBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(self.bigView.mas_right).offset(-15); make.right.equalTo(self.bigView.mas_right).offset(-15);
......
...@@ -115,9 +115,9 @@ ...@@ -115,9 +115,9 @@
#pragma mark - lazy #pragma mark - lazy
- (UICollectionView *)noiseAudioView { - (UICollectionView *)noiseAudioView {
if (!_noiseAudioView) { if (!_noiseAudioView) {
CGFloat space = (kScreenWidth - 240 - 66)/3.0; CGFloat space = (kScreenWidth - 240 - 40)/3.0;
UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init]; UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
layout.sectionInset = UIEdgeInsetsMake(15, 33, 0, 33); layout.sectionInset = UIEdgeInsetsMake(15, 20, 0, 20);
layout.itemSize = CGSizeMake(60, 53); layout.itemSize = CGSizeMake(60, 53);
layout.minimumLineSpacing = 12; layout.minimumLineSpacing = 12;
layout.minimumInteritemSpacing = space; layout.minimumInteritemSpacing = space;
......
...@@ -17,7 +17,7 @@ SingletonH(NoiseDataManager) ...@@ -17,7 +17,7 @@ SingletonH(NoiseDataManager)
/// 选中的白噪音数据 /// 选中的白噪音数据
@property (nonatomic, strong) NSArray *playList; @property (nonatomic, strong) NSArray *playList;
/// 停止白噪音 /// 停止所有白噪音播放
- (void)stopNoiseAudio; - (void)stopNoiseAudio;
@end @end
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!