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:
  //  通知设置
  id为 0 的情况处理

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0414BDA92BC7E81500225367 /* YHMyPermissionSettingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0414BDA82BC7E81500225367 /* YHMyPermissionSettingVC.swift */; };
+		0414BDAB2BC7E9C200225367 /* YHMyPermissionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0414BDAA2BC7E9C200225367 /* YHMyPermissionCell.swift */; };
+		0414BDAD2BC7F02C00225367 /* YHMyNotifySettingVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0414BDAC2BC7F02C00225367 /* YHMyNotifySettingVC.swift */; };
 		041B52872B5657B3007EBCEB /* IMAppKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52862B5657B3007EBCEB /* IMAppKey.swift */; };
 		0425E63D2BA9345200A5E763 /* YHSchemeTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0425E63C2BA9345200A5E763 /* YHSchemeTableViewCell.swift */; };
 		0425E6402BA9357D00A5E763 /* YHScemeItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0425E63F2BA9357D00A5E763 /* YHScemeItemModel.swift */; };
@@ -453,6 +456,9 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		0414BDA82BC7E81500225367 /* YHMyPermissionSettingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyPermissionSettingVC.swift; sourceTree = "<group>"; };
+		0414BDAA2BC7E9C200225367 /* YHMyPermissionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyPermissionCell.swift; sourceTree = "<group>"; };
+		0414BDAC2BC7F02C00225367 /* YHMyNotifySettingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyNotifySettingVC.swift; sourceTree = "<group>"; };
 		041B52862B5657B3007EBCEB /* IMAppKey.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IMAppKey.swift; sourceTree = "<group>"; };
 		0425E63C2BA9345200A5E763 /* YHSchemeTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSchemeTableViewCell.swift; sourceTree = "<group>"; };
 		0425E63F2BA9357D00A5E763 /* YHScemeItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHScemeItemModel.swift; sourceTree = "<group>"; };
@@ -1948,6 +1954,8 @@
 			children = (
 				A5ACE8EA2B4564F7002C94D2 /* YHMyViewController.swift */,
 				04C693612B723AB8004C1758 /* YHMySettingViewController.swift */,
+				0414BDA82BC7E81500225367 /* YHMyPermissionSettingVC.swift */,
+				0414BDAC2BC7F02C00225367 /* YHMyNotifySettingVC.swift */,
 				049A48A72B49417300D0C641 /* YHAboutUsViewController.swift */,
 				048B2A492BC7D9DC00A93BF0 /* YHMyLikeViewController.swift */,
 			);
@@ -1962,6 +1970,7 @@
 				A5ACE8ED2B4564F7002C94D2 /* YHPersonalCenterCell.swift */,
 				049A48A92B49536000D0C641 /* YHAboutUsAdvantageCell.swift */,
 				04C693632B723B56004C1758 /* YHMySettingCell.swift */,
+				0414BDAA2BC7E9C200225367 /* YHMyPermissionCell.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -2564,6 +2573,7 @@
 				045EEE982B9F171A0022A143 /* YHPreviewInfoQuestionAndAnswerItemsView.swift in Sources */,
 				045EEE7A2B9F171A0022A143 /* YHPreviewForOtherInfoModel.swift in Sources */,
 				A501BE682BC2B85F00C4F1FB /* YHHomeSearchView.swift in Sources */,
+				0414BDA92BC7E81500225367 /* YHMyPermissionSettingVC.swift in Sources */,
 				044E1E872BC3D00E00A3B4AF /* YHSearchItemLayout.swift in Sources */,
 				A5ACE94A2B4564F7002C94D2 /* YHHUDProgressView.swift in Sources */,
 				04A271232BABFF3200652B1B /* YHCertificateUploadTypeCell.swift in Sources */,
@@ -2722,6 +2732,7 @@
 				A5C382CC2B5EA11800C5E65C /* YHContractCell.swift in Sources */,
 				0477E17C2BA4238400436346 /* YHCertificateListContainerVC.swift in Sources */,
 				A517A4DF2BB53BE8000DEECD /* YHDocListBottomView.swift in Sources */,
+				0414BDAB2BC7E9C200225367 /* YHMyPermissionCell.swift in Sources */,
 				04C8F4832B7216D800ADF59B /* YHUserInfoHeaderView.swift in Sources */,
 				045EEEAF2B9F171A0022A143 /* YHWorkExperienceTextItemView.swift in Sources */,
 				A5ACE9492B4564F7002C94D2 /* YHHUDSuccessView.swift in Sources */,
@@ -2848,6 +2859,7 @@
 				044414012BC3979800784A14 /* YHServerHKLifeViewController.swift in Sources */,
 				04D5C5662B8ED92600190021 /* YHBaseModel.swift in Sources */,
 				A5F8AC082B9F414000A21EFA /* YHCustomTextView.swift in Sources */,
+				0414BDAD2BC7F02C00225367 /* YHMyNotifySettingVC.swift in Sources */,
 				A5ACE9272B4564F7002C94D2 /* YHLoginViewController.swift in Sources */,
 				0425E6402BA9357D00A5E763 /* YHScemeItemModel.swift in Sources */,
 				045EEECC2B9F171A0022A143 /* YHScoreResultModel.swift in Sources */,

