Commit 265a8ee3 authored by 陈俊俊's avatar 陈俊俊

测试

parent 3ebd6243
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#import "RPassgerView.h" #import "RPassgerView.h"
#import "FinishTimeView.h" #import "FinishTimeView.h"
#import "QueryOrder.h" #import "QueryOrder.h"
@interface ReportDetailViewController ()<CustomSegViewDelegate,FinishTimeViewDelegate> @interface ReportDetailViewController ()<CustomSegViewDelegate,FinishTimeViewDelegate,UIWebViewDelegate>
@property (nonatomic,strong)CustomSegView *segView; @property (nonatomic,strong)CustomSegView *segView;
@property (nonatomic,strong)RSaleView *rsaleView; @property (nonatomic,strong)RSaleView *rsaleView;
@property (nonatomic,strong)UIWebView *rwebView; @property (nonatomic,strong)UIWebView *rwebView;
...@@ -72,17 +72,25 @@ ...@@ -72,17 +72,25 @@
self.rsaleView.bgImage.image = [UIImage imageNamed:@"salebg_1"]; self.rsaleView.bgImage.image = [UIImage imageNamed:@"salebg_1"];
self.rsaleView.cenImage.image = [UIImage imageNamed:@"sale_1"]; self.rsaleView.cenImage.image = [UIImage imageNamed:@"sale_1"];
[self.scrollView addSubview:self.rsaleView]; [self.scrollView addSubview:self.rsaleView];
rect = CGRectMake(0, self.rsaleView.bottom, ScreenSize.width, self.scrollView.height - self.rsaleView.bottom - 64);
self.rwebView = [[UIWebView alloc]initWithFrame:rect];
self.rwebView.scrollView.backgroundColor = [UIColor redColor];
[self.scrollView addSubview:self.rwebView];
rect = CGRectMake(0, self.rsaleView.bottom, ScreenSize.width*2, self.scrollView.height - self.rsaleView.bottom - 64);
CLog(@"-------%f",self.scrollView.height);
UIWebView *webView = [[UIWebView alloc]initWithFrame:CGRectMake(0,self.rsaleView.bottom, ScreenSize.width*2, self.scrollView.height)];
webView.delegate = self;
webView.backgroundColor = [UIColor clearColor];
[self.scrollView addSubview:webView];
self.rwebView = webView;
for (int i = 1; i< 4 ; i++) { for (int i = 1; i< 4 ; i++) {
RPassgerView *prassView = [[RPassgerView alloc]initWithFrame:CGRectMake(i*ScreenSize.width, 0, ScreenSize.width, 145) withPage:i]; RPassgerView *prassView = [[RPassgerView alloc]initWithFrame:CGRectMake(i*ScreenSize.width, 0, ScreenSize.width*2, 145) withPage:i];
UIWebView *web = [[UIWebView alloc]initWithFrame:CGRectMake(i*ScreenSize.width, prassView.bottom, ScreenSize.width, self.scrollView.height - prassView.bottom - 64)];
prassView.bgImage.image = [UIImage imageNamed:[NSString stringWithFormat:@"salebg_%d",(i+1)]]; prassView.bgImage.image = [UIImage imageNamed:[NSString stringWithFormat:@"salebg_%d",(i+1)]];
prassView.cenImage.image = [UIImage imageNamed:[NSString stringWithFormat:@"sale_%d",(i+1)]]; prassView.cenImage.image = [UIImage imageNamed:[NSString stringWithFormat:@"sale_%d",(i+1)]];
UIWebView *web = [[UIWebView alloc]initWithFrame:CGRectMake(i*ScreenSize.width, prassView.bottom, ScreenSize.width*2, self.scrollView.height)];
web.delegate = self;
web.backgroundColor = [UIColor clearColor];
[self.scrollView addSubview:prassView]; [self.scrollView addSubview:prassView];
[self.scrollView addSubview:web]; [self.scrollView addSubview:web];
if (i == 1) { if (i == 1) {
...@@ -98,8 +106,19 @@ ...@@ -98,8 +106,19 @@
} }
self.scrollView.contentSize = CGSizeMake(ScreenSize.width*4, ScreenSize.height - 64 - self.segView.bottom); self.scrollView.contentSize = CGSizeMake(ScreenSize.width*4, ScreenSize.height - 64 - self.segView.bottom);
#warning 测试
[self.rpassgerWebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://218.244.151.129:7580/cruiser-web/chart/surveychart.thor?enterprise=1111&surveyUuid=2222"]]];
[self.rpriceWebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://218.244.151.129:7580/cruiser-web/chart/surveychart.thor?enterprise=1111&surveyUuid=2222"]]];
[self.rgrossWebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://218.244.151.129:7580/cruiser-web/chart/surveychart.thor?enterprise=1111&surveyUuid=2222"]]];
[self.rwebView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"http://218.244.151.129:7580/cruiser-web/chart/surveychart.thor?enterprise=1111&surveyUuid=2222"]]];
}
- (void)webViewDidFinishLoad:(UIWebView *)webView { //webview 自适应高度
if (webView == self.rwebView || webView == self.rpassgerWebView || webView == self.rpriceWebView || webView == self.rgrossWebView) {
webView.scrollView.contentSize = CGSizeMake(ScreenSize.width*3, self.scrollView.height+100);
}
} }
- (void)getDataFromServer{ - (void)getDataFromServer{
__weak typeof(self)weakSelf = self; __weak typeof(self)weakSelf = self;
void(^succ)(id) = ^(id data) { void(^succ)(id) = ^(id data) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment