Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud

朱林
2 parents a7c4531e cc77629c
Showing 33 changed files with 223 additions and 29 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud.xcodeproj/xcuserdata/cnlive.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
LiveVideoCloud/Classes/Sections/PGCSections/View/LVCTelevisionCell.h
LiveVideoCloud/Classes/Sections/PGCSections/View/LVCTelevisionCell.m
LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLiveListView.h → LiveVideoCloud/Classes/Sections/UGCSections/View/LVCUGCLiveListView.h
LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLiveListView.m → LiveVideoCloud/Classes/Sections/UGCSections/View/LVCUGCLiveListView.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerController.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerController.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerListController.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerListController.m
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/Contents.json
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher114.png
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher120-1.png
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher120.png
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher180.png
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher29.png
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher40.png
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher57.png
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher58.png
LiveVideoCloud/animation.xcassets/AppIcon.appiconset/ic_launcher60.png
@@ -258,7 +258,6 @@
 		D2EBC8711F02108000F198FB /* LiveListService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8661F02108000F198FB /* LiveListService.m */; };
 		D2EBC8721F02108000F198FB /* LVCLiveActivityInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8681F02108000F198FB /* LVCLiveActivityInfoService.m */; };
 		D2EBC8741F02108000F198FB /* LVCUGCLiveListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC86C1F02108000F198FB /* LVCUGCLiveListController.m */; };
-		D2EBC8751F02108000F198FB /* LVCUGCLiveListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC86E1F02108000F198FB /* LVCUGCLiveListView.m */; };
 		D2EBC8761F02108000F198FB /* LVCUGCLivePlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8701F02108000F198FB /* LVCUGCLivePlayerController.m */; };
 		D2EBC87B1F02108F00F198FB /* LVCUGCLiveListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8781F02108F00F198FB /* LVCUGCLiveListModel.m */; };
 		D2EBC87C1F02108F00F198FB /* LVCUGCLivePlayerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC87A1F02108F00F198FB /* LVCUGCLivePlayerModel.m */; };
@@ -266,6 +265,8 @@
 		D2EBC8841F02109C00F198FB /* LVCUGCLivePlayerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8801F02109C00F198FB /* LVCUGCLivePlayerCell.m */; };
 		D2EBC8851F02109C00F198FB /* LVCUGCPlayerLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8821F02109C00F198FB /* LVCUGCPlayerLoadingView.m */; };
 		D2EBC8881F0225D900F198FB /* LVCVodPlayerListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8871F0225D900F198FB /* LVCVodPlayerListController.m */; };
+		D2EBC88B1F02361600F198FB /* LVCUGCLiveListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC88A1F02361600F198FB /* LVCUGCLiveListView.m */; };
+		D2EBC88E1F023AA400F198FB /* LVCVodPlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC88D1F023AA400F198FB /* LVCVodPlayerController.m */; };
 /* End PBXBuildFile section */
  
 /* Begin PBXContainerItemProxy section */
@@ -810,8 +811,6 @@
 		D2EBC8681F02108000F198FB /* LVCLiveActivityInfoService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCLiveActivityInfoService.m; sourceTree = "<group>"; };
 		D2EBC86B1F02108000F198FB /* LVCUGCLiveListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListController.h; sourceTree = "<group>"; };
 		D2EBC86C1F02108000F198FB /* LVCUGCLiveListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListController.m; sourceTree = "<group>"; };
-		D2EBC86D1F02108000F198FB /* LVCUGCLiveListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListView.h; sourceTree = "<group>"; };
-		D2EBC86E1F02108000F198FB /* LVCUGCLiveListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListView.m; sourceTree = "<group>"; };
 		D2EBC86F1F02108000F198FB /* LVCUGCLivePlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerController.h; sourceTree = "<group>"; };
 		D2EBC8701F02108000F198FB /* LVCUGCLivePlayerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerController.m; sourceTree = "<group>"; };
 		D2EBC8771F02108F00F198FB /* LVCUGCLiveListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListModel.h; sourceTree = "<group>"; };
@@ -826,6 +825,10 @@
 		D2EBC8821F02109C00F198FB /* LVCUGCPlayerLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCPlayerLoadingView.m; sourceTree = "<group>"; };
 		D2EBC8861F0225D900F198FB /* LVCVodPlayerListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerListController.h; sourceTree = "<group>"; };
 		D2EBC8871F0225D900F198FB /* LVCVodPlayerListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerListController.m; sourceTree = "<group>"; };
+		D2EBC8891F02361600F198FB /* LVCUGCLiveListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListView.h; sourceTree = "<group>"; };
+		D2EBC88A1F02361600F198FB /* LVCUGCLiveListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListView.m; sourceTree = "<group>"; };
+		D2EBC88C1F023AA400F198FB /* LVCVodPlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerController.h; sourceTree = "<group>"; };
+		D2EBC88D1F023AA400F198FB /* LVCVodPlayerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerController.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
  
 /* Begin PBXFrameworksBuildPhase section */
