|
|
@@ -16,7 +16,7 @@
|
|
|
@property (nonatomic, assign) BOOL isOlnyOneType;
|
|
|
|
|
|
@property (nonatomic, strong) UIImageView*bgImageView;
|
|
|
-
|
|
|
+@property (nonatomic, strong)UIButton * playPauseBtn;
|
|
|
@property (nonatomic, strong) NSMutableArray<DFPlayerModel *> *dataArray;
|
|
|
@end
|
|
|
|
|
|
@@ -59,7 +59,7 @@
|
|
|
[[DFPlayer sharedPlayer] df_initPlayerWithUserId:nil];
|
|
|
[DFPlayer sharedPlayer].dataSource = self;
|
|
|
[DFPlayer sharedPlayer].delegate = self;
|
|
|
- [DFPlayer sharedPlayer].playMode = DFPlayerModeSingleCycle;
|
|
|
+ [DFPlayer sharedPlayer].playMode = DFPlayerModeOnlyOnce;
|
|
|
[DFPlayer sharedPlayer].isObserveWWAN = NO;
|
|
|
// [[DFPlayer sharedPlayer] df_reloadData];//需在传入数据源后调用
|
|
|
|
|
|
@@ -128,9 +128,9 @@
|
|
|
// [mgr df_typeBtnWithFrame:typeRect singleImage:singleImage circleImage:circleImage shuffleImage:shuffleImage superView:_bgView block:nil];
|
|
|
|
|
|
//播放暂停按钮
|
|
|
- UIButton * playPauseBtn = [mgr df_playPauseBtnWithFrame:CGRectZero playImage:playImage pauseImage:pauseImage superView:self.view block:nil];
|
|
|
+ _playPauseBtn = [mgr df_playPauseBtnWithFrame:CGRectZero playImage:playImage pauseImage:pauseImage superView:self.view block:nil];
|
|
|
|
|
|
- [playPauseBtn mas_makeConstraints:^(MASConstraintMaker *make) {
|
|
|
+ [_playPauseBtn mas_makeConstraints:^(MASConstraintMaker *make) {
|
|
|
make.top.equalTo(curSlider.mas_bottom).offset(20);
|
|
|
make.height.mas_equalTo(30);
|
|
|
make.width.mas_equalTo(30);
|
|
|
@@ -147,7 +147,7 @@
|
|
|
make.top.equalTo(curSlider.mas_bottom).offset(20);
|
|
|
make.height.mas_equalTo(30);
|
|
|
make.width.mas_equalTo(30);
|
|
|
- make.left.equalTo(playPauseBtn.mas_right).offset(50);
|
|
|
+ make.left.equalTo(_playPauseBtn.mas_right).offset(50);
|
|
|
}];
|
|
|
|
|
|
//上一首按钮
|
|
|
@@ -160,7 +160,7 @@
|
|
|
make.top.equalTo(curSlider.mas_bottom).offset(20);
|
|
|
make.height.mas_equalTo(30);
|
|
|
make.width.mas_equalTo(30);
|
|
|
- make.right.equalTo(playPauseBtn.mas_left).offset(-50);
|
|
|
+ make.right.equalTo(_playPauseBtn.mas_left).offset(-50);
|
|
|
}];
|
|
|
}
|
|
|
|
|
|
@@ -338,6 +338,21 @@
|
|
|
if(_isOlnyOneType){
|
|
|
if( self.dataArray.count == 1){
|
|
|
DFPlayerModel *model = self.dataArray.firstObject;
|
|
|
+
|
|
|
+ if(_audioOutSidedataArray.count > _index){
|
|
|
+ NASFileAudioDataModel *yourModel = _audioOutSidedataArray[_index];
|
|
|
+ NSString *name = yourModel.name;
|
|
|
+ name = [name lowercaseString];
|
|
|
+ if([name containsString:@".ogg"]
|
|
|
+ ||[name containsString:@".wma"]){
|
|
|
+ [[iToast makeText:NSLocalizedString(@"play_video_fail_tip",nil)] show];
|
|
|
+ _playPauseBtn.userInteractionEnabled = NO;
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
[[DFPlayer sharedPlayer] df_playWithAudioId:model.audioId];
|
|
|
}
|
|
|
}
|