Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  解决iOS17七鱼未读消息异常问题
  // 首页URL添加token

galaxy/galaxy/Classes/Modules/ButlerServiceManager(银河管家)/YHButlerServiceManager.swift

@@ -24,6 +24,8 @@ class YHButlerServiceManager: NSObject {
     
     private lazy var getUserInfoViewModel: YHButlerServiceViewModel = YHButlerServiceViewModel()
     
+    private var curentPresentedVC: UIViewController?
+    
     var lastMessage: YHButlerServiceMessage? {
         getLastMessage()
     }
@@ -82,8 +84,23 @@ class YHButlerServiceManager: NSObject {
             completion(true)
             sessionViewController.sessionTitle = sessionTitle
             sessionViewController.source = source
-            sessionViewController.hidesBottomBarWhenPushed = true
-            navigationController?.pushViewController(sessionViewController)
+
+            if isIOS17() {
+                let nav = UINavigationController(rootViewController: sessionViewController)
+                let backButton = UIButton(type: .custom)
+                backButton.setTitle("返回", for: .normal)
+                backButton.setTitleColor(.brandMainColor, for: .normal)
+                backButton.titleLabel?.font = .PFSC_R(ofSize: 15)
+                backButton.frame = CGRect(x: 0, y: 0, width: 60, height: 30)
+                backButton.addTarget(self, action: #selector(sessionGoBack), for: .touchUpInside)
+                sessionViewController.navigationItem.leftBarButtonItem = UIBarButtonItem(customView: backButton)
+                nav.modalPresentationStyle = .fullScreen
+                self.curentPresentedVC = nav
+                UIViewController.current?.present(nav, animated: true, completion: nil)
+            } else {
+                sessionViewController.hidesBottomBarWhenPushed = true
+                navigationController?.pushViewController(sessionViewController)
+            }
         }
         
         guard let userId = YHLoginManager.shared.userModel?.id, userId.count > 0 else {
@@ -185,6 +202,19 @@ extension YHButlerServiceManager {
 extension YHButlerServiceManager {
     // MARK: - 私有方法以及登录登出的处理逻辑
     
+    private func isIOS17() -> Bool {
+        let systemVersion = UIDevice.current.systemVersion
+        let components = systemVersion.split(separator: ".").compactMap { Int($0) }
+        guard components.count >= 1 else { return false }
+        return components[0] == 17
+    }
+    
+    @objc private func sessionGoBack() {
+        curentPresentedVC?.dismiss(animated: true)
+        printLog("$$$$sessionGoBack")
+        curentPresentedVC = nil
+    }
+    
     @objc private func didRevUatParam() {
         guard isUatAllowed() else {
             return

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift

@@ -135,8 +135,14 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
         if model.skip_url.isEmpty == false {
             switch model.skip_type {
             case 1: //跳转H5
+                var token = ""
+                if let myToken = YHLoginManager.shared.userModel?.token {
+                    token = myToken
+                }
+                let url = model.skip_url + "&param=" + token
+                printLog("url: \(url)")
                 let vc = YHHomeWebViewController()
-                vc.url = model.skip_url
+                vc.url = url
                 self.parentViewController?.navigationController?.pushViewController(vc)
             case 2: //跳转APP内Tab
                 goAppTab(tabBarName:model.skip_url)