@@ -2131,6 +2134,8 @@
 			children = (
 				D2EBC8861F0225D900F198FB /* LVCVodPlayerListController.h */,
 				D2EBC8871F0225D900F198FB /* LVCVodPlayerListController.m */,
+				D2EBC88C1F023AA400F198FB /* LVCVodPlayerController.h */,
+				D2EBC88D1F023AA400F198FB /* LVCVodPlayerController.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -2170,16 +2175,14 @@
 		D2EBC85F1F020F3C00F198FB /* Controller */ = {
 			isa = PBXGroup;
 			children = (
-				D2EBC8651F02108000F198FB /* LiveListService.h */,
-				D2EBC8661F02108000F198FB /* LiveListService.m */,
-				D2EBC8671F02108000F198FB /* LVCLiveActivityInfoService.h */,
-				D2EBC8681F02108000F198FB /* LVCLiveActivityInfoService.m */,
 				D2EBC86B1F02108000F198FB /* LVCUGCLiveListController.h */,
 				D2EBC86C1F02108000F198FB /* LVCUGCLiveListController.m */,
-				D2EBC86D1F02108000F198FB /* LVCUGCLiveListView.h */,
-				D2EBC86E1F02108000F198FB /* LVCUGCLiveListView.m */,
 				D2EBC86F1F02108000F198FB /* LVCUGCLivePlayerController.h */,
 				D2EBC8701F02108000F198FB /* LVCUGCLivePlayerController.m */,
+				D2EBC8651F02108000F198FB /* LiveListService.h */,
+				D2EBC8661F02108000F198FB /* LiveListService.m */,
+				D2EBC8671F02108000F198FB /* LVCLiveActivityInfoService.h */,
+				D2EBC8681F02108000F198FB /* LVCLiveActivityInfoService.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -2198,6 +2201,8 @@
 		D2EBC8611F020F3C00F198FB /* View */ = {
 			isa = PBXGroup;
 			children = (
+				D2EBC8891F02361600F198FB /* LVCUGCLiveListView.h */,
+				D2EBC88A1F02361600F198FB /* LVCUGCLiveListView.m */,
 				D2EBC87D1F02109C00F198FB /* LVCUGCBackgroundView.h */,
 				D2EBC87E1F02109C00F198FB /* LVCUGCBackgroundView.m */,
 				D2EBC87F1F02109C00F198FB /* LVCUGCLivePlayerCell.h */,
@@ -2447,6 +2452,7 @@
 				D2575C4A1E7685DE00E3A8FC /* UIView+Bubbling.m in Sources */,
 				D2EBC8571F01FF9200F198FB /* LVCCommentModel.m in Sources */,
 				D23BBDB81EF8D15D002FE0B8 /* LVCMainHeaderCollectionReusableView.m in Sources */,
+				D2EBC88B1F02361600F198FB /* LVCUGCLiveListView.m in Sources */,
 				D2029CA61E6EADE10027CD92 /* MJRefreshHeader.m in Sources */,
 				D2029CC41E6EADE10027CD92 /* UIImageView+WebCache.m in Sources */,
 				4B45CE801EB86A590079AFB7 /* idAndPwdView.m in Sources */,
@@ -2465,6 +2471,7 @@
 				D2029C961E6EADE10027CD92 /* MBProgressHUD.m in Sources */,
 				D24F40921EFB727000833738 /* JBAutoRollTableView.m in Sources */,
 				810B65071E779B1F00133E15 /* ViewController+MASAdditions.m in Sources */,
+				D2EBC88E1F023AA400F198FB /* LVCVodPlayerController.m in Sources */,
 				D2029C9A1E6EADE10027CD92 /* MJProperty.m in Sources */,
 				4BD856031EBACD530082061D /* AFNetworkActivityIndicatorManager.m in Sources */,
 				4BD855CD1EBAC4B70082061D /* CNLiveKeychainWrapper.m in Sources */,
@@ -2566,7 +2573,6 @@
 				D24CFC201EFA092300AA6ADB /* JBBannerView.m in Sources */,
 				D2029CBD1E6EADE10027CD92 /* SDWebImageManager.m in Sources */,
 				D2029CB41E6EADE10027CD92 /* UIView+MJExtension.m in Sources */,
-				D2EBC8751F02108000F198FB /* LVCUGCLiveListView.m in Sources */,
 				81FB5B3C1E7A6FFC00F98E1D /* SevenSwitch.m in Sources */,
 				D2EBC8761F02108000F198FB /* LVCUGCLivePlayerController.m in Sources */,
 				D2029CA91E6EADE10027CD92 /* MJRefreshAutoStateFooter.m in Sources */,
@@ -2,4 +2,54 @@
 <Bucket
    type = "1"
    version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "LiveVideoCloud/Classes/Sections/Mine/Controllers/FeedbackViewController.m"
+            timestampString = "520237865.304262"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "33"
+            endingLineNumber = "33"
+            landmarkName = "-viewDidLoad"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "LiveVideoCloud/Classes/Sections/Mine/Controllers/FeedbackViewController.m"
+            timestampString = "520237929.578646"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "143"
+            endingLineNumber = "143"
+            landmarkName = "-request"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "LiveVideoCloud/Classes/Sections/Mine/Controllers/FeedbackViewController.m"
+            timestampString = "520237933.08285"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "126"
+            endingLineNumber = "126"
+            landmarkName = "-request"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
 </Bucket>
@@ -12,5 +12,6 @@
 @interface LVCTelevisionCell : UITableViewCell
  
 @property (nonatomic, strong) LVCTelevisionModel *model;
+@property (nonatomic, strong) ProgramModel *programModel;
  
 @end
@@ -35,6 +35,12 @@
  
 }
  
+- (void)setProgramModel:(ProgramModel *)programModel {
+    
+    [_imgView sd_setImageWithURL:[NSURL URLWithString:programModel.img] placeholderImage:[UIImage imageNamed:@"load_03"]];
+    _titleLab.text = programModel.title;
+}
+
 #pragma mark -
 #pragma mark - getter
 - (UIImageView *)imgView
+//
+//  LVCVodPlayerController.h
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/6/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface LVCVodPlayerController : BaseViewController
+
+@end
+//
+//  LVCVodPlayerController.m
+//  LiveVideoCloud
+//
+//  Created by cnliveJunBo on 17/6/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCVodPlayerController.h"
+
+@interface LVCVodPlayerController ()
+
+@end
+
+@implementation LVCVodPlayerController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    self.view.backgroundColor = [UIColor whiteColor];
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+@end
@@ -10,4 +10,8 @@
  
 @interface LVCVodPlayerListController : UIViewController
  
+@property (nonatomic, assign)BOOL scrollToTop;
+
+- (void)isNeedToRefresh;
+
 @end
@@ -7,16 +7,21 @@
 //
  
 #import "LVCVodPlayerListController.h"
+#import "LVCTelevisionCell.h"
+#import "LVCRequestFailedView.h"
+#import "LVCVodPlayerController.h"
  
 static NSString *vodCellId = @"vodCellId";
  
-@interface LVCVodPlayerListController ()<UITableViewDelegate, UITableViewDataSource> {
+@interface LVCVodPlayerListController ()<UITableViewDelegate, UITableViewDataSource, LVCRequestFailedViewDelegate> {
  
     AFHTTPRequestOperation *_operation;
     NSMutableArray *_programArrayM;
+    long long _timestamp;
 }
  
 @property (nonatomic, strong)UITableView *tableView;
+@property (nonatomic, strong) LVCRequestFailedView *failedView; //请求失败提示view
  
 @end
  
@@ -28,10 +33,18 @@ static NSString *vodCellId = @&quot;vodCellId&quot;;
     self.navigationItem.title = @"点播";
     self.view.backgroundColor = [UIColor whiteColor];
     _programArrayM = [[NSMutableArray alloc] init];
+    
+    [self.tableView addSubview:self.failedView];
+    [self.view addSubview:self.tableView];
+    
+    _timestamp = [[self timestamp] longLongValue];
+    [self.tableView.header beginRefreshing];
 }
  
 - (void)requestVodPlayerList {
  
+    _failedView.hidden = YES;
+    
     NSString *uid;
     if ([UserTools isLogin]) {
         uid = [UserInformationModel manager].uid;
@@ -64,15 +77,33 @@ static NSString *vodCellId = @&quot;vodCellId&quot;;
                 }
             }
         }
+        _timestamp = [[self timestamp] longLongValue];
+        [self.tableView.header endRefreshing];
         [self.tableView reloadData];
  
     } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
  
         NSLog(@"点播列表请求失败!");
+        _timestamp = [[self timestamp] longLongValue];
+        [self.tableView.header endRefreshing];
+        if (_programArrayM.count == 0) {
+            _failedView.hidden = NO;
+        }
     }];
 }
  
 #pragma mark - UITableViewDelegate !!!!!!!!!!!!!!!!!!!!!!!!
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    [tableView deselectRowAtIndexPath:indexPath animated:NO];
+    
+    LVCVodPlayerController *vc = [[LVCVodPlayerController alloc] init];
+    [self.navigationController pushViewController:vc animated:YES];
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return SCREEN_WIDTH*9/16+40;
+}
  
 #pragma mark - UITableViewDataSource !!!!!!!!!!!!!!!!!!!!!!!!
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
@@ -81,27 +112,82 @@ static NSString *vodCellId = @&quot;vodCellId&quot;;
  
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
  
