no message

iOS-Xiaowen
1 parent 4bdd50cf
Showing 9 changed files with 13 additions and 179 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/Pages/Home/抽屉效果/Controller/CNHomeRightViewController.m
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
CNLiveScioLive/Pages/My/通知公告/Controller/CNMyAnnouncementsViewController.m
CNLiveScioLive/Pages/SDK/Html5Utils/Html5Utils.h
CNLiveScioLive/Pages/SDK/Html5Utils/UIWebView+JavaScript.h
CNLiveScioLive/Pages/SDK/Html5Utils/UIWebView+JavaScript.m
CNLiveScioLive/Pages/SDK/Html5Utils/WKWebView+JavaScript.m
CNLiveScioLive/Pages/Tools/DBAction/DBAction.m
@@ -34,9 +34,6 @@
 		08384862215CAB1C00186618 /* UIColor+Change.m in Sources */ = {isa = PBXBuildFile; fileRef = 0838485B215CAB1C00186618 /* UIColor+Change.m */; };
 		08384863215CAB1C00186618 /* UIColor+Change.m in Sources */ = {isa = PBXBuildFile; fileRef = 0838485B215CAB1C00186618 /* UIColor+Change.m */; };
 		08384864215CAB1C00186618 /* UIColor+Change.m in Sources */ = {isa = PBXBuildFile; fileRef = 0838485B215CAB1C00186618 /* UIColor+Change.m */; };
-		08384865215CAB1C00186618 /* UIWebView+JavaScript.m in Sources */ = {isa = PBXBuildFile; fileRef = 08384860215CAB1C00186618 /* UIWebView+JavaScript.m */; };
-		08384866215CAB1C00186618 /* UIWebView+JavaScript.m in Sources */ = {isa = PBXBuildFile; fileRef = 08384860215CAB1C00186618 /* UIWebView+JavaScript.m */; };
-		08384867215CAB1C00186618 /* UIWebView+JavaScript.m in Sources */ = {isa = PBXBuildFile; fileRef = 08384860215CAB1C00186618 /* UIWebView+JavaScript.m */; };
 		08384868215CAB1C00186618 /* YWWebScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 08384861215CAB1C00186618 /* YWWebScrollView.m */; };
 		08384869215CAB1C00186618 /* YWWebScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 08384861215CAB1C00186618 /* YWWebScrollView.m */; };
 		0838486A215CAB1C00186618 /* YWWebScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 08384861215CAB1C00186618 /* YWWebScrollView.m */; };
@@ -766,10 +763,8 @@
 		08384856215CA75C00186618 /* OldVideoDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OldVideoDetailViewController.m; sourceTree = "<group>"; };
 		0838485B215CAB1C00186618 /* UIColor+Change.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIColor+Change.m"; sourceTree = "<group>"; };
 		0838485C215CAB1C00186618 /* YWWebScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YWWebScrollView.h; sourceTree = "<group>"; };
-		0838485D215CAB1C00186618 /* UIWebView+JavaScript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIWebView+JavaScript.h"; sourceTree = "<group>"; };
 		0838485E215CAB1C00186618 /* Html5Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Html5Utils.h; sourceTree = "<group>"; };
 		0838485F215CAB1C00186618 /* UIColor+Change.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIColor+Change.h"; sourceTree = "<group>"; };
-		08384860215CAB1C00186618 /* UIWebView+JavaScript.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIWebView+JavaScript.m"; sourceTree = "<group>"; };
 		08384861215CAB1C00186618 /* YWWebScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YWWebScrollView.m; sourceTree = "<group>"; };
 		0838486B215CAD2E00186618 /* NewsVideoTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NewsVideoTableViewCell.h; sourceTree = "<group>"; };
 		0838486C215CAD2E00186618 /* NewsVideoTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NewsVideoTableViewCell.m; sourceTree = "<group>"; };
@@ -1294,8 +1289,6 @@
 				0838485B215CAB1C00186618 /* UIColor+Change.m */,
 				0838485C215CAB1C00186618 /* YWWebScrollView.h */,
 				08384861215CAB1C00186618 /* YWWebScrollView.m */,
