Merge branch 'develop'

* develop:
  修改版本号
  按钮逻辑
  1、删除 不使用的代码 2、处理一处 bug
  删除 不使用的库  减少包体积
  我的首页web
  // 去除网易SDK
  1、修改两处文案
  几处代码优化
  1、几处bug修改 2、几处优化
  我的签字bug修复
  我的文书我的签字bug
  添加 tab使用的图片
  添加tab
  我的签字bug修复

galaxy/Podfile

@@ -29,8 +29,8 @@ target 'galaxy' do
   pod 'SwifterSwift','6.0.0'
   #下拉刷新、上拉更多
   pod 'ESPullToRefresh',"2.9.3"
-  #Toast
-  pod 'Toast-Swift', '5.0.1'
+#  #Toast
+#  pod 'Toast-Swift', '5.0.1'
   #富文本 UILabel
   pod 'Nantes','0.1.2'
   #提示框
@@ -43,8 +43,8 @@ target 'galaxy' do
   pod 'SwiftyTimer','2.1.0'
   #UIColor 的扩展
 #  pod 'Hue','5.0.0'
-  #内存泄漏
-  pod 'LifetimeTracker','1.8.1'
+#  #内存泄漏
+#  pod 'LifetimeTracker','1.8.1'
   #控制台转换成中文
   pod 'ByebyeUnicode','1.1.0'
   #轮播图
@@ -53,8 +53,8 @@ target 'galaxy' do
   pod 'SmartCodable','2.2.2'
   #设备框架
   pod 'DeviceKit', '5.1.0'
-  #骨架图
-  pod 'SkeletonView','1.30.4'
+#  #骨架图
+#  pod 'SkeletonView','1.30.4'
   #导航栏、手势
   pod 'GKNavigationBarSwift','1.6.5'
   #crash统计
@@ -71,23 +71,6 @@ target 'galaxy' do
   pod 'JPush', '5.2.0'
   pod 'JCore', '4.6.0-noidfa'
   
-  ############# 网易云信 IM相关 start #############
-  #A 基础Kit库
-  pod 'NECoreKit', '9.6.5'
-  pod 'NECoreIMKit', '9.6.5'
-  pod 'NEChatKit', '9.6.5'
-  pod 'NECommonKit', '9.6.4'
-  pod 'NECommonUIKit', '9.6.5'
-  pod 'NIMSDK_LITE', '9.14.0'
-  
-  #B UI组件，依次为通讯录组件、会话列表组件、会话（聊天）组件、群相关设置组件
-  pod 'NEContactUIKit', '9.6.5'
-  pod 'NEConversationUIKit', '9.6.5'
-  pod 'NEChatUIKit', '9.6.5'
-  pod 'NETeamUIKit', '9.6.5'
-  
-  ############# 网易云信 IM相关 end  #############
-  
   #富文本库
   pod 'AttributedString','3.3.5'
   #json转模型

galaxy/galaxy/AppDelegate.swift

@@ -12,15 +12,6 @@ import SmartCodable
 import GKNavigationBarSwift
 import DeviceKit
 
-import NIMSDK
-import NECoreKit
-import NECoreIMKit
-import NEChatKit
-import NEChatUIKit
-import NEConversationUIKit
-import NETeamUIKit
-import NEChatUIKit
-
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
@@ -71,7 +62,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     
     func setupNavBar() {
         GKConfigure.setupDefault()
-        
     }
 }
 
@@ -135,29 +125,30 @@ extension AppDelegate {
         let tabBarController = YHTabBarViewController()
         let v0 = YHNavigationController(rootVC:YHHomeViewController())
         let v1 = YHNavigationController(rootVC:YHServiceCenterMainViewController())
-        let v2 = YHNavigationController(rootVC:YHMyViewController())
+        let v2 = YHNavigationController(rootVC:YHMsgViewController())
+        let v3 = YHNavigationController(rootVC:YHMyViewController())
+        
+        v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
+        
+        v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务中心", image: UIImage(named: "service"), selectedImage: UIImage(named: "service_1"))
         
-        v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "photo"), selectedImage: UIImage(named: "photo_1"))
-        v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务中心", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
-        v2.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "我的", image: UIImage(named: "find"), selectedImage: UIImage(named: "find_1"))
-        //        tabBarController.viewControllers = [v0,v1,v2]
-        tabBarController.viewControllers = [v1,v2] //for test hjl  配合测试同学做自动化测试 Moon 2023.03.12
+        v2.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "消息", image: UIImage(named: "msg"), selectedImage: UIImage(named: "msg_1"))
+        
+        v3.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "我的", image: UIImage(named: "me"), selectedImage: UIImage(named: "me_1"))
+        
+        tabBarController.viewControllers = [v0,v1,v2,v3]
+//        tabBarController.viewControllers = [v1,v2] //for test hjl  配合测试同学做自动化测试 Moon 2023.03.12
         tabBarController.tabBar.backgroundColor = .white
         
+        
+        
+        
+        
         window = UIWindow(frame: UIScreen.main.bounds)
-        window?.rootViewController = tabBarController
+//        window?.rootViewController = tabBarController
+        window?.rootViewController = YHStartPageViewController()
         window?.makeKeyAndVisible()
-    }
-    
-    // 网银云信IM相关配置
-    private func configIM() {
-        
-        let option = NIMSDKOption()
-        option.appKey = IMAppKey.appKey
-        option.apnsCername = "云信控制台配置的 APNS 推送证书名称"
-        option.pkCername = "云信控制台配置的 PushKit 推送证书名称"
-        IMKitClient.instance.setupCoreKitIM(option)
-        let _ = NEAtMessageManager.instance
+        
     }
 }
 

galaxy/galaxy/Classes/Base/V/YHBasicContentView.swift

@@ -15,10 +15,12 @@ class YHBasicContentView: ESTabBarItemContentView {
         super.init(frame: frame)
         textColor = UIColor.init(white: 175.0 / 255.0, alpha: 1.0)
         highlightTextColor = .brandMainColor
+        
         iconColor = UIColor.init(white: 175.0 / 255.0, alpha: 1.0)
         highlightIconColor = .brandMainColor
+        
 
-        titleLabel.font = UIFont.PFSC_R(ofSize: 10)
+        titleLabel.font = UIFont.PFSC_R(ofSize: 14)
     }
     
     public required init?(coder aDecoder: NSCoder) {

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

@@ -110,7 +110,7 @@ class YHHomeViewController: YHBaseViewController {
         dataSource.titles = arrItemTitles
         
         dataSource.titleNormalFont = UIFont.PFSC_M(ofSize: 16)
-        dataSource.titleNormalColor = UIColor(hexString: "#888F98")
+        dataSource.titleNormalColor = UIColor(hexString: "#888F98")!
         
         dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 18)
         dataSource.titleSelectedColor = .brandMainColor
@@ -394,22 +394,8 @@ extension YHHomeViewController : UITableViewDelegate,UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
-        printLog("点击了 tableView Cell \(indexPath.row)")
-//        let vc = YHWebViewViewController()
-//        vc.url = "https://auth.qiyuesuo.cn?ticket=bQngrvjj1TPHPnaOt91wKNtzO5iBNDfcwtMtgZdpdZxKIiDgW914qVqxQfloCUVT&channel=OPEN_V2"
-        
-        
-        let url = URL(string: "https://auth.qiyuesuo.cn?ticket=mw5mqO2qx5y%2F%2BqZuOKet7ct3JhAtlFkH4ar9JyyMas0gQ4YYg28iV43Cs8QqqvN8&channel=OPEN_V2")!
-               // 创建SFSafariViewController
-        let safariViewController = SFSafariViewController(url: url)
-        safariViewController.dismissButtonStyle = .close
-       // 设置代理
-        safariViewController.delegate = self
-       // 显示
-//       present(safariViewController, animated: true, completion: nil)
-        
-        self.navigationController?.pushViewController(safariViewController)
-//    https://cloudapi.qiyuesuo.cn/contract/share/3202449385770287813?openPageToken=d004e5af-aab9-43e4-b813-c5a6a8c16497
+        let vc = YHHomeWebViewController()
+        self.navigationController?.pushViewController(vc)
     }
 }
 

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

