// 修复导航栏显示问题

galaxy/galaxy/Classes/Modules/AI/AI-Dialogue(AI对话)/C/YHAIRobotChatViewController.swift

@@ -69,7 +69,7 @@ class YHAIRobotChatViewController: YHBaseViewController {
     
     lazy var cleanBtn: UIButton = {
         let btn = UIButton()
-        btn.frame = CGRect(x: KScreenWidth-24-20, y: k_Height_statusBar()+k_Height_NavContentBar/2.0-12, width: 24, height: 24)
+        btn.frame = CGRect(x: KScreenWidth-24-20, y: k_Height_StatusBar+k_Height_NavContentBar/2.0-12, width: 24, height: 24)
         btn.setImage(UIImage(named: "msg_clean"), for: .normal)
         btn.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
         btn.addTarget(self, action: #selector(didCleanButtonClicked), for: .touchUpInside)

galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMatchResultListViewController.swift

@@ -216,7 +216,7 @@ class YHMatchResultListViewController: YHBaseViewController {
         
         self.navBar.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.top.equalToSuperview().offset(k_Height_statusBar())
+            make.top.equalToSuperview().offset(k_Height_StatusBar)
             make.height.equalTo(k_Height_NavContentBar)
         }
         

galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMatchUserViewController.swift

@@ -165,14 +165,14 @@ class YHMatchUserViewController: YHBaseViewController {
         
         bgImgV.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.top.equalTo(-k_Height_statusBar()-48.0)
+            make.top.equalTo(-k_Height_StatusBar-48.0)
             make.bottom.equalToSuperview().offset(k_Height_TabBar)
         }
 
         launchLottieView.snp.makeConstraints { make in
             make.width.height.equalTo(KScreenWidth)
             make.centerX.equalToSuperview()
-            make.top.equalTo(204-48-k_Height_statusBar())
+            make.top.equalTo(204-48-k_Height_StatusBar)
         }
         headLottieView.snp.makeConstraints { make in
             make.width.height.equalTo(KScreenWidth)

galaxy/galaxy/Classes/Modules/Community(社区)/C/YHNameCardViewController.swift

@@ -95,7 +95,7 @@ class YHNameCardViewController: YHBaseViewController {
         self.view.addSubview(self.navBar)
         self.navBar.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.top.equalToSuperview().offset(k_Height_statusBar())
+            make.top.equalToSuperview().offset(k_Height_StatusBar)
             make.height.equalTo(k_Height_NavContentBar)
         }
         self.bgImgView.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift

@@ -129,7 +129,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
         // 获取导航栏高度
         let navHeight = self.navigationController?.navigationBar.frame.height
         // 获取状态栏高度
-        let statusHeight = k_Height_statusBar()
+        let statusHeight = k_Height_StatusBar
         
         // 创建wkwebview
 //        webview = DWKWebView(frame: CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height - statusHeight - navHeight! - 59 - k_Height_safeAreaInsetsBottom()))

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHSearchInfomationVC.swift

@@ -166,7 +166,7 @@ class YHSearchInfomationVC: YHBaseViewController {
         
         navBar.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.top.equalToSuperview().offset(k_Height_statusBar())
+            make.top.equalToSuperview().offset(k_Height_StatusBar)
             make.height.equalTo(k_Height_NavContentBar)
         }
         searchBar.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHStatusAdvantageVC.swift

@@ -119,7 +119,7 @@ private extension YHStatusAdvantageVC {
         // 获取导航栏高度
         let navHeight = self.navigationController?.navigationBar.frame.height
         // 获取状态栏高度
-        let statusHeight = k_Height_statusBar()
+        let statusHeight = k_Height_StatusBar
         
         // 创建wkwebview
         webview = WKWebView(frame: CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height - statusHeight - navHeight! - 59 - k_Height_safeAreaInsetsBottom()))

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHServiceCenterViewController.swift

@@ -254,7 +254,7 @@ extension YHServiceCenterViewController {
         view.addSubview(navBar)
         navBar.snp.makeConstraints { make in
             make.left.equalToSuperview()
-//            make.top.equalToSuperview().offset(k_Height_statusBar())
+//            make.top.equalToSuperview().offset(k_Height_StatusBar)
             make.height.equalTo(k_Height_NavContentBar)
             make.width.equalTo(47)
             make.centerY.equalTo(titleLabel.snp.centerY)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/FileList(文件清单)/C/YHMyFileListViewController.swift

@@ -39,7 +39,7 @@ class YHMyFileListViewController: YHBaseViewController {
         view.addSubview(self.navBar)
         self.navBar.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.top.equalToSuperview().offset(k_Height_statusBar())
+            make.top.equalToSuperview().offset(k_Height_StatusBar)
             make.height.equalTo(k_Height_NavContentBar)
         }
         view.clipsToBounds = true

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyCertificates(我的证书)/C/YHCertificateListContainerVC.swift

@@ -176,7 +176,7 @@ class YHCertificateListContainerVC: YHBaseViewController {
         
         navBar.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.top.equalToSuperview().offset(k_Height_statusBar())
+            make.top.equalToSuperview().offset(k_Height_StatusBar)
             make.height.equalTo(k_Height_NavContentBar)
         }
         segmentContainerView.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyCertificates(我的证书)/C/YHMineCertificateEntryViewController.swift

@@ -113,7 +113,7 @@ extension YHMineCertificateEntryViewController {
         view.addSubview(navBar)
         navBar.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.top.equalToSuperview().offset(k_Height_statusBar())
+            make.top.equalToSuperview().offset(k_Height_StatusBar)
             make.height.equalTo(k_Height_NavContentBar)
         }
         

galaxy/galaxy/Classes/Modules/LivestreamSales(直播销售)/C/YHLiveStateViewController.swift

@@ -114,7 +114,7 @@ class YHLiveStateViewController: YHBaseViewController {
         view.addSubview(closeButton)
         closeButton.snp.makeConstraints { make in
             make.right.equalTo(-16)
-            make.top.equalTo(10 + k_Height_statusBar())
+            make.top.equalTo(10 + k_Height_StatusBar)
             make.width.height.equalTo(24)
         }
         
@@ -127,7 +127,7 @@ class YHLiveStateViewController: YHBaseViewController {
         view.addSubview(shareButton)
         shareButton.snp.makeConstraints { make in
             make.right.equalTo(-62)
-            make.top.equalTo(10 + k_Height_statusBar())
+            make.top.equalTo(10 + k_Height_StatusBar)
             make.width.height.equalTo(24)
         }
         

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHWebViewViewController.swift

@@ -23,7 +23,7 @@ class YHWebViewViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
         // 获取导航栏高度
         let navHeight = self.navigationController?.navigationBar.frame.height
         // 获取状态栏高度
-        let statusHeight = k_Height_statusBar()
+        let statusHeight = k_Height_StatusBar
         
         // 创建wkwebview
         webview = WKWebView(frame: CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height - k_Height_NavigationtBarAndStatuBar))

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageDetailListVC.swift

@@ -197,7 +197,7 @@ class YHMessageDetailListVC: YHBaseViewController {
         view.addSubview(navBar)
         navBar.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.top.equalToSuperview().offset(k_Height_statusBar())
+            make.top.equalToSuperview().offset(k_Height_StatusBar)
             make.height.equalTo(k_Height_NavContentBar)
         }
         tableView.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageListVC.swift

@@ -126,7 +126,7 @@ class YHMessageListVC: YHBaseViewController {
         
 //        navBar.snp.makeConstraints { make in
 //            make.left.right.equalToSuperview()
-//            make.top.equalToSuperview().offset(k_Height_statusBar())
+//            make.top.equalToSuperview().offset(k_Height_StatusBar)
 //            make.height.equalTo(k_Height_NavContentBar)
 //        }
 

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHAboutGalaxyViewController.swift

@@ -118,13 +118,13 @@ class YHAboutGalaxyViewController: YHBaseViewController {
         self.view.addSubview(navBar)
         self.navBar.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.top.equalToSuperview().offset(k_Height_statusBar())
+            make.top.equalToSuperview().offset(k_Height_StatusBar)
             make.height.equalTo(k_Height_NavContentBar)
         }
         self.statusBar.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
             make.top.equalToSuperview()
-            make.height.equalTo(k_Height_statusBar())
+            make.height.equalTo(k_Height_StatusBar)
         }
         self.tableView.snp.makeConstraints { make in
             make.edges.equalToSuperview()

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyNewViewController.swift

@@ -159,14 +159,14 @@ class YHMyNewViewController: YHBaseViewController {
         tableView.snp.makeConstraints { make in
             make.left.equalTo(20)
             make.right.equalTo(-20)
-            make.top.equalToSuperview().offset(k_Height_statusBar()+44)
+            make.top.equalToSuperview().offset(k_Height_StatusBar+44)
             make.bottom.equalToSuperview().offset(-k_Height_TabBar)
         }
         
         settingBtn.snp.makeConstraints { make in
             make.width.height.equalTo(24.0)
             make.right.equalToSuperview().offset(-17)
-            make.top.equalTo(k_Height_statusBar()+10)
+            make.top.equalTo(k_Height_StatusBar+10)
         }
         
         settingRedPointView.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHUserInfoHeaderView.swift

@@ -232,7 +232,7 @@ class YHUserInfoHeaderView: UIView {
         
         settingView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.top.equalToSuperview().offset(k_Height_statusBar())
+            make.top.equalToSuperview().offset(k_Height_StatusBar)
             make.height.equalTo(44.0)
         }
         

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -61,7 +61,7 @@ let kRadio = KScreenWidth / 375.0
 /* 状态栏高度  20 或 44 */
 // 然而从iOS 14开始，全面屏iPhone的状态栏高度不一定是 44 或 20 了，比如下面就是这些设备在iOS 14.1上的状态栏高度。（还可能时47、48）
 /// ①、顶部状态栏高度（包括安全区）
-func k_Height_statusBar() -> CGFloat {
+private func k_Height_statusBar() -> CGFloat {
     var statusBarHeight: CGFloat = 0
     if #available(iOS 13.0, *) {
         let scene = UIApplication.shared.connectedScenes.first

galaxy/galaxy/Classes/Tools/VideoPlay/YHVideoPlayerVC.swift

@@ -121,7 +121,7 @@ class YHVideoPlayerVC: YHBaseViewController {
         }
         navBar.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.top.equalToSuperview().offset(k_Height_statusBar())
+            make.top.equalToSuperview().offset(k_Height_StatusBar)
             make.height.equalTo(k_Height_NavContentBar)
         }