bug fix

model/Classes/Controllers/Controller/MineVC/MineNewViewController.m

@@ -110,7 +110,7 @@
         IntroView* introView = [[IntroView alloc] initWithFrame:CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height)
                                                         confirm:^{
                                                             ModelCardController *modelCardVC = [[ModelCardController alloc] init];
-                                                            modelCardVC.hidesBottomBarWhenPushed = YES;
+                                                            modelCardVC.type = @"init"; modelCardVC.hidesBottomBarWhenPushed = YES;
                                                             [this.navigationController pushViewController:modelCardVC animated:YES];
                                                         }
                                                          cancel:^{

model/Classes/Controllers/Controller/MyTeamVC/MyMemberController.m

@@ -59,7 +59,7 @@ static NSString *cellId = @"MyTeamCell";
 - (UIView *)tableHeader {
     if(!_tableHeader){
         _tableHeader = [[MyTeamHeader alloc] init];
-        _tableHeader.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, 107);
+        _tableHeader.frame = CGRectMake(0, 0, ScreenWidth, 107);
     }
     return _tableHeader;
 }

model/Classes/Controllers/Controller/MyTeamVC/MyModelController.m

@@ -60,7 +60,7 @@ static NSString *cellId = @"MyTeamCell";
 - (UIView *)tableHeader {
     if(!_tableHeader){
         _tableHeader = [[MyTeamHeader alloc] init];
-        _tableHeader.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, 107);
+        _tableHeader.frame = CGRectMake(0, 0, ScreenWidth, 107);
         _tableHeader.type = @"model";
     }
     return _tableHeader;

model/Classes/Controllers/Controller/MyTeamVC/MyTeamController.m

@@ -29,8 +29,6 @@
     self.myMemberVC = [[MyMemberController alloc] init];
     [self addChildViewController:self.myModelVC];
     [self addChildViewController:self.myMemberVC];
-    self.myModelVC.view.frame = CGRectMake(0, 0, self.scrollView.bounds.size.width, self.scrollView.bounds.size.height);
-    self.myMemberVC.view.frame = CGRectMake(self.scrollView.bounds.size.width, 0, self.scrollView.bounds.size.width, self.scrollView.bounds.size.height);
     [self.scrollView addSubview:self.myModelVC.view];
     [self.scrollView addSubview:self.myMemberVC.view];
 }
@@ -47,6 +45,8 @@
 
 - (void)viewDidLayoutSubviews {
     self.scrollView.contentSize = CGSizeMake(2 *  [UIScreen mainScreen].bounds.size.width, 0);
+    self.myModelVC.view.frame = CGRectMake(0, 0, ScreenWidth, self.scrollView.bounds.size.height);
+    self.myMemberVC.view.frame = CGRectMake(ScreenWidth, 0, ScreenWidth, self.scrollView.bounds.size.height);
     [self.myModelVC.view layoutIfNeeded];
     [self.myMemberVC.view layoutIfNeeded];
 }

model/Classes/Controllers/Controller/MyTeamVC/MyTeamHeader.m

@@ -45,7 +45,7 @@
     [super layoutSubviews];
     // gradient
     CAGradientLayer *gl = [CAGradientLayer layer];
-    gl.frame = CGRectMake(0, 0, self.bounds.size.width - 40, self.bounds.size.height - 22);
+    gl.frame = CGRectMake(0, 0, ScreenWidth - 40, self.bounds.size.height - 22);
     gl.startPoint = CGPointMake(0.03, 0.47);
     gl.endPoint = CGPointMake(0.97, 0.47);
     gl.colors = @[(__bridge id)[UIColor colorWithRed:251/255.0 green:92/255.0 blue:163/255.0 alpha:1].CGColor, (__bridge id)[UIColor colorWithRed:253/255.0 green:127/255.0 blue:141/255.0 alpha:1].CGColor];

model/Classes/Controllers/Controller/RankVC/RankChildController.m