-				0838485D215CAB1C00186618 /* UIWebView+JavaScript.h */,
-				08384860215CAB1C00186618 /* UIWebView+JavaScript.m */,
 				08E7998D24B2F52C00F15587 /* WKWebView+JavaScript.h */,
 				08E7998E24B2F52C00F15587 /* WKWebView+JavaScript.m */,
 			);
@@ -3071,7 +3064,6 @@
 				08B5C5B221536BFF00F5476E /* AlertViewTool.m in Sources */,
 				08585D80215B4C7200FC2CA2 /* PGDatePicker+TimeAndSecond.m in Sources */,
 				084ACE3B2154C8310089E035 /* CNLiveNewsUpPicTableViewCell.m in Sources */,
-				08384865215CAB1C00186618 /* UIWebView+JavaScript.m in Sources */,
 				08C08FFA214FAFD400E23D16 /* UIViewController+XLSlideMenu.m in Sources */,
 				08585D6E215B4C7200FC2CA2 /* PGPickerView.m in Sources */,
 				08FB8771215DD3C600DA5423 /* NewVoiceTableViewCell.m in Sources */,
@@ -3109,7 +3101,6 @@
 				08C09008215082B700E23D16 /* XWTabBarModel.m in Sources */,
 				08C090882150C96C00E23D16 /* UIView+Extension.m in Sources */,
 				08B5C59D21534DB800F5476E /* CNLiveRegisterPhoneViewController.m in Sources */,
-				08384866215CAB1C00186618 /* UIWebView+JavaScript.m in Sources */,
 				084ACDFE21547AE80089E035 /* CNLiveContactUsViewController.m in Sources */,
 				08C090612150C3B200E23D16 /* CNLiveReporterAskedViewController.m in Sources */,
 				08B5C592215348A500F5476E /* CNMyAnnouncementsTableViewCell.m in Sources */,
@@ -3265,7 +3256,6 @@
 				08C09009215082B700E23D16 /* XWTabBarModel.m in Sources */,
 				08C090892150C96C00E23D16 /* UIView+Extension.m in Sources */,
 				08B5C59E21534DB800F5476E /* CNLiveRegisterPhoneViewController.m in Sources */,
-				08384867215CAB1C00186618 /* UIWebView+JavaScript.m in Sources */,
 				084ACDFF21547AE80089E035 /* CNLiveContactUsViewController.m in Sources */,
 				08C090622150C3B200E23D16 /* CNLiveReporterAskedViewController.m in Sources */,
 				08B5C593215348A500F5476E /* CNMyAnnouncementsTableViewCell.m in Sources */,
@@ -64,7 +64,7 @@ static NSString *homeRightHeaderFooterView = @&quot;CNHomeRightHeaderFooterView&quot;;
 #pragma mark - UITableViewDataSource
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
-    return 3;
+    return 2;
 }
@@ -101,7 +101,7 @@ static NSString *homeRightHeaderFooterView = @&quot;CNHomeRightHeaderFooterView&quot;;
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section{
-    NSArray *array = @[@"搜索内容", @"栏目列表", @"AR扫描"];
+    NSArray *array = @[@"搜索内容", @"栏目列表"];
     CNHomeRightHeaderFooterView *sectionHeadView = [tableView dequeueReusableHeaderFooterViewWithIdentifier:homeRightHeaderFooterView];
     if(!sectionHeadView){
@@ -77,13 +77,13 @@
          progress:^(NSProgress * _Nonnull uploadProgress) {}
           success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
               // 请求成功，解析数据
-              NSString * jsonString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
+        NSString * jsonString = [[NSString alloc] initWithData:responseObject encoding:NSUTF8StringEncoding];
 //              NSLog(@"jsonString == %@",jsonString);
-              NSArray *arr = [jsonString objectFromJSONString];
-              _dicArticle = [arr objectAtIndex:0];
+        NSArray *arr = [jsonString objectFromJSONString];
+        self->_dicArticle = [arr objectAtIndex:0];
 //              NSLog(@"%@", _dicArticle);
-              [_webView loadHTMLString:[self setHTMLString] baseURL:nil];
-              [SVProgressHUD dismiss];
+        [self->_webView loadHTMLString:[self setHTMLString] baseURL:nil];
+        [SVProgressHUD dismiss];
           }
           failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
               // 请求失败
@@ -27,7 +27,7 @@ static NSString *myAnnouncementsTableViewCell = @&quot;CNMyAnnouncementsTableViewCell
 - (void)loadData{
     NSString *url = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
     NSLog(@"%@",url);
-    NSString *josnParameters = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"wz/fbhgg/\",\"page\":\"%ld\",\"pageSize\":\"%@\"}",(long)self.pageNo,@"15"];
+    NSString *josnParameters = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"wz/fbhgg/\",\"page\":\"%ld\",\"pageSize\":\"%@\",\"lang\":\"%@\"}",(long)self.pageNo,@"15", IS_CHINESE?@"cn":@"en"];
     NSLog(@"%@",josnParameters);
     NSDictionary *parameters = @{@"params":josnParameters};
