diff --git a/OrderScheduling.xcodeproj/project.pbxproj b/OrderScheduling.xcodeproj/project.pbxproj
index 26e74b6..61cd07d 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 = 7;
+ CURRENT_PROJECT_VERSION = 8;
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 = 7;
+ CURRENT_PROJECT_VERSION = 8;
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 = 7;
+ CURRENT_PROJECT_VERSION = 8;
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 = 7;
+ CURRENT_PROJECT_VERSION = 8;
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 = 7;
+ CURRENT_PROJECT_VERSION = 8;
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 = 7;
+ CURRENT_PROJECT_VERSION = 8;
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 93ad4b3..971af37 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 3ae1f65..abffdc4 100644
--- a/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/OrderScheduling.xcworkspace/xcuserdata/zd.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -1218,8 +1218,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "108"
- endingLineNumber = "108"
+ startingLineNumber = "110"
+ endingLineNumber = "110"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
@@ -1234,10 +1234,10 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "119"
- endingLineNumber = "119"
- landmarkName = "userContentController(_:didReceive:)"
- landmarkType = "7">
+ startingLineNumber = "121"
+ endingLineNumber = "121"
+ landmarkName = "WebViewController"
+ landmarkType = "21">
@@ -1773,8 +1773,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "131"
- endingLineNumber = "131"
+ startingLineNumber = "133"
+ endingLineNumber = "133"
landmarkName = "webView(_:didFail:withError:)"
landmarkType = "7">
@@ -1789,8 +1789,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "139"
- endingLineNumber = "139"
+ startingLineNumber = "141"
+ endingLineNumber = "141"
landmarkName = "webView(_:didFailProvisionalNavigation:withError:)"
landmarkType = "7">
@@ -1805,8 +1805,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "138"
- endingLineNumber = "138"
+ startingLineNumber = "140"
+ endingLineNumber = "140"
landmarkName = "webView(_:didFailProvisionalNavigation:withError:)"
landmarkType = "7">
@@ -2501,8 +2501,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "110"
- endingLineNumber = "110"
+ startingLineNumber = "112"
+ endingLineNumber = "112"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
@@ -2579,8 +2579,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "115"
- endingLineNumber = "115"
+ startingLineNumber = "117"
+ endingLineNumber = "117"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
@@ -4273,8 +4273,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "125"
- endingLineNumber = "125"
+ startingLineNumber = "127"
+ endingLineNumber = "127"
landmarkName = "webView(_:didFinish:)"
landmarkType = "7">
@@ -4289,8 +4289,8 @@
filePath = "OrderScheduling/Common/WebView/WebViewController.swift"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
- startingLineNumber = "116"
- endingLineNumber = "116"
+ startingLineNumber = "118"
+ endingLineNumber = "118"
landmarkName = "userContentController(_:didReceive:)"
landmarkType = "7">
@@ -4519,5 +4519,21 @@
landmarkType = "7">
+
+
+
+
diff --git a/OrderScheduling/Common/WebView/WebViewController.swift b/OrderScheduling/Common/WebView/WebViewController.swift
index 3583d78..3a32937 100644
--- a/OrderScheduling/Common/WebView/WebViewController.swift
+++ b/OrderScheduling/Common/WebView/WebViewController.swift
@@ -40,6 +40,8 @@ class WebViewController : ZDViewController {
open override func viewDidLoad() {
super.viewDidLoad()
+ view.backgroundColor = .hex("FAFAFA")
+
webView.scrollView.contentInsetAdjustmentBehavior = .never
webView.backgroundColor = .white
webView.navigationDelegate = self
diff --git a/OrderScheduling/History/ViewController/HistoryController.swift b/OrderScheduling/History/ViewController/HistoryController.swift
index 4b1d0a7..9225ea4 100644
--- a/OrderScheduling/History/ViewController/HistoryController.swift
+++ b/OrderScheduling/History/ViewController/HistoryController.swift
@@ -621,6 +621,7 @@ class HistoryItemView : DDView {
override init(frame: CGRect) {
super.init(frame: frame)
tableView.separatorStyle = .none
+ tableView.backgroundColor = .hex("FAFAFA")
addSubview(tableView)
tableView.snp.makeConstraints { make in
make.edges.equalToSuperview()
diff --git a/OrderScheduling/MessageCenter/ViewController/MessageCenterController.swift b/OrderScheduling/MessageCenter/ViewController/MessageCenterController.swift
index 71978a7..f0151e5 100644
--- a/OrderScheduling/MessageCenter/ViewController/MessageCenterController.swift
+++ b/OrderScheduling/MessageCenter/ViewController/MessageCenterController.swift
@@ -186,12 +186,8 @@ open class MessageCenterController : ZDViewController {
}
func addSubviews() {
- view.backgroundColor = .hex("F4F5F7")
+ view.backgroundColor = .hex("FAFAFA")
view.addSubview(messageCenterView)
- messageCenterView.snp.makeConstraints { make in
- make.top.left.right.equalToSuperview()
- make.bottom.equalTo(-view.safeAreaInsets.bottom)
- }
messageCenterView.tableView.addSubview(emptyView)
emptyView.snp.makeConstraints { make in
@@ -204,6 +200,15 @@ open class MessageCenterController : ZDViewController {
messageCenterView.tableView.dataSource = self
}
+ open override func viewSafeAreaInsetsDidChange() {
+ super.viewSafeAreaInsetsDidChange()
+ messageCenterView.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
}
@@ -215,7 +220,7 @@ open class MessageCenterView : DDView {
tableView = DDTableView(frame: CGRectZero, style: .plain)
super.init(frame: frame)
- tableView.backgroundColor = .hex("F4F5F7")
+ tableView.backgroundColor = .hex("FAFAFA")
tableView.separatorStyle = .none
addSubview(tableView)
tableView.snp.makeConstraints { make in