3.1.2完善

重庆迈尖科技有限公司

2021-08-18 f35cb784f7edb05b113494e86a00268ef902ae89

3.1.2完善

 .DS_Store

Binary files differ

 BuWanVideo2.0.xcodeproj/project.pbxproj

@@ -3235,7 +3235,7 @@
                CODE_SIGN_IDENTITY = "iPhone Developer";
                "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
                CODE_SIGN_STYLE = Automatic;
                CURRENT_PROJECT_VERSION = 87;
                CURRENT_PROJECT_VERSION = 88;
                DEVELOPMENT_TEAM = 98HSDT7AP4;
                ENABLE_BITCODE = NO;
                FRAMEWORK_SEARCH_PATHS = (
@@ -3387,7 +3387,7 @@
                CODE_SIGN_IDENTITY = "iPhone Developer";
                "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
                CODE_SIGN_STYLE = Automatic;
                CURRENT_PROJECT_VERSION = 87;
                CURRENT_PROJECT_VERSION = 88;
                DEVELOPMENT_TEAM = 98HSDT7AP4;
                ENABLE_BITCODE = NO;
                FRAMEWORK_SEARCH_PATHS = (

 BuWanVideo2.0.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -7,38 +7,6 @@
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            uuid = "F26ED4FA-3A87-497C-9C0E-223A92AEA93F"
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "BuWanVideo2.0/PPTVController.m"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "435"
            endingLineNumber = "435"
            landmarkName = "-viewPPTVVip"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            uuid = "A9D14A44-5DC1-414B-8415-D216538FEE4D"
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
            continueAfterRunningActions = "No"
            filePath = "BuWanVideo2.0/BuyVipController.m"
            startingColumnNumber = "9223372036854775807"
            endingColumnNumber = "9223372036854775807"
            startingLineNumber = "130"
            endingLineNumber = "130"
            landmarkName = "-touchSubscribeVip"
            landmarkType = "7">
         </BreakpointContent>
      </BreakpointProxy>
      <BreakpointProxy
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
         <BreakpointContent
            uuid = "2DDE1E4E-1E2C-4444-A791-A30CC51D4B4B"
            shouldBeEnabled = "Yes"
            ignoreCount = "0"
@@ -66,54 +34,6 @@
            endingLineNumber = "57"
            landmarkName = "-viewDidLoad"
            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>

 BuWanVideo2.0.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Expressions.xcexplist

New file
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<VariablesViewState
   version = "1.0">
   <ContextStates>
      <ContextState
         contextName = "main:main.m">
         <PersistentStrings>
            <PersistentString
               value = "">
            </PersistentString>
         </PersistentStrings>
      </ContextState>
   </ContextStates>
</VariablesViewState>

 BuWanVideo2.0/Assets.xcassets/.DS_Store

Binary files differ

 BuWanVideo2.0/Assets.xcassets/ÎҵIJà±ßÀ¸ÇÐͼ/»áÔ±ÖÐÐÄ.imageset/Contents.json

@@ -6,7 +6,7 @@
    },
    {
      "idiom" : "universal",
      "filename" : "我的收藏@2x.png",
      "filename" : "会员中心@2x.png",
      "scale" : "2x"
    },
    {

 BuWanVideo2.0/Assets.xcassets/ÎҵIJà±ßÀ¸ÇÐͼ/»áÔ±ÖÐÐÄ.imageset/»áÔ±ÖÐÐÄ@2x.png

 BuWanVideo2.0/Assets.xcassets/ÎҵIJà±ßÀ¸ÇÐͼ/»áÔ±ÖÐÐÄ.imageset/ÎÒµÄÊÕ²Ø@2x.png

Binary files differ

 BuWanVideo2.0/BuyVipController.m

@@ -82,8 +82,8 @@
    
    [self.webView customJavascriptDialogLabelTitles:@{@"alertTitle":@"Notification",@"alertBtn":@"OK"}];
    
//    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:_url]];
    NSURLRequest *request =  [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://vip.ysdq.yeshitv.com/index_ios_test.html"]];
    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:_url]];
//    NSURLRequest *request =  [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://vip.ysdq.yeshitv.com/index_ios_test.html"]];
    [self.webView loadRequest:request];
}


 BuWanVideo2.0/JSAPI.m