galaxy/galaxy/Classes/Base/C/YHMessageSessionCell.swift

@@ -104,7 +104,7 @@ class YHMessageSessionCell: UITableViewCell {
             make.left.equalTo(iconContentView.snp.right).offset(16)
             make.right.equalTo(timeLabel.snp.left).offset(-20)
             make.top.equalTo(iconContentView)
-            make.height.equalTo(20)
+            make.height.equalTo(21)
         }
         
         detailLabel.snp.makeConstraints { make in

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

@@ -110,6 +110,11 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
         }
         
         getData()
+        
+        if id == 0 {
+            bottomView.isHidden = true
+            webview.frame = CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height - statusHeight - navHeight!)
+        }
     }
     
     deinit {

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

+//
+//  YHMyNotifySettingVC.swift
+//  galaxy
+//
+//  Created by edy on 2024/4/11.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHMyNotifySettingVC: YHBaseViewController {
+
+    var items:[YHPermissionItem] = [YHPermissionItem(title: "接收推送消息通知".local, enableStatus: false)]
+    
+    lazy var tableView: UITableView = {
+        let tableView = UITableView(frame:.zero, style:.grouped)
+        tableView.estimatedSectionFooterHeight = 1.0
+        tableView.showsVerticalScrollIndicator = false
+        tableView.separatorStyle = .none
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.backgroundColor = .white
+        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
+        tableView.register(YHMyPermissionCell.self, forCellReuseIdentifier: YHMyPermissionCell.cellReuseIdentifier)
+        return tableView
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupUI()
+    }
+    
+    func setupUI() {
+        gk_navTitle = "通知设置".local
+        view.backgroundColor = .white
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
+            make.bottom.equalToSuperview().offset(-k_Height_TabBar)
+        }
+    }
+}
+
+extension YHMyNotifySettingVC: 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: YHMyPermissionCell.cellReuseIdentifier, for: indexPath) as! YHMyPermissionCell
+        if 0 <= indexPath.row && indexPath.row < items.count {
+            let item = items[indexPath.row]
+            cell.updateModel(item)
+        }
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 53.0
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+       
+    }
+
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+        return UITableView.automaticDimension
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        return 1.0
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        
+        return UIView()
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        
+        let view = UIView()
+        view.backgroundColor = UIColor(hex: 0xF8FAFB)
+        
+        let label = UILabel()
+        label.textColor = UIColor(hex: 0x121A26, alpha: 0.5)
+        label.textAlignment = .left
+        label.font = UIFont.PFSC_R(ofSize:12)
+        label.numberOfLines = 0
+        label.text = "允许银河APP向您发送通知，可以及时了解到服务进度提醒、政策解读等系统通知".local
+        view.addSubview(label)
+
+        label.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.right.equalToSuperview().offset(-20)
+            make.top.equalToSuperview().offset(12)
+            make.bottom.equalToSuperview().offset(-12)
+        }
+        return view
+    }
+    
+}
+
+

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

+//
+//  YHMyPermissionSettingVC.swift
+//  galaxy
+//
+//  Created by edy on 2024/4/11.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHPermissionItem {
+    var title:String = ""
+    var enableStatus:Bool = false
+    init(title: String, enableStatus: Bool) {
+        self.title = title
+        self.enableStatus = enableStatus
+    }
+}
+
+class YHMyPermissionSettingVC: YHBaseViewController {
+
+    var items:[YHPermissionItem] = [YHPermissionItem(title: "网络".local, enableStatus: true),
+                                    YHPermissionItem(title: "照片".local, enableStatus: true),
+                                    YHPermissionItem(title: "相机".local, enableStatus: false),
+                                    YHPermissionItem(title: "位置".local, enableStatus: true),
+                                    YHPermissionItem(title: "文件".local, enableStatus: false)]
+    
+    lazy var tableView: UITableView = {
+        let tableView = UITableView(frame:.zero, style:.grouped)
+        tableView.estimatedSectionFooterHeight = 1.0
+        tableView.showsVerticalScrollIndicator = false
+        tableView.separatorStyle = .none
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.backgroundColor = .white
+        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
+        tableView.register(YHMyPermissionCell.self, forCellReuseIdentifier: YHMyPermissionCell.cellReuseIdentifier)
+        return tableView
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupUI()
+    }
+    
+    func setupUI() {
+        gk_navTitle = "权限设置".local
+        view.backgroundColor = .white
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
+            make.bottom.equalToSuperview().offset(-k_Height_TabBar)
+        }
+    }
+}
+
+extension YHMyPermissionSettingVC: 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: YHMyPermissionCell.cellReuseIdentifier, for: indexPath) as! YHMyPermissionCell
+        if 0 <= indexPath.row && indexPath.row < items.count {
+            let item = items[indexPath.row]
+            cell.updateModel(item)
+        }
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 53.0
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+       
+    }
+
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+        return UITableView.automaticDimension
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        return 1.0
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        
+        return UIView()
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        
+        let view = UIView()
+        view.backgroundColor = UIColor(hex: 0xF8FAFB)
+        
+        let label = UILabel()
+        label.textColor = UIColor(hex: 0x121A26, alpha: 0.5)
+        label.textAlignment = .left
+        label.font = UIFont.PFSC_R(ofSize:12)
+        label.numberOfLines = 0
+        label.text = "为了更好的使用体验，银河在特定场景会向您申请手机系统权限。您可以随时在手机系统设置中修改".local
+        view.addSubview(label)
+
+        label.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.right.equalToSuperview().offset(-20)
+            make.top.equalToSuperview().offset(12)
+            make.bottom.equalToSuperview().offset(-12)
+        }
+        return view
+    }
+    
+}
+

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

