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

* '630-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // UI
  // UI

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -364,7 +364,6 @@
 		04F957452C1FEC4A003C631C /* YHMessageBellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F957442C1FEC4A003C631C /* YHMessageBellView.swift */; };
 		04F957472C203033003C631C /* YHMyGoodFriendsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F957462C203033003C631C /* YHMyGoodFriendsVC.swift */; };
 		04F9574B2C2032D8003C631C /* YHMyFriendsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F9574A2C2032D8003C631C /* YHMyFriendsCell.swift */; };
-		04F9574D2C20644E003C631C /* YHFriendsResponseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F9574C2C20644E003C631C /* YHFriendsResponseView.swift */; };
 		04FA8B2B2C06F59D00ABE43F /* YHAppleLoginManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FA8B2A2C06F59D00ABE43F /* YHAppleLoginManager.swift */; };
 		04FA8B2E2C084C7E00ABE43F /* ATAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 04FA8B2D2C084C7E00ABE43F /* ATAuthSDK.bundle */; };
 		04FA8B302C0874CA00ABE43F /* YHOneKeyLoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FA8B2F2C0874CA00ABE43F /* YHOneKeyLoginViewModel.swift */; };
@@ -934,7 +933,6 @@
 		04F957442C1FEC4A003C631C /* YHMessageBellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMessageBellView.swift; sourceTree = "<group>"; };
 		04F957462C203033003C631C /* YHMyGoodFriendsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyGoodFriendsVC.swift; sourceTree = "<group>"; };
 		04F9574A2C2032D8003C631C /* YHMyFriendsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyFriendsCell.swift; sourceTree = "<group>"; };
-		04F9574C2C20644E003C631C /* YHFriendsResponseView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFriendsResponseView.swift; sourceTree = "<group>"; };
 		04FA8B2A2C06F59D00ABE43F /* YHAppleLoginManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAppleLoginManager.swift; sourceTree = "<group>"; };
 		04FA8B2D2C084C7E00ABE43F /* ATAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = ATAuthSDK.bundle; path = "galaxy/Classes/Modules/AutoLogin(一键登录)/framework/ATAuthSDK_D.framework/ATAuthSDK.bundle"; sourceTree = "<group>"; };
 		04FA8B2F2C0874CA00ABE43F /* YHOneKeyLoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOneKeyLoginViewModel.swift; sourceTree = "<group>"; };
@@ -2280,7 +2278,6 @@
 				04FD856D2C215DC900BEF9C5 /* YHMyWorkExperienceCell.swift */,
 				04FD856F2C21646200BEF9C5 /* YHMyInterestTopicCell.swift */,
 				04EC2F802C22888E002907D7 /* YHFriendRequestView.swift */,
-				04F9574C2C20644E003C631C /* YHFriendsResponseView.swift */,
 				04FD85712C21786900BEF9C5 /* YHNameCardInfoView.swift */,
 				044D0BFF2C21663300C5CF5E /* YHMyInformationItemCell.swift */,
 				044D0C052C22736F00C5CF5E /* YHSetExplainView.swift */,
@@ -3245,7 +3242,6 @@
 				045EEE7B2B9F171A0022A143 /* YHPersonInfoCellModel2.swift in Sources */,
 				A53B61122BB128AF0010B573 /* YHFileListItemsView2.swift in Sources */,
 				044D0BF62C2154CA00C5CF5E /* YHAllowUseMyInfoViewController.swift in Sources */,
-				04F9574D2C20644E003C631C /* YHFriendsResponseView.swift in Sources */,
 				04F5F8702C1AC4C2004A463C /* YHHKEventWebViewController.swift in Sources */,
 				045EEE892B9F171A0022A143 /* YHPreviewBaseViewController.swift in Sources */,
 				045EEEA42B9F171A0022A143 /* YHImageResultViewController.swift in Sources */,

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

@@ -26,17 +26,6 @@ class YHMyGoodFriendsVC: YHBaseViewController {
         return tableView
     }()
     
