Procházet zdrojové kódy

1.添加音频到办法列表 提示
2.当前播放列表应按播放倒序显示

huangxiaodong před 11 měsíci
rodič
revize
2a29b13952

+ 14 - 1
创维盒子/双子星云手机/Class/Set/previewFile/addAudioToPlayListViewController.m

@@ -628,6 +628,8 @@
         return;
     }
     
+    BOOL didAddAudioType = NO;
+    
     for (NASFileAudioDataModel* dataModel in _didSelectListArr) {
         lastFileModel *lastFileMod = [lastFileModel new];
         lastFileMod.path = dataModel.path;
@@ -637,7 +639,18 @@
         lastFileMod.duration = dataModel.duration;
         lastFileMod.type = @"audio";
         lastFileMod.lastPreTime = [iTools getNowTimeStamp];
-        [[audioPlayListManager shareManager] saveFileInfoWith:lastFileMod with:dataModel.path];
+        BOOL curAddType = [[audioPlayListManager shareManager] saveFileInfoWith:lastFileMod with:dataModel.path];
+        
+        if(curAddType){
+            didAddAudioType = YES;
+        }
+    }
+    
+    if(didAddAudioType){
+        [[iToast makeText:NSLocalizedString(@"NAS_add_audio_to_play_list_ok",nil)] show];
+    }
+    else{
+        [[iToast makeText:NSLocalizedString(@"NAS_add_audio_to_play_list_didInList",nil)] show];
     }
     
     if(_didNeedToRegetAudioPlayListFun){

+ 2 - 0
创维盒子/双子星云手机/Class/Set/previewFile/view/audioPlayListView.m

@@ -121,6 +121,8 @@
 #pragma mark 点击了添加播放列表
 - (void)didClickAddAudioFun
 {
+    [self removeFun];
+    
     if(_didClickButtonFun){
         _didClickButtonFun();
     }

+ 25 - 4
创维盒子/双子星云手机/NAS/recenFile/audioPlayListManager.m

@@ -85,6 +85,23 @@
                         [dataArr addObject:model];
                     }
                 }
+                
+                //数组按第一次预览时间倒序
+                if(dataArr.count >= 2){
+                    NSArray *sortArr = [dataArr sortedArrayUsingComparator:^NSComparisonResult(lastFileModel* obj1, lastFileModel* obj2) {
+                               NSTimeInterval time1 = obj1.lastPreTime;
+                                NSTimeInterval time2 = obj2.lastPreTime;
+                               if (time1 < time2) {
+                                   return NSOrderedDescending;
+                               }
+                               if (time1 > time2) {
+                                   return NSOrderedAscending;
+                               }
+                               return NSOrderedSame;
+                           }];
+                    
+                    dataArr = [NSMutableArray arrayWithArray:sortArr];
+                }
             }
             
         }
@@ -119,20 +136,24 @@
                 break;
             }
             
-            model.localPath = [self getAudioCacheFullPathBy:model.name];
+            //把原来的数据加到saveDictArr
+            //lastFileMod.localPath = [self getAudioCacheFullPathBy:model.name];
             NSDictionary *dict = [model lastFileInfoFun];
             [saveDictArr addObject:dict];
         }
         
         if(isInPlayList){
             HLog(@"音乐保存在播放列表里面了")
-            return YES;
+            return NO;
         }
         
         //1.写到内存
-        [dataArr addObject:lastFileMod];
+        //[dataArr addObject:lastFileMod];
+        [dataArr insertObject:lastFileMod atIndex:0];
         
-        //2.本地持久化
+        //2.本地持久化 把新的的数据加到saveDictArr
+        lastFileMod.lastPreTime = [iTools getNowTimeStamp];
+        lastFileMod.localPath = [self getAudioCacheFullPathBy:lastFileMod.name];
         NSDictionary *dict = [lastFileMod lastFileInfoFun];
         [saveDictArr addObject:dict];
         

+ 2 - 0
创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings

@@ -556,6 +556,8 @@
 "NAS_details_file_path"   = "所在位置:";
 "NAS_audio_cur_play_list"   = "当前播放列表";
 "NAS_add_audio_to_play_list"   = "添加播放列表";
+"NAS_add_audio_to_play_list_ok"   = "添加成功";
+"NAS_add_audio_to_play_list_didInList"   = "音频已存在播放列表中";
 "NAS_newer_guide_video"   = "新手视频";
 "NAS_newer_guide_video_to_world"   = "为您打开新世界的大门";
 "NAS_newer_guide_video_tip1"   = "您可以在"; //您可以在【我的>新手引导】查看操作教程