Skip to content

G
galaxy-iOS
Commit 840bc4d3 authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

// 我的好友

parent 1340b4b0
Hide whitespace changes
Inline Side-by-side
Showing with 326 additions and 36 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 840bc4d3
......@@ -31,6 +31,7 @@
0435FA812BA186D600024EAE /* YHMyFileMethodTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */; };
0435FA832BA2DEB100024EAE /* YHCardButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA822BA2DEB100024EAE /* YHCardButton.swift */; };
043B0A352C1190C6008A9BBA /* YHSelectFileSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043B0A342C1190C6008A9BBA /* YHSelectFileSheetView.swift */; };
043BA8752C241B38006EF02D /* YHAddFriendCardCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043BA8742C241B38006EF02D /* YHAddFriendCardCell.swift */; };
043D2C8A2C0EEF3F00172438 /* YHOrderSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043D2C892C0EEF3F00172438 /* YHOrderSearchViewController.swift */; };
043D2C8C2C0F037B00172438 /* YHServiceOrderSearchViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043D2C8B2C0F037B00172438 /* YHServiceOrderSearchViewModel.swift */; };
044378A42BFC848C001F95AE /* loginBkg.mov in Resources */ = {isa = PBXBuildFile; fileRef = 044378A32BFC848C001F95AE /* loginBkg.mov */; };
......@@ -564,6 +565,7 @@
0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyFileMethodTableViewCell.swift; sourceTree = "<group>"; };
0435FA822BA2DEB100024EAE /* YHCardButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCardButton.swift; sourceTree = "<group>"; };
043B0A342C1190C6008A9BBA /* YHSelectFileSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSelectFileSheetView.swift; sourceTree = "<group>"; };
043BA8742C241B38006EF02D /* YHAddFriendCardCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAddFriendCardCell.swift; sourceTree = "<group>"; };
043D2C892C0EEF3F00172438 /* YHOrderSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOrderSearchViewController.swift; sourceTree = "<group>"; };
043D2C8B2C0F037B00172438 /* YHServiceOrderSearchViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceOrderSearchViewModel.swift; sourceTree = "<group>"; };
044378A32BFC848C001F95AE /* loginBkg.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; path = loginBkg.mov; sourceTree = "<group>"; };
......@@ -2125,6 +2127,7 @@
04FB01CD2C23DDBD0040115D /* YHPeopleMatchNoDataView.swift */,
04FB01D12C23FCDD0040115D /* YHMatchCardUsageGuideView.swift */,
04FB01D32C2404F50040115D /* YHMyFriendsNoDataView.swift */,
043BA8742C241B38006EF02D /* YHAddFriendCardCell.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -3357,6 +3360,7 @@
045EEEF42B9F171A0022A143 /* YHSpouseBasicInfoVC.swift in Sources */,
A5FD63C32B63438A00D1D9DA /* YHContactMainItemStatusModel.swift in Sources */,
045EEEEA2B9F171A0022A143 /* YHFamilyInitialInfo.swift in Sources */,
043BA8752C241B38006EF02D /* YHAddFriendCardCell.swift in Sources */,
A5C382CF2B5F9A9100C5E65C /* YHServiceCenterMainViewModel.swift in Sources */,
045EEEA52B9F171A0022A143 /* YHImageViewController.swift in Sources */,
045EEEF32B9F171A0022A143 /* YHFamilyMemberInfoListVC.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMyGoodFriendsVC.swift
View file @ 840bc4d3
......@@ -20,8 +20,7 @@ class YHMyGoodFriendsVC: YHBaseViewController {
tableView.backgroundColor = UIColor(hex: 0xF8FAFB)
tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
tableView.register(YHMyFriendsCell.self, forCellReuseIdentifier: YHMyFriendsCell.cellReuseIdentifier)
tableView.contentInset = UIEdgeInsets(top: YHFriendsResponseView.height+16, left: 0, bottom: 0, right: 0)
tableView.addSubview(self.friendRequestView)
tableView.register(YHAddFriendCardCell.self, forCellReuseIdentifier: YHAddFriendCardCell.cellReuseIdentifier)
return tableView
}()
......@@ -48,6 +47,7 @@ class YHMyGoodFriendsVC: YHBaseViewController {
}()
var friendsArr:[String] = ["","","",""]
var friendRequestArr:[String] = ["","","",""]
override func viewDidLoad() {
super.viewDidLoad()
......@@ -68,17 +68,30 @@ class YHMyGoodFriendsVC: YHBaseViewController {
extension YHMyGoodFriendsVC: UITableViewDelegate, UITableViewDataSource {
func numberOfSections(in tableView: UITableView) -> Int {
if self.friendsArr.count > 0 {
return 1
}
return 0
return 2
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if section == 0 {
return self.friendRequestArr.count > 0 ? 1 : 0
}
return friendsArr.count
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.section == 0 {
let cell = tableView.dequeueReusableCell(withIdentifier: YHAddFriendCardCell.cellReuseIdentifier, for: indexPath) as! YHAddFriendCardCell
cell.acceptBlock = {
[weak self] accept in
guard let self = self else { return }
self.friendRequestArr.removeFirst()
self.tableView.reloadData()
}
return cell
}
let cell = tableView.dequeueReusableCell(withIdentifier: YHMyFriendsCell.cellReuseIdentifier, for: indexPath) as! YHMyFriendsCell
if 0 <= indexPath.row && indexPath.row < friendsArr.count {
}
......@@ -86,43 +99,84 @@ extension YHMyGoodFriendsVC: UITableViewDelegate, UITableViewDataSource {
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 101
if indexPath.section == 1 {
return 101
}
return UITableView.automaticDimension
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if 0 <= indexPath.row && indexPath.row < friendsArr.count {
let vc = YHMyNameCardViewController()
self.navigationController?.pushViewController(vc)
if indexPath.section == 1 {
if 0 <= indexPath.row && indexPath.row < friendsArr.count {
let vc = YHMyNameCardViewController()
self.navigationController?.pushViewController(vc)
}
}
}
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
return 52.0
if section == 0 {
if friendRequestArr.count > 0 {
return 38.0
}
return 0.1
}
if section == 1 {
if friendsArr.count > 0 {
return 52.0
}
return 0.1
}
return 0.1
}
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth-16.0*2, height: 52))
view.backgroundColor = .white
let titleLabel = UILabel()
titleLabel.text = "好友列表"
titleLabel.textColor = UIColor.mainTextColor
titleLabel.textAlignment = .left
titleLabel.font = UIFont.PFSC_M(ofSize:16)
view.addSubview(titleLabel)
let corner = UIRectCorner(rawValue: UIRectCorner.topLeft.rawValue | UIRectCorner.topRight.rawValue)
let path = UIBezierPath(roundedRect:view.bounds,byRoundingCorners: corner,cornerRadii:CGSizeMake(6.0, 6.0))
let layer = CAShapeLayer()
layer.frame = view.bounds
layer.path = path.cgPath
view.layer.mask = layer
let view = UIView()
titleLabel.snp.makeConstraints { make in
make.left.equalTo(16)
make.top.equalTo(16)
make.height.equalTo(22)
if section == 0 {
if friendRequestArr.count <= 0 { return view }
let titleLabel = UILabel()
titleLabel.text = "好友请求(\(self.friendRequestArr.count))"
titleLabel.textColor = UIColor.mainTextColor
titleLabel.textAlignment = .left
titleLabel.font = UIFont.PFSC_M(ofSize:16)
view.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.left.equalTo(0)
make.top.equalTo(0)
make.height.equalTo(22)
}
} else if section == 1 {
if friendsArr.count <= 0 { return view }
view.frame = CGRect(x: 0, y: 0, width: KScreenWidth-16.0*2, height: 52)
view.backgroundColor = .white
let titleLabel = UILabel()
titleLabel.text = "好友列表"
titleLabel.textColor = UIColor.mainTextColor
titleLabel.textAlignment = .left
titleLabel.font = UIFont.PFSC_M(ofSize:16)
view.addSubview(titleLabel)
let corner = UIRectCorner(rawValue: UIRectCorner.topLeft.rawValue | UIRectCorner.topRight.rawValue)
let path = UIBezierPath(roundedRect:view.bounds,byRoundingCorners: corner,cornerRadii:CGSizeMake(6.0, 6.0))
let layer = CAShapeLayer()
layer.frame = view.bounds
layer.path = path.cgPath
view.layer.mask = layer
titleLabel.snp.makeConstraints { make in
make.left.equalTo(16)
make.top.equalTo(16)
make.height.equalTo(22)
}
}
return view
}
......
galaxy/galaxy/Classes/Modules/Community(社区)/V/YHAddFriendCardCell.swift 0 → 100644
View file @ 840bc4d3
//
// YHAddFriendCardCell.swift
// galaxy
//
// Created by edy on 2024/6/20.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHAddFriendCardCell: UITableViewCell {
static let cellReuseIdentifier = "YHAddFriendCardCell"
var acceptBlock:((Bool)->())?
static let height = 218.0
lazy var cardView: UIView = {
let view = UIView()
view.backgroundColor = .white
view.layer.cornerRadius = 3.0
return view
}()
lazy var bgImageView:UIImageView = {
let bgImgView = UIImageView(image: UIImage(named: "people_add_friend_bg"))
return bgImgView
}()
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 scrollView:UIScrollView = {
let view = UIScrollView()
view.backgroundColor = UIColor(hex: 0xF4F6FA)
view.layer.cornerRadius = 3.0
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(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)
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.contentView.addSubview(cardView)
cardView.addSubview(bgImageView)
cardView.addSubview(headImgV)
cardView.addSubview(nameLabel)
cardView.addSubview(signImgV)
cardView.addSubview(professionalLabel)
cardView.addSubview(scrollView)
scrollView.addSubview(scrollContentView)
scrollContentView.addSubview(msgLabel)
cardView.addSubview(ignoreBtn)
cardView.addSubview(acceptBtn)
self.headImgV.backgroundColor = .red
self.nameLabel.text = "XASAFSDFASDXASAFSDFASDXASAFSDFASDXASAFSDFASD"
self.professionalLabel.text = "咨询副总监 | 资讯科技及电讯"
self.msgLabel.text = "资讯科技及电讯资资讯科技及电讯资资讯科技及电讯资资讯科技及电讯资资讯科技及电讯资资讯科技及电讯资资讯科技及电讯资资讯科技及电讯资资讯科技及电讯资资讯科技及电讯资资讯科技及电讯资资讯科技及电讯资资讯科技及电讯资资讯科技及电讯资资讯科技及电讯资资讯科技及电讯资资讯科技及电讯资资讯科技及电讯资"
cardView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
bgImageView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
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.scrollView.snp.makeConstraints { make in
make.left.equalTo(16)
make.right.equalTo(-16)
make.top.equalTo(self.headImgV.snp.bottom).offset(16)
make.bottom.equalTo(self.ignoreBtn.snp.top).offset(-16)
make.height.lessThanOrEqualTo(60.0+6*2)
}
self.scrollContentView.snp.makeConstraints { make in
make.width.equalTo(KScreenWidth-40*2)
make.height.equalToSuperview().offset(-12)
make.left.equalToSuperview().offset(8)
make.right.equalToSuperview().offset(-8)
make.top.equalToSuperview().offset(6)
make.bottom.equalToSuperview().offset(-6)
}
self.msgLabel.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
self.ignoreBtn.snp.makeConstraints { make in
make.left.equalTo(16)
make.width.equalTo(78)
make.height.equalTo(40)
make.bottom.equalToSuperview().offset(-16)
}
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/YHFriendRequestView.swift
View file @ 840bc4d3
......@@ -12,7 +12,7 @@ class YHFriendRequestView: UIView {
var sendBlock:((String?)->())?
static let cardHeight = 313.0
let textMaxCount = 10
let textMaxCount = 200
// 底层蒙版
lazy var blackMaskView: UIView = {
let view = UIView()
......
galaxy/galaxy/Classes/Modules/Community(社区)/V/YHFriendsResponseView.swift
View file @ 840bc4d3
......@@ -12,7 +12,7 @@ class YHFriendsResponseView: UIView {
var acceptBlock:((Bool)->())?
static let height = 218.0
static let height = 218.0+30.0
lazy var titleLabel: UILabel = {
let titleLabel = UILabel()
......@@ -67,11 +67,22 @@ class YHFriendsResponseView: UIView {
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
}()
......@@ -123,7 +134,9 @@ class YHFriendsResponseView: UIView {
cardView.addSubview(professionalLabel)
cardView.addSubview(msgContentView)
msgContentView.addSubview(msgLabel)
msgContentView.addSubview(scrollView)
scrollView.addSubview(scrollContentView)
scrollContentView.addSubview(msgLabel)
cardView.addSubview(ignoreBtn)
cardView.addSubview(acceptBtn)
......@@ -131,7 +144,7 @@ class YHFriendsResponseView: UIView {
self.headImgV.backgroundColor = .red
self.nameLabel.text = "XASAFSDFASDXASAFSDFASDXASAFSDFASDXASAFSDFASD"
self.professionalLabel.text = "咨询副总监 | 资讯科技及电讯"
self.msgLabel.text = "sdfasdfasdfasfasfasfasfasdfasdfas"
self.msgLabel.text = "资讯科技及电讯资讯科技及电讯资讯科技及电讯资讯科技及电讯资讯科技及电讯资讯科技及电讯资讯科技及电讯资讯科技及电讯"
titleLabel.snp.makeConstraints { make in
make.left.top.right.equalToSuperview()
......@@ -175,14 +188,22 @@ class YHFriendsResponseView: UIView {
make.left.equalTo(16)
make.right.equalTo(-16)
make.top.equalTo(self.headImgV.snp.bottom).offset(16)
make.height.equalTo(30)
make.height.equalTo(60)
}
self.msgLabel.snp.makeConstraints { make in
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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment