diff --git a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/UserInterfaceState.xcuserstate index 5f04628..448617d 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/Common/WebView/WebViewController.swift b/OrderScheduling/Common/WebView/WebViewController.swift index a083469..e57b345 100644 --- a/OrderScheduling/Common/WebView/WebViewController.swift +++ b/OrderScheduling/Common/WebView/WebViewController.swift @@ -66,8 +66,8 @@ class WebViewController : ZDViewController { view.dd_showHUD() } - override func viewWillLayoutSubviews() { - super.viewWillLayoutSubviews() + override func viewSafeAreaInsetsDidChange() { + super.viewSafeAreaInsetsDidChange() if showNavBar == false { statusBarBackgroundView.snp.remakeConstraints { make in make.top.left.right.equalToSuperview() @@ -82,7 +82,7 @@ class WebViewController : ZDViewController { }else{ webView.snp.remakeConstraints { make in make.left.right.equalToSuperview() - make.top.equalTo(CGRectGetHeight(navigationController?.navigationBar.frame ?? .zero) + CGRectGetHeight(UIApplication.shared.dd_statusBarFrame)) + make.top.equalTo(view.safeAreaInsets.top) make.bottom.equalTo(-view.safeAreaInsets.bottom) } } diff --git a/Podfile.lock b/Podfile.lock index 563340d..155ff6c 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -308,7 +308,7 @@ PODS: - ZLPhotoBrowser/Core (4.4.3.2) DEPENDENCIES: - - BRPickerView (= 2.8.0) + - BRPickerView - Bugly - DDAudioPlayerKit_Private - DDAutoUIKit_Private @@ -429,6 +429,6 @@ SPEC CHECKSUMS: SwiftyRSA: 8c6dd1ea7db1b8dc4fb517a202f88bb1354bc2c6 ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b -PODFILE CHECKSUM: 96c1ebaac8dd93918200066b5731f8b3d0ee177c +PODFILE CHECKSUM: 75e62ee633534110b4a33fd42fd1175199c85796 COCOAPODS: 1.11.3 diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index 563340d..155ff6c 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -308,7 +308,7 @@ PODS: - ZLPhotoBrowser/Core (4.4.3.2) DEPENDENCIES: - - BRPickerView (= 2.8.0) + - BRPickerView - Bugly - DDAudioPlayerKit_Private - DDAutoUIKit_Private @@ -429,6 +429,6 @@ SPEC CHECKSUMS: SwiftyRSA: 8c6dd1ea7db1b8dc4fb517a202f88bb1354bc2c6 ZLPhotoBrowser: 0563c2bfc7b247b65d023d646012f46cba94101b -PODFILE CHECKSUM: 96c1ebaac8dd93918200066b5731f8b3d0ee177c +PODFILE CHECKSUM: 75e62ee633534110b4a33fd42fd1175199c85796 COCOAPODS: 1.11.3 diff --git a/fastlane/report.xml b/fastlane/report.xml index 7f53305..c0d15c0 100644 --- a/fastlane/report.xml +++ b/fastlane/report.xml @@ -5,17 +5,17 @@ - + - + - +