@@ -15,6 +15,10 @@

@implementation JSAPI

- (NSString *)getVersion:(NSString *)msg {
    return Version;
}

- (NSString *)login:(NSString *)msg {
    [[NSNotificationCenter defaultCenter] postNotificationName:@"h5Login" object:nil];
    return msg;

 BuWanVideo2.0/LeftViewController.m

@@ -184,6 +184,7 @@
        case 0:{
            if([[NSUserDefaults standardUserDefaults] boolForKey:@"userOnLine"]){//判断用户是否登录
                BuyVipController *vc = [[BuyVipController alloc] init];
                [vc setHidesBottomBarWhenPushed:YES];
                vc.url =[[NSUserDefaults standardUserDefaults] objectForKey:VIPLINK];
                [self.navigationController pushViewController:vc animated:YES];
            }else{

 BuWanVideo2.0/MainViewController.m

@@ -268,6 +268,7 @@
 */
-(void)JumpToRecordView{
    LookNoteController *LookNoteLookNoteVC=[[LookNoteController alloc] init];
    [LookNoteLookNoteVC setHidesBottomBarWhenPushed:YES];
    [self.navigationController pushViewController:LookNoteLookNoteVC animated:YES];
}


 BuWanVideo2.0/PPTVController.m

@@ -67,9 +67,10 @@
- (void)viewWillAppear:(BOOL)animated {
    [super viewWillAppear:animated];
    [self.navigationController setNavigationBarHidden:YES animated:animated];
    
    [self refrshData];
  
    //是否登录
    if([[NSUserDefaults standardUserDefaults] boolForKey:@"userOnLine"]){
        [self refrshData];
    }
}

- (void)viewWillDisappear:(BOOL)animated {

 BuWanVideo2.0/Recommend/MainBaseController.m

@@ -65,6 +65,7 @@
    self.viewRecommendNav.onRecord = ^{
        @strongify(self)
        LookNoteController *LookNoteLookNoteVC=[[LookNoteController alloc] init];
        [LookNoteLookNoteVC setHidesBottomBarWhenPushed:YES];
        [self.navigationController pushViewController:LookNoteLookNoteVC animated:YES];
    };
}

 BuWanVideo2.0/WEBViewController.m

@@ -15,6 +15,7 @@

@property (strong, nonatomic) WKWebView *webView;
@property (strong, nonatomic) UILabel *titleView;
@property (strong, nonatomic) UILabel *urlView;
@property (strong, nonatomic) UIButton *backBt;
@property (strong, nonatomic) UIButton *reloadBt;

@@ -30,6 +31,12 @@
    _titleView.backgroundColor=kGlobalMainColor;
    _titleView.userInteractionEnabled=YES;
    [self.view addSubview:_titleView];
    //添加网页链接
    _urlView=[[UILabel alloc] initWithFrame:CGRectMake(50, 34, KScreenW-100, 24)];
    [_urlView setFont:[UIFont systemFontOfSize:12]];
    [_urlView setTextColor:[UIColor whiteColor]];
    _urlView.userInteractionEnabled=YES;
    [self.view addSubview:_urlView];
    
    //网页视图
    _webView=[[WKWebView alloc] initWithFrame:CGRectMake(0, 64, KScreenW, KScreenH-64)];
@@ -69,9 +76,14 @@
    [_reloadBt addTarget:self action:@selector(reloadButtonPushed:) forControlEvents:UIControlEventTouchUpInside];
    [self.view addSubview:_reloadBt];
    
  
    
    //监听标题
    [_webView addObserver:self forKeyPath:@"title" options:NSKeyValueObservingOptionNew context:NULL];
    [_webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew context:NULL];
    
   
    
    
    [self loadwebViews];
}
@@ -117,6 +129,7 @@
-(void)loadwebViews{
    NSURLRequest *req = [[NSURLRequest alloc] initWithURL:[NSURL URLWithString:_url]];
    [_webView loadRequest:req];
    _urlView.text=_url;
}


@@ -145,6 +158,7 @@
        NSString *url;
        url = navigationAction.request.URL.absoluteString;
        NSLog(@"链接：%@",url);
       
        
        if([url hasPrefix:@"iqiyi"]){
            if ([[UIApplication sharedApplication]
@@ -183,6 +197,7 @@
//支持的方向 å› ä¸ºç•Œé¢A我们只需要支持竖屏
- (UIInterfaceOrientationMask)supportedInterfaceOrientations{
    _titleView.frame=CGRectMake(0, 0, KScreenWp, 64);
    _urlView.frame=CGRectMake(50, 34, KScreenWp-100, 24);
    _webView.frame=CGRectMake(0, 64, KScreenWp, KScreenHp-64);
    _backBt.frame=CGRectMake(8, 22, 32, 32);
    _reloadBt.frame=CGRectMake(KScreenWp-40, 22, 32, 32);
@@ -194,10 +209,10 @@
        if (object == _webView) {
            NSString *title = _webView.title;
            if(webtitle==nil){
                webtitle=[[UILabel alloc] initWithFrame:CGRectMake(50, 22, KScreenW-100, 32)];
                webtitle=[[UILabel alloc] initWithFrame:CGRectMake(50, 15, KScreenW-100, 32)];
                [webtitle setFont:[UIFont systemFontOfSize:14]];
                [webtitle setTextColor:[UIColor whiteColor]];
                [webtitle setTextAlignment:NSTextAlignmentCenter];
                [webtitle setTextAlignment:NSTextAlignmentLeft];
                [_titleView addSubview:webtitle];
            }
            webtitle.text =title;

 BuWanVideo2.0/XYRDetailViewController.m

@@ -1516,13 +1516,16 @@
    // é…ç½®è§†é¢‘播放属性
    self.nativeExpressAd.videoAutoPlayOnWWAN = YES;
    self.nativeExpressAd.videoMuted = NO;
    [self.nativeExpressAd loadAd:10];
    [self.nativeExpressAd loadAd:4];
}
- (void)nativeExpressAdSuccessToLoad:(GDTNativeExpressAd
                                      *)nativeExpressAd views:(NSArray<__kindof
                                                               GDTNativeExpressAdView *> *)views
{
    self.expressAdViews = [NSArray arrayWithArray:views];
    if(views&&views.count>=3)
    {
        self.expressAdViews = [NSArray arrayWithArray:views];
    }
    if (self.expressAdViews.count) {
        [self.expressAdViews enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
            GDTNativeExpressAdView *expressView = (GDTNativeExpressAdView *)obj;

 BuWanVideo2.0/recommendView.m

@@ -882,7 +882,7 @@
            recommentCollectionViewCell *cell=[collectionView dequeueReusableCellWithReuseIdentifier:@"recommentCollectionViewCell" forIndexPath:indexPath];
            //            if (indexPath.row > _dataHomeType.count) {
            //                return cell;
            //            }
            //            }f
            
            //设置cell的背景色（白色）
            cell.backgroundColor=[UIColor whiteColor];

 Pods/Pods.xcodeproj/xcuserdata/mj.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -21,7 +21,7 @@
        <key>IQKeyboardManager.xcscheme_^#shared#^_</key>
        <dict>
            <key>orderHint</key>
            <integer>12</integer>
            <integer>14</integer>
        </dict>
        <key>MJRefresh.xcscheme</key>
        <dict>
@@ -40,12 +40,12 @@
        <key>ReactiveCocoa.xcscheme_^#shared#^_</key>
        <dict>
            <key>orderHint</key>
            <integer>13</integer>
            <integer>15</integer>
        </dict>
        <key>SDAutoLayout.xcscheme_^#shared#^_</key>
        <dict>
            <key>orderHint</key>
            <integer>14</integer>
            <integer>13</integer>
        </dict>
        <key>SDWebImage.xcscheme</key>
        <dict>
@@ -64,7 +64,7 @@
        <key>UMCCommon.xcscheme_^#shared#^_</key>
        <dict>
            <key>orderHint</key>
            <integer>15</integer>
            <integer>12</integer>
        </dict>
        <key>YYCache.xcscheme</key>
        <dict>