Skip to content

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

// 名片

parent 95247cd3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 21 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ e8d86656
......@@ -1168,6 +1168,7 @@
0468D42E2B5654A500CFB916 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0468D42D2B5654A500CFB916 /* CoreTelephony.framework */; };
0468D4302B5654B500CFB916 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0468D42F2B5654B500CFB916 /* SystemConfiguration.framework */; };
0468D4312B5654C100CFB916 /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 0468D42C2B56549200CFB916 /* libresolv.tbd */; };
04760F982E8A57C600B8F776 /* YHNewNameCardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04760F972E8A57C600B8F776 /* YHNewNameCardViewController.swift */; };
047A96832D1674010033BB4E /* YHGCSchemeTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047A96822D1674010033BB4E /* YHGCSchemeTableViewCell.swift */; };
047A96862D1698150033BB4E /* YHGCMySchemeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047A96852D1698150033BB4E /* YHGCMySchemeViewModel.swift */; };
047A96892D169A5F0033BB4E /* YHGCMySchemeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047A96882D169A5F0033BB4E /* YHGCMySchemeModel.swift */; };
......@@ -2532,6 +2533,7 @@
0468D42C2B56549200CFB916 /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; };
0468D42D2B5654A500CFB916 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; };
0468D42F2B5654B500CFB916 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
04760F972E8A57C600B8F776 /* YHNewNameCardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHNewNameCardViewController.swift; sourceTree = "<group>"; };
047A96822D1674010033BB4E /* YHGCSchemeTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCSchemeTableViewCell.swift; sourceTree = "<group>"; };
047A96852D1698150033BB4E /* YHGCMySchemeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMySchemeViewModel.swift; sourceTree = "<group>"; };
047A96882D169A5F0033BB4E /* YHGCMySchemeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMySchemeModel.swift; sourceTree = "<group>"; };
......@@ -6933,6 +6935,7 @@
04B30B7D2E86374E004E4B12 /* C */ = {
isa = PBXGroup;
children = (
04760F972E8A57C600B8F776 /* YHNewNameCardViewController.swift */,
0426E09B2E851A91005C9F5D /* YHNameCardContainerViewController.swift */,
04B30B7A2E86307C004E4B12 /* YHNameCardHomePageViewController.swift */,
04B30B8D2E88C837004E4B12 /* YHNameCardDynamicViewController.swift */,
......@@ -8790,6 +8793,7 @@
045C13A22D12CA5F00BD2DC0 /* YHBottomPresentationController.swift in Sources */,
045C13A32D12CA5F00BD2DC0 /* YHHKRecordsEditButtonCell.swift in Sources */,
045C13A42D12CA5F00BD2DC0 /* YHEducationDetailVC.swift in Sources */,
04760F982E8A57C600B8F776 /* YHNewNameCardViewController.swift in Sources */,
045C13A52D12CA5F00BD2DC0 /* YHBouncesContentView.swift in Sources */,
045C13A62D12CA5F00BD2DC0 /* YHTravelDocsPreparationViewModel.swift in Sources */,
045C13A72D12CA5F00BD2DC0 /* YHWorkExampleMessageTableViewCell.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/Community(社区)/Connections(人脉)/C/YHConnectListViewController.swift
View file @ e8d86656
......@@ -123,10 +123,9 @@ extension YHConnectListViewController: UITableViewDelegate, UITableViewDataSourc
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if 0 <= indexPath.row && indexPath.row < arr.count {
let vc = YHNameCardContainerViewController()
if let userId = YHLoginManager.shared.userModel?.id {
vc.userId = userId
}
let contact = arr[indexPath.row]
let vc = YHNewNameCardViewController()
vc.userId = contact.yh_id
navigationController?.pushViewController(vc)
}
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyNewViewController.swift
View file @ e8d86656
......@@ -667,7 +667,7 @@ extension YHMyNewViewController {
switch item.type {
case .myCard:// 我的名片
let vc = YHNameCardContainerViewController()
let vc = YHNewNameCardViewController()
if let userId = YHLoginManager.shared.userModel?.id {
vc.userId = userId
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/NameCard(名片)/C/YHNameCardDynamicViewController.swift
View file @ e8d86656
......@@ -12,9 +12,10 @@ import JXSegmentedView
class YHNameCardDynamicViewController: YHBaseViewController {
var arr: [String] = ["", "", "", ""]
var vcCanScroll: Bool = true
lazy var tableView: UITableView = {
let tableView = UITableView(frame: .zero, style: .grouped)
lazy var tableView: YHGestureTableView = {
let tableView = YHGestureTableView(frame: .zero, style: .grouped)
tableView.estimatedSectionHeaderHeight = 100
tableView.showsVerticalScrollIndicator = false
tableView.separatorStyle = .none
......@@ -26,10 +27,15 @@ class YHNameCardDynamicViewController: YHBaseViewController {
return tableView
}()
deinit {
NotificationCenter.default.removeObserver(self)
}
override func viewDidLoad() {
super.viewDidLoad()
view.backgroundColor = .white
gk_navigationBar.isHidden = true
addObserver()
view.addSubview(self.tableView)
self.tableView.snp.makeConstraints { make in
make.left.equalTo(20)
......@@ -38,6 +44,11 @@ class YHNameCardDynamicViewController: YHBaseViewController {
make.top.equalToSuperview()
}
}
func addObserver() {
NotificationCenter.default.addObserver(self, selector: #selector(beginDragging), name: Notification.Name(rawValue: "scrollViewWillBeginDragging0"), object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(endDragging), name: Notification.Name(rawValue: "scrollViewDidEndDragging0"), object: nil)
}
}
extension YHNameCardDynamicViewController: UITableViewDelegate, UITableViewDataSource {
......@@ -79,3 +90,34 @@ extension YHNameCardDynamicViewController: JXSegmentedListContainerViewListDeleg
return view
}
}
// **********************************************************************************
extension YHNameCardDynamicViewController: UIScrollViewDelegate {
// 控制滑动交互
func scrollViewDidScroll(_ scrollView: UIScrollView) {
let scrollViewSet: CGFloat = scrollView.contentOffset.y
if vcCanScroll == false {// 不能滚动时
scrollView.contentOffset = CGPoint(x: 0, y: 0)
} else {
if scrollViewSet <= 0 {
scrollView.contentOffset = CGPoint(x: 0, y: 0)
vcCanScroll = false
NotificationCenter.default.post(name: Notification.Name(rawValue: "leaveTop0"), object: nil)
} else {
scrollView.contentOffset = CGPoint(x: 0, y: scrollViewSet)
}
}
}
}
extension YHNameCardDynamicViewController {
@objc func beginDragging() {
tableView.isScrollEnabled = false
vcCanScroll = false
}
@objc func endDragging() {
tableView.isScrollEnabled = true
}
}
galaxy/galaxy/Classes/Modules/Mine（我的）/NameCard(名片)/C/YHNameCardHomePageViewController.swift
View file @ e8d86656
......@@ -15,11 +15,7 @@ class YHNameCardHomePageViewController: YHBaseViewController {
var cardInfoArr: [YHUserNameCardInfo] = []
let viewModel = YHMatchUserViewModel()
var vcCanScroll: Bool = false {
didSet {
tableView.isScrollEnabled = vcCanScroll
}
}
var vcCanScroll: Bool = true
var isCurrentUser: Bool {
get {
......@@ -27,9 +23,9 @@ class YHNameCardHomePageViewController: YHBaseViewController {
}
}
lazy var tableView: UITableView = {
let tableView = UITableView(frame: .zero, style: .grouped)
tableView.estimatedSectionHeaderHeight = 100
lazy var tableView: YHGestureTableView = {
let tableView = YHGestureTableView(frame: .zero, style: .grouped)
tableView.estimatedSectionHeaderHeight = 1.0
tableView.showsVerticalScrollIndicator = false
tableView.separatorStyle = .none
tableView.delegate = self
......@@ -50,6 +46,7 @@ class YHNameCardHomePageViewController: YHBaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
addObserver()
view.backgroundColor = .white
gk_navigationBar.isHidden = true
createUI()
......@@ -57,7 +54,6 @@ class YHNameCardHomePageViewController: YHBaseViewController {
}
func createUI() {
vcCanScroll = false
view.addSubview(self.tableView)
self.tableView.snp.makeConstraints { make in
make.left.equalTo(0)
......@@ -67,6 +63,11 @@ class YHNameCardHomePageViewController: YHBaseViewController {
}
}
func addObserver() {
NotificationCenter.default.addObserver(self, selector: #selector(beginDragging), name: Notification.Name(rawValue: "scrollViewWillBeginDragging0"), object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(endDragging), name: Notification.Name(rawValue: "scrollViewDidEndDragging0"), object: nil)
}
func requestNameCardInfo() {
self.viewModel.getUserNameCardInfo(uid: self.userId) {
_, _ in
......@@ -172,11 +173,11 @@ extension YHNameCardHomePageViewController: UITableViewDelegate, UITableViewData
if cardInfo.type == .honor {
let vc = YHEditHonorViewController()
vc.model = self.viewModel.nameCardInfo
self.navigationController?.pushViewController(vc)
UIViewController.current?.navigationController?.pushViewController(vc)
} else if cardInfo.type == .introduce {
let vc = YHEditPersonalProfileViewController()
vc.model = self.viewModel.nameCardInfo
self.navigationController?.pushViewController(vc)
UIViewController.current?.navigationController?.pushViewController(vc)
}
}
return introCell
......@@ -194,7 +195,7 @@ extension YHNameCardHomePageViewController: UITableViewDelegate, UITableViewData
guard let self = self else { return }
let vc = YHEditSchoolViewController()
vc.model = self.viewModel.nameCardInfo
self.navigationController?.pushViewController(vc)
UIViewController.current?.navigationController?.pushViewController(vc)
}
return eduCell
}
......@@ -211,7 +212,7 @@ extension YHNameCardHomePageViewController: UITableViewDelegate, UITableViewData
guard let self = self else { return }
let vc = YHEditWorkViewController()
vc.model = self.viewModel.nameCardInfo
self.navigationController?.pushViewController(vc)
UIViewController.current?.navigationController?.pushViewController(vc)
}
return workCell
}
......@@ -223,7 +224,7 @@ extension YHNameCardHomePageViewController: UITableViewDelegate, UITableViewData
guard let self = self else { return }
let vc = YHEditInterestViewController()
vc.model = self.viewModel.nameCardInfo
self.navigationController?.pushViewController(vc)
UIViewController.current?.navigationController?.pushViewController(vc)
}
return topicCell
}
......@@ -261,6 +262,8 @@ extension YHNameCardHomePageViewController: JXSegmentedListContainerViewListDele
}
}
// **********************************************************************************
extension YHNameCardHomePageViewController: UIScrollViewDelegate {
// 控制滑动交互
func scrollViewDidScroll(_ scrollView: UIScrollView) {
......@@ -278,3 +281,14 @@ extension YHNameCardHomePageViewController: UIScrollViewDelegate {
}
}
}
extension YHNameCardHomePageViewController {
@objc func beginDragging() {
tableView.isScrollEnabled = false
vcCanScroll = false
}
@objc func endDragging() {
tableView.isScrollEnabled = true
}
}
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