Skip to content

万
万科
Commit f1ff0e9a authored by Sandy's avatar Sandy
Browse files
Options

iOS10适配 bug fix

parent 6a162f7b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 813 additions and 199 deletions
vanke.xcodeproj/project.pbxproj
View file @ f1ff0e9a
......@@ -2985,12 +2985,12 @@
C19BBBEE1BBE85F500831290 /* VankeServiceDashBoard_iPhone.m */,
C19BBBEF1BBE85F500831290 /* VankeServiceDashBoard_iPhone.xml */,
C19BBBF01BBE85F500831290 /* VankeServiceSaleCell_iPhone.h */,
C19BBBF61BBE85F500831290 /* VankeWeatherCell_iPhone.h */,
C19BBBF11BBE85F500831290 /* VankeServiceSaleCell_iPhone.m */,
C19BBBF21BBE85F500831290 /* VankeServiceSaleCell_iPhone.xml */,
C19BBBF31BBE85F500831290 /* VankeTopMenuBoardCell_iPhone.h */,
C19BBBF41BBE85F500831290 /* VankeTopMenuBoardCell_iPhone.m */,
C19BBBF51BBE85F500831290 /* VankeTopMenuBoardCell_iPhone.xml */,
C19BBBF61BBE85F500831290 /* VankeWeatherCell_iPhone.h */,
C19BBBF71BBE85F500831290 /* VankeWeatherCell_iPhone.m */,
C19BBBF81BBE85F500831290 /* VankeWeatherCell_iPhone.xml */,
);
......
vanke/3rd/IBTWebViewController/IBTWebViewController.m
View file @ f1ff0e9a
......@@ -92,11 +92,11 @@
[super viewWillAppear:animated];
self.navigationController.navigationBar.backgroundImage = [UIImage imageWithColor:[UIColor colorWithR:63 g:134 b:244 a:1]];
UIColor *color = [VankeUtil rgbStringToColor: @"237,27,35"];
if ( IOS7_OR_LATER ) {
// if ( IOS7_OR_LATER ) {
self.navigationController.navigationBar.barTintColor = color;
} else {
self.navigationController.navigationBar.tintColor = color;
}
// } else {
// self.navigationController.navigationBar.tintColor = color;
// }
}
......
vanke/Base.lproj/LaunchScreen.xib
View file @ f1ff0e9a
......@@ -12,14 +12,14 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="login_bg.png" translatesAutoresizingMaskIntoConstraints="NO" id="T3n-rV-MUb">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright (c) 2015年 万科. " textAlignment="center" lineBreakMode="tailTruncation" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D9f-bJ-RUy">
<rect key="frame" x="82" y="638.5" width="211" height="20.5"/>
<rect key="frame" x="82" y="638" width="211" height="20.5"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
<nil key="highlightedColor"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="login_bg.png" translatesAutoresizingMaskIntoConstraints="NO" id="T3n-rV-MUb">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
</imageView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
......
vanke/Images.xcassets/新天地/Contents.json 0 → 100644
View file @ f1ff0e9a
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
vanke/Images.xcassets/新天地/xtd_business.imageset/Contents.json 0 → 100644
View file @ f1ff0e9a
{
"images" : [
{
"idiom" : "universal",
"filename" : "xtd_business.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "xtd_business@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
vanke/Images.xcassets/新天地/xtd_business_checked.imageset/Contents.json 0 → 100644
View file @ f1ff0e9a
{
"images" : [
{
"idiom" : "universal",
"filename" : "xtd_business_checked.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "xtd_business_checked@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
vanke/Images.xcassets/新天地/xtd_home.imageset/Contents.json 0 → 100644
View file @ f1ff0e9a
{
"images" : [
{
"idiom" : "universal",
"filename" : "xtd_home.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "xtd_home@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
vanke/Images.xcassets/新天地/xtd_home_checked.imageset/Contents.json 0 → 100644
View file @ f1ff0e9a
{
"images" : [
{
"idiom" : "universal",
"filename" : "xtd_home_checked.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "xtd_home_checked@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
vanke/Images.xcassets/新天地/xtd_homepage_logo.imageset/Contents.json 0 → 100644
View file @ f1ff0e9a
{
"images" : [
{
"idiom" : "universal",
"filename" : "xtd_homepage_logo.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "xtd_homepage_logo@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
vanke/Images.xcassets/新天地/xtd_launchImg.imageset/Contents.json 0 → 100644
View file @ f1ff0e9a
{
"images" : [
{
"idiom" : "universal",
"filename" : "xtd_launchImg.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
vanke/Images.xcassets/新天地/xtd_sales_red.imageset/Contents.json 0 → 100644
View file @ f1ff0e9a
{
"images" : [
{
"idiom" : "universal",
"filename" : "xtd_sales_red.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "xtd_sales_red@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
vanke/Images.xcassets/新天地/xtd_tabbar_report_checked_blue.imageset/Contents.json 0 → 100644
View file @ f1ff0e9a
{
"images" : [
{
"idiom" : "universal",
"filename" : "xtd_tabbar_report_checked_blue.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "xtd_tabbar_report_checked_blue@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
vanke/Images.xcassets/新天地/xtd_tabbar_report_uncheck.imageset/Contents.json 0 → 100644
View file @ f1ff0e9a
{
"images" : [
{
"idiom" : "universal",
"filename" : "xtd_tabbar_report_uncheck.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "xtd_tabbar_report_uncheck@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
vanke/Images.xcassets/新天地/xtd_user.imageset/Contents.json 0 → 100644
View file @ f1ff0e9a
{
"images" : [
{
"idiom" : "universal",
"filename" : "xtd_user.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "xtd_user@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
vanke/Images.xcassets/新天地/xtd_user_checked.imageset/Contents.json 0 → 100644
View file @ f1ff0e9a
{
"images" : [
{
"idiom" : "universal",
"filename" : "xtd_user_checked.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "xtd_user_checked@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
vanke/Info.plist
View file @ f1ff0e9a
......@@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.5.7</string>
<string>1.5.8</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0</string>
<string>1.5.8</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
......
vanke/Main.storyboard
View file @ f1ff0e9a
This diff is collapsed.
vanke/VankeConfig.h
View file @ f1ff0e9a
......@@ -22,9 +22,9 @@ static NSString *const VANKE_BAIDU_API_KEY = @"442b5fb0a1dc4dcbbccd26975e180e29"
static NSString *const VANKE_BAIDU_WEATHER_SERVER_URL = @"http://api.map.baidu.com/telematics/v3/weather";
//正式环境
static NSString *const VANKE_SERVER_BASE_URL = @"http://140.206.62.178:8080/wanke-server/rest"; //正式
static NSString *const VANKE_SERVER_BASE_URL = @"http://58.246.29.147:9005/wanke-server/rest"; //正式
//后台多媒体文件基准地址
static NSString *const VANKE_SERVER_MEDIA_BASE_URL = @"http://140.206.62.178:8080"; //正式
static NSString *const VANKE_SERVER_MEDIA_BASE_URL = @"http://58.246.29.147:9005"; //正式
// 测试环境
//static NSString *const VANKE_SERVER_BASE_URL = @"http://139.196.39.77:6080/wanke-server/rest";
......
vanke/view_iPhone/templates/VankeAffairsTenantBoard_iPhone.m
View file @ f1ff0e9a
......@@ -62,11 +62,13 @@ ON_WILL_APPEAR( signal )
{
self.navigationController.navigationBar.backgroundImage = [UIImage imageWithColor:[UIColor colorWithR:63 g:134 b:244 a:1]];
UIColor *color = [VankeUtil rgbStringToColor: @"237,27,35"];
if ( IOS7_OR_LATER ) {
// if ( IOS7_OR_LATER ) {
self.navigationController.navigationBar.barTintColor = color;
} else {
self.navigationController.navigationBar.tintColor = color;
}
self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
// } else {
// self.navigationController.navigationBar.tintColor = color;
// }
[[VankeAppBoard_iPhone sharedInstance] showMenu];
}
......
vanke/view_iPhone/templates/VankeAppBoard_iPhone.m
View file @ f1ff0e9a
......@@ -51,7 +51,7 @@ DEF_NOTIFICATION( HIDE_MENU )
ON_CREATE_VIEWS( signal )
{
self.view.backgroundColor = [VankeUtil colorWithHexString:@"#fafafa"];
[[UINavigationBar appearance] setTitleTextAttributes:@{NSForegroundColorAttributeName:[UIColor whiteColor]}];
_router = [BeeUIRouter sharedInstance];
_router.parentBoard = self;
_router.view.alpha = 0.0f;
......
vanke/view_iPhone/templates/announcement/ICRAnnouncementViewController.m
View file @ f1ff0e9a
......@@ -53,7 +53,7 @@ DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
// Do any additional setup after loading the view.
self.title = @"公告";
self.navigationController.navigationBar.barTintColor = kMainBlueColor;
[self initSegmentConatinerFromOriginY:0];
[self initTableView];
[self createRefresh];
......@@ -68,6 +68,14 @@ DZNEmptyDataSetSource, DZNEmptyDataSetDelegate>
}
[self.m_tableView.mj_header beginRefreshing];
}
- (void)viewDidLayoutSubviews {
[super viewDidLayoutSubviews];
if ([[UIDevice currentDevice] systemVersion].floatValue >= 10) {
self.view.superview.frame = CGRectMake(0, 64, SCREEN_WIDTH, SCREEN_HEIGHT - 64);
}
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
......
vanke/view_iPhone/templates/common/VankeBaseBoard.m
View file @ f1ff0e9a
......@@ -16,6 +16,7 @@
ON_CREATE_VIEWS( signal )
{
[[UINavigationBar appearance] setTitleTextAttributes:@{NSForegroundColorAttributeName:[UIColor whiteColor]}];
self.navigationBarLeft = [UIImage imageNamed:@"left_arrow"];
}
......@@ -31,11 +32,11 @@ ON_WILL_APPEAR( signal )
self.navigationController.navigationBar.backgroundImage = [UIImage imageNamed:@"navigation-bar.png"];
}
} else {
if ( IOS7_OR_LATER ) {
// if ( IOS7_OR_LATER ) {
self.navigationController.navigationBar.barTintColor = bgColor;
} else {
self.navigationController.navigationBar.tintColor = bgColor;
}
[[UINavigationBar appearance] setTitleTextAttributes:@{NSForegroundColorAttributeName:[UIColor whiteColor]}];
// } else {
// }
}
}
......
vanke/view_iPhone/templates/floor-list/VankeFloorListBoard_iPhone.m
View file @ f1ff0e9a
......@@ -55,7 +55,7 @@ DEF_OUTLET( BeeUISearchBar, searchBar);
ON_CREATE_VIEWS( signal )
{
[UIApplication sharedApplication].statusBarHidden = NO;
[[UINavigationBar appearance] setTitleTextAttributes:@{NSForegroundColorAttributeName:[UIColor whiteColor]}];
self.navigationBarShown = YES;
self.title = _projectCategory;
......@@ -143,6 +143,14 @@ ON_DELETE_VIEWS( signal )
ON_LAYOUT_VIEWS( signal )
{
}
- (void)viewDidLayoutSubviews {
if ([[UIDevice currentDevice] systemVersion].floatValue >= 10) {
self.list.frame = CGRectMake(0, 110, SCREEN_WIDTH, SCREEN_HEIGHT);
}
}
ON_WILL_APPEAR( signal )
......
vanke/view_iPhone/templates/notice/VankeNoticeListBoard_iPhone.m
View file @ f1ff0e9a
......@@ -147,11 +147,13 @@ ON_WILL_APPEAR( signal )
}
UIColor *color = [VankeUtil rgbStringToColor: @"102,160,255"];
if ( IOS7_OR_LATER ) {
// if ( IOS7_OR_LATER ) {
self.navigationController.navigationBar.barTintColor = color;
} else {
self.navigationController.navigationBar.tintColor = color;
}
self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
// } else {
// self.navigationController.navigationBar.tintColor = color;
// }
[BeeUIRouter sharedInstance].view.pannable = YES;
}
......
vanke/view_iPhone/templates/report/ReportBoardsViewController.m
View file @ f1ff0e9a
......@@ -26,11 +26,13 @@ ON_CREATE_VIEWS( signal )
self.navigationBarLeft = nil;
UIColor *color = [UIColor colorWithR:63 g:134 b:244 a:1];
if ( IOS7_OR_LATER ) {
// if ( IOS7_OR_LATER ) {
self.navigationController.navigationBar.barTintColor = color;
} else {
self.navigationController.navigationBar.tintColor = color;
}
self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
// } else {
// self.navigationController.navigationBar.tintColor = color;
// }
......
vanke/view_iPhone/templates/report/ReportViewController.m
View file @ f1ff0e9a
......@@ -59,12 +59,12 @@ ON_CREATE_VIEWS( signal )
//添加通知
UIColor *color = [UIColor colorWithR:63 g:134 b:244 a:1];
if ( IOS7_OR_LATER ) {
// if ( IOS7_OR_LATER ) {
self.navigationController.navigationBar.barTintColor = color;
self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
} else {
self.navigationController.navigationBar.tintColor = color;
}
// } else {
// self.navigationController.navigationBar.tintColor = color;
// }
}
......@@ -113,6 +113,11 @@ ON_CREATE_VIEWS( signal )
}
- (void)viewWillDisappear:(BOOL)animated {
[super viewWillDisappear:animated];
[self clearDatePickView];
}
- (void)searchClick{
if (self.startTimeView) {
[self.startTimeView removeFromSuperview];
......
vanke/view_iPhone/templates/salesInput/Controller/ChooseProjectTableViewController.m
View file @ f1ff0e9a
......@@ -35,6 +35,8 @@
[self.tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:kCellID];
}
- (void)cancellACtion {
[self dismissViewControllerAnimated:YES completion:nil];
}
......
vanke/view_iPhone/templates/salesInput/Controller/ChooseShopViewController.m
View file @ f1ff0e9a
......@@ -39,6 +39,12 @@
// Do any additional setup after loading the view.
}
- (void)viewDidLayoutSubviews {
[super viewDidLayoutSubviews];
if ([[UIDevice currentDevice] systemVersion].floatValue >= 10) {
self.view.superview.frame = CGRectMake(0, 64, SCREEN_WIDTH, SCREEN_HEIGHT - 64);
}
}
- (void)httpRequestGetShops {
......
vanke/view_iPhone/templates/salesInput/Controller/GalleryViewController.m
View file @ f1ff0e9a
......@@ -25,6 +25,9 @@
self.flowLayout.minimumLineSpacing = 0;
self.flowLayout.minimumInteritemSpacing = 0;
self.flowLayout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
self.view.backgroundColor = [UIColor blackColor];
UIBarButtonItem *bacBtn = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"back_icon"] style:UIBarButtonItemStyleDone target:self action:@selector(actionBack)];
self.navigationItem.leftBarButtonItem = bacBtn;
switch (self.type) {
case GalleryTypeHistory: {
self.arrPic = self.arrData;
......@@ -41,6 +44,11 @@
}
- (void)actionBack {
[self DismissModalViewControllerAnimated:YES];
}
- (void)deletePic {
UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"确认删除这张图片？" message:nil preferredStyle:UIAlertControllerStyleAlert];
WS(weakSelf);
......@@ -67,10 +75,11 @@
}
- (void)viewDidLayoutSubviews {
[self.collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:self.page inSection:0] atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:NO];
if (self.page < 0) {
return;
}
[self.collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForRow:self.page inSection:0] atScrollPosition:UICollectionViewScrollPositionCenteredHorizontally animated:NO];
}
#pragma mark <UICollectionViewDataSource>
......
vanke/view_iPhone/templates/salesInput/Controller/HistoryViewController.m
View file @ f1ff0e9a
......@@ -59,6 +59,16 @@
}
}
- (void)viewDidLayoutSubviews {
[super viewDidLayoutSubviews];
if ([[UIDevice currentDevice] systemVersion].floatValue >= 10) {
self.topView.frame = CGRectMake(0 , 64, SCREEN_WIDTH, 150);
self.view.height = SCREEN_HEIGHT + 30;
self.imageNoData.centerY = self.view.height/2 + 100;
self.scrollView.frame = CGRectMake(0, self.topView.bottom, SCREEN_WIDTH, SCREEN_HEIGHT - self.topView.height - 64 - 30);
}
}
- (UIImageView *)imageNoData {
if (!_imageNoData) {
_imageNoData = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 150, 150)];
......@@ -181,7 +191,7 @@
- (void)scrollViewDidScroll:(UIScrollView *)scrollView
{
for (int i = 0; i < self.titles.count; i++) {
for (int i = 0; i < 20; i++) {
UILabel *label = (UILabel *)[scrollView viewWithTag:1000 + i];
label.y = scrollView.contentOffset.y;
UILabel *labelBottom = (UILabel *)[scrollView viewWithTag:2000 + i];
......@@ -194,7 +204,7 @@
}
for (int i = 0; i < klineCount; i++) {
for (int i = 0; i < 20; i++) {
UILabel *label = (UILabel *)[scrollView viewWithTag:3000 + i];
label.x = scrollView.contentOffset.x;
}
......
vanke/view_iPhone/templates/salesInput/Controller/SaleInputAuditViewController.m
View file @ f1ff0e9a
......@@ -30,6 +30,7 @@
self.tableView.rowHeight = UITableViewAutomaticDimension;
self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
self.navigationController.navigationBar.backgroundImage = [UIImage imageWithColor:[UIColor colorWithRed:0.918 green:0.392 blue:0.004 alpha:1.000]];
self.navigationController.navigationBar.barTintColor = kMainOrangeColor;
WS(weakSelf);
self.tableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
......
vanke/view_iPhone/templates/salesInput/Controller/SalesInputViewController.m
View file @ f1ff0e9a
......@@ -67,7 +67,7 @@ static NSInteger const TOP_HEIGHT = 145;
[self setUpTableView];
[self setUpTotalView];
[self setUpCommitView];
self.automaticallyAdjustsScrollViewInsets = NO;
switch (self.type) {
case SalesInputViewControllerTypeInput: {
self.navigationItem.title = @"销售录入";
......@@ -91,6 +91,21 @@ static NSInteger const TOP_HEIGHT = 145;
}
}
- (void)viewDidLayoutSubviews {
[super viewDidLayoutSubviews];
if ([[UIDevice currentDevice] systemVersion].floatValue >= 10) {
self.topView.frame = CGRectMake(0, 64, SCREEN_WIDTH, TOP_HEIGHT);
self.totalView.frame = CGRectMake(0, 0, SCREEN_WIDTH, 140);
self.tableView.tableHeaderView = self.totalView;
self.tableView.frame = CGRectMake(0, TOP_HEIGHT + 64, SCREEN_WIDTH, SCREEN_HEIGHT - 64 - TOP_HEIGHT - 81);
self.submitView.frame = CGRectMake(0, SCREEN_HEIGHT - 81, SCREEN_WIDTH, 81);
}else{
self.submitView.frame = CGRectMake(0, SCREEN_HEIGHT - 81 - 64, SCREEN_WIDTH, 81);
}
}
- (void)configWithAuditModel{
[self.topView setShopName:[NSString stringWithFormat:@"%@", self.model.shopName]];
self.topView.textfieldDate.enabled = NO;
......@@ -114,7 +129,6 @@ static NSInteger const TOP_HEIGHT = 145;
- (void)setUpCommitView {
self.submitView = [self viewWithNibName:@"SalesInputCommitView"];
self.submitView.frame = CGRectMake(0, SCREEN_HEIGHT - 70 - 64, SCREEN_WIDTH, 70 + 64);
[self.view addSubview:self.submitView];
}
......@@ -220,7 +234,9 @@ ON_WILL_APPEAR( signal )
galleryVC.page = tag;
galleryVC.type = GalleryTypeAudit;
galleryVC.arrOnlineUuids = self.arrOnlineUuids;
[self.navigationController pushViewController:galleryVC animated:YES];
// [self.navigationController pushViewController:galleryVC animated:YES];
UINavigationController *navi = [[UINavigationController alloc] initWithRootViewController:galleryVC];
[self presentViewController:navi animated:YES completion:nil];
};
WS(weakSelf);
......@@ -294,6 +310,7 @@ ON_WILL_APPEAR( signal )
- (void)setUpNavigationBar {
self.navigationController.navigationBar.backgroundImage = [UIImage imageWithColor:[UIColor colorWithRed:0.918 green:0.392 blue:0.004 alpha:1.000]];
self.navigationController.navigationBar.barTintColor = kMainOrangeColor;
self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
}
......
vanke/view_iPhone/templates/salesInput/View/HistoryTopView.xib
View file @ f1ff0e9a
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
......@@ -27,15 +27,8 @@
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="javen_right_icon" translatesAutoresizingMaskIntoConstraints="NO" id="w5x-NT-NnM">
<rect key="frame" x="349" y="32" width="16" height="19"/>
<constraints>
<constraint firstAttribute="height" constant="19" id="ULk-f7-HNz"/>
<constraint firstAttribute="width" constant="16" id="USv-dN-rIb"/>
</constraints>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oEx-Id-X1s">
<rect key="frame" x="137" y="15" width="228" height="53"/>
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oEx-Id-X1s">
<rect key="frame" x="137" y="15" width="205" height="53"/>
<constraints>
<constraint firstAttribute="height" constant="53" id="S2o-aV-dMZ"/>
</constraints>
......@@ -46,6 +39,13 @@
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" misplaced="YES" image="javen_right_icon" translatesAutoresizingMaskIntoConstraints="NO" id="w5x-NT-NnM">
<rect key="frame" x="350" y="32" width="16" height="19"/>
<constraints>
<constraint firstAttribute="height" constant="19" id="ULk-f7-HNz"/>
<constraint firstAttribute="width" constant="16" id="USv-dN-rIb"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" red="0.95294117649999999" green="0.43921568630000002" blue="0.062745098040000002" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
......@@ -154,7 +154,7 @@
<outlet property="labelShopName" destination="V51-vf-Qaf" id="SDt-PW-6YR"/>
<outlet property="startDate" destination="s5M-pR-dBt" id="Lhk-eU-uZW"/>
</connections>
<point key="canvasLocation" x="254.5" y="25"/>
<point key="canvasLocation" x="189.5" y="32"/>
</view>
</objects>
<resources>
......
vanke/view_iPhone/templates/salesInput/View/SaleInputPictureCellHeader.xib
View file @ f1ff0e9a
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
......
vanke/view_iPhone/templates/salesInput/View/SaleInputPictureTableViewCell.xib
View file @ f1ff0e9a
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
......
vanke/view_iPhone/templates/salesInput/View/SalesInputCommitView.xib
View file @ f1ff0e9a
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
......@@ -24,7 +24,7 @@
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Zfi-kO-rTQ">
<rect key="frame" x="0.0" y="0.0" width="326" height="1"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="PL5-W9-4Qm"/>
</constraints>
......
vanke/view_iPhone/templates/salesInput/View/SalesInputTableViewCell.xib
View file @ f1ff0e9a
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
......
vanke/view_iPhone/templates/salesInput/View/SalesInputTopView.xib
View file @ f1ff0e9a
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
......
vanke/view_iPhone/templates/salesInput/View/SalesInputTotalView.xib
View file @ f1ff0e9a
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
......@@ -69,14 +69,14 @@
</textField>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WoP-2s-Y60">
<rect key="frame" x="0.0" y="99" width="375" height="1"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="eCy-Sh-0GX"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="s1a-Z6-auw">
<rect key="frame" x="187" y="13" width="1" height="79"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" constant="1" id="1GS-0G-ju9"/>
</constraints>
......
vanke/view_iPhone/templates/settings/ICRSystemViewController.m
View file @ f1ff0e9a
......@@ -40,11 +40,13 @@ ON_CREATE_VIEWS( signal )
self.navigationBarLeft = nil;
UIColor *color = [UIColor colorWithR:63 g:134 b:244 a:1];
if ( IOS7_OR_LATER ) {
// if ( IOS7_OR_LATER ) {
self.navigationController.navigationBar.barTintColor = color;
} else {
self.navigationController.navigationBar.tintColor = color;
}
self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
// } else {
// self.navigationController.navigationBar.tintColor = color;
// }
}
ON_WILL_APPEAR( signal )
......
vanke/view_iPhone/templates/statement/VankeStatementDetailListBoard_iPhone.m
View file @ f1ff0e9a
......@@ -104,11 +104,13 @@ ON_WILL_APPEAR( signal )
}
UIColor *color = [VankeUtil rgbStringToColor: @"144,76,245"];
if ( IOS7_OR_LATER ) {
// if ( IOS7_OR_LATER ) {
self.navigationController.navigationBar.barTintColor = color;
} else {
self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
// } else {
self.navigationController.navigationBar.tintColor = color;
}
// }
[BeeUIRouter sharedInstance].view.pannable = YES;
}
......
vanke/view_iPhone/templates/statement/VankeStatementListBoard_iPhone.m
View file @ f1ff0e9a
......@@ -86,11 +86,13 @@ ON_WILL_APPEAR( signal )
}
UIColor *color = [VankeUtil rgbStringToColor: @"144,76,245"];
if ( IOS7_OR_LATER ) {
// if ( IOS7_OR_LATER ) {
self.navigationController.navigationBar.barTintColor = color;
} else {
self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
// } else {
self.navigationController.navigationBar.tintColor = color;
}
// }
[BeeUIRouter sharedInstance].view.pannable = YES;
}
......
vanke/view_iPhone/templates/statements/ViewControllers/StatementViewController.m
View file @ f1ff0e9a
......@@ -80,7 +80,7 @@
- (void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:animated];
self.navigationController.navigationBar.barTintColor = kMainPurpleColor;
self.navigationController.navigationBar.backgroundImage = [UIImage imageWithColor:kMainPurpleColor];
}
......
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