Skip to content

G
galaxy-iOS
Commit 99b67bf7 authored by Alex朱枝文's avatar Alex朱枝文
Browse files
Options

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

parents 20d7d958 ece9f8c4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 54 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 99b67bf7
......@@ -362,7 +362,6 @@
045C108B2D12CA5F00BD2DC0 /* YHSmsCodeInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045C0EB22D12CA5E00BD2DC0 /* YHSmsCodeInputView.swift */; };
045C108C2D12CA5F00BD2DC0 /* YHActivityDetailCell0.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045C0A742D12CA5E00BD2DC0 /* YHActivityDetailCell0.swift */; };
045C108D2D12CA5F00BD2DC0 /* YHSelectApplicantCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045C0B852D12CA5E00BD2DC0 /* YHSelectApplicantCell.swift */; };
045C108E2D12CA5F00BD2DC0 /* YHNameCardViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045C0A892D12CA5E00BD2DC0 /* YHNameCardViewController.swift */; };
045C108F2D12CA5F00BD2DC0 /* YHFamilyMemberInfoListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045C0DAC2D12CA5E00BD2DC0 /* YHFamilyMemberInfoListVC.swift */; };
045C10902D12CA5F00BD2DC0 /* YHHKEventWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045C0AA72D12CA5E00BD2DC0 /* YHHKEventWebViewController.swift */; };
045C10912D12CA5F00BD2DC0 /* YHDocumentFileItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045C0C392D12CA5E00BD2DC0 /* YHDocumentFileItemView.swift */; };
......@@ -672,7 +671,6 @@
045C11C22D12CA5F00BD2DC0 /* YHMyFileListFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045C0C052D12CA5E00BD2DC0 /* YHMyFileListFooterView.swift */; };
045C11C32D12CA5F00BD2DC0 /* YHChildBasicInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045C0DA12D12CA5E00BD2DC0 /* YHChildBasicInfoVC.swift */; };
045C11C42D12CA5F00BD2DC0 /* YHMyFriendsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045C0A942D12CA5E00BD2DC0 /* YHMyFriendsCell.swift */; };
045C11C52D12CA5F00BD2DC0 /* YHMyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045C0EDE2D12CA5E00BD2DC0 /* YHMyViewController.swift */; };
045C11C62D12CA5F00BD2DC0 /* YHListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045C0ECF2D12CA5E00BD2DC0 /* YHListViewController.swift */; };
045C11C72D12CA5F00BD2DC0 /* YHWorkExperiencePositionTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045C0E642D12CA5E00BD2DC0 /* YHWorkExperiencePositionTableViewCell.swift */; };
045C11C82D12CA5F00BD2DC0 /* YHOrderSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045C0B162D12CA5E00BD2DC0 /* YHOrderSearchViewController.swift */; };
......@@ -1560,7 +1558,6 @@
045C0A862D12CA5E00BD2DC0 /* YHMatchResultListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMatchResultListViewController.swift; sourceTree = "<group>"; };
045C0A872D12CA5E00BD2DC0 /* YHMatchUserViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMatchUserViewController.swift; sourceTree = "<group>"; };
045C0A882D12CA5E00BD2DC0 /* YHMyGoodFriendsVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyGoodFriendsVC.swift; sourceTree = "<group>"; };
045C0A892D12CA5E00BD2DC0 /* YHNameCardViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHNameCardViewController.swift; sourceTree = "<group>"; };
045C0A8B2D12CA5E00BD2DC0 /* YHFriendListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFriendListModel.swift; sourceTree = "<group>"; };
045C0A8C2D12CA5E00BD2DC0 /* YHMatchUserInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMatchUserInfo.swift; sourceTree = "<group>"; };
045C0A8D2D12CA5E00BD2DC0 /* YHUserInformationModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUserInformationModel.swift; sourceTree = "<group>"; };
......@@ -2434,7 +2431,6 @@
045C0EDB2D12CA5E00BD2DC0 /* YHMyNotifySettingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyNotifySettingVC.swift; sourceTree = "<group>"; };
045C0EDC2D12CA5E00BD2DC0 /* YHMyPermissionSettingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyPermissionSettingVC.swift; sourceTree = "<group>"; };
045C0EDD2D12CA5E00BD2DC0 /* YHMySettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingViewController.swift; sourceTree = "<group>"; };
045C0EDE2D12CA5E00BD2DC0 /* YHMyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyViewController.swift; sourceTree = "<group>"; };
045C0EDF2D12CA5E00BD2DC0 /* YHTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTestViewController.swift; sourceTree = "<group>"; };
045C0EE02D12CA5E00BD2DC0 /* YHVideoPlaySettingVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVideoPlaySettingVC.swift; sourceTree = "<group>"; };
045C0EE22D12CA5E00BD2DC0 /* YHCollectionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCollectionModel.swift; sourceTree = "<group>"; };
......@@ -3289,7 +3285,6 @@
045C0A862D12CA5E00BD2DC0 /* YHMatchResultListViewController.swift */,
045C0A872D12CA5E00BD2DC0 /* YHMatchUserViewController.swift */,
045C0A882D12CA5E00BD2DC0 /* YHMyGoodFriendsVC.swift */,
045C0A892D12CA5E00BD2DC0 /* YHNameCardViewController.swift */,
);
path = C;
sourceTree = "<group>";
......@@ -6042,7 +6037,6 @@
045C0EDB2D12CA5E00BD2DC0 /* YHMyNotifySettingVC.swift */,
045C0EDC2D12CA5E00BD2DC0 /* YHMyPermissionSettingVC.swift */,
045C0EDD2D12CA5E00BD2DC0 /* YHMySettingViewController.swift */,
045C0EDE2D12CA5E00BD2DC0 /* YHMyViewController.swift */,
04AFEF3E2D5D8F8A0007A011 /* YHMyNewViewController.swift */,
045C0EDF2D12CA5E00BD2DC0 /* YHTestViewController.swift */,
045C0EE02D12CA5E00BD2DC0 /* YHVideoPlaySettingVC.swift */,
......@@ -7918,7 +7912,6 @@
0411CEF12D153F6300644D35 /* YHGCWorkExperienceViewController.swift in Sources */,
045C108D2D12CA5F00BD2DC0 /* YHSelectApplicantCell.swift in Sources */,
0411CF042D1A815100644D35 /* YHGCMySignatureDetailViewModel.swift in Sources */,
045C108E2D12CA5F00BD2DC0 /* YHNameCardViewController.swift in Sources */,
045C108F2D12CA5F00BD2DC0 /* YHFamilyMemberInfoListVC.swift in Sources */,
045C10902D12CA5F00BD2DC0 /* YHHKEventWebViewController.swift in Sources */,
045C10912D12CA5F00BD2DC0 /* YHDocumentFileItemView.swift in Sources */,
......@@ -8289,7 +8282,6 @@
045C11C22D12CA5F00BD2DC0 /* YHMyFileListFooterView.swift in Sources */,
045C11C32D12CA5F00BD2DC0 /* YHChildBasicInfoVC.swift in Sources */,
045C11C42D12CA5F00BD2DC0 /* YHMyFriendsCell.swift in Sources */,
045C11C52D12CA5F00BD2DC0 /* YHMyViewController.swift in Sources */,
045C11C62D12CA5F00BD2DC0 /* YHListViewController.swift in Sources */,
045C11C72D12CA5F00BD2DC0 /* YHWorkExperiencePositionTableViewCell.swift in Sources */,
045C11C82D12CA5F00BD2DC0 /* YHOrderSearchViewController.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHCommunityViewController.swift
View file @ 99b67bf7
......@@ -333,20 +333,20 @@ class YHCommunityViewController: YHBaseViewController {
extension YHCommunityViewController: JXSegmentedViewDelegate {
func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
navigationController?.interactivePopGestureRecognizer?.isEnabled = (segmentedView.selectedIndex == 0)
if segmentedView.selectedIndex == 3 { // 人脉
bgImgV.isHidden = false
// friendsBtn.isHidden = false
cleanAllMsgBtn.isHidden = true
segmentedDataSource.titleNormalColor = UIColor(hex: 0xFFFFFF, alpha: 0.6)
segmentedDataSource.titleSelectedColor = .white
let indicator = JXSegmentedIndicatorLineView()
indicator.indicatorWidth = 16
indicator.indicatorHeight = 2
indicator.indicatorCornerRadius = 0.0
indicator.indicatorColor = UIColor.white
segmentedView.indicators = [indicator]
} else { // 非人脉tab
// if segmentedView.selectedIndex == 3 { // 人脉
// bgImgV.isHidden = false
//// friendsBtn.isHidden = false
// cleanAllMsgBtn.isHidden = true
// segmentedDataSource.titleNormalColor = UIColor(hex: 0xFFFFFF, alpha: 0.6)
// segmentedDataSource.titleSelectedColor = .white
// let indicator = JXSegmentedIndicatorLineView()
// indicator.indicatorWidth = 16
// indicator.indicatorHeight = 2
// indicator.indicatorCornerRadius = 0.0
// indicator.indicatorColor = UIColor.white
// segmentedView.indicators = [indicator]
//
// } else { // 非人脉tab
bgImgV.isHidden = true
friendsBtn.isHidden = true
cleanAllMsgBtn.isHidden = segmentedView.selectedIndex != 0
......@@ -358,7 +358,7 @@ extension YHCommunityViewController: JXSegmentedViewDelegate {
indicator.indicatorCornerRadius = 0.0
indicator.indicatorColor = UIColor.brandMainColor
segmentedView.indicators = [indicator]
}
// }
segmentedView.dataSource = segmentedDataSource
self.segmentedView.reloadDataWithoutListContainer()
}
......
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHInformationAuthorizationStepOneViewController.swift
View file @ 99b67bf7
......@@ -161,7 +161,7 @@ class YHInformationAuthorizationStepOneViewController: YHBaseViewController {
promptView = {
let view = YHFailPromptView()
view.titleLable.text = "温馨提示：请填写真实信息，AI人脉匹配更精准"
view.titleLable.text = "温馨提示：请填写真实信息，便于资源互换"
view.backgroundColor = UIColor.brandGrayColor2
view.titleLable.textColor = UIColor.brandGrayColor8
view.alertImageView.image = UIImage(named: "user_prompt_image")
......
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMatchResultListViewController.swift
View file @ 99b67bf7
......@@ -178,7 +178,7 @@ class YHMatchResultListViewController: YHBaseViewController {
}
if let userId = YHLoginManager.shared.userModel?.id, !userId.isEmpty {
let vc = YHNameCardViewController()
let vc = YHNewNameCardViewController()
vc.userId = userId
self.navigationController?.pushViewController(vc)
} else {
......@@ -189,7 +189,7 @@ class YHMatchResultListViewController: YHBaseViewController {
guard let self = self else { return }
if !uid.isEmpty {
YHLoginManager.shared.userModel?.id = uid
let vc = YHNameCardViewController()
let vc = YHNewNameCardViewController()
vc.userId = uid
self.navigationController?.pushViewController(vc)
}
......
galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMyGoodFriendsVC.swift
View file @ 99b67bf7
......@@ -144,7 +144,7 @@ extension YHMyGoodFriendsVC: UITableViewDelegate, UITableViewDataSource {
if indexPath.section == 1 {
if 0 <= indexPath.row && indexPath.row < friendsArr.count {
let friend = self.friendsArr[indexPath.row]
let vc = YHNameCardViewController()
let vc = YHNewNameCardViewController()
vc.userId = friend.yhId
self.navigationController?.pushViewController(vc)
}
......
galaxy/galaxy/Classes/Modules/Community(社区)/Connections(人脉)/V/YHConnectListCell.swift
View file @ 99b67bf7
......@@ -17,10 +17,11 @@ class YHConnectListCell: UITableViewCell {
private lazy var avatarImageView: UIImageView = {
let imageView = UIImageView()
imageView.layer.borderWidth = 0.5
imageView.layer.borderColor = UIColor.brandGrayColor3.cgColor
imageView.layer.cornerRadius = 22
imageView.clipsToBounds = true
imageView.contentMode = .scaleAspectFill
imageView.backgroundColor = UIColor.brandGrayColor3
return imageView
}()
......@@ -51,7 +52,7 @@ class YHConnectListCell: UITableViewCell {
button.setTitle("添加好友", for: .normal)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 11)
button.setTitleColor(UIColor.brandGrayColor8, for: .normal)
button.layer.borderWidth = 1
button.layer.borderWidth = 0.5
button.layer.borderColor = UIColor.brandGrayColor5.cgColor
button.addTarget(self, action: #selector(didAddFriendBtnClicked), for: .touchUpInside)
return button
......@@ -109,6 +110,7 @@ class YHConnectListCell: UITableViewCell {
make.left.equalToSuperview().offset(20)
make.top.equalToSuperview().offset(20)
make.width.height.equalTo(44)
make.bottom.lessThanOrEqualTo(-20)
}
nameLabel.snp.makeConstraints { make in
......@@ -142,21 +144,23 @@ class YHConnectListCell: UITableViewCell {
make.top.equalTo(titleLabel.snp.bottom).offset(4)
make.right.equalToSuperview().offset(-20)
make.height.equalTo(15)
make.bottom.equalTo(-20)
make.bottom.lessThanOrEqualTo(-20)
}
separatorLine.snp.makeConstraints { make in
make.left.equalToSuperview().offset(20)
make.right.equalToSuperview().offset(-20)
make.bottom.equalToSuperview()
make.height.equalTo(1)
make.height.equalTo(0.5)
}
}
func updateModel(_ contact: YHContact) {
self.contact = contact
avatarImageView.sd_setImage(with: URL(string: contact.avatar), placeholderImage: UIImage(named: ""))
nameLabel.text = contact.username
contact.bio = "啊放假啊两地分居阿拉法久啊失蜡法开机啊索拉卡飞机阿卡拉说法登记卡拉萨"
detailLabel.text = contact.bio
var text1 = ""
......@@ -172,6 +176,11 @@ class YHConnectListCell: UITableViewCell {
}
titleLabel.text = text1
detailLabel.snp.updateConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(contact.bio.isEmpty ? 0 : 4)
make.height.equalTo(contact.bio.isEmpty ? 0 : 15)
}
if contact.type == YHContactRelation.stranger.rawValue {
addFriendButton.isHidden = false
statusLabel.isHidden = true
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyNewViewController.swift
View file @ 99b67bf7
......@@ -9,6 +9,55 @@
import UIKit
import SafariServices
enum YHPersonalModuleItemType: Int {
case none = 0
case myCard
case myMessage
case myProgress
case myActivity
case scoreCenter
case inviteFriends
case recommend
case myPoster
case myTestCode
case appointGalaxyBay
case exchangeHistory
case myCourseVideo
case notifySettings
case permissionSettings
case playSettings
case infoCollectList
case infoShareList
case aboutUs
case deviceInfo
case version
case userItems// 用户条款
case privaceAgreement// 隐私协议
case myOrder // 我的订单 双十一订单入口
case mycart // 我的订单 双十一订单入口
case serviceStep
case myFriend
case myEnterprise
// case liveEntryTest //直播入口
}
class PersonalModuleItem {
var icon: String?
var title: String
var desc: String
var type: YHPersonalModuleItemType = .none
var isShowRedPoint: Bool = false
init(icon: String? = nil, title: String, desc: String = "", isShowRedPoint: Bool = false, type: YHPersonalModuleItemType) {
self.icon = icon
self.title = title
self.desc = desc
self.isShowRedPoint = isShowRedPoint
self.type = type
}
}
enum YHFunctionGroupType: Int {
case none = 0
case score = 1
......@@ -674,27 +723,6 @@ extension YHMyNewViewController {
extension YHMyNewViewController {
func enterMyNameCard() {
if let userId = YHLoginManager.shared.userModel?.id, !userId.isEmpty {
let vc = YHNameCardViewController()
vc.userId = userId
self.navigationController?.pushViewController(vc)
} else {
YHHUD.show(.progress(message: "加载中..."))
self.loginViewModel.getUserId {
[weak self] uid in
YHHUD.hide()
guard let self = self else { return }
if !uid.isEmpty {
YHLoginManager.shared.userModel?.id = uid
let vc = YHNameCardViewController()
vc.userId = uid
self.navigationController?.pushViewController(vc)
}
}
}
}
func enterUserInfoEditPage() {
let vc = YHEditBaseUserInfoViewController()
vc.model = self.userViewModel.nameCardInfo
......@@ -727,7 +755,6 @@ extension YHMyNewViewController {
switch item.type {
case .myCard:// 我的名片
enterNewNameCard()
// enterMyNameCard()
case .myMessage:// 我的消息
printLog("我的消息")
goToMessagePage()
......
galaxy/galaxy/Classes/Modules/Mine（我的）/NameCard(名片)/C/YHNewNameCardViewController.swift
View file @ 99b67bf7
//
// YHNameCardViewController.swift
// YHNewNameCardViewController.swift
// galaxy
//
// Created by Dufet on 2025/9/29.
......
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