parent: 06d2594f | 补丁 | 提交 | show whitespace
重庆迈尖科技有限公司
2018-08-14 e8b6aafa9296160b67e5e12cdf57b55aae4eec9a 
no message
3个文件已修改
99 ■■■■■ 已修改文件
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate 补丁 | 查看 | 原始文档 | blame | 历史
MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MIduo/界面/邀请/商品分享/ShonpingShareViewController.m 87 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate

Binary files differ



 MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist


@@ -10,7 +10,7 @@


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/界面/SJBaseViewController.m"


            timestampString = "555928501.777197"


            timestampString = "555932281.9243211"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "253"


@@ -26,7 +26,7 @@


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/界面/SJBaseViewController.m"


            timestampString = "555928501.777253"


            timestampString = "555932281.924618"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "263"


@@ -42,7 +42,7 @@


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/界面/SJBaseViewController.m"


            timestampString = "555928501.777293"


            timestampString = "555932281.9247071"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "268"


@@ -58,7 +58,7 @@


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/界面/SJBaseViewController.m"


            timestampString = "555928501.7773269"


            timestampString = "555932281.924788"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "269"


@@ -72,7 +72,7 @@


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/界面/SJBaseViewController.m"


            timestampString = "555928501.77736"


            timestampString = "555932281.924858"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "255"


@@ -88,7 +88,7 @@


            ignoreCount = "0"


            continueAfterRunningActions = "No"


            filePath = "MIduo/界面/SJBaseViewController.m"


            timestampString = "555928501.7773941"


            timestampString = "555932281.9249279"


            startingColumnNumber = "9223372036854775807"


            endingColumnNumber = "9223372036854775807"


            startingLineNumber = "269"




 MIduo/½çÃæ/ÑûÇë/ÉÌÆ··ÖÏí/ShonpingShareViewController.m


@@ -29,13 +29,11 @@


@implementation ShonpingShareViewController


- (void)viewWillAppear:(BOOL)animated{


    [super viewWillAppear:animated];


    


    self.navigationController.navigationBar.translucent = NO;


    


    self.navigationController.navigationBar.barTintColor = [UIColor whiteColor];


    


    self.tabBarController.tabBar.hidden = YES;


    


    self.navigationController.navigationBar.titleTextAttributes=@{NSForegroundColorAttributeName:XYRMainColor,NSFontAttributeName:[UIFont boldSystemFontOfSize:17]};




    UIImage *image = [UIImage imageNamed:@"F72A37B3-8434-44EE-A2BA-BDCEB598C99F"];


@@ -47,22 +45,13 @@


    [backbutton addTarget:self action:@selector(back:) forControlEvents:UIControlEventTouchUpInside];


    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:backbutton];


    


    [self.webView removeFromSuperview];


    self.webView.delegate = self;


    self.webView = nil;


    [self.view addSubview:self.webView];


    _interface = [[MyJSInterface alloc] init];


    [self.webView addJavascriptInterfaces:_interface WithName:@"yestv"];


    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.urlString]]];


}




- (void)back:(UIButton *)sender {


    if (self.isHelpBack) {


        [self.webView removeFromSuperview];


        self.webView.delegate = self;


        self.webView = nil;


        [self.view addSubview:self.webView];


        _interface = [[MyJSInterface alloc] init];


        _interface = [MyJSInterface new];


        [self.webView addJavascriptInterfaces:_interface WithName:@"yestv"];


        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.urlString]]];


        self.isHelpBack = NO;


@@ -83,10 +72,15 @@


    [self.view addSubview:self.webView];


    [self.view addSubview:self.loadingProgressView];


    




     _interface = [MyJSInterface new];




    [self.webView addJavascriptInterfaces:_interface WithName:@"yestv"];




    [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.urlString]]];


}




- (void)viewWillDisappear:(BOOL)animated {


    [super viewWillDisappear:animated];


    


}




@@ -145,6 +139,20 @@


    }


    [shareView tappedCancel];


}


- (UIImage*)imageWithImageSimple:(UIImage*)image scaledToSize:(CGSize)newSize


{


    // Create a graphics image context


    UIGraphicsBeginImageContext(newSize);


    // Tell the old image to draw in this new context, with the desired


    // new size


    [image drawInRect:CGRectMake(0,0,newSize.width,newSize.height)];


    // Get the new image from the context


    UIImage* newImage = UIGraphicsGetImageFromCurrentImageContext();


    // End the context


    UIGraphicsEndImageContext();


    // Return the new image.


    return newImage;


}




