.DS_Store | 补丁 | 查看 | 原始文档 | blame | 历史 | |
BuWanVideo2.0.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
BuWanVideo2.0/.DS_Store | 补丁 | 查看 | 原始文档 | blame | 历史 | |
BuWanVideo2.0/Assets.xcassets/.DS_Store | 补丁 | 查看 | 原始文档 | blame | 历史 | |
BuWanVideo2.0/Assets.xcassets/我的侧边栏切图/会员中心.imageset/Contents.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
BuWanVideo2.0/Assets.xcassets/我的侧边栏切图/会员中心.imageset/我的收藏@2x.png | 补丁 | 查看 | 原始文档 | blame | 历史 | |
BuWanVideo2.0/BuyVipController.m | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
BuWanVideo2.0/LeftViewController.m | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
BuWanVideo2.0/PPTVController.m | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
BuWanVideo2.0/XYRDetailViewController.m | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Pods/Pods.xcodeproj/xcuserdata/mj.xcuserdatad/xcschemes/xcschememanagement.plist | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.DS_StoreBinary files differ
BuWanVideo2.0.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -14,8 +14,8 @@ filePath = "BuWanVideo2.0/PPTVController.m" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "419" endingLineNumber = "419" startingLineNumber = "435" endingLineNumber = "435" landmarkName = "-viewPPTVVip" landmarkType = "7"> </BreakpointContent> @@ -68,5 +68,53 @@ landmarkType = "7"> </BreakpointContent> </BreakpointProxy> <BreakpointProxy BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint"> <BreakpointContent uuid = "5F8924F6-6BA0-49FC-8EA0-7B58749C93BA" shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" filePath = "BuWanVideo2.0/LoggingViewController.m" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "394" endingLineNumber = "394" landmarkName = "-fetchNewInfo" landmarkType = "7"> <Locations> <Location uuid = "5F8924F6-6BA0-49FC-8EA0-7B58749C93BA - 1955b0666b186dd2" shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" symbolName = "-[LoggingViewController fetchNewInfo]" moduleName = "BuWanVideo2.0" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/mj/Desktop/buwan/buwan-ios/BuWanVideo2.0/LoggingViewController.m" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "394" endingLineNumber = "394" offsetFromSymbolStart = "24"> </Location> <Location uuid = "5F8924F6-6BA0-49FC-8EA0-7B58749C93BA - ac93558e77c6149a" shouldBeEnabled = "Yes" ignoreCount = "0" continueAfterRunningActions = "No" symbolName = "__37-[LoggingViewController fetchNewInfo]_block_invoke" moduleName = "BuWanVideo2.0" usesParentBreakpointCondition = "Yes" urlString = "file:///Users/mj/Desktop/buwan/buwan-ios/BuWanVideo2.0/LoggingViewController.m" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" startingLineNumber = "396" endingLineNumber = "396" offsetFromSymbolStart = "80"> </Location> </Locations> </BreakpointContent> </BreakpointProxy> </Breakpoints> </Bucket> BuWanVideo2.0/.DS_StoreBinary files differ
BuWanVideo2.0/Assets.xcassets/.DS_StoreBinary files differ
BuWanVideo2.0/Assets.xcassets/ÎҵIJà±ßÀ¸ÇÐͼ/»áÔ±ÖÐÐÄ.imageset/Contents.json
New file @@ -0,0 +1,21 @@ { "images" : [ { "idiom" : "universal", "scale" : "1x" }, { "idiom" : "universal", "filename" : "æçæ¶è@2x.png", "scale" : "2x" }, { "idiom" : "universal", "scale" : "3x" } ], "info" : { "version" : 1, "author" : "xcode" } } BuWanVideo2.0/Assets.xcassets/ÎҵIJà±ßÀ¸ÇÐͼ/»áÔ±ÖÐÐÄ.imageset/ÎÒµÄÊÕ²Ø@2x.png
BuWanVideo2.0/BuyVipController.m
@@ -83,7 +83,7 @@ [self.webView customJavascriptDialogLabelTitles:@{@"alertTitle":@"Notification",@"alertBtn":@"OK"}]; // NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:_url]]; NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://192.168.3.122:8848/BuWanWeb/vip/index_ios_test.html"]]; NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://vip.ysdq.yeshitv.com/index_ios_test.html"]]; [self.webView loadRequest:request]; } @@ -230,7 +230,7 @@ NSMutableDictionary *parms = [[NSMutableDictionary alloc] init]; parms[@"receipt"] = encodeStr; parms[@"transactionIdentifier"] = transaction.transactionIdentifier; parms[@"orderNo"] = self.orderNo; NSString *json = [self jsonStringToJsonData:parms]; BuWanVideo2.0/LeftViewController.m
@@ -14,6 +14,7 @@ #import "MymessageContrlloer.h" #import "LookNoteController.h" #import "CollectionController.h" #import "BuyVipController.h" //#import "PublishGoodsViewController.h" #import "MyRegardController.h" #import "Share.h" @@ -144,10 +145,10 @@ */ -(void)creatData{ if (!_iconArr) { _iconArr=[NSArray arrayWithObjects:@"æçæ¶è",@"è§çè®°å½",@"æçå ³æ³¨",@"æçæ¶æ¯",@"帮å©ååé¦",@"éç§æ¿ç",@"设置", nil]; _iconArr=[NSArray arrayWithObjects:@"ä¼åä¸å¿",@"æçæ¶è",@"è§çè®°å½",@"æçå ³æ³¨",@"æçæ¶æ¯",@"帮å©ååé¦",@"éç§æ¿ç",@"设置", nil]; } if (!_dataArr) { _dataArr=[NSArray arrayWithObjects:@"æçæ¶è",@"è§çè®°å½",@"æçå ³æ³¨",@"æçæ¶æ¯",@"帮å©ä¸åé¦",@"éç§æ¿ç",@"设置", nil]; _dataArr=[NSArray arrayWithObjects:@"ä¼åä¸å¿",@"æçæ¶è",@"è§çè®°å½",@"æçå ³æ³¨",@"æçæ¶æ¯",@"帮å©ä¸åé¦",@"éç§æ¿ç",@"设置", nil]; } } /** @@ -179,7 +180,22 @@ [tableView deselectRowAtIndexPath:indexPath animated:YES]; switch (indexPath.row) { case 0:{ if([[NSUserDefaults standardUserDefaults] boolForKey:@"userOnLine"]){//å¤æç¨æ·æ¯å¦ç»å½ BuyVipController *vc = [[BuyVipController alloc] init]; vc.url =[[NSUserDefaults standardUserDefaults] objectForKey:VIPLINK]; [self.navigationController pushViewController:vc animated:YES]; }else{ LoggingViewController *loginVC=[LoggingViewController new]; [loginVC setHidesBottomBarWhenPushed:YES]; [self.navigationController pushViewController:loginVC animated:YES]; } } break; case 1:{ // if([[NSUserDefaults standardUserDefaults] boolForKey:@"userOnLine"]){ // CollectionController * cc = [CollectionController new]; @@ -197,14 +213,14 @@ } break; case 1:{ case 2:{ LookNoteController * note = [LookNoteController new]; [note setHidesBottomBarWhenPushed:YES]; [self.navigationController pushViewController:note animated:YES]; } break; case 2:{ case 3:{ if([[NSUserDefaults standardUserDefaults] boolForKey:@"userOnLine"]){//å¤æç¨æ·æ¯å¦ç»å½ MyRegardController * nr = [MyRegardController new]; [nr setHidesBottomBarWhenPushed:YES]; @@ -216,7 +232,7 @@ } } break; case 3:{ case 4:{ if([[NSUserDefaults standardUserDefaults] boolForKey:@"userOnLine"]){//å¤æç¨æ·æ¯å¦ç»å½ MymessageContrlloer *message = [MymessageContrlloer new]; [message setHidesBottomBarWhenPushed:YES]; @@ -229,7 +245,7 @@ } break; case 4:{ case 5:{ //帮å©ä¸åé¦ HelpViewController *Help = [HelpViewController new]; [Help setHidesBottomBarWhenPushed:YES]; @@ -237,7 +253,7 @@ } break; case 5:{ case 6:{ NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"%@/api_control_ios.jsp",iconImageUrl]]; SFSafariViewController *safariVC = [[SFSafariViewController alloc] initWithURL:url]; // safariVC.delegate = self; @@ -255,7 +271,7 @@ } break; case 6:{ case 7:{ //设置 SettingController * setting = [SettingController new]; [setting setHidesBottomBarWhenPushed:YES]; @@ -308,7 +324,7 @@ cell.Icon.image=[UIImage imageNamed:_iconArr[indexPath.row]]; cell.titleText.text=_dataArr[indexPath.row]; //å½ææ°æ¶æ¯æ¶ï¼æ¾ç¤ºå°çº¢ç¹ if(indexPath.row == 3){ if(indexPath.row == 4){ if([[NSUserDefaults standardUserDefaults] boolForKey:@"HaveMessage"]){ UIView * red = [[UIView alloc]initWithFrame:CGRectMake(cell.titleText.frame.origin.x + 100, 21, 8, 8)]; red.backgroundColor = [UIColor redColor]; BuWanVideo2.0/PPTVController.m
@@ -40,6 +40,23 @@ [super viewDidLoad]; [self addObservers]; [self loadViewConfig]; NSDictionary *dictionary = [[NSUserDefaults standardUserDefaults] objectForKey:@"buUserInfo"]; NSDate *datenow = [NSDate date]; // ç°å¨æ¶é´ NSInteger timeSp = [datenow timeIntervalSince1970]*1000; if(dictionary) { if ([dictionary[@"vipExpireTime"] integerValue] <= timeSp) { if ([YTHsharedManger startManger].ad[@"videoDetailFullVideo"] && [[YTHsharedManger startManger].ad[@"videoDetailFullVideo"] isEqualToString:@"csj"]) { [self loadFullscreenVideoAd]; } } }else{ if ([YTHsharedManger startManger].ad[@"videoDetailFullVideo"] && [[YTHsharedManger startManger].ad[@"videoDetailFullVideo"] isEqualToString:@"csj"]) { [self loadFullscreenVideoAd]; } } //[self tryPlayFinish]; } - (void)dealloc @@ -51,9 +68,8 @@ [super viewWillAppear:animated]; [self.navigationController setNavigationBarHidden:YES animated:animated]; if ([YTHsharedManger startManger].ad[@"videoDetailFullVideo"] && [[YTHsharedManger startManger].ad[@"videoDetailFullVideo"] isEqualToString:@"csj"]) { [self loadFullscreenVideoAd]; } [self refrshData]; } - (void)viewWillDisappear:(BOOL)animated { BuWanVideo2.0/XYRDetailViewController.m
@@ -177,6 +177,17 @@ } - (void)loadFullscreenVideoAd { NSDictionary *dictionary = [[NSUserDefaults standardUserDefaults] objectForKey:@"buUserInfo"]; NSDate *datenow = [NSDate date]; // ç°å¨æ¶é´ NSInteger timeSp = [datenow timeIntervalSince1970]*1000; if(dictionary) { if ([dictionary[@"vipExpireTime"] integerValue] > timeSp) { return; } } self.fullscreenVideoAd = [[BUNativeExpressFullscreenVideoAd alloc] initWithSlotID:@"945472378"]; self.fullscreenVideoAd.delegate = self; [self.fullscreenVideoAd loadAdData]; Pods/Pods.xcodeproj/xcuserdata/mj.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -21,7 +21,7 @@ <key>IQKeyboardManager.xcscheme_^#shared#^_</key> <dict> <key>orderHint</key> <integer>13</integer> <integer>12</integer> </dict> <key>MJRefresh.xcscheme</key> <dict> @@ -40,12 +40,12 @@ <key>ReactiveCocoa.xcscheme_^#shared#^_</key> <dict> <key>orderHint</key> <integer>14</integer> <integer>13</integer> </dict> <key>SDAutoLayout.xcscheme_^#shared#^_</key> <dict> <key>orderHint</key> <integer>12</integer> <integer>14</integer> </dict> <key>SDWebImage.xcscheme</key> <dict>