@@ -36,8 +36,8 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
     }()
     
     lazy var items: [PersonalModuleItem] = {
-        return [PersonalModuleItem(title: "调整设置".local, type:.changeSettings),
-                PersonalModuleItem(title: "深色模式".local, type:.darkMode),
+        return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
+                PersonalModuleItem(title: "权限配置".local, type:.permissionSettings),
                 PersonalModuleItem(title: "个人信息收集清单".local, type:.infoCollectList),
                 PersonalModuleItem(title: "第三方信息共享清单".local, type:.infoShareList),
                 PersonalModuleItem(title: "关于我们".local, type:.aboutUs)]
@@ -84,8 +84,10 @@ extension YHMySettingViewController : UITableViewDelegate, UITableViewDataSource
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: YHMySettingCell.cellReuseIdentifier, for: indexPath) as! YHMySettingCell
+        if 0 <= indexPath.row && indexPath.row < items.count {
             let item : PersonalModuleItem = items[indexPath.row];
             cell.titleLabel.text = item.title
+        }
         return cell
     }
     
@@ -95,12 +97,21 @@ extension YHMySettingViewController : UITableViewDelegate, UITableViewDataSource
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
-        if (indexPath.row >= items.count) { return }
+        if 0 <= indexPath.row && indexPath.row < items.count {
             let item = items[indexPath.row]
-        if item.type == .aboutUs {
+            if item.type == .notifySettings {
+                let vc = YHMyNotifySettingVC()
+                self.navigationController?.pushViewController(vc)
+
+            } else if item.type == .permissionSettings {
+                let vc = YHMyPermissionSettingVC()
+                self.navigationController?.pushViewController(vc)
+
+            } else if item.type == .aboutUs {
                 let vc = YHAboutUsViewController()
                 self.navigationController?.pushViewController(vc)
             }
         }
+    }
 }
 

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

@@ -20,8 +20,8 @@ enum YHPersonalModuleItemType: Int {
     case myTestCode
     case appointGalaxyBay
     
-    case changeSettings
-    case darkMode
+    case notifySettings
+    case permissionSettings
     case infoCollectList
     case infoShareList
     case aboutUs

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

+//
+//  YHMyPermissionCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/4/11.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHMyPermissionCell: UITableViewCell {
+
+   
+    static let cellReuseIdentifier = "YHMyPermissionCell"
+    static let enableColor = UIColor(hex: 0x121A26, alpha: 0.3)
+    static let disableColor = UIColor(hex: 0x121A26, alpha: 0.7)
+
+    var titleLabel: UILabel!
+    var statusLabel: UILabel!
+    var rightArrowImgV: UIImageView!
+    
+    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
+        
+        titleLabel = UILabel()
+        titleLabel.textColor = UIColor(hex:0x121A26)
+        titleLabel.textAlignment = .left
+        titleLabel.font = UIFont.PFSC_R(ofSize: 15)
+        contentView.addSubview(titleLabel)
+
+        statusLabel = UILabel()
+        statusLabel.textColor = Self.disableColor
+        statusLabel.textAlignment = .right
+        statusLabel.font = UIFont.PFSC_R(ofSize:15)
+        contentView.addSubview(statusLabel)
+        
+        rightArrowImgV = UIImageView(image: UIImage(named: "service_center_right_next_icon"))
+        contentView.addSubview(rightArrowImgV)
+        
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.centerY.equalToSuperview()
+            make.right.equalTo(statusLabel.snp.left).offset(-10)
+        }
+        
+        statusLabel.snp.makeConstraints { make in
+            make.right.equalTo(rightArrowImgV.snp.left).offset(-4)
+            make.size.equalTo(CGSize(width: 46, height: 21))
+            make.centerY.equalToSuperview()
+        }
+        
+        rightArrowImgV.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-20)
+            make.size.equalTo(CGSize(width: 16, height: 16))
+            make.centerY.equalToSuperview()
+        }
+        
+    }
+    
+    func updateModel(_ model: YHPermissionItem) {
+        
+        self.titleLabel.text = model.title
+        self.statusLabel.text = model.enableStatus ? "已开启".local : "未开启".local
+        self.statusLabel.textColor = model.enableStatus ? Self.enableColor : Self.disableColor
+    }
+}