/**


 åˆ†äº«


@@ -180,20 +188,19 @@




    if (shareType == SSDKPlatformSubTypeWechatTimeline || shareType == SSDKPlatformSubTypeWechatSession) {


        if (![WXApi isWXAppInstalled]) {


            


            ALToastCenter(@"微信未安装");


            [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];


            [SVProgressHUD showInfoWithStatus:@"微信未安装"];


            return;


        }


    }




    if ( SSDKPlatformSubTypeQQFriend == shareType || shareType == SSDKPlatformSubTypeQZone ) {


        if (![[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"mqq://"]]) {


          


            ALToastCenter(@"QQ未安装");


            [SVProgressHUD setContainerView:[UIApplication sharedApplication].delegate.window];


            [SVProgressHUD showInfoWithStatus:@"QQ未安装"];


            return;


        }


    }


    


    if (shareType == SSDKPlatformSubTypeQZone) {


        type = SSDKContentTypeImage;


    }


@@ -269,14 +276,14 @@


    if ( [urlString containsString:@"yeshitv://fanli_invite"]) {


        if ([YTHsharedManger startManger].networkStatus == 0) {


            


            ALToastCenter(@"网络未连接，请检测网络设置");


            [CustomProgressHUD showNormal:@"网络未连接，请检测网络设置"];


            


            return NO;


        }


        


        if ([YTHsharedManger startManger].isCheckNetCanUse == -2) {


            


            ALToastCenter(@"网络连接异常，请检测网络设置");


            [CustomProgressHUD showNormal:@"网络连接异常，请检测网络设置"];


            


            return NO;


        }


@@ -300,8 +307,7 @@


            NSLog(@"%@",decodedString);


            UIPasteboard*pasteboard = [UIPasteboard generalPasteboard];


            pasteboard.string=decodedString;


    


            


            [SVProgressHUD showSuccessWithStatus:@"复制成功！"];


        }else if([array[0] isEqualToString:@"yestv://share"]){


            NSData *decodedData = [[NSData alloc] initWithBase64EncodedString:array[2] options:0];


            NSString *decodedString = [[NSString alloc] initWithData:decodedData encoding:NSUTF8StringEncoding];


@@ -352,7 +358,8 @@


    };




}


- (NSDictionary *)dictionaryWithJsonString:(NSString *)jsonString {


- (NSDictionary *)dictionaryWithJsonString:(NSString *)jsonString


{


    if (jsonString == nil) {


        return nil;


    }


@@ -362,7 +369,8 @@


    NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData


                                                        options:NSJSONReadingMutableContainers


                                                          error:&err];


    if (err) {


    if(err)


    {


        NSLog(@"json解析失败：%@",err);


        return nil;


    }


@@ -376,7 +384,7 @@


        decisionHandler(WKNavigationActionPolicyCancel);


        NSArray *array = [url componentsSeparatedByString:@"#"];


       if([array[0] isEqualToString:@"fanli://yaoqin"]){


     


            //            shareMeassageArr=array;


            NSArray *shareAry = @[


                                  @{@"image":@"new微信",


                                    @"title":@"微信"},


@@ -430,9 +438,9 @@


- (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error{


    NSLog(@"%@",error);


    self.isField = YES;


//    self.title = @"网页无法打开";


//    NSNotification *notice = [[NSNotification alloc]initWithName:@"netWorkChangeEventNotification" object:@([YTHsharedManger startManger].networkStatus) userInfo:nil];


//    [self NetWorkStatesChange:notice];


    self.title = @"网页无法打开";


    NSNotification *notice = [[NSNotification alloc]initWithName:@"netWorkChangeEventNotification" object:@([YTHsharedManger startManger].networkStatus) userInfo:nil];


    [self NetWorkStatesChange:notice];


}


- (void)loadData {


    


@@ -446,7 +454,7 @@


        [self.webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.urlString]]];


        


        if (!self.urlString) {




//            [CustomProgressHUD showNormal:@"网络连接异常，请检测网络设置"];


            [self.navigationController popViewControllerAnimated:YES];


        }


    }


@@ -479,7 +487,7 @@


    if (self.isHelpBack) {


        height = 0;


    }


    _webView = [[EasyJSWebView alloc]initWithFrame:CGRectMake(0, 0, KScreenW, KScreenH - height)];


    _webView = [[EasyJSWebView alloc]initWithFrame:CGRectMake(0, 0, self.view.bounds.size.width, self.view.bounds.size.height - height)];


    _webView.scalesPageToFit = YES;


    _webView.delegate = self;


     //加载进度监听


@@ -500,29 +508,14 @@




- (void)webViewReload {


    if (!self.isshareType) {


        [self.webView reload];


        [_webView reload];


    }


   


}


- (void)dealloc {


    


    [self.webView removeObserver:self forKeyPath:@"estimatedProgress"];


    self.webView.delegate = self;


    [self.webView removeFromSuperview];


    self.webView = nil;


    


    [[NSNotificationCenter defaultCenter] removeObserver:self];


    [_webView removeObserver:self forKeyPath:@"estimatedProgress"];


   


    


    NSHTTPCookie *cookie;


    NSHTTPCookieStorage *storage = [NSHTTPCookieStorage sharedHTTPCookieStorage];


    


    for (cookie in [storage cookies]) {


        


        [storage deleteCookie:cookie];


    }


    // 清除webView的缓存


    [[NSURLCache sharedURLCache] removeAllCachedResponses];


}


- (void)didReceiveMemoryWarning {


    [super didReceiveMemoryWarning];