+//
+//  YHHomeWebViewController.swift
+//  galaxy
+//
+//  Created by EDY on 2024/4/7.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import WebKit
+
+class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationDelegate {
+
+    var webview = WKWebView()
+    var progBar = UIProgressView()
+    var bottomView: YHHomeWebBottomView!
+    var url = "https://upload-cdn.galaxy-immi.com/crm/production/1620271613711.pdf"
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        //获取导航栏高度
+        let navHeight = self.navigationController?.navigationBar.frame.height
+        //获取状态栏高度
+        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))
+        webview.navigationDelegate = self
+        // 创建网址
+        let url = NSURL(string: url)
+        // 创建请求
+        let request = NSURLRequest(url: url! as URL)
+        // 加载请求
+        webview.load(request as URLRequest)
+        // 添加wkwebview
+        self.view.addSubview(webview)
+        
+        // 加载网页的进度条
+        progBar = UIProgressView(frame: CGRect(x: 0, y: 0, width: self.view.frame.width, height: 30))
+        progBar.progress = 0.0
+        progBar.tintColor = UIColor.brandMainColor
+        webview.addSubview(progBar)
+        // 监听网页加载的进度
+        webview.addObserver(self, forKeyPath: "estimatedProgress", options: .new, context: nil)
+        
+        bottomView = {
+            let view = YHHomeWebBottomView()
+            view.likeBlock = { [weak self] flag in
+                guard let self = self else { return }
+                if flag {
+                    YHHUD.flash(message: "已点赞")
+                } else {
+                    YHHUD.flash(message: "已取消点赞")
+                }
+            }
+            
+            view.starBlock = { [weak self] flag in
+                guard let self = self else { return }
+                if flag {
+                    YHHUD.flash(message: "已收藏")
+                } else {
+                    YHHUD.flash(message: "已取消收藏")
+                }
+            }
+            return view
+        }()
+        view.addSubview(bottomView)
+        bottomView.snp.makeConstraints { make in
+            make.bottom.left.right.equalToSuperview()
+            make.height.equalTo(59 + k_Height_safeAreaInsetsBottom())
+        }
+    }
+    
+    deinit {
+        webview.removeObserver(self, forKeyPath: "estimatedProgress")
+    }
+    
+    
+    
+    // MARK: - WKNavigationDelegate
+    func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
+        self.navigationItem.title = webview.title
+    }
+    
+    // MARK: - WKUIDelegate
+    
+    func webView(_ webView: WKWebView, createWebViewWith configuration: WKWebViewConfiguration, for navigationAction: WKNavigationAction, windowFeatures: WKWindowFeatures) -> WKWebView? {
+        // 实现非安全链接的跳转。如果目标主视图不为空,则允许导航
+        if !(navigationAction.targetFrame?.isMainFrame != nil) {
+            webview.load(navigationAction.request)
+        }
+        return nil
+    }
+    
+    func webView(_ webView: WKWebView, runJavaScriptAlertPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping () -> Void) {
+        // 修复弹窗弹出的问题
+        let alert = UIAlertController(title: nil, message: message, preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: "Ok", style: .default, handler: { (_) -> Void in
+            completionHandler()
+        }))
+        self.present(alert, animated: true, completion: nil)
+    }
+    
+    // MARK: - webview function
+    
+    @objc func toBack() {
+        if webview.canGoBack {
+            webview.goBack()
+        }
+    }
+     
+    @objc func toForward() {
+        if webview.canGoForward {
+            webview.goForward()
+        }
+    }
+    
+    // MARK: - KVO
+
+    override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
+        if keyPath == "estimatedProgress" {
+            self.progBar.alpha = 1.0
+            progBar.setProgress(Float(webview.estimatedProgress), animated: true)
+             //进度条的值最大为1.0
+            if(self.webview.estimatedProgress >= 1.0) {
+                UIView.animate(withDuration: 0.3, delay: 0.1, options: .curveEaseInOut, animations: { () -> Void in
+                    self.progBar.alpha = 0.0
+                }, completion: { (finished:Bool) -> Void in
+                    self.progBar.progress = 0
+                })
+            }
+        }
+    }
+    
+    override class func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
+        
+    }
+}

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

