diff --git a/OrderScheduling.xcodeproj/project.pbxproj b/OrderScheduling.xcodeproj/project.pbxproj index 25d1365..f6fab30 100644 --- a/OrderScheduling.xcodeproj/project.pbxproj +++ b/OrderScheduling.xcodeproj/project.pbxproj @@ -1122,7 +1122,7 @@ CODE_SIGN_IDENTITY = "iPhone Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 5; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; FRAMEWORK_SEARCH_PATHS = ( @@ -1176,7 +1176,7 @@ CODE_SIGN_IDENTITY = "Apple Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 5; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; GENERATE_INFOPLIST_FILE = YES; @@ -1337,7 +1337,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Haifeng Cen (F2QAMRC42Q)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 5; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "$(inherited)"; @@ -1395,7 +1395,7 @@ CODE_SIGN_ENTITLEMENTS = OrderScheduling/OrderSchedulingRelease.entitlements; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 5; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; FRAMEWORK_SEARCH_PATHS = ( @@ -1449,7 +1449,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development: Haifeng Cen (F2QAMRC42Q)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 5; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; GENERATE_INFOPLIST_FILE = YES; @@ -1490,7 +1490,7 @@ CODE_SIGN_IDENTITY = "Apple Distribution"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: SINO ASSISTANCE INDUSTRIAL CO., LTD. (X9WF5T89LV)"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2; + CURRENT_PROJECT_VERSION = 5; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = X9WF5T89LV; GENERATE_INFOPLIST_FILE = YES; diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 016b4b5..646806a 100644 Binary files a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate and b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 570633b..5119fe9 100644 --- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -1597,8 +1597,8 @@ filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "269" - endingLineNumber = "269" + startingLineNumber = "274" + endingLineNumber = "274" landmarkName = "reloadData()" landmarkType = "7"> @@ -2882,8 +2882,8 @@ filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "268" - endingLineNumber = "268" + startingLineNumber = "273" + endingLineNumber = "273" landmarkName = "reloadData()" landmarkType = "7"> @@ -2898,8 +2898,8 @@ filePath = "OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "267" - endingLineNumber = "267" + startingLineNumber = "272" + endingLineNumber = "272" landmarkName = "reloadData()" landmarkType = "7"> @@ -4359,5 +4359,53 @@ landmarkType = "7"> + + + + + + + + + + + + diff --git a/OrderScheduling/Main/Initial.swift b/OrderScheduling/Main/Initial.swift index a4158de..b295f03 100644 --- a/OrderScheduling/Main/Initial.swift +++ b/OrderScheduling/Main/Initial.swift @@ -128,10 +128,10 @@ class Initial : NSObject { } NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: Notification_loginSuccessToRescueController), object: nil, queue: .main) {[weak self] note in - self?.initRefreshToken() + window?.rootViewController = MainTabBarController.init() self?.initPermission() self?.initAppUpdate() - window?.rootViewController = MainTabBarController.init() + self?.initRefreshToken() } } diff --git a/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift b/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift index 2dfb16e..37462af 100644 --- a/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift +++ b/OrderScheduling/ReviewFailed/ViewController/ReviewFailedController.swift @@ -227,10 +227,6 @@ open class ReviewFailedController : ZDViewController { func addSubviews() { view.backgroundColor = .hex("F4F5F7") view.addSubview(reviewFailedView) - reviewFailedView.snp.makeConstraints { make in - make.top.left.right.equalToSuperview() - make.bottom.equalTo(-view.safeAreaInsets.bottom) - } reviewFailedView.tableView.addSubview(emptyView) emptyView.snp.makeConstraints { make in @@ -259,6 +255,15 @@ open class ReviewFailedController : ZDViewController { } } + open override func viewSafeAreaInsetsDidChange() { + super.viewSafeAreaInsetsDidChange() + reviewFailedView.snp.makeConstraints { make in + make.top.equalTo(view.safeAreaInsets.top) + make.left.right.equalToSuperview() + make.bottom.equalTo(-view.safeAreaInsets.bottom) + } + } + open override var preferredStatusBarStyle: UIStatusBarStyle { return .lightContent }