iOS Team / CNLiveBalanceModule · Commits

Commit 833222dfeab8f1da11a3435a0e51df834541fd72

Authored by zhangxiaowen
1 parent 52a972fe

no message

Inline Side-by-side
Showing 6 changed files with 9 additions and 6 deletions
CNLiveBalanceModule/Classes/Detail/CNLiveBalanceDetailController.m
  View file @833222d
@@ -122,7 +122,7 @@ static const CGFloat height = 44; @@ -122,7 +122,7 @@ static const CGFloat height = 44;
122 JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init]; 122 JXCategoryIndicatorLineView *lineView = [[JXCategoryIndicatorLineView alloc] init];
123 lineView.indicatorColor = [UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0]; 123 lineView.indicatorColor = [UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0];
124 lineView.indicatorWidth = 40; 124 lineView.indicatorWidth = 40;
125 - _titleCategoryView.indicators = @[lineView]; 125 + _titleCategoryView.indicators = @[lineView];
126 } 126 }
127 return _titleCategoryView; 127 return _titleCategoryView;
128 } 128 }
Example/CNLiveBalanceModule/CNLIVEAppDelegate.m
  View file @833222d
@@ -67,10 +67,11 @@ @@ -67,10 +67,11 @@
67 [[NSUserDefaults standardUserDefaults] setObject:@"RkFYeLkl/u5S7tW8UcOkT3rfLTP/Ua8NIkdEsKlcolvl/yxTMNbAYXmmJyhKGpkj" forKey:@"CNLiveAuthToken"]; 67 [[NSUserDefaults standardUserDefaults] setObject:@"RkFYeLkl/u5S7tW8UcOkT3rfLTP/Ua8NIkdEsKlcolvl/yxTMNbAYXmmJyhKGpkj" forKey:@"CNLiveAuthToken"];
68 68
69 // CNLiveBaseViewController *vc = [[CNLiveBaseViewController alloc] init]; 69 // CNLiveBaseViewController *vc = [[CNLiveBaseViewController alloc] init];
70 -// CNLiveBalanceController *vc = [[CNLiveBalanceController alloc] initWithType:@"1" ID:CNUserShareModel.uid]; 70 + CNLiveBalanceController *vc = [[CNLiveBalanceController alloc] initWithType:@"2" ID:CNUserShareModel.uid];
71 // CNLIVEViewController *vc = [[CNLIVEViewController alloc] initWithUrl:@"http://www.baidu.com" title:@"asdasd" closeHidden:NO]; 71 // CNLIVEViewController *vc = [[CNLIVEViewController alloc] initWithUrl:@"http://www.baidu.com" title:@"asdasd" closeHidden:NO];
72 72
73 - CNLIVEViewController *vc = [[CNLIVEViewController alloc] initWithUrl:@"http://wjjh5test.cnlive.com/cnComplaint.html" title:@"" closeHidden:NO]; 73 +// CNLIVEViewController *vc = [[CNLIVEViewController alloc] initWithUrl:@"http://wjjh5test.cnlive.com/cnComplaint.html" title:@"" closeHidden:NO];
  74 +// vc.navigationHidden = YES;
74 // CNLIVEViewController *vc = [[CNLIVEViewController alloc] initWithUrl:@"" title:@"" closeHidden:NO]; 75 // CNLIVEViewController *vc = [[CNLIVEViewController alloc] initWithUrl:@"" title:@"" closeHidden:NO];
75 76
76 UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc]; 77 UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc];
Example/CNLiveBalanceModule/CNLiveBaseViewController.h
  View file @833222d
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 NS_ASSUME_NONNULL_BEGIN 11 NS_ASSUME_NONNULL_BEGIN
12 12
13 @interface CNLiveBaseViewController : UIViewController 13 @interface CNLiveBaseViewController : UIViewController
  14 +// 是否隐藏导航栏
14 @property (nonatomic, assign) BOOL navigationHidden; 15 @property (nonatomic, assign) BOOL navigationHidden;
15 16
16 // 子类重写添加子视图方法 17 // 子类重写添加子视图方法
Example/CNLiveBalanceModule/CNLiveBaseViewController.m
  View file @833222d
@@ -44,6 +44,7 @@ @@ -44,6 +44,7 @@
44 _navigationHidden = navigationHidden; 44 _navigationHidden = navigationHidden;
45 _navigationBar.hidden = navigationHidden; 45 _navigationBar.hidden = navigationHidden;
46 } 46 }
  47 +
47 /* 48 /*
48 #pragma mark - Navigation 49 #pragma mark - Navigation
49 50
Example/CNLiveBalanceModule/CNLiveBaseWebViewController.m
  View file @833222d
@@ -45,7 +45,7 @@ static const NSInteger margin = 10; @@ -45,7 +45,7 @@ static const NSInteger margin = 10;
45 _url = url; 45 _url = url;
46 } 46 }
47 47
48 -- (NSString *)html:(NSString *)url{ 48 +- (NSString *)editHtml:(NSString *)url{
49 return [NSString stringWithFormat:@"<div style=\"font-size:45px\">%@</div>",url]; 49 return [NSString stringWithFormat:@"<div style=\"font-size:45px\">%@</div>",url];
50 } 50 }
51 51
@@ -57,7 +57,7 @@ static const NSInteger margin = 10; @@ -57,7 +57,7 @@ static const NSInteger margin = 10;
57 [self.webView loadRequest:request]; 57 [self.webView loadRequest:request];
58 58
59 } else { 59 } else {
60 - [self.webView loadHTMLString:[self html:_url]]; 60 + [self.webView loadHTMLString:[self editHtml:_url]];
61 } 61 }
62 } 62 }
63 63
Example/CNLiveBalanceModule/CNLiveWebView.m
  View file @833222d
@@ -22,8 +22,8 @@ static CGFloat const progressViewHeight = 1; @@ -22,8 +22,8 @@ static CGFloat const progressViewHeight = 1;
22 if (@available(iOS 11, *)) { 22 if (@available(iOS 11, *)) {
23 self.wkWebView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentAutomatic; 23 self.wkWebView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentAutomatic;
24 } 24 }
25 - [self addSubview:self.wkWebView];  
26 [self addSubview:self.progressView]; 25 [self addSubview:self.progressView];
  26 + [self addSubview:self.wkWebView];
27 } 27 }
28 return self; 28 return self;
29 } 29 }