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

galaxy/fastlane/README.md

@@ -31,6 +31,14 @@ Description of what the lane does
 
 
 
+### ios galaxyUat
+
+```sh
+[bundle exec] fastlane ios galaxyUat
+```
+
+
+
 ----
 
 This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -311,6 +311,7 @@
 		04B9EE5B2C06CC3100A4018D /* YHOtherLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B9EE592C06CC3100A4018D /* YHOtherLoginViewController.swift */; };
 		04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693612B723AB8004C1758 /* YHMySettingViewController.swift */; };
 		04C693642B723B56004C1758 /* YHMySettingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693632B723B56004C1758 /* YHMySettingCell.swift */; };
+		04C85DDF2C364FE9008B20D6 /* YHAboutUsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C85DDE2C364FE9008B20D6 /* YHAboutUsCell.swift */; };
 		04C8F4832B7216D800ADF59B /* YHUserInfoHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */; };
 		04CC2EF02BC3DDB2000305DD /* YHServiceBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CC2EEF2BC3DDB2000305DD /* YHServiceBannerView.swift */; };
 		04CE1ACF2C2AD91F001CB80A /* YHActivityViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1AB72C2AD91F001CB80A /* YHActivityViewModel.swift */; };
@@ -352,6 +353,7 @@
 		04EA376F2BEA071600DBAF64 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 04EA376E2BEA070500DBAF64 /* libc++.tbd */; };
 		04EA37742BEA0A3400DBAF64 /* YHShareManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04EA37732BEA0A3400DBAF64 /* YHShareManager.swift */; };
 		04EC2F812C22888E002907D7 /* YHFriendRequestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04EC2F802C22888E002907D7 /* YHFriendRequestView.swift */; };
+		04F316442C3568F000024164 /* YHAboutGalaxyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F316432C3568F000024164 /* YHAboutGalaxyViewController.swift */; };
 		04F0ABF32C364F9400518C30 /* home.json in Resources */ = {isa = PBXBuildFile; fileRef = 04F0ABF02C364F9400518C30 /* home.json */; };
 		04F0ABF42C364F9400518C30 /* my.json in Resources */ = {isa = PBXBuildFile; fileRef = 04F0ABF12C364F9400518C30 /* my.json */; };
 		04F0ABF52C364F9400518C30 /* community.json in Resources */ = {isa = PBXBuildFile; fileRef = 04F0ABF22C364F9400518C30 /* community.json */; };
@@ -884,6 +886,7 @@
 		04B9EE592C06CC3100A4018D /* YHOtherLoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOtherLoginViewController.swift; sourceTree = "<group>"; };
 		04C693612B723AB8004C1758 /* YHMySettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingViewController.swift; sourceTree = "<group>"; };
 		04C693632B723B56004C1758 /* YHMySettingCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingCell.swift; sourceTree = "<group>"; };
+		04C85DDE2C364FE9008B20D6 /* YHAboutUsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAboutUsCell.swift; sourceTree = "<group>"; };
 		04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUserInfoHeaderView.swift; sourceTree = "<group>"; };
 		04CC2EEF2BC3DDB2000305DD /* YHServiceBannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceBannerView.swift; sourceTree = "<group>"; };
 		04CE1AB72C2AD91F001CB80A /* YHActivityViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityViewModel.swift; sourceTree = "<group>"; };
@@ -924,6 +927,7 @@
 		04EA376E2BEA070500DBAF64 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		04EA37732BEA0A3400DBAF64 /* YHShareManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHShareManager.swift; sourceTree = "<group>"; };
 		04EC2F802C22888E002907D7 /* YHFriendRequestView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFriendRequestView.swift; sourceTree = "<group>"; };
+		04F316432C3568F000024164 /* YHAboutGalaxyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAboutGalaxyViewController.swift; sourceTree = "<group>"; };
 		04F0ABF02C364F9400518C30 /* home.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = home.json; sourceTree = "<group>"; };
 		04F0ABF12C364F9400518C30 /* my.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = my.json; sourceTree = "<group>"; };
 		04F0ABF22C364F9400518C30 /* community.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = community.json; sourceTree = "<group>"; };
@@ -2642,6 +2646,7 @@
 				049AB5EF2C0F339200155DDF /* YHVideoPlaySettingVC.swift */,
 				0414BDAC2BC7F02C00225367 /* YHMyNotifySettingVC.swift */,
 				049A48A72B49417300D0C641 /* YHAboutUsViewController.swift */,