-    return nil;
+    LVCTelevisionCell *cell = [tableView dequeueReusableCellWithIdentifier:vodCellId forIndexPath:indexPath];
+    
+    cell.programModel = _programArrayM[indexPath.row];
+    return cell;
+}
+
+#pragma mark - LVCRequestFailedViewDelegate
+- (void)reloadDataWithView:(LVCRequestFailedView *)view
+{
+    [self.tableView.header beginRefreshing];
+    [self requestVodPlayerList];
 }
  
 #pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (UITableView *)tableView {
  
     if (!_tableView) {
-        _tableView = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStylePlain];
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, self.view.bounds.size.width, self.view.bounds.size.height - 50) style:UITableViewStylePlain];
         _tableView.dataSource = self;
         _tableView.delegate = self;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        _tableView.showsHorizontalScrollIndicator = NO;
+        _tableView.scrollsToTop = YES;
+        _tableView.header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(refresh)];
  
-        UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, -KScreenHeight, KScreenWidth, KScreenHeight)];
-        view.backgroundColor = [UIColor backgroundColor];
-        [_tableView addSubview:view];
-        
-        [_tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:vodCellId];
+        [_tableView registerClass:[LVCTelevisionCell class] forCellReuseIdentifier:vodCellId];
     }
     return _tableView;
 }
  
