Skip to content

G
galaxy-iOS
Commit 242cc3ce authored by DavidHuang's avatar DavidHuang
Browse files
Options

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

parents 4303c3bf 6da1d3bb
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 29 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 242cc3ce
......@@ -287,6 +287,7 @@
047AA3E82C4A6D69009C4554 /* YHListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3E72C4A6D69009C4554 /* YHListViewController.swift */; };
047AA3EA2C4A6FB7009C4554 /* YHDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3E92C4A6FB7009C4554 /* YHDetailViewController.swift */; };
047AA3ED2C4A70F6009C4554 /* YHHeadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3EC2C4A70F6009C4554 /* YHHeadView.swift */; };
047AA3F02C4F912D009C4554 /* YHListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3EF2C4F912D009C4554 /* YHListViewModel.swift */; };
0480976B2BA15269000B9DCA /* YHCertificateInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480976A2BA15269000B9DCA /* YHCertificateInfoCell.swift */; };
0480976D2BA158A1000B9DCA /* YHCertificateListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480976C2BA158A1000B9DCA /* YHCertificateListVC.swift */; };
048097712BA18D66000B9DCA /* YHCertificateSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048097702BA18D66000B9DCA /* YHCertificateSearchBar.swift */; };
......@@ -901,6 +902,7 @@
047AA3E72C4A6D69009C4554 /* YHListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHListViewController.swift; sourceTree = "<group>"; };
047AA3E92C4A6FB7009C4554 /* YHDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDetailViewController.swift; sourceTree = "<group>"; };
047AA3EC2C4A70F6009C4554 /* YHHeadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHeadView.swift; sourceTree = "<group>"; };
047AA3EF2C4F912D009C4554 /* YHListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHListViewModel.swift; sourceTree = "<group>"; };
0480976A2BA15269000B9DCA /* YHCertificateInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateInfoCell.swift; sourceTree = "<group>"; };
0480976C2BA158A1000B9DCA /* YHCertificateListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateListVC.swift; sourceTree = "<group>"; };
048097702BA18D66000B9DCA /* YHCertificateSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateSearchBar.swift; sourceTree = "<group>"; };
......@@ -2165,6 +2167,7 @@
047AA3E52C4A6D3A009C4554 /* AboutYH */ = {
isa = PBXGroup;
children = (
047AA3EE2C4F9114009C4554 /* VM */,
047AA3EB2C4A70DF009C4554 /* V */,
047AA3E62C4A6D50009C4554 /* C */,
);
......@@ -2188,6 +2191,14 @@
path = V;
sourceTree = "<group>";
};
047AA3EE2C4F9114009C4554 /* VM */ = {
isa = PBXGroup;
children = (
047AA3EF2C4F912D009C4554 /* YHListViewModel.swift */,
);
path = VM;
sourceTree = "<group>";
};
04808C022B4686510056D53C /* Frameworks */ = {
isa = PBXGroup;
children = (
......@@ -3712,6 +3723,7 @@
045EEF202B9F171A0022A143 /* YHCardExampleView.swift in Sources */,
A567E5A72BD7643D00D5D5A0 /* YHHomeKingKongBlockView.swift in Sources */,
04A6715E2B9FFCA700C1FB91 /* YHCertificateNameCell.swift in Sources */,
047AA3F02C4F912D009C4554 /* YHListViewModel.swift in Sources */,
A567E5AF2BD7643D00D5D5A0 /* YHHomeWebViewBottomForSavePicView.swift in Sources */,
045A7E672C2ACB1A008F995B /* YHLoginOneLeadView.swift in Sources */,
048787D72BCE96F50036E221 /* YHServiceOrderProgressTableViewCell.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeIdentityViewController.swift
View file @ 242cc3ce
......@@ -29,6 +29,12 @@ class YHHomeIdentityViewController: YHBaseViewController {
var scrollContentY: CGFloat = 0.0
var isShowBottomView: Bool = false
lazy var viewModel: YHHomePageViewModel = {
let vm = YHHomePageViewModel()
return vm
}()
var imgItems:[YHHomeIdentityItem] = [YHHomeIdentityItem(img:UIImage(named: "identity_talent_1")),
YHHomeIdentityItem(img:UIImage(named: "identity_talent_2")),
YHHomeIdentityItem(img:UIImage(named: "identity_talent_3")),
......@@ -107,6 +113,7 @@ class YHHomeIdentityViewController: YHBaseViewController {
}()
static let tabWidth = 64.0
// 默认为4个tab
static let tabGap = (KScreenWidth-20.0*2-tabWidth*4.0)/3.0
lazy var segmentedDataSource: JXSegmentedTitleDataSource = {
......@@ -125,6 +132,7 @@ class YHHomeIdentityViewController: YHBaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
createUI()
loadData()
}
func createUI() {
......@@ -140,7 +148,7 @@ class YHHomeIdentityViewController: YHBaseViewController {
make.height.equalTo(44)
}
self.tableView.snp.makeConstraints { make in
make.top.equalTo(self.subTabBar.snp.bottom)
make.top.equalTo(self.subTabBar.snp.bottom).offset(8.0)
make.left.right.bottom.equalToSuperview()
}
let left = 20.0-Self.tabGap
......@@ -216,8 +224,9 @@ extension YHHomeIdentityViewController: UIScrollViewDelegate {
}
}
let gap = 10.0
if scrollView.contentOffset.y >= self.scrollContentY+gap {
if scrollView.contentOffset.y > self.scrollContentY+gap {
self.scrollContentY = scrollView.contentOffset.y
printLog("ABCD:\(self.scrollContentY), \(scrollView.contentOffset.y)")
if !self.isShowBottomView {
self.isShowBottomView = true
printLog("ABC show: \(self.scrollContentY)")
......@@ -230,7 +239,8 @@ extension YHHomeIdentityViewController: UIScrollViewDelegate {
}
} else if scrollView.contentOffset.y <= self.scrollContentY-gap {
} else if scrollView.contentOffset.y < self.scrollContentY-gap {
printLog("ABCD:\(self.scrollContentY), \(scrollView.contentOffset.y)")
self.scrollContentY = scrollView.contentOffset.y
if self.isShowBottomView {
self.isShowBottomView = false
......@@ -245,8 +255,14 @@ extension YHHomeIdentityViewController: UIScrollViewDelegate {
extension YHHomeIdentityViewController {
func requestData() {
func loadData() {
let params : [String : Any] = ["pid" : 2]
self.viewModel.getGoodsCategory(params: params) {
[weak self] success, error in
guard let self = self else { return }
self.viewModel.categoryArr
}
}
func requestImages() {
......
galaxy/galaxy/Classes/Modules/Home(首页)/M/YHHKEventModel.swift
View file @ 242cc3ce
......@@ -9,6 +9,7 @@
import UIKit
class YHHKEventModel: YHBaseModel {
var id: Int = 0
var tag: String = ""
var list: [String] = []
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentToActionTableViewCell.swift
View file @ 242cc3ce
......@@ -252,7 +252,7 @@ class YHDocumentToActionTableViewCell: UITableViewCell {
fileImageView.image = UIImage(named: iconImgName)
fileNameLabel.text = dataSource.writing_document.doc_sign.doc_type_name
if dataSource.writing_document.doc_sign.doc_type == 7 || dataSource.writing_document.doc_sign.doc_type == 8 {
// shareButton.isHidden = false
shareButton.isHidden = false
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHMyFileMethodTableViewCell.swift
View file @ 242cc3ce
......@@ -264,7 +264,7 @@ class YHSignatureToActionTableViewCell: UITableViewCell {
fileImageView.image = UIImage(named: iconImgName)
fileNameLabel.text = dataSource.doc_type_name
if dataSource.doc_type == 7 || dataSource.doc_type == 8 {
// shareButton.isHidden = false
shareButton.isHidden = false
}
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/AboutYH/C/YHDetailViewController.swift
View file @ 242cc3ce
......@@ -11,6 +11,8 @@ import UIKit
class YHDetailViewController: YHBaseViewController {
var tableView: UITableView!
var viewModel: YHListViewModel = YHListViewModel()
var model = YHHKEventModel()
lazy var headView : YHHeadView = {
let headView = YHHeadView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 581))
......@@ -26,11 +28,12 @@ class YHDetailViewController: YHBaseViewController {
extension YHDetailViewController: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 2
return (self.viewModel.model.first?.list.count ?? 1) - 1
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withClass: YHListTableViewCell.self)
cell.imageUrl = self.viewModel.model.first?.list[indexPath.row + 1]
return cell
}
......@@ -58,14 +61,6 @@ extension YHDetailViewController: UITableViewDelegate, UITableViewDataSource {
extension YHDetailViewController {
func getData() {
}
func updateDataSource() {
}
func setView() {
view.backgroundColor = .white
tableView = {
......@@ -78,7 +73,7 @@ extension YHDetailViewController {
tableView.dataSource = self
tableView.delegate = self
tableView.tableHeaderView = headView
tableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 0.01))
tableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 20))
tableView.register(cellWithClass: YHListTableViewCell.self)
return tableView
}()
......@@ -89,6 +84,11 @@ extension YHDetailViewController {
}
func loadData() {
viewModel.getToolsEvent(pid: model.id) {[weak self] success, error in
guard let self = self else { return }
guard let url = URL(string: self.viewModel.model.first?.list.first) else { return }
self.headView.imageView.kf.setImage(with: url)
self.tableView.reloadData()
}
}
}
galaxy/galaxy/Classes/Modules/Mine（我的）/AboutYH/C/YHListViewController.swift
View file @ 242cc3ce
......@@ -11,7 +11,8 @@ import UIKit
class YHListViewController: YHBaseViewController {
var tableView: UITableView!
var viewModel: YHListViewModel = YHListViewModel()
override func viewDidLoad() {
super.viewDidLoad()
setView()
......@@ -21,11 +22,12 @@ class YHListViewController: YHBaseViewController {
extension YHListViewController: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 3
return self.viewModel.model.count
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withClass: YHListTableViewCell.self)
cell.dataSource = self.viewModel.model[indexPath.row]
return cell
}
......@@ -51,19 +53,13 @@ extension YHListViewController: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let vc = YHDetailViewController()
vc.model = self.viewModel.model[indexPath.row]
self.navigationController?.pushViewController(vc)
}
}
extension YHListViewController {
func getData() {
}
func updateDataSource() {
}
func setView() {
gk_navTitle = "关于银河湾"
......@@ -89,13 +85,29 @@ extension YHListViewController {
}
func loadData() {
viewModel.getToolsEvent(pid: 7) {[weak self] success, error in
guard let self = self else { return }
self.tableView.reloadData()
}
}
}
class YHListTableViewCell: UITableViewCell {
var centerImageView: UIImageView!
var dataSource: YHHKEventModel? {
didSet {
guard let url = URL(string: dataSource?.list.first) else { return }
centerImageView.kf.setImage(with: url)
}
}
var imageUrl: String? {
didSet {
guard let url = URL(string: imageUrl) else { return }
centerImageView.kf.setImage(with: url)
}
}
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
......
galaxy/galaxy/Classes/Modules/Mine（我的）/AboutYH/V/YHHeadView.swift
View file @ 242cc3ce
......@@ -26,7 +26,7 @@ class YHHeadView: UIView {
imageView.backgroundColor = .red
imageView.snp.makeConstraints { make in
make.top.left.right.equalToSuperview()
make.bottom.equalTo(-8)
make.height.equalTo(510)
}
titleLabel = {
......
galaxy/galaxy/Classes/Modules/Mine（我的）/AboutYH/VM/YHListViewModel.swift 0 → 100644
View file @ 242cc3ce
//
// YHListViewModel.swift
// galaxy
//
// Created by EDY on 2024/7/23.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHListViewModel: YHBaseViewModel {
var model: [YHHKEventModel] = []
func getToolsEvent(pid: Int, callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.hklistApi
let param = ["pid[0]": pid]
let _ = YHNetRequest.getRequest(url: strUrl, params:param) { [weak self] json, code in
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = [YHHKEventModel].deserialize(from: dic as? [Any]) else {
callBackBlock(false,nil)
return
}
self.model = (result as! [YHHKEventModel])
callBackBlock(true, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
callBackBlock(false, error)
}
} failBlock: { err in
callBackBlock(false,err)
}
}
}
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