+				04F316432C3568F000024164 /* YHAboutGalaxyViewController.swift */,
 				048B2A492BC7D9DC00A93BF0 /* YHMyLikeViewController.swift */,
 				04174D632BCD52BD000BA46D /* YHDeviceInfoViewController.swift */,
 				A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */,
@@ -2657,6 +2662,7 @@
 				04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */,
 				A5ACE8ED2B4564F7002C94D2 /* YHPersonalCenterCell.swift */,
 				049A48A92B49536000D0C641 /* YHAboutUsAdvantageCell.swift */,
+				04C85DDE2C364FE9008B20D6 /* YHAboutUsCell.swift */,
 				04C693632B723B56004C1758 /* YHMySettingCell.swift */,
 				0414BDAA2BC7E9C200225367 /* YHMyPermissionCell.swift */,
 			);
@@ -3258,6 +3264,7 @@
 				045EEE892B9F171A0022A143 /* YHPreviewBaseViewController.swift in Sources */,
 				045EEEA42B9F171A0022A143 /* YHImageResultViewController.swift in Sources */,
 				045EEE812B9F171A0022A143 /* YHPreviewQuestionAndAnswerModel.swift in Sources */,
+				04C85DDF2C364FE9008B20D6 /* YHAboutUsCell.swift in Sources */,
 				045EEEB02B9F171A0022A143 /* YHWorkItemView.swift in Sources */,
 				0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */,
 				048787D12BCE61B20036E221 /* YHServiceNoOrderView.swift in Sources */,
@@ -3622,6 +3629,7 @@
 				045EEEB82B9F171A0022A143 /* YHWorkExampleMessageView.swift in Sources */,
 				04F4B76B2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift in Sources */,
 				045EEEA22B9F171A0022A143 /* YHWorkExperienceProjectModel.swift in Sources */,
+				04F316442C3568F000024164 /* YHAboutGalaxyViewController.swift in Sources */,
 				0435FA832BA2DEB100024EAE /* YHCardButton.swift in Sources */,
 				045EEECA2B9F171A0022A143 /* YHMyDocumentsListViewController.swift in Sources */,
 				045EEF052B9F171A0022A143 /* YHFormItemExpireDateCell.swift in Sources */,

galaxy/galaxy/Applegate(JPush).swift