@@ -51,7 +51,7 @@ static NSString *cellId = @"RankCell";
 - (RankHeader*)headerView {
     if (!_headerView) {
         _headerView = [[RankHeader alloc] init];
-        _headerView.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width - 30, 240);
+        _headerView.frame = CGRectMake(0, 0, ScreenWidth - 30, 240);
     }
     return _headerView;
 }

model/Classes/Controllers/Controller/RankVC/RankController.m

@@ -23,14 +23,15 @@
     [super viewDidLoad];
     self.scrollView.delegate = self;
     self.tabControl.delegate = self;
+   
     self.weekVC = [[RankChildController alloc] init];
     self.weekVC.type = @"week";
     self.monthVC = [[RankChildController alloc] init];
     self.monthVC.type = @"month";
     [self addChildViewController:self.weekVC];
     [self addChildViewController:self.monthVC];
-    self.weekVC.view.frame = CGRectMake(0, 0, self.scrollView.bounds.size.width, self.scrollView.bounds.size.height);
-    self.monthVC.view.frame = CGRectMake(self.scrollView.bounds.size.width, 0, self.scrollView.bounds.size.width, self.scrollView.bounds.size.height);
+    self.weekVC.view.frame = CGRectMake(0, 0, ScreenWidth, self.scrollView.bounds.size.height);
+    self.monthVC.view.frame = CGRectMake(ScreenWidth, 0, ScreenWidth, self.scrollView.bounds.size.height);
     [self.scrollView addSubview:self.weekVC.view];
     [self.scrollView addSubview:self.monthVC.view];
 }
@@ -46,6 +47,12 @@
 
 - (void)viewDidLayoutSubviews {
     [super viewDidLayoutSubviews];
+    
+   
+    self.weekVC.view.frame = CGRectMake(0, 0, ScreenWidth, self.scrollView.bounds.size.height);
+    self.monthVC.view.frame = CGRectMake(ScreenWidth, 0, ScreenWidth, self.scrollView.bounds.size.height);
+
+    
     CAGradientLayer *gl = [CAGradientLayer layer];
     gl.frame = self.view.bounds;
     gl.startPoint = CGPointMake(0.5, 0);

model/Classes/Controllers/Controller/RankVC/RankHeader.m

@@ -42,7 +42,10 @@
     view.frame = self.bounds;
     view.backgroundColor = [UIColor clearColor];
     [self addSubview:view];
-    
+ 
+}
+
+- (void)layoutSubviews {
     UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:self.bgView.bounds byRoundingCorners:UIRectCornerTopLeft | UIRectCornerTopRight cornerRadii:CGSizeMake(22, 22)];
     CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
     maskLayer.frame = self.bgView.bounds;

model/ModelHeader.h

@@ -15,17 +15,17 @@
 //#define imageURl @"http://118.190.49.85/thmodel/"
 //#define apnsCernameStr @"chmoModelPush"
 
-//#define PublicUrl @"http://118.190.49.85:8080/thmodeltest"
-//#define imageURl @"http://118.190.49.85:8080/thmodeltest/"
-//#define apnsCernameStr @"chmoModelTest"
+#define PublicUrl @"http://118.190.49.85:8080/thmodel"
+#define imageURl @"http://118.190.49.85:8080/thmodel/"
+#define apnsCernameStr @"chmoModelTest"
 
 //#define PublicUrl @"http://192.168.50.132:8081"
 //#define imageURl @"http://192.168.50.132:8081/"
 //#define apnsCernameStr @"chmoMemberTest"
 
-#define PublicUrl @"http://192.168.123.90:8080"
-#define imageURl @"http://192.168.123.90:8080/"
-#define apnsCernameStr @"chmoMemberTest"
+//#define PublicUrl @"http://192.168.123.90:8080"
+//#define imageURl @"http://192.168.123.90:8080/"
+//#define apnsCernameStr @"chmoMemberTest"
 
 #define shareUrl(type,code) [NSString stringWithFormat:@"%@/share.jsp?type=%@&code=%@", PublicUrl, type, code]