-    lazy var friendRequestView:YHFriendsResponseView = {
-        let view = YHFriendsResponseView(frame: CGRectMake(0, -16-YHFriendsResponseView.height, KScreenWidth-16*2, YHFriendsResponseView.height))
-        view.acceptBlock = {
-            [weak self] accept in
-            guard let self = self else { return }
-            self.tableView.contentInset = UIEdgeInsets.zero
-            self.friendRequestView.removeFromSuperview()
-        }
-        return view
-    }()
-    
     lazy var emptyDataTipsView: YHMyFriendsNoDataView = {
         let view = YHMyFriendsNoDataView(frame: CGRect(x: 0, y: k_Height_NavigationtBarAndStatuBar, width: KScreenWidth, height: KScreenHeight-k_Height_NavigationtBarAndStatuBar))
         view.bottomBtnClick = {

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHFriendRequestView.swift

@@ -51,7 +51,7 @@ class YHFriendRequestView: UIView {
     lazy var cardView: UIView = {
         let view = UIView()
         view.backgroundColor = .white
-        view.layer.cornerRadius = 3.0
+        view.layer.cornerRadius = 6.0
         view.clipsToBounds = true
         return view
     }()

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHFriendsResponseView.swift

-//
-//  YHFriendsRequestView.swift
-//  galaxy
-//
-//  Created by edy on 2024/6/17.
-//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
-//
-
-import UIKit
-
-class YHFriendsResponseView: UIView {
-    
-    var acceptBlock:((Bool)->())?
-    
-    static let height = 218.0+30.0
-
-    lazy var titleLabel: UILabel = {
-        let titleLabel = UILabel()
-        titleLabel.text = "好友请求"
-        titleLabel.textColor = UIColor.mainTextColor
-        titleLabel.textAlignment = .left
-        titleLabel.font = UIFont.PFSC_M(ofSize:16)
-        return titleLabel
-    }()
-    
-    lazy var cardView: UIView = {
-        let view = UIView()
-        view.backgroundColor = .white
-        let bgImgView = UIImageView(image: UIImage(named: "people_add_friend_bg"))
-        view.addSubview(bgImgView)
-        view.layer.cornerRadius = 3.0
-        return view
-    }()
-    
-    lazy var headImgV:UIImageView = {
-        let view = UIImageView()
-        view.layer.cornerRadius = 23.0
-        return view
-    }()
-    
-    lazy var nameLabel:UILabel = {
-        let nameLabel = UILabel()
-        nameLabel.textColor = UIColor.mainTextColor
-        nameLabel.textAlignment = .left
-        nameLabel.font = UIFont.PFSC_B(ofSize:16)
-        return nameLabel
-    }()
-    
-    lazy var signImgV:UIImageView = {
-        let view = UIImageView()
-        view.image = UIImage(named: "people_sign")
-        return view
-    }()
-    
-    lazy var professionalLabel:UILabel = {
-        let label = UILabel()
-        label.textColor = UIColor.mainTextColor70
-        label.textAlignment = .left
-        label.font = UIFont.PFSC_R(ofSize:13)
-        return label
-    }()
-    
-    lazy var msgContentView:UIView = {
-        let view = UIView()
-        view.backgroundColor = UIColor(hex: 0xF4F6FA)
-        view.layer.cornerRadius = 3.0
-        return view
-    }()
-    
-    lazy var scrollView:UIScrollView = {
-        let view = UIScrollView()
-        return view
-    }()
-    
-    lazy var scrollContentView:UIView = {
-        let view = UIView()
-        return view
-    }()
-    
-    lazy var msgLabel:UILabel = {
-        let label = UILabel()
-        label.textColor = UIColor.mainTextColor50
-        label.textAlignment = .left
-        label.font = UIFont.PFSC_R(ofSize:13)
-        label.numberOfLines = 0
-        return label
-    }()
-    
-    lazy var ignoreBtn:UIButton = {
-       let btn = UIButton()
-        btn.setTitle("忽略", for: .normal)
-        btn.backgroundColor = UIColor(hexString:"#F8F9FB")
-        btn.setTitleColor(UIColor(hexString: "#222222"), for: .normal)
-        btn.titleLabel?.font = .PFSC_M(ofSize: 13.6)
-        btn.layer.cornerRadius = 2.75
-        btn.addTarget(self, action: #selector(didIgnoreBtnClicked), for: .touchUpInside)
-        return btn
-    }()
-    
-    lazy var acceptBtn:UIButton = {
-       let btn = UIButton()
-        btn.setTitle("接受", for: .normal)
-        btn.backgroundColor = UIColor.brandMainColor
-        btn.setTitleColor(UIColor.white, for: .normal)
-        btn.titleLabel?.font = .PFSC_M(ofSize: 13.6)
-        btn.layer.cornerRadius = 2.75
-        btn.addTarget(self, action: #selector(didAcceptBtnClicked), for: .touchUpInside)
-        return btn
-    }()
-    
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        createUI()
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    @objc func didIgnoreBtnClicked() {
-        self.acceptBlock?(true)
-    }
-    
-    @objc func didAcceptBtnClicked() {
-        self.acceptBlock?(false)
-    }
-    
-    func createUI() {
-        self.addSubview(titleLabel)
-        self.addSubview(cardView)
-        cardView.addSubview(headImgV)
-        cardView.addSubview(nameLabel)
-        cardView.addSubview(signImgV)
-        cardView.addSubview(professionalLabel)
-        
-        cardView.addSubview(msgContentView)
-        msgContentView.addSubview(scrollView)
-        scrollView.addSubview(scrollContentView)
-        scrollContentView.addSubview(msgLabel)
-        
-        cardView.addSubview(ignoreBtn)
-        cardView.addSubview(acceptBtn)
-        
-        titleLabel.snp.makeConstraints { make in
-            make.left.top.right.equalToSuperview()
-            make.height.equalTo(22.0)
-        }
-        
-        cardView.snp.makeConstraints { make in
-            make.left.right.equalToSuperview()
-            make.top.equalTo(titleLabel.snp.bottom).offset(16)
-            make.height.equalTo(180.0)
-        }
-        
-        headImgV.snp.makeConstraints { make in
-            make.width.height.equalTo(46.0)
-            make.left.equalTo(16)
-            make.top.equalTo(16)
-        }
-        
-        self.nameLabel.snp.makeConstraints { make in
-            make.left.equalTo(self.headImgV.snp.right).offset(10)
-            make.height.equalTo(22.0)
-            make.top.equalTo(self.headImgV)
-        }
-        
-        self.signImgV.snp.makeConstraints { make in
-            make.width.equalTo(49)
-            make.height.equalTo(16)
-            make.centerY.equalTo(self.nameLabel)
-            make.left.equalTo(self.nameLabel.snp.right).offset(8)
-            make.right.lessThanOrEqualToSuperview().offset(-16)
-        }
-        
-        self.professionalLabel.snp.makeConstraints { make in
-            make.left.equalTo(self.nameLabel)
-            make.right.equalTo(-16)
-            make.top.equalTo(self.nameLabel.snp.bottom).offset(6)
-            make.height.equalTo(18)
-        }
-        
-        self.msgContentView.snp.makeConstraints { make in
-            make.left.equalTo(16)
-            make.right.equalTo(-16)
-            make.top.equalTo(self.headImgV.snp.bottom).offset(16)
-            make.height.equalTo(60)
-        }
-        
-        self.scrollView.snp.makeConstraints { make in
-            make.left.top.equalTo(6)
-            make.right.bottom.equalTo(-6)
-        }
-        
-        self.scrollContentView.snp.makeConstraints { make in
-            make.width.equalTo(KScreenWidth-38*2)
-            make.edges.equalToSuperview()
-        }
-        self.msgLabel.snp.makeConstraints { make in
-            make.edges.equalToSuperview()
-        }
-        
-        self.ignoreBtn.snp.makeConstraints { make in
-            make.left.equalTo(16)
-            make.top.equalTo(self.msgContentView.snp.bottom).offset(16)
-            make.width.equalTo(78)
-            make.height.equalTo(40)
-        }
-        
-        self.acceptBtn.snp.makeConstraints { make in
-            make.left.equalTo(self.ignoreBtn.snp.right).offset(10)
-            make.right.equalTo(-16)
-            make.centerY.equalTo(self.ignoreBtn)
-            make.height.equalTo(40)
-        }
-    }
-}

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHInterestTopicLayout.swift

@@ -12,12 +12,11 @@ class YHInterestTopicLayout: UICollectionViewFlowLayout {
      
     var dataSource:[String] = []
     weak var layoutDelegate: UICollectionViewDelegateFlowLayout? = nil
-    var interItemSpacing: CGFloat = 12.0 // 相邻单元格之间的水平间距
     var collectionViewWidth = KScreenWidth-16.0*4
     override func prepare() {
         super.prepare()
-        self.minimumInteritemSpacing = 12
-        self.minimumLineSpacing = 12
+        self.minimumInteritemSpacing = 8.0
+        self.minimumLineSpacing = 8.0
     }
     
     override func layoutAttributesForElements(in rect: CGRect) -> [UICollectionViewLayoutAttributes]? {
@@ -31,7 +30,7 @@ class YHInterestTopicLayout: UICollectionViewFlowLayout {
             let prevLayout = arrCell![i - 1]
             if (prevLayout.indexPath.section == currentLayout.indexPath.section) {
                 //我们想设置的最大间距，可根据需要改
-                let maximumSpacing = 12.0
+                let maximumSpacing = self.minimumInteritemSpacing
                 //前一个cell的最右边
                 let originX = prevLayout.frame.maxX
                 //如果当 （上一个cell的最右边X + 我们想要的间距 + 当前cell的宽度 + 区边距） 依然在contentSize中 (小于屏幕宽度)，我们改变当前cell的原点位置

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyEducationCell.swift

@@ -64,7 +64,7 @@ class YHMyEducationCell: UITableViewCell {
     lazy var cardView: UIView = {
         let view = UIView()
         view.backgroundColor = .white
-        view.layer.cornerRadius = 3.0
+        view.layer.cornerRadius = 6.0
         view.clipsToBounds = true
         return view
     }()

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyFriendsCell.swift

@@ -115,7 +115,7 @@ class YHMyFriendsCell: UITableViewCell {
             make.left.equalTo(15)
             make.right.equalTo(-15)
             make.top.equalTo(0)
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
         
         self.headImgV.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyInterestTopicCell.swift

@@ -16,7 +16,7 @@ class YHTopicItemCell: UICollectionViewCell {
         var label = UILabel()
         label.font = .PFSC_R(ofSize: 12)
         label.textAlignment = .left
-        label.textColor = UIColor.mainTextColor
+        label.textColor = UIColor.mainTextColor70
         return label
     }()
 
@@ -32,7 +32,7 @@ class YHTopicItemCell: UICollectionViewCell {
     func setupUI() {
         
         contentView.layer.cornerRadius = 3.0
-        contentView.backgroundColor = UIColor.init(hex: 0xF8F8F8)
+        contentView.backgroundColor = UIColor.init(hex: 0xF4F6FA)
         contentView.addSubview(titleLabel)
         
         titleLabel.snp.makeConstraints { make in
@@ -115,7 +115,7 @@ class YHMyInterestTopicCell: UITableViewCell {
     lazy var cardView: UIView = {
         let view = UIView()
         view.backgroundColor = .white
-        view.layer.cornerRadius = 3.0
+        view.layer.cornerRadius = 6.0
         view.clipsToBounds = true
         return view
     }()

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyIntroductionCell.swift

@@ -50,7 +50,7 @@ class YHMyIntroductionCell: UITableViewCell {
     lazy var cardView: UIView = {
         let view = UIView()
         view.backgroundColor = .white
-        view.layer.cornerRadius = 3.0
+        view.layer.cornerRadius = 6.0
         view.clipsToBounds = true
         return view
     }()

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyNameCardAvatarInfoCell.swift

@@ -114,7 +114,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
     
     lazy var cardView: UIView = {
         let view = UIView()
-        view.layer.cornerRadius = 3.0
+        view.layer.cornerRadius = 6.0
         view.backgroundColor = .white
         view.clipsToBounds = true
         return view

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyWorkExperienceCell.swift

@@ -158,7 +158,7 @@ class YHMyWorkExperienceCell: UITableViewCell {
     lazy var cardView: UIView = {
         let view = UIView()
         view.backgroundColor = .white
-        view.layer.cornerRadius = 3.0
+        view.layer.cornerRadius = 6.0
         view.clipsToBounds = true
         return view
     }()

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

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