+- (LVCRequestFailedView *)failedView
+{
+    if (!_failedView) {
+        _failedView = [[LVCRequestFailedView alloc] initWithFrame:CGRectMake(0, 0, 150, 100) words:@"您的网络不太顺畅哦~"];
+        _failedView.center = self.tableView.center;
+        _failedView.delegate = self;
+        _failedView.hidden = YES;
+    }
+    return _failedView;
+}
+
+#pragma mark - Action !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+- (void)refresh {
+    
+    [self requestVodPlayerList];
+}
+
+- (NSString *)timestamp {
+    
+    NSString *stamp = @"";
+    
+    stamp = [NSString stringWithFormat:@"%.3f", [[NSDate date] timeIntervalSince1970]];
+    stamp = [stamp stringByReplacingOccurrencesOfString:@"." withString:@""];
+    
+    return stamp;
+}
+
+- (void)autoRefresh {
+    
+    [self requestVodPlayerList];
+}
+
+- (void)isNeedToRefresh {
+    
+    long long timestamp = [[self timestamp] longLongValue];
+    if (timestamp-_timestamp > 180000) {
+        [self.tableView.header beginRefreshing];
+    }
+}
+
+- (void)setScrollToTop:(BOOL)scrollToTop {
+    
+    _scrollToTop = scrollToTop;
+    self.tableView.scrollsToTop = scrollToTop;
+}
+
 #pragma mark ------------------------------ 分割线 ----------------------------------------------
 - (NSDictionary *)addParameters:(NSDictionary *)dict {
  
@@ -3,67 +3,67 @@
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "ic_launcher40.png",
+      "filename" : "web_hi_res40.png",
       "scale" : "2x"
     },
     {
       "size" : "20x20",
       "idiom" : "iphone",
-      "filename" : "ic_launcher60.png",
+      "filename" : "web_hi_res60.png",
       "scale" : "3x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "ic_launcher29.png",
+      "filename" : "web_hi_res29.png",
       "scale" : "1x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "ic_launcher58.png",
+      "filename" : "web_hi_res58.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "ic_launcher87.png",
+      "filename" : "web_hi_res87.png",
       "scale" : "3x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "ic_launcher80.png",
+      "filename" : "web_hi_res80.png",
       "scale" : "2x"
     },
     {
       "size" : "40x40",
       "idiom" : "iphone",
-      "filename" : "ic_launcher120-1.png",
+      "filename" : "web_hi_res120-1.png",
       "scale" : "3x"
     },
     {
       "size" : "57x57",
       "idiom" : "iphone",
-      "filename" : "ic_launcher57.png",
+      "filename" : "web_hi_res57.png",
       "scale" : "1x"
     },
     {
       "size" : "57x57",
       "idiom" : "iphone",
-      "filename" : "ic_launcher114.png",
+      "filename" : "web_hi_res114.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "ic_launcher120.png",
+      "filename" : "web_hi_res120png.png",
       "scale" : "2x"
     },
     {
       "size" : "60x60",
       "idiom" : "iphone",
-      "filename" : "ic_launcher180.png",
+      "filename" : "web_hi_res180.png",
       "scale" : "3x"
     }
   ],