Skip to content

V
VirtualCard-iOS
Commit e48f7ddf authored by IOS-张 博's avatar IOS-张 博
Browse files
Options

修复12.1tabbar引起的问题

parent 487fcf6d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 514 additions and 29 deletions
VirtualPayment/VirtualPayment.xcodeproj/project.pbxproj
View file @ e48f7ddf
...@@ -198,6 +198,7 @@ ...@@ -198,6 +198,7 @@
9E26B66E2293F27D00A15F9A /* QGBaseNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E26B66D2293F27D00A15F9A /* QGBaseNetwork.m */; }; 9E26B66E2293F27D00A15F9A /* QGBaseNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E26B66D2293F27D00A15F9A /* QGBaseNetwork.m */; };
9E26B6712293F29200A15F9A /* QGMainNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E26B6702293F29200A15F9A /* QGMainNetwork.m */; }; 9E26B6712293F29200A15F9A /* QGMainNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E26B6702293F29200A15F9A /* QGMainNetwork.m */; };
9E26B68A22B22B3F00A15F9A /* QGDiscoverViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E26B68222B22B3E00A15F9A /* QGDiscoverViewController.m */; }; 9E26B68A22B22B3F00A15F9A /* QGDiscoverViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E26B68222B22B3E00A15F9A /* QGDiscoverViewController.m */; };
9E4AB09B22DC5B970066C467 /* applist.js in Resources */ = {isa = PBXBuildFile; fileRef = 9E4AB09A22DC5B970066C467 /* applist.js */; };
9E920BA12285155D004B01D6 /* UIViewController+CommonConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E920B9F2285155D004B01D6 /* UIViewController+CommonConfig.m */; }; 9E920BA12285155D004B01D6 /* UIViewController+CommonConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E920B9F2285155D004B01D6 /* UIViewController+CommonConfig.m */; };
9E920BA522855345004B01D6 /* QGCardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E920BA422855345004B01D6 /* QGCardViewController.m */; }; 9E920BA522855345004B01D6 /* QGCardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E920BA422855345004B01D6 /* QGCardViewController.m */; };
9E920BA922855364004B01D6 /* QGUserCenterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E920BA822855364004B01D6 /* QGUserCenterViewController.m */; }; 9E920BA922855364004B01D6 /* QGUserCenterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E920BA822855364004B01D6 /* QGUserCenterViewController.m */; };
...@@ -1274,6 +1275,7 @@ ...@@ -1274,6 +1275,7 @@
9E26B68222B22B3E00A15F9A /* QGDiscoverViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QGDiscoverViewController.m; sourceTree = "<group>"; }; 9E26B68222B22B3E00A15F9A /* QGDiscoverViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QGDiscoverViewController.m; sourceTree = "<group>"; };
9E26B68322B22B3E00A15F9A /* QGDiscoverViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QGDiscoverViewController.h; sourceTree = "<group>"; }; 9E26B68322B22B3E00A15F9A /* QGDiscoverViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QGDiscoverViewController.h; sourceTree = "<group>"; };
9E4AB09322D48EC00066C467 /* VirtualPayment.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = VirtualPayment.entitlements; sourceTree = "<group>"; }; 9E4AB09322D48EC00066C467 /* VirtualPayment.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = VirtualPayment.entitlements; sourceTree = "<group>"; };
9E4AB09A22DC5B970066C467 /* applist.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = applist.js; sourceTree = "<group>"; };
9E920B9F2285155D004B01D6 /* UIViewController+CommonConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+CommonConfig.m"; sourceTree = "<group>"; }; 9E920B9F2285155D004B01D6 /* UIViewController+CommonConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+CommonConfig.m"; sourceTree = "<group>"; };
9E920BA02285155D004B01D6 /* UIViewController+CommonConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+CommonConfig.h"; sourceTree = "<group>"; }; 9E920BA02285155D004B01D6 /* UIViewController+CommonConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+CommonConfig.h"; sourceTree = "<group>"; };
9E920BA322855345004B01D6 /* QGCardViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QGCardViewController.h; sourceTree = "<group>"; }; 9E920BA322855345004B01D6 /* QGCardViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QGCardViewController.h; sourceTree = "<group>"; };
...@@ -3642,6 +3644,7 @@ ...@@ -3642,6 +3644,7 @@
9EA797F422817C8800CDCB80 /* PrefixHeader.pch */, 9EA797F422817C8800CDCB80 /* PrefixHeader.pch */,
9EB1D11322B72CFD008D28CE /* ConvertHeaderFile.py */, 9EB1D11322B72CFD008D28CE /* ConvertHeaderFile.py */,
9E4AB09322D48EC00066C467 /* VirtualPayment.entitlements */, 9E4AB09322D48EC00066C467 /* VirtualPayment.entitlements */,
9E4AB09A22DC5B970066C467 /* applist.js */,
); );
path = Application; path = Application;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -4918,26 +4921,26 @@ ...@@ -4918,26 +4921,26 @@
9EB1D3AD22BCC04F008D28CE /* Controller */ = { 9EB1D3AD22BCC04F008D28CE /* Controller */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
9EB1D3BA22BCC04F008D28CE /* CancelOrderController.h */,
9EB1D3AE22BCC04F008D28CE /* CancelOrderController.m */, 9EB1D3AE22BCC04F008D28CE /* CancelOrderController.m */,
9EB1D3AF22BCC04F008D28CE /* OrderRecordsComplelteVC.h */, 9EB1D3BE22BCC04F008D28CE /* OrderListTableController.h */,
9EB1D3B022BCC04F008D28CE /* OrderRecordsAllVC.m */,
9EB1D3B122BCC04F008D28CE /* OrderRecordsDaifahuoVC.h */,
9EB1D3B222BCC04F008D28CE /* OrderRecordsDaifukuanVC.h */,
9EB1D3B322BCC04F008D28CE /* OrderRecordsController.m */,
9EB1D3B422BCC04F008D28CE /* OrderListTableController.m */, 9EB1D3B422BCC04F008D28CE /* OrderListTableController.m */,
9EB1D3B522BCC04F008D28CE /* OrderRecordsContainerVC.h */,
9EB1D3B622BCC04F008D28CE /* OrderRecordsBaseVC.m */,
9EB1D3B722BCC04F008D28CE /* OrderRecordsDaishouhuoVC.h */,
9EB1D3B822BCC04F008D28CE /* OrderRecordsAllVC.h */, 9EB1D3B822BCC04F008D28CE /* OrderRecordsAllVC.h */,
9EB1D3B022BCC04F008D28CE /* OrderRecordsAllVC.m */,
9EB1D3C122BCC04F008D28CE /* OrderRecordsBaseVC.h */,
9EB1D3B622BCC04F008D28CE /* OrderRecordsBaseVC.m */,
9EB1D3AF22BCC04F008D28CE /* OrderRecordsComplelteVC.h */,
9EB1D3B922BCC04F008D28CE /* OrderRecordsComplelteVC.m */, 9EB1D3B922BCC04F008D28CE /* OrderRecordsComplelteVC.m */,
9EB1D3BA22BCC04F008D28CE /* CancelOrderController.h */, 9EB1D3B522BCC04F008D28CE /* OrderRecordsContainerVC.h */,
9EB1D3BB22BCC04F008D28CE /* OrderRecordsDaifukuanVC.m */,
9EB1D3BC22BCC04F008D28CE /* OrderRecordsDaifahuoVC.m */,
9EB1D3BD22BCC04F008D28CE /* OrderRecordsContainerVC.m */, 9EB1D3BD22BCC04F008D28CE /* OrderRecordsContainerVC.m */,
9EB1D3BE22BCC04F008D28CE /* OrderListTableController.h */,
9EB1D3BF22BCC04F008D28CE /* OrderRecordsController.h */, 9EB1D3BF22BCC04F008D28CE /* OrderRecordsController.h */,
9EB1D3B322BCC04F008D28CE /* OrderRecordsController.m */,
9EB1D3B122BCC04F008D28CE /* OrderRecordsDaifahuoVC.h */,
9EB1D3BC22BCC04F008D28CE /* OrderRecordsDaifahuoVC.m */,
9EB1D3B222BCC04F008D28CE /* OrderRecordsDaifukuanVC.h */,
9EB1D3BB22BCC04F008D28CE /* OrderRecordsDaifukuanVC.m */,
9EB1D3B722BCC04F008D28CE /* OrderRecordsDaishouhuoVC.h */,
9EB1D3C022BCC04F008D28CE /* OrderRecordsDaishouhuoVC.m */, 9EB1D3C022BCC04F008D28CE /* OrderRecordsDaishouhuoVC.m */,
9EB1D3C122BCC04F008D28CE /* OrderRecordsBaseVC.h */,
); );
path = Controller; path = Controller;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -6425,6 +6428,7 @@ ...@@ -6425,6 +6428,7 @@
9EB1DB3222C0D02C008D28CE /* CategoriesMenuPromptView.xib in Resources */, 9EB1DB3222C0D02C008D28CE /* CategoriesMenuPromptView.xib in Resources */,
9EB1DAE022C0CEE8008D28CE /* QGCreditDiscountInfoCell.xib in Resources */, 9EB1DAE022C0CEE8008D28CE /* QGCreditDiscountInfoCell.xib in Resources */,
9EB1DA5922C0CA80008D28CE /* DigitalOrderDistributionCell.xib in Resources */, 9EB1DA5922C0CA80008D28CE /* DigitalOrderDistributionCell.xib in Resources */,
9E4AB09B22DC5B970066C467 /* applist.js in Resources */,
9EB1DAA922C0CD53008D28CE /* DigitalOrderDetailOrderInfoCell.xib in Resources */, 9EB1DAA922C0CD53008D28CE /* DigitalOrderDetailOrderInfoCell.xib in Resources */,
9EB1D69122BCC050008D28CE /* QGGoodsScrollCell.xib in Resources */, 9EB1D69122BCC050008D28CE /* QGGoodsScrollCell.xib in Resources */,
9EA79A602282866800CDCB80 /* README.txt in Resources */, 9EA79A602282866800CDCB80 /* README.txt in Resources */,
......
VirtualPayment/VirtualPayment/Application/applist.js 0 → 100644
View file @ e48f7ddf
This diff is collapsed.
VirtualPayment/VirtualPayment/QGClasses/Card/Function/QGCard/ViewController/QGCardViewController.m
View file @ e48f7ddf
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
[self setNavBarBackgroundAlpha:0]; [self setNavBarBackgroundAlpha:0];
//适配 //适配
self.isBelowNavBar = YES; self.isBelowNavBar = YES;
self.isAboveTabBar = YES; // self.isAboveTabBar = YES;
//添加下拉刷新 //添加下拉刷新
[self addRefresh]; [self addRefresh];
......
VirtualPayment/VirtualPayment/QGClasses/MainRoot/Function/QGMainRoot/ViewController/QGRootTabbarController.m
View file @ e48f7ddf
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
[viewControllers addObject:viewController]; [viewControllers addObject:viewController];
} }
self.viewControllers = viewControllers; self.viewControllers = viewControllers;
[[UITabBar appearance] setTranslucent:NO]; [[UITabBar appearance] setTranslucent:NO];
} }
- (void)initTabWithBarItems:(NSArray *)barItems - (void)initTabWithBarItems:(NSArray *)barItems
......
VirtualPayment/VirtualPayment/QGClasses/Mall/Function/BlankNote/Controller/BlanknoteKindVC/BlanknoteRecommend.m
View file @ e48f7ddf
...@@ -175,10 +175,6 @@ ...@@ -175,10 +175,6 @@
self.tableView.dataSource = self; self.tableView.dataSource = self;
[self.view addSubview:self.tableView]; [self.view addSubview:self.tableView];
[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self.view);
}];
} }
#pragma mark - 获取白条状态数据 #pragma mark - 获取白条状态数据
......
VirtualPayment/VirtualPayment/QGClasses/Mall/Function/BlankNote/Controller/QGBlanknoteContainerVC.m
View file @ e48f7ddf
...@@ -57,14 +57,7 @@ ...@@ -57,14 +57,7 @@
} }
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
/// 特别说明：
///[[UITabBar appearance] setTranslucent:NO];
/// 这个位置设置UIRectEdgeNone 因为上一行代码
/// 上代码问题产生的原因详见此博客：https://www.cnblogs.com/fakeCoder/p/9979145.html
self.edgesForExtendedLayout = UIRectEdgeNone;
[self initNormalUI]; [self initNormalUI];
[self initNormalData]; [self initNormalData];
[self requestData]; [self requestData];
......
VirtualPayment/VirtualPayment/QGClasses/UserCenter/Function/QGUserCenter/ViewController/QGUserCenterViewController.m
View file @ e48f7ddf
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
self.title = @"我的"; self.title = @"我的";
[self setNavBarBottomLineHidden:YES]; [self setNavBarBottomLineHidden:YES];
self.isBelowNavBar = NO; self.isBelowNavBar = NO;
// self.isAboveTabBar = YES;
......
VirtualPayment/VirtualPayment/QGUtils/QGTool/QGBasicControllerTool/QGBaseTableViewController.h
View file @ e48f7ddf
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
/** /**
是否放在tabbar的上面 是否放在tabbar的上面
[[UITabBar appearance] setTranslucent:NO]的时候不需要此方法
*/ */
@property (nonatomic, assign) BOOL isAboveTabBar; @property (nonatomic, assign) BOOL isAboveTabBar;
......
VirtualPayment/VirtualPayment/QGUtils/QGTool/QGBasicUITool/UITableView+RefreshControl.m
View file @ e48f7ddf
...@@ -232,6 +232,14 @@ static const char *refreshLoadDataBlockKey = "refreshLoadDataBlockKey"; ...@@ -232,6 +232,14 @@ static const char *refreshLoadDataBlockKey = "refreshLoadDataBlockKey";
self.estimatedSectionHeaderHeight = 0; self.estimatedSectionHeaderHeight = 0;
self.estimatedSectionFooterHeight = 0; self.estimatedSectionFooterHeight = 0;
} }
#if (__IPHONE_OS_VERSION_MAX_ALLOWED >= 110000)
if (@available(iOS 11.0, *)) {
if ([self respondsToSelector:@selector(contentInsetAdjustmentBehavior)]) {
self.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
}
}
#endif
} }
......
VirtualPayment/VirtualPayment/QGVender/WMPageController/WMPageController.m
View file @ e48f7ddf
...@@ -432,7 +432,7 @@ static NSInteger const kWMControllerCountUndefined = -1; ...@@ -432,7 +432,7 @@ static NSInteger const kWMControllerCountUndefined = -1;
CGFloat navigationHeight = CGRectGetMaxY(self.navigationController.navigationBar.frame); CGFloat navigationHeight = CGRectGetMaxY(self.navigationController.navigationBar.frame);
UIView *tabBar = [self wm_bottomView]; UIView *tabBar = [self wm_bottomView];
CGFloat height = (tabBar && !tabBar.hidden) ? CGRectGetHeight(tabBar.frame) : 0; CGFloat height = (tabBar && !tabBar.hidden) ? CGRectGetHeight(tabBar.frame) : 0;
CGFloat tarBarHeight = (self.hidesBottomBarWhenPushed == YES) ? 0 : ([DeviceAdaptation isIphoneXSeries] ? 0 : height); CGFloat tarBarHeight = (self.hidesBottomBarWhenPushed == YES) ? 0 : height;
// 计算相对 window 的绝对 frame (self.view.window 可能为 nil) // 计算相对 window 的绝对 frame (self.view.window 可能为 nil)
UIWindow *mainWindow = [[UIApplication sharedApplication].delegate window]; UIWindow *mainWindow = [[UIApplication sharedApplication].delegate window];
CGRect absoluteRect = [self.view convertRect:self.view.bounds toView:mainWindow]; CGRect absoluteRect = [self.view convertRect:self.view.bounds toView:mainWindow];
......
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