+//
+//  YHStartPageViewController.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/4/7.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import ESTabBarController_swift
+/*
+ 启动页 自带倒计时
+ */
+
+class YHStartPageViewController: UIViewController {
+    
+    private var MaxTime : Int = 10 //for test hjl
+    private var timer : Timer?
+    
+    lazy var imagV: UIImageView = {
+        let imagV  = UIImageView()
+        imagV.contentMode = .scaleAspectFill
+        return imagV
+    }()
+    
+    lazy var closeBtn: UIButton = {
+        let button = UIButton(type: .custom)
+        button.titleLabel?.font = UIFont.PFSC_R(ofSize: 12)
+        button.setTitle("跳过 5", for: .normal)
+        button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
+        button.setBackgroundColor(color: UIColor(red: 0.071, green: 0.102, blue: 0.149, alpha: 0.3), forState: .normal)
+        return button
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        initView()
+        self.startTimer()
+    }
+}
+
+
+private extension YHStartPageViewController {
+    
+    func cancelTimer() {
+        guard self.timer != nil else {
+            return
+        }
+        self.timer!.invalidate()
+        self.timer = nil
+    }
+    
+    
+    func startTimer() {
+        cancelTimer()
+        self.timer = Timer.scheduledTimer(timeInterval: TimeInterval(1), target: self, selector: #selector(downTimerOp), userInfo: nil, repeats:  true)
+        RunLoop.current.add(self.timer!, forMode: .common)
+    }
+    
+    @objc func downTimerOp() {
+        MaxTime = MaxTime - 1
+        if MaxTime < 0 {
+            cancelTimer()
+            clickCancelBtn()
+            return
+        }
+        
+        let title = "跳过 " + MaxTime.string
+        closeBtn.setTitle(title, for: .normal)
+    }
+    
+    func initView() {
+        imagV.image = UIImage(named: "start_page_bkg")
+        view.addSubview(imagV)
+        imagV.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
+        
+        view.addSubview(closeBtn)
+        closeBtn.layer.zPosition = 10
+        closeBtn.clipsToBounds = true
+        closeBtn.layer.cornerRadius = 14
+        closeBtn.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
+            make.right.equalTo(-10)
+            make.width.equalTo(56)
+            make.height.equalTo(28)
+        }
+        closeBtn.addTarget(self, action: #selector(clickCancelBtn), for: .touchUpInside)
+    }
+    
+    @objc func clickCancelBtn() {
+        cancelTimer()
+        setupRootVC()
+    }
+    
+    //1.设置主窗口
+    func setupRootVC() {
+        let tabBarController = YHTabBarViewController()
+        let v0 = YHNavigationController(rootVC:YHHomeViewController())
+        let v1 = YHNavigationController(rootVC:YHServiceCenterMainViewController())
+        let v2 = YHNavigationController(rootVC:YHMsgViewController())
+        let v3 = YHNavigationController(rootVC:YHMyViewController())
+        
+        v0.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "首页", image: UIImage(named: "home"), selectedImage: UIImage(named: "home_1"))
+        
+        v1.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "服务中心", image: UIImage(named: "service"), selectedImage: UIImage(named: "service_1"))
+        
+        v2.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "消息", image: UIImage(named: "msg"), selectedImage: UIImage(named: "msg_1"))
+        
+        v3.tabBarItem = ESTabBarItem.init(YHBasicContentView(),title: "我的", image: UIImage(named: "me"), selectedImage: UIImage(named: "me_1"))
+        
+        tabBarController.viewControllers = [v0,v1,v2,v3]
+        //        tabBarController.viewControllers = [v1,v2] //for test hjl  配合测试同学做自动化测试 Moon 2023.03.12
+        tabBarController.tabBar.backgroundColor = .white
+        
+        
+        let window = UIApplication.shared.yhKeyWindow()
+        window?.rootViewController = tabBarController
+        window?.makeKeyAndVisible()
+    }
+}

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

+//
+//  YHHomeWebBottomButton.swift
+//  galaxy
+//
+//  Created by EDY on 2024/4/7.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHHomeWebBottomButton: UIButton {
+
+    var topImageView: UIImageView!
+    var bottomTitleLabel: UILabel!
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setView()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setView() {
+        topImageView = {
+            let view = UIImageView()
+            return view
+        }()
+        addSubview(topImageView)
+        topImageView.snp.makeConstraints { make in
+            make.top.centerX.equalToSuperview()
+            make.width.height.equalTo(21)
+        }
+        
+        bottomTitleLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_B(ofSize: 11)
+            label.textAlignment = .center
+            label.textColor = UIColor.mainTextColor
+            return label
+        }()
+        addSubview(bottomTitleLabel)
+        bottomTitleLabel.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(15)
+        }
+    }
+    
+    func setContent(_ image: String, _ title: String) {
+        bottomTitleLabel.text = title
+        topImageView.image = UIImage(named: image)
+    }
+    /*
+    // Only override draw() if you perform custom drawing.
+    // An empty implementation adversely affects performance during animation.
+    override func draw(_ rect: CGRect) {
+        // Drawing code
+    }
+    */
+
+}

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