@@ -60,7 +60,6 @@ extension AppDelegate: JPUSHRegisterDelegate {
         YHHUD.flash(message: error.localizedDescription)
 #elseif TESTENV
         YHHUD.flash(message: error.localizedDescription)
-#elseif UATENV
 #else
 #endif
         

galaxy/galaxy/Classes/Modules/AutoLogin(一键登录)/M/YHOneKeyLoginManager.swift

@@ -269,7 +269,7 @@ extension YHOneKeyLoginManager {
         }
         
         // 登录按钮自定义UI
-        model.loginBtnText = NSAttributedString(string: "本机号码一键登录", attributes: [NSAttributedString.Key.foregroundColor : UIColor.mainTextColor, NSAttributedString.Key.font: UIFont.PFSC_M(ofSize: 16)])
+        model.loginBtnText = NSAttributedString(string: "本机号码一键登录/注册", attributes: [NSAttributedString.Key.foregroundColor : UIColor.mainTextColor, NSAttributedString.Key.font: UIFont.PFSC_M(ofSize: 16)])
         
         let enableLoginBgImg = TXCommonUtils.image(with: .white, size: CGSize(width: KScreenWidth-20*2, height: 48), isRoundedCorner: true, radius: kCornerRadius3)!
         let disableLoginBgImg = TXCommonUtils.image(with: .white, size: CGSize(width: KScreenWidth-20*2, height: 48), isRoundedCorner: true, radius: kCornerRadius3)!

galaxy/galaxy/Classes/Modules/AutoLogin(一键登录)/V/YHOneKeyLoginView.swift

@@ -56,6 +56,7 @@ class YHOneKeyLoginView: UIView {
     lazy var logoImgView: UIImageView = {
         let imageView = UIImageView()
         imageView.image = UIImage(named: "login_icon")
+        imageView.isHidden = true
         return imageView
     }()
     
@@ -69,7 +70,7 @@ class YHOneKeyLoginView: UIView {
     
     lazy var loginSubTitleLabel: UILabel = {
         let label = UILabel()
-        label.text = "用户首次登录自动注册"
+        label.text = "美好新生活从这里开始"
         label.font = UIFont.PFSC_R(ofSize: 15)
         label.textColor =  UIColor(hex: 0xffffff, alpha: 0.8)
         return label

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

@@ -42,7 +42,6 @@ class YHCustomNavigationBar: UIView {
         label.textColor = .navTitleColor
         label.textAlignment = .center
         label.font = UIFont.PFSC_M(ofSize:17)
-        label.text = "默认标题"
         return label
     }()
     

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

+//
+//  YHAboutGalaxyViewController.swift
+//  galaxy
+//
+//  Created by edy on 2024/7/3.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHAboutGalaxyViewController: YHBaseViewController {
+
+    lazy var navBar: YHCustomNavigationBar = {
+        let bar = YHCustomNavigationBar.navBar()
+        bar.backgroundColor = .clear
+        bar.titleColor = .white
+        bar.backButton.setImage(UIImage(named: "back_icon_for_code_input"), for: .normal)
+        bar.backBlock = {
+            [weak self] in
+            guard let self = self else { return }
+            self.navigationController?.popViewController(animated: true)
+        }
+        return bar
+    }()
+    
+    lazy var statusBar: UIView = {
+        let view = UIView()
+        return view
+    }()
+    
+    lazy var tableView: UITableView = {
+        let tableView = UITableView(frame: CGRect.zero, style:.grouped)
+        tableView.contentInsetAdjustmentBehavior = .never
+        tableView.estimatedSectionHeaderHeight = 1.0
+        tableView.showsVerticalScrollIndicator = false
+        tableView.tableHeaderView = headerView
+        tableView.backgroundColor = .clear
+        tableView.separatorStyle = .none
+        tableView.bounces = false
+        tableView.register(YHAboutUsCell.self, forCellReuseIdentifier: YHAboutUsCell.cellReuseIdentifier)
+        tableView.delegate = self
+        tableView.dataSource = self
+        return tableView
+    }()
+    
+    lazy var bgImageView:UIImageView = {
+        let view = UIImageView(image: UIImage(named: "about_bg"))
+        view.contentMode = .scaleAspectFill
+        return view
+    }()
+    
+    lazy var aboutLabel = {
+        var label = UILabel()
+        label.text = "关于我们".local
+        label.textColor = UIColor.white
+        label.textAlignment = NSTextAlignment.left
+        label.font = UIFont.PFSC_M(ofSize: 30)
+        return label
+    }()
+    
+    lazy var detailLabel = {
+        var label = UILabel()
+        label.text = "专注海外服务17年，总部设立在深圳，现已分别在北京、上海、广州等地建立分公司，立足于香港身份规划服务，业务逐步多元化发展。".local
+        label.textColor = UIColor.white
+        label.textAlignment = NSTextAlignment.left
+        label.font = UIFont.PFSC_R(ofSize: 12)
+        label.numberOfLines = 0
+        return label
+    }()
+    
+    lazy var headerView:UIView = {
+       let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 496))
+       view.addSubview(bgImageView)
+       view.addSubview(aboutLabel)
+       view.addSubview(detailLabel)
+        bgImageView.snp.makeConstraints { make in
+            make.top.left.right.equalToSuperview()
+            make.height.equalTo(496.0)
+        }
+        aboutLabel.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar+12.5)
+            make.left.equalTo(20.0)
+            make.right.equalTo(-20.0)
+            make.height.equalTo(42.0)
+        }
+        detailLabel.snp.makeConstraints { make in
+            make.top.equalTo(aboutLabel.snp.bottom).offset(12)
+            make.left.equalTo(20.0)
+            make.right.equalTo(-20.0)
+        }
+       return view
+    }()
+    
+    lazy var items:[AboutAdvantageItem] = {
+        return [AboutAdvantageItem(iconName: "about_match", title: "精准匹配".local, detail: "大数据精准匹配，专属方案获批率更高", url: ""),
+                AboutAdvantageItem(iconName: "about_response", title: "快速响应", detail: "身份规划师一对一专业服务，第一时间响应您的需求", url: ""),
+                AboutAdvantageItem(iconName: "about_service", title: "专业服务", detail: "5年经验+英语专8级文案导师团队倾力支持", url: ""),
+                AboutAdvantageItem(iconName: "about_guarantee", title: "获批保障", detail: "香港专才、香港留学获批常年保持90%以上", url: "")]
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        createUI()
+    }
+    
+    func createUI() {
+        gk_navigationBar.isHidden = true
+        view.backgroundColor = .white
+        self.view.addSubview(self.tableView)
+        self.view.addSubview(statusBar)
+        self.view.addSubview(navBar)
+        self.navBar.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            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())
+        }
+        self.tableView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+    }
+}
+
+extension YHAboutGalaxyViewController : UITableViewDelegate, UITableViewDataSource {
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return items.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: YHAboutUsCell.cellReuseIdentifier, for: indexPath) as! YHAboutUsCell
+        let item = items[indexPath.row];
+        cell.item = item
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return UITableView.automaticDimension
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 93.0
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let view = UIView()
+        let label = UILabel()
+        label.text = "四大优势".local
+        label.textColor = UIColor.mainTextColor
+        label.textAlignment = NSTextAlignment.left
+        label.font = UIFont.PFSC_M(ofSize: 21)
+        view.addSubview(label)
+        label.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(20)
+            make.height.equalTo(30)
+        }
+        return view
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 33.0+18.0+46.0
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        let view = UIView()
+        let label = UILabel()
+        label.text = "美好新生活从这里开始".local
+        label.textColor = UIColor.brandMainColor(alpha: 0.24)
+        label.textAlignment = NSTextAlignment.left
+        label.font = UIFont.PFSC_R(ofSize: 13)
+        view.addSubview(label)
+        let line1 = UIView()
+        line1.backgroundColor = UIColor.brandMainColor(alpha: 0.16)
+        view.addSubview(line1)
+        let line2 = UIView()
+        line2.backgroundColor = UIColor.brandMainColor(alpha: 0.16)
+        view.addSubview(line2)
+        label.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalTo(33.0)
+            make.height.equalTo(18)
+        }
+        line1.snp.makeConstraints { make in
+            make.width.equalTo(16.0)
+            make.height.equalTo(1)
+            make.centerY.equalTo(label)
+            make.right.equalTo(label.snp.left).offset(-12)
+        }
+        line2.snp.makeConstraints { make in
+            make.width.equalTo(16.0)
+            make.height.equalTo(1)
+            make.centerY.equalTo(label)
+            make.left.equalTo(label.snp.right).offset(12)
+        }
+        return view
+    }
+    
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        if scrollView.contentOffset.y >= 12.5 {
+            self.navBar.backgroundColor = .white
+            self.statusBar.backgroundColor = .white
+            self.navBar.backButton.setImage(UIImage(named: "back_icon"), for: .normal)
+
+        } else {
+            self.navBar.backgroundColor = .clear
+            self.statusBar.backgroundColor = .clear
+            self.navBar.backButton.setImage(UIImage(named: "back_icon_for_code_input"), for: .normal)
+        }
+    }
+}

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

