Skip to content

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

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

parents 30c9a1af 4d3ccc33
Hide whitespace changes
Inline Side-by-side
Showing with 213 additions and 15 deletions
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityDetailViewController.swift
View file @ 6ec07fd3
...@@ -78,9 +78,7 @@ extension YHActivityDetailViewController { ...@@ -78,9 +78,7 @@ extension YHActivityDetailViewController {
showApplyUI() showApplyUI()
case .applied: case .applied:
printLog("已报名") printLog("已报名")
let vc = YHActivityTravelViewController() gotoActivityTravelVC()
vc.travelId = viewModel.activityDetailModel?.checkId ?? ""
navigationController?.pushViewController(vc)
case .canceled: case .canceled:
// printLog("已取消报名") // printLog("已取消报名")
showApplyUI() showApplyUI()
...@@ -96,6 +94,34 @@ extension YHActivityDetailViewController { ...@@ -96,6 +94,34 @@ extension YHActivityDetailViewController {
} }
func gotoActivityTravelVC() {
if let nav = self.navigationController {
let rrr = nav.viewControllers.contains { $0.isKind(of: YHActivityTravelViewController.self) }
if rrr {
var targetVc : UIViewController?
for(_,value) in nav.viewControllers.enumerated() {
if value.isKind(of: YHActivityTravelViewController.self) {
targetVc = value
break
}
}
if let vc = targetVc {
navigationController?.popToViewController(vc, animated: true)
}
return
}
}
//行程单详情
let vc = YHActivityTravelViewController()
vc.travelId = viewModel.activityDetailModel?.checkId ?? ""
navigationController?.pushViewController(vc)
}
func showApplyUI() { func showApplyUI() {
YHApplyActivityAlert.showApplyActivityAlertView(name: self.viewModel.activityDetailModel?.businessCardName ?? "") { (tag,name,number,phone) in YHApplyActivityAlert.showApplyActivityAlertView(name: self.viewModel.activityDetailModel?.businessCardName ?? "") { (tag,name,number,phone) in
if tag { if tag {
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityListViewController.swift
View file @ 6ec07fd3
...@@ -272,9 +272,7 @@ extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSour ...@@ -272,9 +272,7 @@ extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSour
if type == 1 { if type == 1 {
if model.status.int == 2 { if model.status.int == 2 {
let vc = YHActivityTravelViewController() gotoActivityTravelVC(checkId: model.checkId)
vc.travelId = model.checkId
navigationController?.pushViewController(vc)
return return
} else if model.status.int == 5 { } else if model.status.int == 5 {
YHHUD.flash(message: "已下架") YHHUD.flash(message: "已下架")
...@@ -289,6 +287,34 @@ extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSour ...@@ -289,6 +287,34 @@ extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSour
} }
} }
func gotoActivityTravelVC(checkId : String = "") {
if let nav = self.navigationController {
let rrr = nav.viewControllers.contains { $0.isKind(of: YHActivityTravelViewController.self) }
if rrr {
var targetVc : UIViewController?
for(_,value) in nav.viewControllers.enumerated() {
if value.isKind(of: YHActivityTravelViewController.self) {
targetVc = value
break
}
}
if let vc = targetVc {
navigationController?.popToViewController(vc, animated: true)
}
return
}
}
//行程单详情
let vc = YHActivityTravelViewController()
vc.travelId = checkId
navigationController?.pushViewController(vc)
}
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
var height : CGFloat = 16.0 var height : CGFloat = 16.0
if section != 0 { if section != 0 {
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityTravelViewController.swift
View file @ 6ec07fd3
...@@ -57,9 +57,88 @@ class YHActivityTravelViewController: YHBaseViewController { ...@@ -57,9 +57,88 @@ class YHActivityTravelViewController: YHBaseViewController {
super.viewWillAppear(animated) super.viewWillAppear(animated)
loadData() loadData()
} }
override func backItemClick(_ sender: Any) {
// if viewModel.didChange {
// YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "仍然关闭", "继续编辑", fullGuestureEnable: false) {
// self.navigationController?.popViewController()
// } callBack: {
// }
// } else {
// self.navigationController?.popViewController()
// }
gotoActivityVC()
}
/// 是否可以返回，包括点击返回和手势返回，默认YES
override func navigationShouldPop() -> Bool {
// if viewModel.didChange {
// YHCommonAlertView.show("", "您尚未保存修改，确定关闭吗？", "仍然关闭", "继续编辑", fullGuestureEnable: false) {
// self.navigationController?.popViewController()
// } callBack: {
// }
// return false
// }
gotoActivityVC()
return false
}
} }
extension YHActivityTravelViewController { extension YHActivityTravelViewController {
func gotoActivityVC() {
if let vc = UIApplication.shared.keyWindow?.rootViewController as? YHTabBarViewController {
if vc.selectedIndex == 3 {
if let nav = self.navigationController {
let rrr = nav.viewControllers.contains { $0.isKind(of: YHActivityListViewController.self) }
if rrr {
var targetVc : UIViewController?
for(_,value) in nav.viewControllers.enumerated() {
if value.isKind(of: YHActivityListViewController.self) {
targetVc = value
break
}
}
if let vc = targetVc {
navigationController?.popToViewController(vc, animated: true)
}
return
}
}
} else if vc.selectedIndex == 2 {
if let nav = self.navigationController {
let rrr = nav.viewControllers.contains { $0.isKind(of: YHCommunityViewController.self) }
if rrr {
var targetVc : UIViewController?
for(_,value) in nav.viewControllers.enumerated() {
if value.isKind(of: YHCommunityViewController.self) {
targetVc = value
break
}
}
if let vc = targetVc {
navigationController?.popToViewController(vc, animated: true)
}
return
}
}
}
}
}
func setupUI() { func setupUI() {
gk_navigationBar.isHidden = false gk_navigationBar.isHidden = false
gk_navigationBar.backgroundColor = .clear gk_navigationBar.backgroundColor = .clear
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHApplyActivityResultViewController.swift
View file @ 6ec07fd3
...@@ -76,7 +76,6 @@ extension YHApplyActivityResultViewController { ...@@ -76,7 +76,6 @@ extension YHApplyActivityResultViewController {
gk_navigationBar.backgroundColor = .clear gk_navigationBar.backgroundColor = .clear
gk_navTitle = "报名结果" gk_navTitle = "报名结果"
// view.backgroundColor = UIColor.pageBkgColor
view.backgroundColor = UIColor.white view.backgroundColor = UIColor.white
view.addSubview(statusImageV) view.addSubview(statusImageV)
...@@ -127,13 +126,38 @@ extension YHApplyActivityResultViewController { ...@@ -127,13 +126,38 @@ extension YHApplyActivityResultViewController {
@objc func clickSubmitBtn() { @objc func clickSubmitBtn() {
if isSuccessFlag { if isSuccessFlag {
//行程单详情 //行程单详情
let vc = YHActivityTravelViewController() gotoActivityTravelVC()
vc.travelId = activityTravelId
self.navigationController?.pushViewController(vc)
} else { } else {
//返回活动列表 //返回活动列表
navigationController?.popToRootViewController(animated: true) navigationController?.popToRootViewController(animated: true)
} }
} }
func gotoActivityTravelVC() {
if let nav = self.navigationController {
let rrr = nav.viewControllers.contains { $0.isKind(of: YHActivityTravelViewController.self) }
if rrr {
var targetVc : UIViewController?
for(_,value) in nav.viewControllers.enumerated() {
if value.isKind(of: YHActivityTravelViewController.self) {
targetVc = value
break
}
}
if let vc = targetVc {
navigationController?.popToViewController(vc, animated: true)
}
return
}
}
//行程单详情
let vc = YHActivityTravelViewController()
vc.travelId = activityTravelId
self.navigationController?.pushViewController(vc)
}
} }
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityTravelitemView.swift
View file @ 6ec07fd3
...@@ -98,6 +98,40 @@ class YHActivityTravelitemView: UIView { ...@@ -98,6 +98,40 @@ class YHActivityTravelitemView: UIView {
extension YHActivityTravelitemView { extension YHActivityTravelitemView {
@objc func goActiveDetailVC(gestureRecognizer:UITapGestureRecognizer) {
guard let model = dataModel else {
return
}
if let pvc = self.parentViewController,let nav = pvc.navigationController {
let rrr = nav.viewControllers.contains { $0.isKind(of: YHActivityDetailViewController.self) }
if rrr {
var targetVc : UIViewController?
for(_,value) in nav.viewControllers.enumerated() {
if value.isKind(of: YHActivityDetailViewController.self) {
targetVc = value
break
}
}
if let vc = targetVc {
pvc.navigationController?.popToViewController(vc, animated: true)
}
return
}
let vc = YHActivityDetailViewController()
vc.activityId = String(model.id)
vc.activityName = model.name
pvc.navigationController?.pushViewController(vc)
}
}
func updateUI() { func updateUI() {
guard let model = dataModel else { guard let model = dataModel else {
return return
...@@ -167,6 +201,15 @@ extension YHActivityTravelitemView { ...@@ -167,6 +201,15 @@ extension YHActivityTravelitemView {
make.bottom.equalToSuperview().offset(-20) make.bottom.equalToSuperview().offset(-20)
} }
let tap : UITapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(goActiveDetailVC(gestureRecognizer:)))
activityImgV.addGestureRecognizer(tap)
activityImgV.isUserInteractionEnabled = true
let tap1 : UITapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(goActiveDetailVC(gestureRecognizer:)))
nameLabel.addGestureRecognizer(tap1)
nameLabel.isUserInteractionEnabled = true
} }
func setupUI() { func setupUI() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServerHKLifeViewController.swift
View file @ 6ec07fd3
...@@ -124,7 +124,7 @@ extension YHServerHKLifeViewController { ...@@ -124,7 +124,7 @@ extension YHServerHKLifeViewController {
} }
tableHeadView = YHServerTableHeadView() tableHeadView = YHServerTableHeadView()
tableHeadView.titleLabel.text = "香港身份攻略" tableHeadView.titleLabel.text = "香港生活攻略"
tableHeadView.frame = CGRect(x: 0, y: -YHServerTableHeadView.viewH - 48, width: KScreenWidth, height: YHServerTableHeadView.viewH) tableHeadView.frame = CGRect(x: 0, y: -YHServerTableHeadView.viewH - 48, width: KScreenWidth, height: YHServerTableHeadView.viewH)
sectionView.frame = CGRect(x: 0, y: -48, width: KScreenWidth, height: 48) sectionView.frame = CGRect(x: 0, y: -48, width: KScreenWidth, height: 48)
homeCollectView.addSubview(tableHeadView) homeCollectView.addSubview(tableHeadView)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceItemView.swift
View file @ 6ec07fd3
...@@ -207,9 +207,9 @@ class YHWorkExperienceItemView: UIView { ...@@ -207,9 +207,9 @@ class YHWorkExperienceItemView: UIView {
} }
messageTextField.placeholder = dataSource.prompts messageTextField.placeholder = dataSource.prompts
messageTextField.text = dataSource.message messageTextField.text = dataSource.message
if dataSource.message == "0" { // if dataSource.message == "0" {
messageTextField.text = "" // messageTextField.text = ""
} // }
showPromptLabel.text = dataSource.alertMessage showPromptLabel.text = dataSource.alertMessage
if dataSource.isUserKeyBoard ?? false { if dataSource.isUserKeyBoard ?? false {
nextStepImageView.isHidden = true nextStepImageView.isHidden = 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