Skip to content

G
galaxy-iOS
Commit 732c5044 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

Merge commit '40a64f30' into xiezhaolin

parents 0ea84172 40a64f30
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 40 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 732c5044
......@@ -323,6 +323,7 @@
A5573EE92B317C0100D98EC0 /* galaxyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573EE82B317C0100D98EC0 /* galaxyTests.swift */; };
A5573EF32B317C0100D98EC0 /* galaxyUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573EF22B317C0100D98EC0 /* galaxyUITests.swift */; };
A5573EF52B317C0100D98EC0 /* galaxyUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573EF42B317C0100D98EC0 /* galaxyUITestsLaunchTests.swift */; };
A567E5642BD6309700D5D5A0 /* YHHomeWebViewBottomForSavePicView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A567E5632BD6309700D5D5A0 /* YHHomeWebViewBottomForSavePicView.swift */; };
A56D2D612B62020C009C83A8 /* YHContractMainItemStatusCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A56D2D602B62020C009C83A8 /* YHContractMainItemStatusCell.swift */; };
A57F1F252B48F09200B644E6 /* ATAuthSDK_D.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04808C032B4686510056D53C /* ATAuthSDK_D.framework */; };
A580371E2BAD784B0031C312 /* YHMySchemeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A580371D2BAD784B0031C312 /* YHMySchemeViewModel.swift */; };
......@@ -781,6 +782,7 @@
A5573EEE2B317C0100D98EC0 /* galaxyUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = galaxyUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
A5573EF22B317C0100D98EC0 /* galaxyUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = galaxyUITests.swift; sourceTree = "<group>"; };
A5573EF42B317C0100D98EC0 /* galaxyUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = galaxyUITestsLaunchTests.swift; sourceTree = "<group>"; };
A567E5632BD6309700D5D5A0 /* YHHomeWebViewBottomForSavePicView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeWebViewBottomForSavePicView.swift; sourceTree = "<group>"; };
A56D2D602B62020C009C83A8 /* YHContractMainItemStatusCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHContractMainItemStatusCell.swift; sourceTree = "<group>"; };
A580371D2BAD784B0031C312 /* YHMySchemeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySchemeViewModel.swift; sourceTree = "<group>"; };
A58037202BAD7B2A0031C312 /* YHMySchemeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySchemeModel.swift; sourceTree = "<group>"; };
......@@ -2241,6 +2243,7 @@
A50A747D2BC91308003D28D9 /* YHHomeBannerIndicatorView.swift */,
048787D22BCE6B7D0036E221 /* YHServiceOrderAlertView.swift */,
A53F05EC2BCE86E50071D35A /* YHAgreementAlertView.swift */,
A567E5632BD6309700D5D5A0 /* YHHomeWebViewBottomForSavePicView.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -2784,6 +2787,7 @@
A592BFEF2B9AB720004C04A9 /* YHWholeScreenTipsView.swift in Sources */,
045EEEF42B9F171A0022A143 /* YHSpouseBasicInfoVC.swift in Sources */,
A5FD63C32B63438A00D1D9DA /* YHContactMainItemStatusModel.swift in Sources */,
A567E5642BD6309700D5D5A0 /* YHHomeWebViewBottomForSavePicView.swift in Sources */,
045EEEEA2B9F171A0022A143 /* YHFamilyInitialInfo.swift in Sources */,
A5C382CF2B5F9A9100C5E65C /* YHServiceCenterMainViewModel.swift in Sources */,
045EEEA52B9F171A0022A143 /* YHImageViewController.swift in Sources */,
......@@ -2983,7 +2987,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -3189,7 +3193,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -3237,7 +3241,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......
galaxy/galaxy/Applegate(JPush).swift
View file @ 732c5044
......@@ -49,9 +49,9 @@ extension AppDelegate: JPUSHRegisterDelegate {
JPUSHService.registerDeviceToken(deviceToken)
YHLoginManager.shared.deviceTokenModel.deviceToken = deviceTokenStr
#if DEBUG
YHHUD.flash(message: deviceTokenStr)
// YHHUD.flash(message: deviceTokenStr)
#elseif TESTENV
// YHHUD.flash(message: deviceTokenStr)
#else
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift
View file @ 732c5044
......@@ -25,6 +25,12 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
var id: Int = 0
var vcTitle : String?
lazy var bottomViewForSavePic: YHHomeWebViewBottomForSavePicView = {
let view = YHHomeWebViewBottomForSavePicView()
view.isHidden = true
return view
}()
override func viewDidLoad() {
super.viewDidLoad()
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeWebViewBottomForSavePicView.swift 0 → 100644
View file @ 732c5044
//
// YHHomeWebViewBottomForSavePicView.swift
// galaxy
//
// Created by davidhuangA on 2024/4/22.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHHomeWebViewBottomForSavePicView: UIView {
static let viewH : CGFloat = 98.0
override init(frame: CGRect) {
super.init(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: YHBasicInfoFillBottomView.viewH))
setupUI()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
typealias Block = (Int) -> ()
var block: Block?
var saveButton: UIButton!
// var nextButton: UIButton!
}
private extension YHHomeWebViewBottomForSavePicView {
func setupUI() {
backgroundColor = .white
saveButton = {
let button = UIButton(type: .custom)
button.backgroundColor = UIColor.contentBkgColor
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
button.contentHorizontalAlignment = .center
button.setTitle("保存图片到相册", for: .normal)
button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.layer.cornerRadius = kCornerRadius6
button.addTarget(self, action: #selector(save), for: .touchUpInside)
return button
}()
addSubview(saveButton)
saveButton.snp.makeConstraints { make in
make.left.equalTo(kMargin)
make.right.equalTo(-kMargin)
make.top.equalTo(12)
make.height.equalTo(44)
}
// nextButton = {
// let button = UIButton(type: .custom)
// button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
// button.contentHorizontalAlignment = .center
// button.setTitle("保存清单图", for: .normal)
// button.setTitleColor(.white, for: .normal)
// button.layer.cornerRadius = kCornerRadius6
// button.clipsToBounds = true
// button.addTarget(self, action: #selector(submit), for: .touchUpInside)
// return button
// }()
// addSubview(nextButton)
// nextButton.snp.makeConstraints { make in
// make.right.equalTo(-kMargin)
// make.top.equalTo(8)
// make.height.equalTo(44)
// make.left.equalTo(kMargin)
// }
//
// nextButton.layoutIfNeeded()
// nextButton.addYinHeGradualLayer()
}
@objc func save() {
block?(0)
}
}
galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift
View file @ 732c5044
......@@ -17,11 +17,11 @@ class YHHomePageViewModel : YHBaseViewModel {
var hkList: [YHHKEventModel]?
//首页相关参数
private var curPageIndex : Int = 1
private var page_Size : Int = 6
private var page_Size : Int = 20
var totalCount : Int = 0
var hasMoreForHomeNews : Bool = true
// 搜索
let searchPageSize: Int = 10
let searchPageSize: Int = 20
}
//接口
......
galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageDetailListVC.swift
View file @ 732c5044
......@@ -76,8 +76,9 @@ class YHMessageDetailListVC: YHBaseViewController {
label.text = "暂无消息".local
view.addSubview(label)
let topMargin = (KScreenHeight-k_Height_NavigationtBarAndStatuBar-124.0)/2.0
imgView.snp.makeConstraints { make in
make.top.equalToSuperview().offset(204)
make.top.equalToSuperview().offset(topMargin)
make.width.height.equalTo(92)
make.centerX.equalTo(view)
}
......
galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageListVC.swift
View file @ 732c5044
......@@ -74,8 +74,9 @@ class YHMessageListVC: YHBaseViewController {
label.text = "暂无消息".local
view.addSubview(label)
let topMargin = (KScreenHeight-k_Height_NavigationtBarAndStatuBar-k_Height_TabBar-124.0)/2.0
imgView.snp.makeConstraints { make in
make.top.equalToSuperview().offset(204)
make.top.equalToSuperview().offset(topMargin)
make.width.height.equalTo(92)
make.centerX.equalTo(view)
}
......@@ -307,7 +308,7 @@ extension YHMessageListVC: UITableViewDelegate, UITableViewDataSource {
private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
if !isNotifyEnabled {
return 42.0
return 52.0
}
return 1.0
}
......@@ -326,16 +327,21 @@ extension YHMessageListVC: UITableViewDelegate, UITableViewDataSource {
if isNotifyEnabled {
return UIView()
}
let view = UIView()
view.backgroundColor = UIColor(hex: 0x3570DC, alpha: 0.06)
let contentview = UIView()
contentview.backgroundColor = UIColor(hex: 0x3570DC, alpha: 0.06)
view.addSubview(contentview)
contentview.snp.makeConstraints { make in
make.left.right.top.equalToSuperview()
make.bottom.equalToSuperview().offset(-10)
}
let label = UILabel()
label.textColor = UIColor(hex: 0x121A26)
label.textAlignment = .left
label.font = UIFont.PFSC_R(ofSize:13)
label.text = "开启通知，及时掌握最新消息".local
view.addSubview(label)
contentview.addSubview(label)
let enableBtn = UIButton()
enableBtn.setTitle("开启".local, for: .normal)
......@@ -343,7 +349,7 @@ extension YHMessageListVC: UITableViewDelegate, UITableViewDataSource {
enableBtn.titleLabel?.font = .PFSC_R(ofSize: 13)
enableBtn.YH_clickEdgeInsets = UIEdgeInsets(top: 12, left: 20, bottom: 12, right: 20)
enableBtn.addTarget(self, action: #selector(didEnableNotifyBtnClicked), for: .touchUpInside)
view.addSubview(enableBtn)
contentview.addSubview(enableBtn)
label.snp.makeConstraints { make in
make.left.equalToSuperview().offset(20)
......
galaxy/galaxy/Classes/Modules/Message(消息)/V/YHDetailMessageCell.swift
View file @ 732c5044
......@@ -114,6 +114,8 @@ class YHDetailMessageCell: UITableViewCell {
detailLabel = UILabel()
detailLabel.textAlignment = .left
detailLabel.numberOfLines = 0
detailLabel.font = UIFont.PFSC_R(ofSize:14)
titleLabel.textColor = UIColor(hex: 0x121A26, alpha: 0.7)
whiteView.addSubview(detailLabel)
lineView = UIView()
......
galaxy/galaxy/Classes/Modules/Message(消息)/V/YHMessageSessionCell.swift
View file @ 732c5044
......@@ -136,7 +136,7 @@ class YHMessageSessionCell: UITableViewCell {
contentView.addSubview(timeLabel)
bottomLineView = UIView()
bottomLineView.backgroundColor = UIColor(hex: 0xF0F3F7)
bottomLineView.backgroundColor = UIColor(hex:0x121A26,transparency: 0.05)
contentView.addSubview(bottomLineView)
iconContentView.snp.makeConstraints { make in
......@@ -179,7 +179,7 @@ class YHMessageSessionCell: UITableViewCell {
bottomLineView.snp.makeConstraints { make in
make.left.right.equalTo(detailLabel)
make.height.equalTo(1)
make.height.equalTo(0.5)
make.bottom.equalToSuperview()
}
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHAboutUsViewController.swift
View file @ 732c5044
......@@ -19,10 +19,10 @@ struct AboutAdvantageItem {
class YHAboutUsViewController: YHBaseViewController {
lazy var items = {
return [AboutAdvantageItem(iconName: "about_match", title: "ABC".local, detail: "大数据精准匹配，专属方案获批率更高", url: ""),
return [AboutAdvantageItem(iconName: "about_match", title: "精准匹配".local, detail: "大数据精准匹配，专属方案获批率更高", url: ""),
AboutAdvantageItem(iconName: "about_response", title: "快速响应", detail: "身份规划师一对一专业服务，第一时间响应您的需求", url: ""),
AboutAdvantageItem(iconName: "about_service", title: "专业服务", detail: "5年经验+英语专8级文案导师团队倾力支持", url: ""),
AboutAdvantageItem(iconName: "about_service2", title: "精准匹配", detail: "香港专才、香港留学获批常年保持90%以上", url: "")]
AboutAdvantageItem(iconName: "about_service2", title: "获批保障", detail: "香港专才、香港留学获批常年保持90%以上", url: "")]
}()
lazy var collectView = {
......@@ -50,9 +50,9 @@ class YHAboutUsViewController: YHBaseViewController {
lazy var aboutLabel = {
var label = UILabel()
label.text = "关于银河".local
label.textColor = UIColor.mainTextColor
label.textColor = UIColor.init(hex: 0x121A26)
label.textAlignment = NSTextAlignment.left
label.font = UIFont.systemFont(ofSize: 20)
label.font = UIFont.PFSC_B(ofSize: 21)
return label
}()
......@@ -62,16 +62,16 @@ class YHAboutUsViewController: YHBaseViewController {
label.numberOfLines = 0
label.textColor = .labelTextColor2
label.textAlignment = NSTextAlignment.left
label.font = UIFont.systemFont(ofSize: 14)
label.font = UIFont.PFSC_R(ofSize: 14)
return label
}()
lazy var advantageLabel = {
var label = UILabel()
label.text = "四大优势"
label.textColor = UIColor.mainTextColor
label.textColor = UIColor.init(hex: 0x121A26)
label.textAlignment = .center
label.font = UIFont.systemFont(ofSize: 15)
label.font = UIFont.PFSC_B(ofSize: 17)
return label
}()
......@@ -93,14 +93,12 @@ class YHAboutUsViewController: YHBaseViewController {
self.collectView.reloadData()
self.collectView.layoutIfNeeded()
let height = self.collectView.contentSize.height
printLog("self.collectView.contentSize.height = \(height)")
}
func setupUI() {
self.title = "关于我们"
self.gk_navTitle = "关于我们"
view.backgroundColor = .white
view.addSubview(collectView)
......@@ -113,19 +111,19 @@ class YHAboutUsViewController: YHBaseViewController {
aboutLabel.snp.makeConstraints { make in
make.left.equalTo(view).offset(18)
make.right.equalTo(view).offset(-18)
make.top.equalTo(view).offset(k_Height_NavigationtBarAndStatuBar+18)
make.top.equalTo(view).offset(k_Height_NavigationtBarAndStatuBar+16)
}
detailLabel.snp.makeConstraints { make in
make.left.equalTo(view).offset(18)
make.right.equalTo(view).offset(-18)
make.top.equalTo(aboutLabel.snp.bottom).offset(18)
make.top.equalTo(aboutLabel.snp.bottom).offset(12)
}
advantageLabel.snp.makeConstraints { make in
make.centerX.equalTo(view)
make.height.equalTo(40)
make.top.equalTo(detailLabel.snp.bottom).offset(48)
make.top.equalTo(detailLabel.snp.bottom).offset(38)
}
advantageLeftImgView.snp.makeConstraints { make in
......@@ -142,7 +140,7 @@ class YHAboutUsViewController: YHBaseViewController {
collectView.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.top.equalTo(advantageLabel.snp.bottom).offset(22)
make.top.equalTo(advantageLabel.snp.bottom).offset(18)
}
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHAboutUsAdvantageCell.swift
View file @ 732c5044
......@@ -30,20 +30,18 @@ class YHAboutUsAdvantageCell: UICollectionViewCell {
lazy var titleLabel:UILabel = {
let label = UILabel()
label.text = "是的发放"
label.textColor = UIColor(hexString:"#333333")
label.textColor = UIColor.init(hex: 0x121A26)
label.textAlignment = .center
label.font = UIFont.systemFont(ofSize: 14)
label.font = UIFont.PFSC_B(ofSize: 14)
return label
}()
lazy var detailLabel:UILabel = {
let label = UILabel()
label.text = "sdfasfdasfasdfasfasdfasdfsafasdfasdfasdfasfdas"
label.textColor = .labelTextColor2
label.textColor = UIColor(hex: 0x121A2680, alpha: 0.5)
label.numberOfLines = 0
label.textAlignment = .center
label.font = UIFont.systemFont(ofSize: 12)
label.font = UIFont.PFSC_R(ofSize: 11)
return label
}()
......@@ -60,7 +58,7 @@ class YHAboutUsAdvantageCell: UICollectionViewCell {
func setupUI() {
contentView.backgroundColor = UIColor(hexString: "#F8F9FB")
contentView.backgroundColor = UIColor.init(hex: 0xF8FAFB)
contentView.layer.cornerRadius = 4
contentView.clipsToBounds = true
......@@ -81,9 +79,9 @@ class YHAboutUsAdvantageCell: UICollectionViewCell {
}
detailLabel.snp.makeConstraints { make in
make.left.equalTo(contentView).offset(5)
make.right.equalTo(contentView).offset(-5)
make.top.equalTo(titleLabel.snp.bottom).offset(8)
make.left.equalTo(contentView).offset(15)
make.right.equalTo(contentView).offset(-15)
make.top.equalTo(titleLabel.snp.bottom).offset(6)
make.bottom.equalTo(contentView).offset(-5)
}
}
......
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @ 732c5044
......@@ -81,6 +81,9 @@ class YHNetRequest: NSObject {
requestHeader.add(name:"appid",value:"1")
let dateStr = String(Date().timeIntervalSince1970)
requestHeader.add(name:"timestamp",value:dateStr)
requestHeader.add(name:"appPlatform",value:"iOS")
let version = UIDevice.appVersion()
requestHeader.add(name:"appVersion",value:version)
requestHeader.add(name:"pass",value:"")
let appkey = "958364f87222c200a72414f492bf0e26"
......
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