@@ -7,7 +7,6 @@
 //
 #import <UIKit/UIKit.h>
-#import "UIWebView+JavaScript.h"
 #import "WKWebView+JavaScript.h"
 //! Project version number for Html5Utils.
-//
-//  UIWebView+JavaScript.h
-//  eCarry
-//
-//  Created by whde on 15/11/10.
-//  Copyright © 2015年 Joybon. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface UIWebView (JavaScript)
-///  获取某个标签的结点个数
-- (int)nodeCountOfTag:(NSString *)tag;
-
-///  获取当前页面URL
-- (NSString *)getCurrentURL;
-
-///  获取标题
-- (NSString *)getTitle;
-
-///  获取文章内容
-- (NSString *)getContent;
-
-///  获取图片
-- (NSMutableArray *)getImgs;
-
-///  获取当前页面所有链接
-- (NSArray *)getOnClicks;
-
-///  改变背景颜色
-- (void)setBackgroundColor:(UIColor *)color;
-
-///  为所有图片添加点击事件(网页中有些图片添加无效)
-- (void)addClickEventOnImg;
-
-///  改变指定标签的字体颜色
-- (void)setFontColor:(UIColor *)color withTag:(NSString *)tagName;
-
-///  改变指定标签的字体大小
-- (void)setFontSize:(int)size withTag:(NSString *)tagName;
-
-///  设置网页没有拷贝粘贴
-- (void)disableTouchCallout;
-@end
-//
-//  UIWebView+JavaScript.m
-//  eCarry
-//
-//  Created by whde on 15/11/10.
-//  Copyright © 2015年 Joybon. All rights reserved.
-//
-
-#import "UIWebView+JavaScript.h"
-#import "UIColor+Change.h"
-#define HTML_STRING_NIL_TO_NONE_IF(x) [UIWebView STRING_NIL_TO_NONE:x]
-@implementation UIWebView (JavaScript)
-+ (NSString *)STRING_NIL_TO_NONE:(NSString *)x;{
-    if (x == nil || ([x isKindOfClass:[NSNull class]]) || ([x isKindOfClass:[NSString class]]&&x.length<=0) || [x isEqual:NULL]){
-        return @"";
-    } else {
-        return [NSString stringWithFormat:@"%@",x];
-    }
-}
-
-///  获取某个标签的结点个数
-- (int)nodeCountOfTag:(NSString *)tag {
-    NSString *jsString = [NSString stringWithFormat:@"document.getElementsByTagName('%@').length", tag];
-    int len = [[self stringByEvaluatingJavaScriptFromString:jsString] intValue];
-    return len;
-}
-
-///  获取当前页面URL
-- (NSString *)getCurrentURL {
-    return HTML_STRING_NIL_TO_NONE_IF([self stringByEvaluatingJavaScriptFromString:@"document.location.href"]);
-}
-
-///  获取标题
-- (NSString *)getTitle {
-    return HTML_STRING_NIL_TO_NONE_IF([self stringByEvaluatingJavaScriptFromString:@"document.title"]);
-}
-
-///  获取文章内容
-- (NSString *)getContent{
-    NSString *result = [self stringByEvaluatingJavaScriptFromString:@"document.documentElement.innerText"];
-    if (!result) {
-        result = [self stringByEvaluatingJavaScriptFromString:@"document.body.innerText"];
-    }
-    result = HTML_STRING_NIL_TO_NONE_IF(result);
-    return result;
-}
-
-///  获取所有图片链接
-- (NSMutableArray *)getImgs {
-    NSMutableArray *arrImgURL = [[NSMutableArray alloc] init];
-    int node = [self nodeCountOfTag:@"img"];
-    for (int i = 0; i < node; i++) {
-        NSString *jsString = [NSString stringWithFormat:@"document.getElementsByTagName('img')[%d].src", i];
-        NSString *img = [self stringByEvaluatingJavaScriptFromString:jsString];
-        [arrImgURL addObject:img];
-    }
-    return arrImgURL;
-}
-
-///  获取当前页面所有点击链接
-- (NSArray *)getOnClicks {
-    NSMutableArray *arrOnClicks = [[NSMutableArray alloc] init];
-    int node = [self nodeCountOfTag:@"a"];
-    for (int i = 0; i < node; i++) {
-        NSString *jsString = [NSString stringWithFormat:@"document.getElementsByTagName('a')[%d].getAttribute('onclick')", i];
-        NSString *clickString = [self stringByEvaluatingJavaScriptFromString:jsString];
-        [arrOnClicks addObject:clickString];
-    }
-    return arrOnClicks;
-}
-
-///  改变背景颜色
-- (void)setBackgroundColor:(UIColor *)color {
-    NSString * jsString = [NSString stringWithFormat:@"document.body.style.backgroundColor = '%@'",[color webColorString]];
-    [self stringByEvaluatingJavaScriptFromString:jsString];
-}
-
-///  为所有图片添加点击事件(网页中有些图片添加无效)
-- (void)addClickEventOnImg {
-    int node = [self nodeCountOfTag:@"img"];
-    for (int i = 0; i < node; i++) {
-        //利用重定向获取img.src，为区分，给url添加'img:'前缀
-        NSString *jsString = [NSString stringWithFormat:
-                              @"document.getElementsByTagName('img')[%d].onclick = \
-                              function() { document.location.href = 'img:' + this.src; }",i];
-        [self stringByEvaluatingJavaScriptFromString:jsString];
-    }
-}
-
-///  改变指定标签的字体颜色
-- (void)setFontColor:(UIColor *)color withTag:(NSString *)tagName {
-    NSString *jsString = [NSString stringWithFormat:
-                          @"var nodes = document.getElementsByTagName('%@'); \
-                          for(var i=0;i<nodes.length;i++){\
-                          nodes[i].style.color = '%@';}", tagName, [color webColorString]];
-    [self stringByEvaluatingJavaScriptFromString:jsString];
-}
-
-///  改变指定标签的字体大小
-- (void)setFontSize:(int)size withTag:(NSString *)tagName {
-    NSString *jsString = [NSString stringWithFormat:
-                          @"var nodes = document.getElementsByTagName('%@'); \
-                          for(var i=0;i<nodes.length;i++){\
-                          nodes[i].style.fontSize = '%dpx';}", tagName, size];
-    [self stringByEvaluatingJavaScriptFromString:jsString];
-}
-
-///  设置网页没有拷贝粘贴
-- (void)disableTouchCallout {
-    [self stringByEvaluatingJavaScriptFromString:@"document.documentElement.style.webkitUserSelect='none';"];
-    [self stringByEvaluatingJavaScriptFromString:@"document.documentElement.style.webkitTouchCallout='none';"];
-}
-
-
-@end
@@ -23,7 +23,8 @@
 ///  获取某个标签的结点个数
 - (int)nodeCountOfTag:(NSString *)tag {
     __block int len = 0;
-    [self evaluateJavaScript:@"document.getElementsByTagName('%@').length" completionHandler:^(id _Nullable response, NSError * _Nullable error) {
+    NSString *jsString = [NSString stringWithFormat:@"document.getElementsByTagName('%@').length", tag];
+    [self evaluateJavaScript:jsString completionHandler:^(id _Nullable response, NSError * _Nullable error) {
         NSLog(@"value: %@ error: %@", response, error);
         len = [response intValue];
     }];
@@ -130,6 +130,9 @@ static DBAction *instance = nil;
         BOOL res = [db executeUpdate:sql];
         if (!res) {
             NSLog(@"建表失败");
+            NSString *sql = [NSString stringWithFormat:@"ALTER TABLE %@ ADD %@ INTEGER",@"DATATABLE",@"playType"];
+            BOOL result = [db executeUpdate:sql];
+            
         } else {
             NSLog(@"建表成功");
         }