@@ -282,7 +282,7 @@ extension YHMySettingViewController : UITableViewDelegate, UITableViewDataSource
                 self.navigationController?.pushViewController(vc)
                 
             } else if item.type == .aboutUs {
-                let vc = YHAboutUsViewController()
+                let vc = YHAboutGalaxyViewController()
                 self.navigationController?.pushViewController(vc)
                 
             } else if item.type == .userItems {

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

+//
+//  YHAboutUsCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/7/4.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHAboutUsCell: UITableViewCell {
+    
+    static let cellReuseIdentifier = "YHAboutUsCell"
+    
+    var item: AboutAdvantageItem? {
+        didSet {
+            if let item = item {
+                iconImgView.image = UIImage(named: item.iconName)
+                titleLabel.text = item.title
+                detailLabel.text = item.detail
+            }
+        }
+    }
+
+    lazy var iconImgView:UIImageView = {
+        let icon = UIImageView(image: UIImage(named: "mine_manager"))
+        return icon
+    }()
+    
+    lazy var titleLabel:UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor.mainTextColor
+        label.textAlignment = .left
+        label.font = UIFont.PFSC_M(ofSize: 15)
+        return label
+    }()
+    
+    lazy var detailLabel:UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor.mainTextColor50
+        label.numberOfLines = 0
+        label.textAlignment = .left
+        label.font = UIFont.PFSC_R(ofSize: 12)
+        return label
+    }()
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    func setupUI() {
+        
+        self.selectionStyle = .none
+        contentView.backgroundColor = UIColor.clear
+        contentView.addSubview(iconImgView)
+        contentView.addSubview(titleLabel)
+        contentView.addSubview(detailLabel)
+        
+        iconImgView.snp.makeConstraints { make in
+            make.top.equalToSuperview()
+            make.left.equalTo(20)
+            make.width.height.equalTo(58.0)
+        }
+        
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(iconImgView).offset(8.0)
+            make.height.equalTo(21)
+            make.left.equalTo(iconImgView.snp.right).offset(20)
+            make.right.equalTo(-20)
+        }
+        
+        detailLabel.snp.makeConstraints { make in
+            make.left.equalTo(iconImgView.snp.right).offset(20)
+            make.right.equalTo(-20)
+            make.top.equalTo(titleLabel.snp.bottom).offset(5.0)
+            make.bottom.equalToSuperview().offset(-27)
+        }
+    }
+}

