Skip to content

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

// plan

parent 699ca07f
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 105 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ ef323993
......@@ -1249,7 +1249,6 @@
04D8FF572D925A0800703C75 /* YHPlanScoreChart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FF562D925A0800703C75 /* YHPlanScoreChart.swift */; };
04D8FF592D925E6700703C75 /* YHPlanModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FF582D925E6700703C75 /* YHPlanModel.swift */; };
04D8FF5B2D925E8100703C75 /* YHPlanViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FF5A2D925E8100703C75 /* YHPlanViewModel.swift */; };
04D8FF5D2D925EA900703C75 /* YHPlanViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FF5C2D925EA900703C75 /* YHPlanViewController.swift */; };
04D8FF5F2D93945100703C75 /* YHPlanAnalyzeInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FF5E2D93945100703C75 /* YHPlanAnalyzeInfoCell.swift */; };
04D8FF612D939D2400703C75 /* YHPlanScoreCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FF602D939D2400703C75 /* YHPlanScoreCell.swift */; };
04D8FF632D93A98200703C75 /* YHPlanProductListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FF622D93A98200703C75 /* YHPlanProductListView.swift */; };
......@@ -1267,6 +1266,7 @@
04D8FF7B2D97C29E00703C75 /* YHPlanShareView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FF7A2D97C29E00703C75 /* YHPlanShareView.swift */; };
04D8FFB02D9A3CF200703C75 /* YHPlanShareImageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FFAF2D9A3CF200703C75 /* YHPlanShareImageCell.swift */; };
04D8FFB22DA5007A00703C75 /* YHPictureBrowserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FFB12DA5007A00703C75 /* YHPictureBrowserViewController.swift */; };
04D8FFB42DA61DA300703C75 /* YHPlanTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D8FFB32DA61DA200703C75 /* YHPlanTestViewController.swift */; };
04E4CF3E2D5C6D32004D4013 /* YHCountryMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E4CF3D2D5C6D32004D4013 /* YHCountryMessageView.swift */; };
04E4CF402D5C83AE004D4013 /* YHSelectPhoneCountryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E4CF3F2D5C83AE004D4013 /* YHSelectPhoneCountryViewController.swift */; };
04E507D62D6EE856005F758B /* YHUserLevelAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E507D52D6EE856005F758B /* YHUserLevelAlertView.swift */; };
......@@ -2559,7 +2559,6 @@
04D8FF562D925A0800703C75 /* YHPlanScoreChart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPlanScoreChart.swift; sourceTree = "<group>"; };
04D8FF582D925E6700703C75 /* YHPlanModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPlanModel.swift; sourceTree = "<group>"; };
04D8FF5A2D925E8100703C75 /* YHPlanViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPlanViewModel.swift; sourceTree = "<group>"; };
04D8FF5C2D925EA900703C75 /* YHPlanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPlanViewController.swift; sourceTree = "<group>"; };
04D8FF5E2D93945100703C75 /* YHPlanAnalyzeInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPlanAnalyzeInfoCell.swift; sourceTree = "<group>"; };
04D8FF602D939D2400703C75 /* YHPlanScoreCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPlanScoreCell.swift; sourceTree = "<group>"; };
04D8FF622D93A98200703C75 /* YHPlanProductListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPlanProductListView.swift; sourceTree = "<group>"; };
......@@ -2577,6 +2576,7 @@
04D8FF7A2D97C29E00703C75 /* YHPlanShareView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPlanShareView.swift; sourceTree = "<group>"; };
04D8FFAF2D9A3CF200703C75 /* YHPlanShareImageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPlanShareImageCell.swift; sourceTree = "<group>"; };
04D8FFB12DA5007A00703C75 /* YHPictureBrowserViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPictureBrowserViewController.swift; sourceTree = "<group>"; };
04D8FFB32DA61DA200703C75 /* YHPlanTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPlanTestViewController.swift; sourceTree = "<group>"; };
04E4CF3D2D5C6D32004D4013 /* YHCountryMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCountryMessageView.swift; sourceTree = "<group>"; };
04E4CF3F2D5C83AE004D4013 /* YHSelectPhoneCountryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSelectPhoneCountryViewController.swift; sourceTree = "<group>"; };
04E507D52D6EE856005F758B /* YHUserLevelAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUserLevelAlertView.swift; sourceTree = "<group>"; };
......@@ -6787,7 +6787,7 @@
04D8FF502D92580200703C75 /* C */ = {
isa = PBXGroup;
children = (
04D8FF5C2D925EA900703C75 /* YHPlanViewController.swift */,
04D8FFB32DA61DA200703C75 /* YHPlanTestViewController.swift */,
04A750CF2D925FD400974E5F /* YHCustomerInformationQuestionnaireVC.swift */,
04A750D52D94242000974E5F /* YHSurveySubmitDoneViewController.swift */,
04A750D72D94F3F400974E5F /* YHSurveyMatchResultViewController.swift */,
......@@ -7224,7 +7224,6 @@
045C0FD92D12CA5F00BD2DC0 /* YHHomeCollectionViewCell.swift in Sources */,
045C0FDA2D12CA5F00BD2DC0 /* YHBasicContentView.swift in Sources */,
045C0FDB2D12CA5F00BD2DC0 /* YHSelectViewController.swift in Sources */,
04D8FF5D2D925EA900703C75 /* YHPlanViewController.swift in Sources */,
047A96862D1698150033BB4E /* YHGCMySchemeViewModel.swift in Sources */,
04AE20312D13B6E500891D24 /* YHGCChildBasicInfoVC.swift in Sources */,
045C0FDC2D12CA5F00BD2DC0 /* YHMyNotifySettingVC.swift in Sources */,
......@@ -8351,6 +8350,7 @@
045C13992D12CA5F00BD2DC0 /* YHActivityDetailViewController.swift in Sources */,
045C139A2D12CA5F00BD2DC0 /* YHAdopterCardExplainTableViewCell.swift in Sources */,
045C139B2D12CA5F00BD2DC0 /* YHPreviewInfoQuestionAndAnswerItemView2.swift in Sources */,
04D8FFB42DA61DA300703C75 /* YHPlanTestViewController.swift in Sources */,
045C139C2D12CA5F00BD2DC0 /* YHPreviewInfoNameAndDetailCell.swift in Sources */,
045C139D2D12CA5F00BD2DC0 /* YHTestViewController.swift in Sources */,
045C139E2D12CA5F00BD2DC0 /* YHMajorSearchViewController.swift in Sources */,
......
galaxy/galaxy/AppDelegate.swift
View file @ ef323993
......@@ -163,7 +163,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
return
}
if state.isGeneratePlan == true {
let vc = YHPlanViewController()
let vc = YHPlanTestViewController()
UIViewController.current?.navigationController?.pushViewController(vc)
} else {
let vc = YHCustomerInformationQuestionnaireVC()
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift
View file @ ef323993
......@@ -126,7 +126,7 @@ private extension YHHomeBannerView {
return
}
if state.isGeneratePlan == true {
let vc = YHPlanViewController()
let vc = YHPlanTestViewController()
UIViewController.current?.navigationController?.pushViewController(vc)
} else {
let vc = YHCustomerInformationQuestionnaireVC()
......
galaxy/galaxy/Classes/Modules/Plan(方案)/C/YHPlanViewController.swift → galaxy/galaxy/Classes/Modules/Plan(方案)/C/YHPlanTestViewController.swift
View file @ ef323993
//
// YHPlanViewController.swift
// YHPlanTestViewController.swift
// galaxy
//
// Created by Dufet on 2025/3/25.
......@@ -9,7 +9,7 @@
import UIKit
import JXSegmentedView
class YHPlanViewController: YHBaseViewController {
class YHPlanTestViewController: YHBaseViewController {
let viewModel = YHPlanViewModel()
......@@ -52,27 +52,6 @@ class YHPlanViewController: YHBaseViewController {
return tableView
}()
lazy var fakeTableView: UITableView = {
let tableView = UITableView(frame: .zero, style: .grouped)
tableView.isHidden = true
if #available(iOS 11.0, *) {
tableView.contentInsetAdjustmentBehavior = .never
}
tableView.showsVerticalScrollIndicator = false
tableView.estimatedSectionHeaderHeight = 1.0
tableView.estimatedSectionFooterHeight = 1.0
tableView.backgroundColor = .clear
tableView.separatorStyle = .none
tableView.delegate = self
tableView.dataSource = self
tableView.register(YHPlanAnalyzeInfoCell.self, forCellReuseIdentifier: YHPlanAnalyzeInfoCell.cellReuseIdentifier)
tableView.register(YHPlanScoreCell.self, forCellReuseIdentifier: YHPlanScoreCell.cellReuseIdentifier)
tableView.register(YHPlanCustomerCaseListCell.self, forCellReuseIdentifier: YHPlanCustomerCaseListCell.cellReuseIdentifier)
tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
return tableView
}()
lazy var whiteBackBtn: UIButton = {
let v = UIButton()
v.setImage(UIImage(named: "nav_back_white"), for: .normal)
......@@ -80,12 +59,12 @@ class YHPlanViewController: YHBaseViewController {
return v
}()
lazy var shareBtn: UIButton = {
let v = UIButton()
v.setImage(UIImage(named: "plan_nav_share"), for: .normal)
v.addTarget(self, action: #selector(didShareBtnClicked), for: .touchUpInside)
return v
}()
// lazy var shareBtn: UIButton = {
// let v = UIButton()
// v.setImage(UIImage(named: "plan_nav_share"), for: .normal)
// v.addTarget(self, action: #selector(didShareBtnClicked), for: .touchUpInside)
// return v
// }()
@objc func didShareBtnClicked() {
let vc = YHPlanShareViewController()
......@@ -301,22 +280,26 @@ class YHPlanViewController: YHBaseViewController {
self.navigationController?.pushViewController(vc)
}
func updateRightBarButtonItemWhite(_ isWhite: Bool) {
let rightButtonItem = UIBarButtonItem(image: UIImage(named: isWhite ? "plan_nav_share" : "share_item")?.withRenderingMode(.alwaysOriginal), style: .plain, target: self, action: #selector(didShareBtnClicked))
gk_navRightBarButtonItem = rightButtonItem
gk_navItemRightSpace = 16
}
override func viewDidLoad() {
super.viewDidLoad()
gk_navigationBar.backgroundColor = .white
gk_navigationBar.alpha = 0.0
gk_navBarAlpha = 0.0
gk_navBackgroundColor = .clear
gk_backImage = UIImage(named: "back_icon_white")
gk_navTitleColor = .mainTextColor
gk_navTitle = "续签至永居方案分析"
self.view.backgroundColor = .init(hex: 0xF8F9FB)
self.view.addSubview(bgImgView)
self.view.addSubview(fakeTableView)
self.view.addSubview(tableView)
self.view.addSubview(fixedSegmentView)
self.view.addSubview(bottomView)
self.view.addSubview(whiteBackBtn)
self.view.addSubview(shareBtn)
tableView.snp.makeConstraints { make in
make.left.right.equalToSuperview()
......@@ -324,12 +307,6 @@ class YHPlanViewController: YHBaseViewController {
make.bottom.equalTo(bottomView.snp.top)
}
fakeTableView.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalTo(k_Height_NavigationtBarAndStatuBar+44.0)
make.bottom.equalTo(bottomView.snp.top)
}
fixedSegmentView.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
......@@ -341,18 +318,6 @@ class YHPlanViewController: YHBaseViewController {
make.height.equalTo(102 + k_Height_safeAreaInsetsBottom())
}
whiteBackBtn.snp.makeConstraints { make in
make.left.equalTo(16)
make.top.equalTo(10+k_Height_statusBar())
make.width.height.equalTo(24)
}
shareBtn.snp.makeConstraints { make in
make.right.equalTo(-16)
make.top.equalTo(10+k_Height_statusBar())
make.width.height.equalTo(24)
}
requestData()
}
......@@ -403,12 +368,16 @@ class YHPlanViewController: YHBaseViewController {
shareUrl = self.viewModel.planListModel.share_url
self.tableView.reloadData()
self.fakeTableView.reloadData()
UIView.performWithoutAnimation {
self.tableView.scrollToRow(at: IndexPath(row: NSNotFound, section: self.infoArr.count-1), at: .top, animated: false)
self.tableView.setContentOffset(.zero, animated: false)
}
}
}
}
extension YHPlanViewController: UITableViewDelegate, UITableViewDataSource {
extension YHPlanTestViewController: UITableViewDelegate, UITableViewDataSource {
func numberOfSections(in tableView: UITableView) -> Int {
return self.infoArr.count
......@@ -531,52 +500,34 @@ extension YHPlanViewController: UITableViewDelegate, UITableViewDataSource {
}
}
extension YHPlanViewController: UIScrollViewDelegate {
extension YHPlanTestViewController: UIScrollViewDelegate {
func scrollViewDidScroll(_ scrollView: UIScrollView) {
printLog("\(scrollView.contentOffset.y)")
if scrollView == tableView {
if scrollView.contentOffset.y >= topScrollHeight {
tableView.contentOffset.y = topScrollHeight
}
var percent = scrollView.contentOffset.y/20.0
if percent > 1.0 {
percent = 1.0
} else if percent < 0.0 {
percent = 0.0
if scrollView.contentOffset.y > 0 {
var alpha = scrollView.contentOffset.y/20.0
if alpha > 1.0 {
alpha = 1.0
} else if alpha < 0.0 {
alpha = 0.0
}
gk_navBarAlpha = alpha
gk_navBackgroundColor = .white
gk_navTitle = "续签至永居方案分析"
gk_backImage = UIImage(named: "nav_black_24")
updateRightBarButtonItemWhite(false)
fixedSegmentView.alpha = scrollView.contentOffset.y >= topScrollHeight ? 1.0 : 0.0
gk_navigationBar.alpha = percent
whiteBackBtn.isHidden = percent >= 1.0
shareBtn.isHidden = percent >= 1.0
}
fakeTableView.isHidden = tableView.contentOffset.y <= topScrollHeight-1
if fakeTableView.contentOffset.y > 0 {
bgImgView.y = -tableView.contentOffset.y-fakeTableView.contentOffset.y
} else {
bgImgView.y = -tableView.contentOffset.y
gk_navBarAlpha = 0.0
gk_navBackgroundColor = .clear
gk_navTitle = nil
gk_backImage = UIImage(named: "back_icon_white")
updateRightBarButtonItemWhite(true)
}
if fakeTableView.contentOffset.y < -1 {
fakeTableView.contentOffset.y = -1
}
if tableView.contentOffset.y >= topScrollHeight, fakeTableView.contentOffset.y >= 0 {
tableView.isHidden = true
fakeTableView.isHidden = false
} else {
tableView.isHidden = false
fakeTableView.isHidden = true
}
printLog("fakeTableView: \(fakeTableView.contentOffset.y) tableView: \(tableView.contentOffset.y)")
fixedSegmentView.alpha = scrollView.contentOffset.y >= topScrollHeight ? 1.0 : 0.0
bgImgView.y = -tableView.contentOffset.y
printLog("tableView: \(tableView.contentOffset.y)")
}
......@@ -584,9 +535,9 @@ extension YHPlanViewController: UIScrollViewDelegate {
var find = false
for index in 0...infoArr.count-1 {
let rect = self.fakeTableView.rectForRow(at: IndexPath(row: 0, section: index))
let rect = self.tableView.rectForRow(at: IndexPath(row: 0, section: index))
let conditon = index == 0 ? fakeTableView.contentOffset.y <= rect.origin.y : fakeTableView.contentOffset.y < rect.origin.y-5
let conditon = tableView.contentOffset.y <= rect.origin.y
if conditon, index < infoArr.count-1 {
find = true
......@@ -612,13 +563,13 @@ extension YHPlanViewController: UIScrollViewDelegate {
}
}
extension YHPlanViewController: JXSegmentedViewDelegate {
extension YHPlanTestViewController: JXSegmentedViewDelegate {
func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
let index = segmentedView.selectedIndex
self.tableView.setContentOffset(CGPoint(x: 0, y: topScrollHeight), animated: true)
self.fakeTableView.scrollToRow(at: IndexPath(row: 0, section: index), at: .top, animated: true)
let rect = self.tableView.rectForRow(at: IndexPath(row: 0, section: index))
self.tableView.setContentOffset(CGPoint(x: 0, y: rect.origin.y-44.0+2.0), animated: true)
if segmentedView == segmented1View {
self.segmented2View.defaultSelectedIndex = index
......
galaxy/galaxy/Classes/Modules/Plan(方案)/C/YHSurveyMatchResultViewController.swift
View file @ ef323993
......@@ -167,7 +167,7 @@ class YHSurveyMatchResultViewController: YHBaseViewController {
guard let navigationController = self.navigationController else {
return
}
let ctl = YHPlanViewController()
let ctl = YHPlanTestViewController()
ctl.hidesBottomBarWhenPushed = true
var viewControllers = Array(navigationController.viewControllers.prefix(1))
viewControllers.append(ctl)
......
galaxy/galaxy/Classes/Modules/Plan(方案)/V/YHPlanItemView.swift
View file @ ef323993
......@@ -13,6 +13,7 @@ class YHPlanItemView: UIView {
lazy var iconImgV: UIImageView = {
let v = UIImageView()
v.image = UIImage(named: "plan_item_icon")
v.contentMode = .scaleAspectFit
return v
}()
......@@ -42,11 +43,11 @@ class YHPlanItemView: UIView {
iconImgV.snp.makeConstraints { make in
make.width.height.equalTo(12)
make.left.equalToSuperview()
make.right.equalTo(titleLabel.snp.left).offset(-4)
make.centerY.equalToSuperview()
}
titleLabel.snp.makeConstraints { make in
make.left.equalTo(iconImgV.snp.right).offset(4)
make.right.equalToSuperview()
make.centerY.equalToSuperview()
make.height.equalTo(17)
......
galaxy/galaxy/Res/Assets.xcassets/Plan/plan_nav_share.imageset/Contents.json
View file @ ef323993
......@@ -18,5 +18,8 @@
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
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