+//
+//  YHHomeWebBottomView.swift
+//  galaxy
+//
+//  Created by EDY on 2024/4/7.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHHomeWebBottomView: UIView {
+    typealias Block = (Bool) -> ()
+    var likeBlock: Block?
+    var starBlock: Block?
+    private var likeButton: YHHomeWebBottomButton!
+    private var starButton: YHHomeWebBottomButton!
+    var isStar: Bool = false {
+        didSet {
+            if isStar {
+                starButton.setContent("home_web_stared", "34")
+            } else {
+                starButton.setContent("home_web_star", "34")
+            }
+        }
+    }//是否收藏
+    var isLike: Bool = false {
+        didSet {
+            if isLike {
+                likeButton.setContent("home_web_liked", "34")
+            } else {
+                likeButton.setContent("home_web_like", "34")
+            }
+        }
+    }//是否点赞
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = .white
+        setUpView()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setUpView() {
+        
+        likeButton = {
+            let button = YHHomeWebBottomButton()
+            button.setContent("home_web_like", "652")
+            button.addTarget(self, action: #selector(likeBtnClick), for: .touchUpInside)
+            return button
+        }()
+        addSubview(likeButton)
+        likeButton.snp.makeConstraints { make in
+            make.right.equalTo(-31)
+            make.top.equalTo(10)
+            make.height.equalTo(39)
+            make.width.equalTo(24)
+        }
+        
+        starButton = {
+            let button = YHHomeWebBottomButton()
+            button.setContent("home_web_star", "34")
+            button.addTarget(self, action: #selector(starBtnClick), for: .touchUpInside)
+            return button
+        }()
+        addSubview(starButton)
+        starButton.snp.makeConstraints { make in
+            make.right.equalTo(-79)
+            make.top.equalTo(10)
+            make.height.equalTo(39)
+            make.width.equalTo(24)
+        }
+    }
+    
+    @objc private func likeBtnClick() {
+        isLike = !isLike
+        if let block = likeBlock {
+            block(isLike)
+        }
+    }
+    
+    @objc private func starBtnClick() {
+        isStar = !isStar
+        if let block = starBlock {
+            block(isStar)
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift

@@ -47,6 +47,7 @@ class YHInformationPerfectListVC: YHBaseViewController {
         let titleLable = UILabel(text: "您好,-")
         titleLable.font = UIFont.PFSC_B(ofSize: 21)
         titleLable.textColor = UIColor.mainTextColor
+        titleLable.lineBreakMode = .byTruncatingMiddle
         return titleLable
     }()
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHContactMainItemStatusModel.swift

@@ -28,7 +28,7 @@ class YHContactMainItemStatusModel {
                 iconName = "service_center_sfsq_wdqz_icon"
                 itemName = "我的签字"
             } else if type == 6 {
-                iconName = "service_center_sfsq_wdpf_icon"
+                iconName = "service_center_sfsq_wdfa_icon"
                 itemName = "我的方案"
             } else {
                 

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

@@ -90,7 +90,7 @@ class YHCertificateListContainerVC: YHBaseViewController {
         dataSource.titleNormalFont = UIFont.PFSC_R(ofSize: 14)
         dataSource.titleNormalColor = .labelTextColor2
         dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 16)
-        dataSource.titleSelectedColor = UIColor(hexString: "#000000")
+        dataSource.titleSelectedColor = UIColor(hexString: "#000000")!
         dataSource.isItemSpacingAverageEnabled = false
         dataSource.itemWidth = JXSegmentedViewAutomaticDimension
         dataSource.itemSpacing = 24

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateUploadContentListVC.swift

@@ -399,22 +399,22 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
         var bgColor:UIColor = .clear
         if supplementInfo.checkStatus == YHCertificateUploadStatus.review.rawValue {
             text = "审核中".local
-            textColor = UIColor(hexString: "#FF9900")
-            bgColor = UIColor(hexString: "#FF9900", 0.08)
+            textColor = UIColor(hexString: "#FF9900")!
+            bgColor = UIColor(hexString: "#FF9900", transparency: 0.08)!
         } else if supplementInfo.checkStatus == YHCertificateUploadStatus.preUpload.rawValue {
             text = "待上传".local
-            textColor = UIColor(hexString: "#2F7EF6")
-            bgColor = UIColor(hexString: "#2F7EF6", 0.08)
+            textColor = UIColor(hexString: "#2F7EF6")!
+            bgColor = UIColor(hexString: "#2F7EF6", transparency: 0.08)!
 
         } else if supplementInfo.checkStatus == YHCertificateUploadStatus.finish.rawValue {
             text =  "已完成".local
-            textColor = UIColor(hexString: "#49D2B1")
-            bgColor = UIColor(hexString: "#49D2B1", 0.08)
+            textColor = UIColor(hexString: "#49D2B1")!
+            bgColor = UIColor(hexString: "#49D2B1", transparency: 0.08)!
 
         } else if supplementInfo.checkStatus == YHCertificateUploadStatus.rejected.rawValue {
             text =  "已驳回".local
-            textColor = UIColor(hexString: "#F81D22")
-            bgColor = UIColor(hexString: "#F81D22", 0.08)
+            textColor = UIColor(hexString: "#F81D22")!
+            bgColor = UIColor(hexString: "#F81D22", transparency: 0.08)!
         }
         statusLabel.text = text
         statusLabel.textColor = textColor
@@ -475,7 +475,7 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
         
         let tipsFont = UIFont.PFSC_R(ofSize: 12)
         let a: ASAttributedString = .init("*最多上传", .font(tipsFont),.foreground(UIColor.labelTextColor2))
-        let b: ASAttributedString = .init(" \(items.count)/99 ", .font(UIFont.PFSC_M(ofSize: 12)), .foreground(UIColor.init(hexString:"#2F2F2F")))
+        let b: ASAttributedString = .init(" \(items.count)/99 ", .font(UIFont.PFSC_M(ofSize: 12)), .foreground(UIColor.init(hexString:"#2F2F2F")!))
         let c: ASAttributedString = .init("张图片或文件", .font(tipsFont), .foreground(UIColor.labelTextColor2))
         
         label.attributed.text = a+b+c

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateEditSheetView.swift

@@ -34,7 +34,7 @@ class YHCertificateEditItem {
     var type: YHCertificateEditType
     var title: String
     
-    init(type:YHCertificateEditType, title: String) {
+    init(type:YHCertificateEditType, title: String,itemTitle : String? = nil) {
         self.type = type
         self.title = title
     }
@@ -103,6 +103,7 @@ class YHCertificateEditSheetView: UIView {
     
     var items:[YHCertificateEditItem]
     var action:((YHCertificateEditType)->())?
+    private var sheetTitle : String?
 
     lazy var blackMaskView: UIView = {
         let view = UIView(frame:UIScreen.main.bounds)
@@ -135,8 +136,9 @@ class YHCertificateEditSheetView: UIView {
     }()
     
     
-    init(items:[YHCertificateEditItem]) {
+    init(items:[YHCertificateEditItem],sheetTitle : String? = nil) {
         self.items = items
+        self.sheetTitle = sheetTitle
         super.init(frame:UIScreen.main.bounds)
         createUI()
     }
@@ -145,8 +147,8 @@ class YHCertificateEditSheetView: UIView {
         fatalError("init(coder:) has not been implemented")
     }
     
-    static func sheetView(items:[YHCertificateEditItem], action:((YHCertificateEditType)->())?) -> YHCertificateEditSheetView {
-        let view = YHCertificateEditSheetView(items:items)
+    static func sheetView(items:[YHCertificateEditItem],sheetTitle : String? = nil, action:((YHCertificateEditType)->())?) -> YHCertificateEditSheetView {
+        let view = YHCertificateEditSheetView(items:items,sheetTitle: sheetTitle)
         view.action = action
         return view
     }
@@ -180,6 +182,10 @@ class YHCertificateEditSheetView: UIView {
             make.left.right.top.equalToSuperview()
         }
         
+        if let title = sheetTitle {
+            titleLabel.text = title
+        }
+        
         closeBtn.snp.makeConstraints { make in
             make.centerY.equalTo(titleLabel)
             make.right.equalToSuperview().offset(-20)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateEntryHeadView.swift

@@ -32,6 +32,7 @@ class YHCertificateEntryHeadView: UIView {
         let titleLable = UILabel(text: "您好,李先生")
         titleLable.font = UIFont.PFSC_B(ofSize: 21)
         titleLable.textColor = UIColor.mainTextColor
+        titleLable.lineBreakMode = .byTruncatingMiddle
         return titleLable
     }()
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateNameCell.swift

@@ -57,6 +57,10 @@ class YHCertificateNameCell: UITableViewCell {
         
         } else if suffix == "ppt" || suffix == "pptx" {
             iconImgName = "my_cer_type_ppt"
+        } else if suffix == "bmp" {
+            iconImgName = "my_cer_type_bmp"
+        } else if suffix == "tiff" {
+            iconImgName = "my_cer_type_tiff"
         }
         
         iconImgV.image = UIImage(named: iconImgName)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHHKPlanDoctumentVC.swift

@@ -79,6 +79,7 @@ extension YHHKPlanDoctumentVC {
     
     
     fileprivate func startTimer() {
+        cancelTimer()
         self.timer = Timer.scheduledTimer(timeInterval: TimeInterval(3), target: self, selector: #selector(self.flipNext(sender:)), userInfo: nil, repeats:  false)
         RunLoop.current.add(self.timer!, forMode: .common)
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsListViewController.swift

@@ -259,6 +259,8 @@ extension YHMyDocumentsListViewController {
                 make.left.right.equalToSuperview()
                 make.bottom.equalTo(bottomView.snp.top)
             }
+            
+            gk_navTitle = "批量下载"
         } else if type == .cancel {
             bottomView.isHidden = true
             tableView.snp.remakeConstraints { make in
@@ -266,6 +268,10 @@ extension YHMyDocumentsListViewController {
                 make.left.right.equalToSuperview()
                 make.bottom.equalToSuperview()
             }
+            
+            gk_navTitle = "我的文书"
+        } else {
+            gk_navTitle = "我的文书"
         }
     }
     
@@ -303,7 +309,7 @@ extension YHMyDocumentsListViewController {
         //弹窗 选择发送邮箱
         let items = [YHCertificateEditItem(type:.sendEmail, title:"发送至邮箱"),
                      YHCertificateEditItem(type:.cancel, title:"取消")]
-        YHCertificateEditSheetView.sheetView(items:items) {
+        YHCertificateEditSheetView.sheetView(items:items,sheetTitle: "请选择下载方式") {
             [weak self] editType in
             guard let self = self else { return }
             

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentFileItemView.swift

@@ -130,9 +130,14 @@ class YHDocumentFileItemView: UIView {
             iconImgName = "my_cer_type_word"
         } else if suffix == "ppt" || suffix == "pptx" {
             iconImgName = "my_cer_type_ppt"
+        } else if suffix == "bmp" {
+            iconImgName = "my_cer_type_bmp"
+        } else if suffix == "tiff" {
+            iconImgName = "my_cer_type_tiff"
         }
+
         fileImageView.image = UIImage(named: iconImgName)
-        fileNameLabel.text = name + "." + suffix + "(已签章)"
+        fileNameLabel.text = name + "\(index + 1)(已签章)"
     }
     
     @objc func centerClick() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentMessageTableViewCell.swift

@@ -270,6 +270,10 @@ class YHDocumentMessageTableViewCell: UITableViewCell {
                 iconImgName = "my_cer_type_word"
             } else if suffix == "ppt" || suffix == "pptx" {
                 iconImgName = "my_cer_type_ppt"
+            } else if suffix == "bmp" {
+                iconImgName = "my_cer_type_bmp"
+            } else if suffix == "tiff" {
+                iconImgName = "my_cer_type_tiff"
             }
             fileImageView.image = UIImage(named: iconImgName)
         } else {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentToActionTableViewCell.swift

@@ -27,7 +27,11 @@ class YHDocumentToActionTableViewCell: UITableViewCell {
             updateAllViews()
         }
     }
-
+    var isSign: Bool = false {
+        didSet {
+            updataButton()
+        }
+    }
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
@@ -209,7 +213,7 @@ class YHDocumentToActionTableViewCell: UITableViewCell {
     func updateAllViews() {
         guard let dataSource = dataSource else { return }
         let suffix = dataSource.writing_document.name.pathExtension.lowercased()
-        var iconImgName = ""
+        var iconImgName = "my_cer_type_pdf"
         if suffix == "jpeg" {
             iconImgName = "my_cer_type_jpg"
         } else if suffix == "jpg" {
@@ -222,6 +226,10 @@ class YHDocumentToActionTableViewCell: UITableViewCell {
             iconImgName = "my_cer_type_word"
         } else if suffix == "ppt" || suffix == "pptx" {
             iconImgName = "my_cer_type_ppt"
+        } else if suffix == "bmp" {
+            iconImgName = "my_cer_type_bmp"
+        } else if suffix == "tiff" {
+            iconImgName = "my_cer_type_tiff"
         }
         fileImageView.image = UIImage(named: iconImgName)
         fileNameLabel.text = dataSource.writing_document.name
@@ -244,5 +252,32 @@ class YHDocumentToActionTableViewCell: UITableViewCell {
             block(.look)
         }
     }
+    
+    func updataButton() {
+        if isSign {
+            bottomLeftLineView.isHidden = true
+            editButton.isHidden = true
+            bottomRightLineView.snp.remakeConstraints { make in
+                make.centerX.equalToSuperview()
+                make.width.equalTo(1)
+                make.bottom.equalTo(-17.5)
+                make.height.equalTo(16)
+            }
+            
+            submitButton.snp.remakeConstraints { make in
+                make.bottom.equalToSuperview()
+                make.top.equalTo(bottomView.snp.bottom)
+                make.left.equalToSuperview()
+                make.right.equalTo(bottomRightLineView.snp.left)
+            }
+            
+            lookButton.snp.remakeConstraints { make in
+                make.bottom.equalToSuperview()
+                make.top.equalTo(bottomView.snp.bottom)
+                make.right.equalToSuperview()
+                make.left.equalTo(bottomRightLineView.snp.left)
+            }
+        }
+    }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentUploadTableViewCell.swift

@@ -100,6 +100,7 @@ class YHDocumentUploadTableViewCell: UITableViewCell {
         bottomView = {
             let view = YHWorkItemAddView()
             view.addBtn.setTitle("上传已签章件".local, for: .normal)
+            view.addBtn.setImage(UIImage(named: "document_upload"), for: .normal)
             view.clickBlock = {[weak self] in
                 guard let self = self else { return }
                 if let block = self.block {
@@ -133,6 +134,11 @@ class YHDocumentUploadTableViewCell: UITableViewCell {
     func updateAllViews() {
         guard let dataSource = dataSource else { return }
         mainItemView.removeSubviews()
+        if dataSource.writing_document.doc_sign.doc_return_manual.count != 0 {
+            bottomView.addBtn.setTitle("继续上传".local, for: .normal)
+        } else {
+            bottomView.addBtn.setTitle("上传已签章件".local, for: .normal)
+        }
         var y = 0
         for i in 0 ..< (dataSource.writing_document.doc_sign.doc_return_manual.count) {
             let line = UIView()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentUploadView.swift

@@ -114,11 +114,7 @@ class YHDocumentUploadView: UIView {
     lazy var documentPickerVC: UIDocumentPickerViewController = {
         
         let docTypes =   [ "public.image",
-                           "com.adobe.pdf",
-                           "com.microsoft.word.doc",
-                           "org.openxmlformats.wordprocessingml.document",
-                           "com.microsoft.powerpoint.ppt",
-                           "org.openxmlformats.presentationml.presentation",]
+                           "com.adobe.pdf"]
 
          if #available(iOS 14.0, *) {
              var arr:[UTType] = []

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHEmailInputAlertView.swift

@@ -199,7 +199,7 @@ extension YHEmailInputAlertView  {
             dismiss()
             
         } else {
-            YHHUD.flash(message: "邮箱不合法")
+            YHHUD.flash(message: "邮箱格式有误")
             
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHFailPromptView.swift

@@ -33,7 +33,7 @@ class YHFailPromptView: UIView {
     }()
     
     func setPrompt(_ prompt: String) {
-        titleLable.text = prompt
+        titleLable.text = "驳回原因：" + prompt
     }
 }
 
@@ -42,7 +42,7 @@ private extension YHFailPromptView {
         backgroundColor = UIColor(hex: 0xfeeded)
         addSubview(alertImageView)
         alertImageView.snp.makeConstraints { make in
-            make.centerY.equalToSuperview()
+            make.top.equalTo(10)
             make.left.equalTo(18)
             make.width.height.equalTo(16)
         }
@@ -51,7 +51,7 @@ private extension YHFailPromptView {
         titleLable.snp.makeConstraints { make in
             make.left.equalTo(38)
             make.right.equalTo(-18)
-            make.top.bottom.equalToSuperview()
+            make.top.equalTo(8)
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHMyDocListHeaderView.swift

@@ -60,6 +60,7 @@ class YHMyDocListHeaderView: UIView {
         let lable0 = UILabel(text: "您好，尊敬的客户")
         lable0.textColor = UIColor.mainTextColor
         lable0.font = UIFont.PFSC_M(ofSize: 21)
+        lable0.lineBreakMode = .byTruncatingMiddle
         return lable0
     }()
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/View/YHSchemeTableViewCell.swift

@@ -190,7 +190,14 @@ class YHSchemeTableViewCell: UITableViewCell {
                 }
                 
             } else if title.contains("文书写作") {
-                UIViewController.current?.navigationController?.pushViewController(YHMyDocumentsListViewController())
+                
+                if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
+                    let vc = YHMyDocumentsListViewController()
+                    vc.orderId = orderID as? Int ?? 0
+                    UIViewController.current?.navigationController?.pushViewController(vc)
+                } else {
+                    YHHUD.flash(message: "订单号为空")
+                }
             }
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift

@@ -67,19 +67,33 @@ class YHMySignatureDetailViewController: YHBaseViewController {
                     self.promptView.isHidden = true
                     self.bottomButton.isEnabled = true
                     self.bottomView.isHidden = false
+                    self.bottomButton.alpha = 1
+                    self.bottomButton.setTitle("确定已签章，提交", for: .normal)
                 } else if state == 4 {
                     self.promptView.isHidden = true
                     self.bottomButton.isEnabled = false
                     self.bottomView.isHidden = false
+                    self.bottomButton.alpha = 0.4
+                    self.bottomButton.setTitle("提交成功", for: .normal)
                 } else if state == 5 {
                     self.promptView.isHidden = true
                     self.bottomView.isHidden = true
                     self.bottomButton.isEnabled = true
+                    self.bottomButton.alpha = 1
+                    self.bottomButton.setTitle("确定已签章，提交", for: .normal)
                 } else {
                     self.promptView.isHidden = false
                     self.promptView.setPrompt(self.viewModel.mainModel?.audit_opinion ?? "")
                     self.bottomButton.isEnabled = true
                     self.bottomView.isHidden = false
+                    self.bottomButton.alpha = 1
+                    self.bottomButton.setTitle("确定已签章，提交", for: .normal)
+                    let height = self.getPromptHeight(self.viewModel.mainModel?.audit_opinion ?? "")
+                    self.promptView.snp.remakeConstraints { make in
+                        make.height.equalTo(height)
+                        make.bottom.equalTo(-k_Height_safeAreaInsetsBottom() - 64)
+                        make.left.right.equalTo(self.view)
+                    }
                 }
                 self.tableView.reloadData()
             } else {
@@ -90,9 +104,31 @@ class YHMySignatureDetailViewController: YHBaseViewController {
         viewModel?.requestSignCallBack("\(self.id)", callBackBlock: {[weak self] success, error in
             guard let self = self else { return }
             self.isSign = success
+            if self.type == 3 && self.viewModel.mainModel?.doc_return_manual.count == 0 && !success {
+                self.bottomButton.isEnabled = false
+                self.bottomButton.alpha = 0.4
+            } else {
+                self.bottomButton.isEnabled = true
+                self.bottomButton.alpha = 1
+            }
+            self.tableView.reloadData()
         })
     }
     
+    func getPromptHeight(_ value: String) -> CGFloat {
+        let text = value // 要显示的文本内容
+        let font = UIFont.PFSC_R(ofSize: 12) // 字体大小
+        let maxWidth = KScreenWidth - 74 // 最大宽度限制
+        
+        // 创建NSAttributedString对象并设置属性
+        let attributes = [NSAttributedString.Key.font : font] as [NSAttributedString.Key : Any]
+        _ = NSMutableAttributedString(string: text, attributes: attributes)
+         
+        // 根据指定的最大宽度和字体大小计算文本的高度
+        let size = (text as NSString).boundingRect(with: CGSize(width: maxWidth, height: .greatestFiniteMagnitude), options: .usesLineFragmentOrigin, attributes: attributes, context: nil).size
+        return size.height + 15
+    }
+    
     func updateDataSource() {
         self.tableView.reloadData()
     }
@@ -210,6 +246,7 @@ class YHMySignatureDetailViewController: YHBaseViewController {
             guard let self = self else { return }
             if success {
                 self.getData()
+                YHHUD.flash(message: "提交成功")
             } else {
                 if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
                     YHHUD.flash(message: errorMsg)
@@ -326,6 +363,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
         } else if indexPath.row == 1 {
             let cell = tableView.dequeueReusableCell(withClass: YHSignatureToActionTableViewCell.self)
             cell.dataSource = self.viewModel.mainModel
+            cell.isSign = self.isSign
             cell.backgroundColor = .clear
             cell.contentView.backgroundColor = .clear
             cell.block = { [weak self] type in
@@ -337,7 +375,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
                             YHHUD.hide()
                             guard let self = self else { return }
                             if success {
-                                let url = URL(string: self.viewModel.pageUrl)!
+                                let url = URL(string: self.viewModel.pageUrl) ?? URL(fileURLWithPath: "")
                                 let safariViewController = SFSafariViewController(url: url)
                                 safariViewController.dismissButtonStyle = .close
                                 safariViewController.delegate = self
@@ -355,7 +393,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
                                 YHCommonAlertView.show("实名认证", "为保证签署有效，请先实名认证", "取消", "去认证") {
                                     self.viewModel.requestSignaturePersonalURL(callBackBlock: {[weak self] success, error in
                                         guard let self = self else { return }
-                                        let url = URL(string: self.viewModel.personalUrl)!
+                                        let url = URL(string: self.viewModel.personalUrl) ?? URL(fileURLWithPath: "")
                                         let safariViewController = SFSafariViewController(url: url)
                                         safariViewController.dismissButtonStyle = .close
                                         safariViewController.delegate = self
@@ -364,7 +402,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
                                 }
                             } else {
                                 if success ?? false {
-                                    let url = URL(string: self.viewModel.pageUrl)!
+                                    let url = URL(string: self.viewModel.pageUrl) ?? URL(fileURLWithPath: "")
                                     let safariViewController = SFSafariViewController(url: url)
                                     safariViewController.dismissButtonStyle = .close
                                     safariViewController.delegate = self
@@ -383,7 +421,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
                         YHHUD.hide()
                         guard let self = self else { return }
                         if success {
-                            let url = URL(string: self.viewModel.pageUrl)!
+                            let url = URL(string: self.viewModel.pageUrl) ?? URL(fileURLWithPath: "")
                             let safariViewController = SFSafariViewController(url: url)
                             safariViewController.dismissButtonStyle = .close
                             safariViewController.delegate = self
@@ -398,7 +436,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
                     //弹窗 选择发送邮箱
                     let items = [YHCertificateEditItem(type:.sendEmail, title:"发送至邮箱"),
                                  YHCertificateEditItem(type:.cancel, title:"取消")]
-                    YHCertificateEditSheetView.sheetView(items:items) {
+                    YHCertificateEditSheetView.sheetView(items:items,sheetTitle: "请选择下载方式") {
                         [weak self] editType in
                         guard let self = self else { return }
                         
@@ -421,8 +459,17 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
                 guard let self = self else { return }
                 if type == .upload {
                     self.oldUrl = ""
+                    let count = self.viewModel.mainModel?.doc_return_manual.count ?? 0
+                    if count >= 10 {
+                        YHHUD.flash(message: "最多上传10个图片或文件")
+                        return
+                    }
+                    var maxCount = 10 - count
+                    if maxCount > 9 {
+                        maxCount = 9
+                    }
                     let sheetView = YHDocumentUploadView.sheetView()
-                    sheetView.maxSelectCount = 9
+                    sheetView.maxSelectCount = maxCount
                     sheetView.uploadFilesBlock = {
                         [weak self] fileUrl in
                         guard let self = self else { return }
@@ -470,6 +517,11 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
                 
                 if type == .reUpload {
                     self.oldUrl = self.viewModel.mainModel?.doc_return_manual[index]
+                    let count = self.viewModel.mainModel?.doc_return_manual.count ?? 0
+                    var maxCount = 10 - count
+                    if maxCount > 9 {
+                        maxCount = 9
+                    }
                     let sheetView = YHDocumentUploadView.sheetView()
                     sheetView.maxSelectCount = 9
                     sheetView.uploadFilesBlock = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureListViewController.swift

@@ -254,6 +254,7 @@ extension YHMySignatureListViewController {
                 make.left.right.equalToSuperview()
                 make.bottom.equalTo(bottomView.snp.top)
             }
+            gk_navTitle = "批量下载"
         } else if type == .cancel {
             bottomView.isHidden = true
             tableView.snp.remakeConstraints { make in
@@ -261,6 +262,9 @@ extension YHMySignatureListViewController {
                 make.left.right.equalToSuperview()
                 make.bottom.equalToSuperview()
             }
+            gk_navTitle = "我的签字"
+        } else {
+            gk_navTitle = "我的签字"
         }
     }
     
@@ -298,7 +302,7 @@ extension YHMySignatureListViewController {
         //弹窗 选择发送邮箱
         let items = [YHCertificateEditItem(type:.sendEmail, title:"发送至邮箱"),
                      YHCertificateEditItem(type:.cancel, title:"取消")]
-        YHCertificateEditSheetView.sheetView(items:items) {
+        YHCertificateEditSheetView.sheetView(items:items,sheetTitle: "请选择下载方式") {
             [weak self] editType in
             guard let self = self else { return }
             

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHMyFileMethodTableViewCell.swift

@@ -39,6 +39,11 @@ class YHSignatureToActionTableViewCell: UITableViewCell {
         }
     }
 
+    var isSign: Bool = false {
+        didSet {
+            updataButton()
+        }
+    }
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
@@ -220,7 +225,7 @@ class YHSignatureToActionTableViewCell: UITableViewCell {
     func updateAllViews() {
         guard let dataSource = dataSource else { return }
         let suffix = dataSource.doc_type_name.pathExtension.lowercased()
-        var iconImgName = "my_cer_type_word"
+        var iconImgName = "my_cer_type_pdf"
         if suffix == "jpeg" {
             iconImgName = "my_cer_type_jpg"
         } else if suffix == "jpg" {
@@ -233,6 +238,10 @@ class YHSignatureToActionTableViewCell: UITableViewCell {
             iconImgName = "my_cer_type_word"
         } else if suffix == "ppt" || suffix == "pptx" {
             iconImgName = "my_cer_type_ppt"
+        } else if suffix == "bmp" {
+            iconImgName = "my_cer_type_bmp"
+        } else if suffix == "tiff" {
+            iconImgName = "my_cer_type_tiff"
         }
         fileImageView.image = UIImage(named: iconImgName)
         fileNameLabel.text = dataSource.doc_type_name
@@ -255,4 +264,31 @@ class YHSignatureToActionTableViewCell: UITableViewCell {
             block(.look)
         }
     }
+    
+    func updataButton() {
+        if isSign {
+            bottomLeftLineView.isHidden = true
+            editButton.isHidden = true
+            bottomRightLineView.snp.remakeConstraints { make in
+                make.centerX.equalToSuperview()
+                make.width.equalTo(1)
+                make.bottom.equalTo(-17.5)
+                make.height.equalTo(16)
+            }
+            
+            submitButton.snp.remakeConstraints { make in
+                make.bottom.equalToSuperview()
+                make.top.equalTo(bottomView.snp.bottom)
+                make.left.equalToSuperview()
+                make.right.equalTo(bottomRightLineView.snp.left)
+            }
+            
+            lookButton.snp.remakeConstraints { make in
+                make.bottom.equalToSuperview()
+                make.top.equalTo(bottomView.snp.bottom)
+                make.right.equalToSuperview()
+                make.left.equalTo(bottomRightLineView.snp.left)
+            }
+        }
+    }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHSignatureUploadTableViewCell.swift

@@ -100,6 +100,7 @@ class YHSignatureUploadTableViewCell: UITableViewCell {
         bottomView = {
             let view = YHWorkItemAddView()
             view.addBtn.setTitle("上传已签章件".local, for: .normal)
+            view.addBtn.setImage(UIImage(named: "document_upload"), for: .normal)
             view.clickBlock = {[weak self] in
                 guard let self = self else { return }
                 if let block = self.block {
@@ -133,6 +134,11 @@ class YHSignatureUploadTableViewCell: UITableViewCell {
     func updateAllViews() {
         guard let dataSource = dataSource else { return }
         mainItemView.removeSubviews()
+        if dataSource.doc_return_manual.count != 0 {
+            bottomView.addBtn.setTitle("继续上传".local, for: .normal)
+        } else {
+            bottomView.addBtn.setTitle("上传已签章件".local, for: .normal)
+        }
         var y = 0
         for i in 0 ..< (dataSource.doc_return_manual.count) {
             let line = UIView()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 import SwifterSwift
-import Toast_Swift
+//import Toast_Swift
 
 class YHEducationDetailVC: YHBaseViewController {
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationInfoListVC.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import Toast_Swift
+//import Toast_Swift
 
 class YHEducationInfoListVC: YHBaseViewController {
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHQualificationDetailVC.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import Toast_Swift
+//import Toast_Swift
 
 class YHQualificationDetailVC: YHBaseViewController {
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHContractMainItemStatusCell.swift

@@ -95,7 +95,7 @@ extension YHContractMainItemStatusCell {
         } else if dataModel?.type == 2 {
             gofinishHoldView.isHidden = !(dataModel?.isFinished ?? false)
             goUnfinishHoldView.isHidden = dataModel?.isFinished ?? false
-        } else if dataModel?.type == 3 {
+        } else {
             myNextImgV.isHidden = false
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHInformationFillTipsCell.swift

@@ -227,7 +227,7 @@ extension YHInformationFillTipsCell {
         holdView3.layer.cornerRadius = kCornerRadius6
         holdView3.clipsToBounds = true
         holdView3.layer.borderWidth = 1
-        holdView3.layer.borderColor = UIColor(hexString: "#E4EEFF").cgColor
+        holdView3.layer.borderColor = UIColor(hexString: "#E4EEFF")?.cgColor
         holdView.addSubview(holdView3)
         holdView3.snp.makeConstraints { make in
             make.top.equalTo(holdView2.snp.bottom).offset(12)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift

@@ -167,11 +167,7 @@ extension YHServiceCenterMainViewModel {
 >>>>>>> develop
                     
                    
-                    //我的评分
-                    let model3 = YHContactMainItemStatusModel()
-                    model3.type = 3
-                    model3.isFinished = true
-                    arrContactStausItmes.append(model3)
+                   
                     
                     if resultModel.my_document {
                         //我的文书
@@ -206,6 +202,13 @@ extension YHServiceCenterMainViewModel {
                     }
 >>>>>>> develop
                     
+                    
+                    //我的评分
+                    let model3 = YHContactMainItemStatusModel()
+                    model3.type = 3
+                    model3.isFinished = true
+                    arrContactStausItmes.append(model3)
+                    
                     if resultModel.scheme_position_switch == 1 {
                         //我的方案
 //                        let model6 = YHContactMainItemStatusModel()

galaxy/galaxy/Classes/Modules/Message/C/YHMsgViewController.swift

+//
+//  YHMsgViewController.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/4/7.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHMsgViewController: YHBaseViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        initView()
+    }
+}
+
+extension YHMsgViewController {
+    func initView() {
+        gk_backStyle = .white
+        gk_navTitle = "消息中心"
+    }
+}

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

@@ -8,7 +8,6 @@
 
 import UIKit
 import SnapKit
-import NEConversationUIKit
 
 class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget {
     

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

@@ -7,7 +7,6 @@
 
 import UIKit
 import SnapKit
-import NEConversationUIKit
 import SafariServices
 
 enum YHPersonalModuleItemType: Int {

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

@@ -133,26 +133,8 @@ func isIphoneX() -> Bool {
 }
 
 class YhConstant {
-    // MARK: -  URL 相关
-    struct URL {
-        
-        // MARK: - 帮助与反馈
-        static let userQAUrl = YHBaseUrlManager.shared.h5URL() + "landing/index.html#/pages/my/index"
-        
-        // MARK: - 优眠用户注销条款
-        static let userUnregisterURL = "https://www.baidu.com"
-        
-        // MARK: - 隐私政策
-        static let privacyURL = YHBaseUrlManager.shared.h5URL() + "landing/index.html#/subpages/personal/pages/protocol/index?classify=privacy"
-        
-        // MARK: - 用户协议
-        static let userProtocalURL = YHBaseUrlManager.shared.h5URL() + "landing/index.html#/subpages/personal/pages/protocol/index?classify=agreement"
-    }
-    
     // MARK: - 登录信息
     static let KLoginedInfoKey = "KLoginedInfoKey"
-    
-    
 }
 
 extension YhConstant {

galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift

@@ -8,10 +8,11 @@
 
 // MARK: - 管理项目开发中需要使用到的域名地址
 class YHBaseUrlManager {
+    //单例
     static let shared = YHBaseUrlManager()
+    
     //测试环境
     static let baseUrlTest : String = "https://test-app-go-api.galaxy-immi.com/" //APP 使用域名
-    
     //正式环境
     static let baseUrlRelease : String = "https://app-go-api.galaxy-immi.com/"
     
@@ -21,12 +22,7 @@ class YHBaseUrlManager {
     //正式环境-OSS
     static let baseOSSUrlRelease : String = "http://comserver.galaxy-immi.com/"
     
-    //h5开发环境-H5
-    static let h5UrlDev : String = ""
-    //h5正式环境-H5
-    static let h5UrlRelease : String = ""
     
-    // MARK: - 当前使用的url
     func curURL() -> String {
 #if DEBUG
         return YHBaseUrlManager.baseUrlTest
@@ -44,17 +40,6 @@ class YHBaseUrlManager {
         return YHBaseUrlManager.baseOSSUrlTest
 #else
         return YHBaseUrlManager.baseOSSUrlRelease
-#endif
-    }
-    
-    // MARK: - 当前使用的url
-    func h5URL() -> String {
-#if DEBUG
-        return YHBaseUrlManager.h5UrlDev
-#elseif TESTENV
-        return YHBaseUrlManager.h5UrlDev
-#else
-        return YHBaseUrlManager.h5UrlRelease
 #endif
     }
 }

galaxy/galaxy/Res/Assets.xcassets/tabBar/photo.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/Home/home_web_like.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "icon／24／tabbar／music1@2x.png",
+      "filename" : "home_web_like@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "icon／24／tabbar／music1@3x.png",
+      "filename" : "home_web_like@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/tabBar/photo_1.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/Home/home_web_liked.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "icon／24／tabbar／music2@2x.png",
+      "filename" : "home_web_liked@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "icon／24／tabbar／music2@3x.png",
+      "filename" : "home_web_liked@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/tabBar/find.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/Home/home_web_star.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "icon／24／tabbar／product1@2x.png",
+      "filename" : "home_web_star@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "icon／24／tabbar／product1@3x.png",
+      "filename" : "home_web_star@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Home/home_web_stared.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "home_web_stared@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "home_web_stared@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/我的文书和签字/document_upload.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "document_upload@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "document_upload@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/我的证书/my_cer_type_bmp.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "my_cer_type_bmp@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "my_cer_type_bmp@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/我的证书/my_cer_type_tiff.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "my_cer_type_tiff@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "my_cer_type_tiff@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/StartPage/Contents.json

+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/tabBar/find_1.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/StartPage/start_page_bkg.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "icon／24／tabbar／product2@2x.png",
+      "filename" : "摄图网_501771221_家庭亲子户外露营玩耍(企业商用) 1@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "icon／24／tabbar／product2@3x.png",
+      "filename" : "摄图网_501771221_家庭亲子户外露营玩耍(企业商用) 1@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/tabBar/favor_1.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "icon／24／tabbar／product2@2x.png",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "icon／24／tabbar／product2@3x.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

galaxy/galaxy/Res/Assets.xcassets/tabBar/home.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "icon／24／tabbar／home1@2x.png",
+      "filename" : "Mask group@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "icon／24／tabbar／home1@3x.png",
+      "filename" : "Mask group@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/tabBar/home_1.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "icon／24／tabbar／home2@2x.png",
+      "filename" : "Mask group@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "icon／24／tabbar／home2@3x.png",
+      "filename" : "Mask group@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/tabBar/me.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "icon／24／tabbar／my1@2x.png",
+      "filename" : "Mask group@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "icon／24／tabbar／my1@3x.png",
+      "filename" : "Mask group@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/tabBar/me_1.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "icon／24／tabbar／my2@2x.png",
+      "filename" : "Mask group@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "icon／24／tabbar／my2@3x.png",
+      "filename" : "Mask group@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }