1.最近文件播放音频，在详情页面点击删除，依然会播放（预期结果：删除应该播放下一首）

2.音频播放时，无文件名称显示

创维盒子/双子星云手机/Class/Set/previewFile/audioPlayerViewController.m

@@ -65,6 +65,38 @@
     [[netWorkManager shareInstance] DataEmbeddingPointBy:4 withEventValue:@"Music_preview"];
 }
 
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    
+    if(_outSideDataModel){
+        [[DFPlayer sharedPlayer] df_pause];
+        [[DFPlayer sharedPlayer] df_reloadData];//需在传入数据源后调用
+        
+        [self setTitleFunByIndex];
+        
+        //if(_isfirstEnterType){
+            KWeakSelf
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [weakSelf playAudioFun];
+            });
+        //}
+    }
+    else{//点击playingview 进来的
+        
+        _allAudioDataArray = [audioPlayListManager shareManager].audioPlayListArr;
+        _lastAudioIndex = -1;
+        _index = [DFPlayer sharedPlayer].currentAudioModel.audioId;
+        [self setTitleFunByIndex];
+    }
+}
+
+- (void)viewDidDisappear:(BOOL)animated
+{
+    [super viewDidDisappear:animated];
+    //[[DFPlayer sharedPlayer] df_deallocPlayer];
+}
+
 - (void)drawAnyView{
     
     _bgImageView = [UIImageView new];
@@ -519,6 +551,7 @@
     
     //数据埋点
     [[netWorkManager shareInstance] DataEmbeddingPointBy:3 withEventValue:@"Music_delete"];
+    
 }
 
 #pragma  mark 删除成功
@@ -528,10 +561,29 @@
     [[lastFileManager shareManager] deleteFileInfoWithUrl:path];
     [[audioPlayListManager shareManager] deleteFileInfoWithUrl:path];
     
+    
     if(_didNeedToRegetDataFun){
         _didNeedToRegetDataFun();
     }
-    [self.navigationController popViewControllerAnimated:YES];
+    
+    if([audioPlayListManager shareManager].audioPlayListArr.count >= 1){
+        _isfirstEnterType = NO;
+        [[DFPlayer sharedPlayer] df_reloadData];
+        
+        if([DFPlayer sharedPlayer].playerModelArray.count > _index){
+            [[DFPlayer sharedPlayer] df_playWithAudioId:_index];
+        }
+        else{
+            [[DFPlayer sharedPlayer] df_playWithAudioId:0];
+        }
+    }
+    else{
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+    
+    
+    
+    
 }
 
 #pragma mark 用户点击详情
@@ -695,6 +747,9 @@
             [_dataArray insertObject:model atIndex:0];
             [_allAudioDataArray insertObject:lastFileMod atIndex:0];
             
+            [[audioPlayListManager shareManager] saveFileInfoWith:lastFileMod with:lastFileMod.path];
+            _index = 0;
+            
             //有数据插入 重新排序audioId
             for (NSInteger i = 0; i < _dataArray.count; i++) {
                 DFPlayerModel *model = _dataArray[i];
@@ -702,6 +757,7 @@
             }
         }
         
+        _isfirstEnterType = NO;
     }
     
     HLog(@"hxd :%@ --- %ld---index:%ld",_dataArray,_dataArray.count,_index);
@@ -791,37 +847,6 @@
 }
 
 
-- (void)viewDidAppear:(BOOL)animated
-{
-    [super viewDidAppear:animated];
-    
-    if(_outSideDataModel){
-        [self setTitleFunByIndex];
-        [[DFPlayer sharedPlayer] df_reloadData];//需在传入数据源后调用
-        
-        //if(_isfirstEnterType){
-            KWeakSelf
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [weakSelf playAudioFun];
-                self->_isfirstEnterType = NO;
-            });
-        //}
-    }
-    else{//点击playingview 进来的
-        
-        _allAudioDataArray = [audioPlayListManager shareManager].audioPlayListArr;
-        _lastAudioIndex = -1;
-        _index = [DFPlayer sharedPlayer].currentAudioModel.audioId;
-        [self setTitleFunByIndex];
-    }
-}
-
-- (void)viewDidDisappear:(BOOL)animated
-{
-    [super viewDidDisappear:animated];
-    //[[DFPlayer sharedPlayer] df_deallocPlayer];
-}
-
 -(void)setTitleFunByIndex
 {
     if(_index < _allAudioDataArray.count){
@@ -839,6 +864,7 @@
 
 - (void)playAudioFun
 {
+    HLog(@"playAudioFun-index:%ld",_index)
     if(_index < self.dataArray.count){
         DFPlayerModel *model = self.dataArray[_index];
         [[DFPlayer sharedPlayer] df_playWithAudioId:model.audioId];

创维盒子/双子星云手机/Class/Set/previewFile/videoPlayByAVPlayerViewController.m

@@ -641,11 +641,7 @@
         if(model && model.status == 0){
             [[iToast makeText:NSLocalizedString(@"delete_file_suc_msg",nil)] show];
             
-            if(weakSelf.didNeedToRegetDataFun){
-                weakSelf.didNeedToRegetDataFun();
-            }
-            
-            [weakSelf.navigationController popViewControllerAnimated:YES];
+            [weakSelf didDeleteSucFun:self->_VideoDataMode.path];
         }
         else{
             
@@ -658,6 +654,18 @@
     [[netWorkManager shareInstance] DataEmbeddingPointBy:3 withEventValue:@"Video_delete"];
 }
 
+#pragma  mark 删除成功
+- (void)didDeleteSucFun:(NSString*)path
+{
+    //1.删除最近文件数据
+    [[lastFileManager shareManager] deleteFileInfoWithUrl:path];
+    
+    if(_didNeedToRegetDataFun){
+        _didNeedToRegetDataFun();
+    }
+    
+    [self.navigationController popViewControllerAnimated:YES];
+}
 #pragma mark 去下载文件
 - (void)gotoDownLoadFileFun:(BOOL)isLandscapeType
 {