修改代码

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityDetailViewController.swift

@@ -54,6 +54,7 @@ class YHActivityDetailViewController: YHBaseViewController {
     }()
 
     // MARK: - 生命周期方法
+
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
@@ -67,7 +68,7 @@ class YHActivityDetailViewController: YHBaseViewController {
 
 extension YHActivityDetailViewController {
     func gotoTheRightVcForStatus() {
-        guard let model = self.viewModel.activityDetailModel  else {
+        guard let model = viewModel.activityDetailModel else {
             return
         }
 
@@ -91,16 +92,14 @@ extension YHActivityDetailViewController {
                 printLog("")
             }
         }
-        
     }
 
     func gotoActivityTravelVC() {
-        if let nav = self.navigationController {
+        if let nav = navigationController {
             let rrr = nav.viewControllers.contains { $0.isKind(of: YHActivityTravelViewController.self) }
             if rrr {
-                
                 var targetVc: UIViewController?
-                for(_, value) in nav.viewControllers.enumerated() {
+                for (_, value) in nav.viewControllers.enumerated() {
                     if value.isKind(of: YHActivityTravelViewController.self) {
                         targetVc = value
                         break
@@ -121,7 +120,7 @@ extension YHActivityDetailViewController {
     }
 
     func showApplyUI() {
-        YHApplyActivityAlert.showApplyActivityAlertView(name: self.viewModel.activityDetailModel?.businessCardName ?? "") { (tag, name, number, phone) in
+        YHApplyActivityAlert.showApplyActivityAlertView(name: viewModel.activityDetailModel?.businessCardName ?? "") { tag, name, number, phone in
             if tag {
                 printLog(tag)
                 printLog(name)
@@ -169,7 +168,7 @@ extension YHActivityDetailViewController {
                 self?.gotoTheRightVcForStatus()
             } else {
                 YHOneKeyLoginManager.shared.oneKeyLogin()
-                YHLoginManager.shared.loginSuccessActionBlock = {[weak self] in
+                YHLoginManager.shared.loginSuccessActionBlock = { [weak self] in
                     guard self != nil else { return }
                     self?.loadData()
                     YHLoginManager.shared.loginSuccessActionBlock = nil
@@ -183,6 +182,7 @@ extension YHActivityDetailViewController {
             make.height.equalTo(114)
         }
     }
+
     func loadData() {
         if !activityId.isEmpty {
             viewModel.getActivityDetailData(activityID: activityId) { success, error in
@@ -206,7 +206,7 @@ extension YHActivityDetailViewController {
     }
 
     func requestImages() {
-        guard let detailModel = self.viewModel.activityDetailModel else {
+        guard let detailModel = viewModel.activityDetailModel else {
             return
         }
         let ossGroup = DispatchGroup()
@@ -214,13 +214,13 @@ extension YHActivityDetailViewController {
             ossGroup.enter()
             item.imgView.kf.setImage(with: URL(string: item.url)) { result in
                 switch result {
-                case .success(let value):
+                case let .success(value):
                     let size = value.image.size
                     let scale = size.width > 0 ? Double(size.height / size.width) : 0.0
                     if scale > 0 {
                         item.height = scale * item.width
                     }
-                case .failure(let error):
+                case let .failure(error):
                     print("Job failed: \(error.localizedDescription)")
                 }
                 ossGroup.leave()
@@ -232,7 +232,6 @@ extension YHActivityDetailViewController {
     }
 
     func applyActivity(param: [String: Any]) {
-        
         viewModel.applyActivity(param: param) { success, error in
             if success {
                 YHHUD.flash(message: "报名成功")
@@ -270,12 +269,10 @@ extension YHActivityDetailViewController: UITableViewDelegate, UITableViewDataSo
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        
         let cell = tableView.dequeueReusableCell(withIdentifier: YHActivityDetailCell.cellReuseIdentifier, for: indexPath) as! YHActivityDetailCell
         cell.dataModel = viewModel.activityDetailModel
 
         if indexPath.row < viewModel.arrActivityDetail.count {
-            
             let model = viewModel.arrActivityDetail[indexPath.row]
 
             if model.type == 0 {
@@ -284,7 +281,6 @@ extension YHActivityDetailViewController: UITableViewDelegate, UITableViewDataSo
                 return cell
 
             } else if model.type == 1 {
-                
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHActivityDetailCell1.cellReuseIdentifier, for: indexPath) as! YHActivityDetailCell1
                 cell.dataModel = model.activityDetailModel ?? YHActivityDetailModel()
                 return cell
@@ -293,7 +289,6 @@ extension YHActivityDetailViewController: UITableViewDelegate, UITableViewDataSo
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHActivityDetailCell2.cellReuseIdentifier, for: indexPath) as! YHActivityDetailCell2
                 cell.dataModel = model.activityDetailModel ?? YHActivityDetailModel()
                 return cell
-                
             }
         }
         return cell

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityListViewController.swift

@@ -6,11 +6,10 @@
 //  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
 //
 
-import UIKit
 import JXSegmentedView
+import UIKit
 
 enum YHActivityStatus: Int {
-    
     // 活动的状态 1：立即报名 2：已报名 3：活动结束 4：已取消报名
 
     case unknow = 0 // 未知
@@ -110,7 +109,6 @@ enum YHActivityStatus: Int {
  活动列表 或 我的报名活动
  */
 class YHActivityListViewController: YHBaseViewController {
-    
     var type: Int = 0 // 0-活动列表  1-我的报名活动
 
     lazy var viewModel: YHActivityViewModel = {
@@ -139,6 +137,7 @@ class YHActivityListViewController: YHBaseViewController {
     }()
 
     // MARK: - 生命周期方法
+
     override func viewDidLoad() {
         super.viewDidLoad()
         view.backgroundColor = .white
@@ -177,7 +176,6 @@ class YHActivityListViewController: YHBaseViewController {
         }
 
         emptyDataTipsView.isHidden = viewModel.arrActivityListData.count > 0 ? true : false
-    
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -188,7 +186,7 @@ class YHActivityListViewController: YHBaseViewController {
 
 extension YHActivityListViewController {
     func loadMoreData() {
-        self.viewModel.getActivityList(firstFlag: false, type: type) {[weak self] _, _ in
+        viewModel.getActivityList(firstFlag: false, type: type) { [weak self] _, _ in
             guard let self = self else { return }
             self.tableView.reloadData()
             self.emptyDataTipsView.isHidden = self.viewModel.arrActivityListData.count > 0 ? true : false
@@ -206,7 +204,7 @@ extension YHActivityListViewController {
     }
 
     func loadFirstData() {
-        self.viewModel.getActivityList(firstFlag: true, type: type) {[weak self] _, _ in
+        viewModel.getActivityList(firstFlag: true, type: type) { [weak self] _, _ in
             guard let self = self else { return }
 
             self.tableView.es.stopPullToRefresh()
@@ -229,7 +227,6 @@ extension YHActivityListViewController {
 }
 
 extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSource {
-    
     func numberOfSections(in tableView: UITableView) -> Int {
         if viewModel.arrActivityListData.count > 0 {
             return viewModel.arrActivityListData.count
@@ -242,7 +239,7 @@ extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSour
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: YHActivityListCell.cellReuseIdentifier, for: indexPath) as! YHActivityListCell
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: YHActivityListCell.cellReuseIdentifier, for: indexPath) as? YHActivityListCell else { return UITableViewCell() }
         cell.sessionIndex = indexPath.section
         cell.type = type
 
@@ -278,12 +275,11 @@ extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSour
     }
 
     func gotoActivityTravelVC(checkId: String = "") {
-        if let nav = self.navigationController {
+        if let nav = navigationController {
             let rrr = nav.viewControllers.contains { $0.isKind(of: YHActivityTravelViewController.self) }
             if rrr {
-                
                 var targetVc: UIViewController?
-                for(_, value) in nav.viewControllers.enumerated() {
+                for (_, value) in nav.viewControllers.enumerated() {
                     if value.isKind(of: YHActivityTravelViewController.self) {
                         targetVc = value
                         break
@@ -312,19 +308,18 @@ extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSour
     }
 
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        
         var height: CGFloat = 16.0
         if section != 0 {
             height = 20.0
         }
 
-        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth-16.0*2, height: height))
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth - 16.0 * 2, height: height))
         view.backgroundColor = .clear
         return view
     }
 
     func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
-        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth-16.0*2, height: 0.001))
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth - 16.0 * 2, height: 0.001))
         view.backgroundColor = .clear
         return view
     }

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityTravelViewController.swift

@@ -233,7 +233,8 @@ extension YHActivityTravelViewController: UITableViewDelegate, UITableViewDataSo
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: YHActivityTravelCell.cellReuseIdentifier, for: indexPath) as! YHActivityTravelCell
+        
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: YHActivityTravelCell.cellReuseIdentifier, for: indexPath) as? YHActivityTravelCell else { return UITableViewCell() }
         cell.dataModel = viewModel.activityTravelModel
         cell.block = {[weak self] in
             self?.clickBottomButton()

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

@@ -88,7 +88,8 @@ extension YHMyGoodFriendsVC: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         if indexPath.section == 0 {
-            let cell = tableView.dequeueReusableCell(withIdentifier: YHAddFriendCardCell.cellReuseIdentifier, for: indexPath) as! YHAddFriendCardCell
+            guard let cell = tableView.dequeueReusableCell(withIdentifier: YHAddFriendCardCell.cellReuseIdentifier, for: indexPath) as? YHAddFriendCardCell else { return UITableViewCell() }
+            
             cell.cardCount = self.friendRequestArr.count
             if self.friendRequestArr.count > 0 {
                 cell.friendModel = self.friendRequestArr[0]
@@ -118,7 +119,7 @@ extension YHMyGoodFriendsVC: UITableViewDelegate, UITableViewDataSource {
             return cell
         }
         
-        let cell = tableView.dequeueReusableCell(withIdentifier: YHMyFriendsCell.cellReuseIdentifier, for: indexPath) as! YHMyFriendsCell
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: YHMyFriendsCell.cellReuseIdentifier, for: indexPath) as? YHMyFriendsCell else { return UITableViewCell() }
         if 0 <= indexPath.row && indexPath.row < friendsArr.count {
             let friend = self.friendsArr[indexPath.row]
             cell.friendModel = friend

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

@@ -127,7 +127,7 @@ extension YHNameCardViewController: UITableViewDelegate, UITableViewDataSource {
             let cardInfo = self.cardInfoArr[indexPath.section]
             
             if cardInfo.type == .avatar {
-                let cell = tableView.dequeueReusableCell(withIdentifier: YHMyNameCardAvatarInfoCell.cellReuseIdentifier, for: indexPath) as! YHMyNameCardAvatarInfoCell
+                guard let cell = tableView.dequeueReusableCell(withIdentifier: YHMyNameCardAvatarInfoCell.cellReuseIdentifier, for: indexPath) as? YHMyNameCardAvatarInfoCell else { return UITableViewCell() }
                 cell.userModel = cardInfo
                 cell.editBlock = { [weak self] in
                     guard let self = self else { return }
@@ -139,7 +139,8 @@ extension YHNameCardViewController: UITableViewDelegate, UITableViewDataSource {
             }
             
             if cardInfo.type == .honor || cardInfo.type == .introduce {
-                let introCell = tableView.dequeueReusableCell(withIdentifier: YHMyIntroductionCell.cellReuseIdentifier, for: indexPath) as! YHMyIntroductionCell
+                
+                guard let introCell = tableView.dequeueReusableCell(withIdentifier: YHMyIntroductionCell.cellReuseIdentifier, for: indexPath) as? YHMyIntroductionCell else { return UITableViewCell() }
                 introCell.userModel = cardInfo
                 introCell.editBlock = { [weak self] in
                     guard let self = self else { return }
@@ -157,7 +158,7 @@ extension YHNameCardViewController: UITableViewDelegate, UITableViewDataSource {
             }
             
             if cardInfo.type == .education {
-                let eduCell = tableView.dequeueReusableCell(withIdentifier: YHMyEducationCell.cellReuseIdentifier, for: indexPath) as! YHMyEducationCell
+                guard let eduCell = tableView.dequeueReusableCell(withIdentifier: YHMyEducationCell.cellReuseIdentifier, for: indexPath) as? YHMyEducationCell else { return UITableViewCell() }
                 eduCell.userModel = cardInfo
                 eduCell.hiddenBtnBlock = {
                     [weak self] in
@@ -174,7 +175,7 @@ extension YHNameCardViewController: UITableViewDelegate, UITableViewDataSource {
             }
             
             if cardInfo.type == .workExperience {
-                let workCell = tableView.dequeueReusableCell(withIdentifier: YHMyWorkExperienceCell.cellReuseIdentifier, for: indexPath) as! YHMyWorkExperienceCell
+                guard let workCell = tableView.dequeueReusableCell(withIdentifier: YHMyWorkExperienceCell.cellReuseIdentifier, for: indexPath) as? YHMyWorkExperienceCell else { return UITableViewCell() }
                 workCell.userModel = cardInfo
                 workCell.hiddenBtnBlock = {
                     [weak self] in
@@ -191,7 +192,7 @@ extension YHNameCardViewController: UITableViewDelegate, UITableViewDataSource {
             }
             
             if cardInfo.type == .topics {
-                let topicCell = tableView.dequeueReusableCell(withIdentifier: YHMyInterestTopicCell.cellReuseIdentifier, for: indexPath) as! YHMyInterestTopicCell
+                guard let topicCell = tableView.dequeueReusableCell(withIdentifier: YHMyInterestTopicCell.cellReuseIdentifier, for: indexPath) as? YHMyInterestTopicCell else { return UITableViewCell() }
                 topicCell.userModel = cardInfo
                 topicCell.editBlock = { [weak self] in
                     guard let self = self else { return }