galaxy/galaxy/Classes/Tools/Extention/UIColor+Extension.swift

@@ -29,7 +29,9 @@ extension UIColor {
     //品牌主色 6
     static let brandMainColor6: UIColor = UIColor(hexString: "#0046B4",transparency: 0.06)!
     
-    
+    public static func brandMainColor(alpha:CGFloat) -> UIColor {
+        return UIColor(hexString: "#0046B4",transparency: alpha)!
+    }
     
     //标题/主内容
 //    static let mainTextColor : UIColor = UIColor(hexString: "#222222")!

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

@@ -12,22 +12,22 @@ class YHBaseUrlManager {
     static let shared = YHBaseUrlManager()
     
     //测试环境
-    static let baseUrlTest : String = "https://test-app-go-api.galaxy-immi.com" //APP 使用域名
+    static let baseUrlForTest : String = "https://test-app-go-api.galaxy-immi.com" //APP 使用域名
     //正式环境
-    static let baseUrlRelease : String = "https://app-go-api.galaxy-immi.com"
+    static let baseUrlForRelease : String = "https://app-go-api.galaxy-immi.com"
     // UAT灰度环境
-    static let baseUatUrlTest: String = "https://uat-go-api.galaxy-immi.com"
+    static let baseUrlForUat: String = "https://uat-go-api.galaxy-immi.com"
     
     
     func curURL() -> String {
 #if DEBUG
-        return YHBaseUrlManager.baseUrlTest + "/"
+        return YHBaseUrlManager.baseUrlForTest + "/"
 #elseif TESTENV
-        return YHBaseUrlManager.baseUrlTest + "/"
+        return YHBaseUrlManager.baseUrlForTest + "/"
 #elseif UATENV
-        return YHBaseUrlManager.baseUatUrlTest + "/"
+        return YHBaseUrlManager.baseUrlForUat + "/"
 #else
-        return YHBaseUrlManager.baseUrlRelease + "/"
+        return YHBaseUrlManager.baseUrlForRelease + "/"
 #endif
     }
     

galaxy/galaxy/Res/Assets.xcassets/other/launch_screen_image.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/Mine/about_bg.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "启动页@2x.jpg",
+      "filename" : "Group 2033195201@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "启动页@3x.jpg",
+      "filename" : "Group 2033195201@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/about_guarantee.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/Mine/about_match.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Group 2995@2x.png",
+      "filename" : "Group 2033195196@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 2995@3x.png",
+      "filename" : "Group 2033195196@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/about_response.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Group 2998@2x.png",
+      "filename" : "Group 2033195195@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 2998@3x.png",
+      "filename" : "Group 2033195195@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/about_service.imageset/Contents.json

@@ -5,11 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Group 2999@2x.png",
+      "filename" : "Group 2033195194@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "Group 2033195194@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/Mine/about_service2.imageset/Contents.json → galaxy/galaxy/Res/Assets.xcassets/StartPage/launch_screen_image.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Group 3000@2x.png",
+      "filename" : "启动页切图@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 3000@3x.png",
+      "filename" : "启动页切图@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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

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