Skip to content

G
galaxy-iOS
Commit ecec3bd0 authored by David黄金龙's avatar David黄金龙
Browse files
Options

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

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 版本update
  //  版本更新
parents 671d02ec 8f074b7c
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 24 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ ecec3bd0
......@@ -35,6 +35,7 @@
044414052BC3B9DE00784A14 /* YHServiceTableFootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044414042BC3B9DE00784A14 /* YHServiceTableFootView.swift */; };
0445E6AF2BE9CFF6003C52F9 /* YHAppVersionForceUpdateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0445E6AE2BE9CFF6003C52F9 /* YHAppVersionForceUpdateView.swift */; };
0445E6B12BE9E15C003C52F9 /* YHFindAppNewVersionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0445E6B02BE9E15C003C52F9 /* YHFindAppNewVersionView.swift */; };
0445E6B42BEA15C4003C52F9 /* YHAppVersionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0445E6B32BEA15C4003C52F9 /* YHAppVersionManager.swift */; };
044867B42BA1953B00DFAD4A /* YHCertificateFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044867B32BA1953B00DFAD4A /* YHCertificateFilterView.swift */; };
044867B62BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044867B52BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift */; };
044867B82BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044867B72BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift */; };
......@@ -487,6 +488,7 @@
044414042BC3B9DE00784A14 /* YHServiceTableFootView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceTableFootView.swift; sourceTree = "<group>"; };
0445E6AE2BE9CFF6003C52F9 /* YHAppVersionForceUpdateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAppVersionForceUpdateView.swift; sourceTree = "<group>"; };
0445E6B02BE9E15C003C52F9 /* YHFindAppNewVersionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFindAppNewVersionView.swift; sourceTree = "<group>"; };
0445E6B32BEA15C4003C52F9 /* YHAppVersionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAppVersionManager.swift; sourceTree = "<group>"; };
044867B32BA1953B00DFAD4A /* YHCertificateFilterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateFilterView.swift; sourceTree = "<group>"; };
044867B52BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateFilterItemCell.swift; sourceTree = "<group>"; };
044867B72BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateUploadFailTipsView.swift; sourceTree = "<group>"; };
......@@ -1005,6 +1007,7 @@
0445E6AC2BE9CF53003C52F9 /* VersionUpload(版本更新) */ = {
isa = PBXGroup;
children = (
0445E6B22BEA15A2003C52F9 /* M */,
0445E6AD2BE9CF95003C52F9 /* V */,
);
path = "VersionUpload(版本更新)";
......@@ -1019,6 +1022,14 @@
path = V;
sourceTree = "<group>";
};
0445E6B22BEA15A2003C52F9 /* M */ = {
isa = PBXGroup;
children = (
0445E6B32BEA15C4003C52F9 /* YHAppVersionManager.swift */,
);
path = M;
sourceTree = "<group>";
};
045EED972B9F171A0022A143 /* ServiceProcess(我的信息流程) */ = {
isa = PBXGroup;
children = (
......@@ -2817,6 +2828,7 @@
A5C382CF2B5F9A9100C5E65C /* YHServiceCenterMainViewModel.swift in Sources */,
045EEEA52B9F171A0022A143 /* YHImageViewController.swift in Sources */,
045EEEF32B9F171A0022A143 /* YHFamilyMemberInfoListVC.swift in Sources */,
0445E6B42BEA15C4003C52F9 /* YHAppVersionManager.swift in Sources */,
04EA230C2BB5199D009DA928 /* YHDocumentToActionTableViewCell.swift in Sources */,
A5ACE9572B4564F7002C94D2 /* YHBasicContentView.swift in Sources */,
A517A4E52BB6C4BB000DEECD /* YHDocumentFileItemView.swift in Sources */,
......@@ -3038,7 +3050,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = dev.intelligenceGalaxy.profile;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = com.dev.profile;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = TESTENV;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
......@@ -3244,7 +3256,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = dev.intelligenceGalaxy.profile;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = com.dev.profile;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
SWIFT_VERSION = 5.0;
......@@ -3292,7 +3304,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = dev.intelligenceGalaxy.profile;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = com.dev.profile;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
SWIFT_VERSION = 5.0;
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMySettingViewController.swift
View file @ ecec3bd0
......@@ -49,18 +49,22 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
PersonalModuleItem(title: "权限配置".local, type:.permissionSettings),
PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
PersonalModuleItem(title: "设备相关".local, type:.deviceInfo)]
PersonalModuleItem(title: "设备相关".local, type:.deviceInfo),
PersonalModuleItem(title: "版本 \(UIDevice.appVersion())", type:.version)]
#elseif TESTENV
return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
PersonalModuleItem(title: "权限配置".local, type:.permissionSettings),
PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
PersonalModuleItem(title: "设备相关".local, type:.deviceInfo)]
PersonalModuleItem(title: "设备相关".local, type:.deviceInfo),
PersonalModuleItem(title: "版本 \(UIDevice.appVersion())", type:.version)]
#else
return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
PersonalModuleItem(title: "权限配置".local, type:.permissionSettings),
// PersonalModuleItem(title: "个人信息收集清单".local, type:.infoCollectList),
// PersonalModuleItem(title: "第三方信息共享清单".local, type:.infoShareList),
PersonalModuleItem(title: "关于我们".local, type:.aboutUs)]
PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
PersonalModuleItem(title: "版本 \(UIDevice.appVersion())", type:.version)]
#endif
}()
......@@ -111,6 +115,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
versionLabel.text = version
#endif
}
@objc func logout() {
YHHUD.show(.progress(message: "退出登录中..."))
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ ecec3bd0
......@@ -26,6 +26,7 @@ enum YHPersonalModuleItemType: Int {
case infoShareList
case aboutUs
case deviceInfo
case version
}
class PersonalModuleItem {
......@@ -237,14 +238,14 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
#if DEBUG
if true {
let view = YHFindAppNewVersionView.alertView()
view.updateContentArray(["阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发。 ",
"阿打发打发是的发生富士达",
"阿打发打发山东发斯蒂芬撒打发撒打发手打",
"阿斯顿发发是的发生"])
view.show()
// let view = YHFindAppNewVersionView.alertView()
// view.updateContentArray(["阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发。 ",
// "阿打发打发是的发生富士达",
// "阿打发打发山东发斯蒂芬撒打发撒打发手打",
// "阿斯顿发发是的发生"])
// view.show()
// YHAppVersionForceUpdateView.alertView().show()
YHAppVersionForceUpdateView.alertView().show()
return
}
#endif
......
galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHMySettingCell.swift
View file @ ecec3bd0
......@@ -18,9 +18,26 @@ class YHMySettingCell: UITableViewCell {
label.textAlignment = .left
label.numberOfLines = 0
label.font = UIFont.PFSC_R(ofSize: 15)
label.setContentCompressionResistancePriority(.required, for: .horizontal)
return label
}()
lazy var detailLabel: UILabel = {
let label = UILabel()
label.textColor = UIColor(hexString:"#141414")
label.textAlignment = .right
label.font = UIFont.PFSC_R(ofSize: 15)
return label
}()
private lazy var redPointView: UIView = {
let view = UIView()
view.layer.cornerRadius = 3.0
view.backgroundColor = .failColor
view.isHidden = true
return view
}()
lazy var arrowImgView:UIImageView = {
let arrowImgView = UIImageView(image: UIImage(named: "mine_arrow_right"))
return arrowImgView
......@@ -41,21 +58,33 @@ class YHMySettingCell: UITableViewCell {
contentView.backgroundColor = .white
contentView.addSubview(titleLabel)
contentView.addSubview(detailLabel)
contentView.addSubview(redPointView)
contentView.addSubview(arrowImgView)
titleLabel.snp.makeConstraints { make in
make.centerY.equalTo(contentView)
make.centerY.equalToSuperview()
make.left.equalToSuperview().offset(20)
make.right.equalTo(arrowImgView.snp.left)
}
detailLabel.snp.makeConstraints { make in
make.right.equalTo(arrowImgView.snp.left).offset(-4)
make.centerY.equalToSuperview()
make.left.equalTo(redPointView.snp.right).offset(4)
}
redPointView.snp.makeConstraints { make in
make.width.height.equalTo(6)
make.centerY.equalToSuperview()
make.left.greaterThanOrEqualTo(titleLabel.snp.right).offset(4)
}
arrowImgView.snp.makeConstraints { make in
make.width.equalTo(20)
make.height.equalTo(20)
make.centerY.equalTo(contentView)
make.centerY.equalToSuperview()
make.right.equalTo(contentView).offset(-20)
}
}
}
galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHUserInfoHeaderView.swift
View file @ ecec3bd0
......@@ -159,6 +159,14 @@ class YHUserInfoHeaderView: UIView {
return btn
}()
private lazy var settingRedPointView: UIView = {
let view = UIView()
view.layer.cornerRadius = 3.0
view.backgroundColor = .failColor
view.isHidden = true
return view
}()
private lazy var settingView:UIView = {
let view = UIView()
return view
......@@ -198,6 +206,7 @@ class YHUserInfoHeaderView: UIView {
self.addSubview(bgImgView)
self.addSubview(settingView)
settingView.addSubview(settingBtn)
settingView.addSubview(settingRedPointView)
self.addSubview(avarImgView)
self.addSubview(userNameLabel)
......@@ -232,6 +241,12 @@ class YHUserInfoHeaderView: UIView {
make.centerY.equalToSuperview()
}
settingRedPointView.snp.makeConstraints { make in
make.width.height.equalTo(6)
make.left.equalTo(settingBtn.snp.right).offset(-3)
make.bottom.equalTo(settingBtn.snp.top).offset(3)
}
avarImgView.snp.makeConstraints { make in
make.size.equalTo(CGSize(width: 72, height: 72))
make.top.equalTo(settingBtn.snp.bottom).offset(12)
......
galaxy/galaxy/Classes/Modules/VersionUpload(版本更新)/M/YHAppVersionManager.swift 0 → 100644
View file @ ecec3bd0
//
// YHAppVersionManager.swift
// galaxy
//
// Created by edy on 2024/5/7.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHAppVersionManager {
static func goToAppStore() {
// 替换为你要打开的 App Store 中的应用程序链接
let appStoreLink = "https://itunes.apple.com/app/989673964"
// 使用该链接创建一个 URL 实例
if let url = URL(string: appStoreLink) {
if UIApplication.shared.canOpenURL(url) {
UIApplication.shared.open(url, options: [:], completionHandler: nil)
} else {
YHHUD.flash(message: "无法打开AppStore链接~")
}
}
}
}
galaxy/galaxy/Classes/Modules/VersionUpload(版本更新)/V/YHAppVersionForceUpdateView.swift
View file @ ecec3bd0
......@@ -19,8 +19,6 @@ class YHAppVersionForceUpdateView: UIView {
lazy var blackMaskView: UIView = {
let view = UIView()
view.backgroundColor = .alertMaskColor
// let tap = UITapGestureRecognizer(target: self, action: #selector(dismiss))
// view.addGestureRecognizer(tap)
return view
}()
......@@ -161,10 +159,12 @@ class YHAppVersionForceUpdateView: UIView {
}
@objc func didClickUpdateBtn() {
YHAppVersionManager.goToAppStore()
}
@objc func didClickExitBtn() {
DispatchQueue.main.async {
exit(0)
}
}
}
galaxy/galaxy/Classes/Modules/VersionUpload(版本更新)/V/YHFindAppNewVersionView.swift
View file @ ecec3bd0
......@@ -63,8 +63,6 @@ class YHFindAppNewVersionView: UIView {
lazy var blackMaskView: UIView = {
let view = UIView()
view.backgroundColor = .alertMaskColor
let tap = UITapGestureRecognizer(target: self, action: #selector(dismiss))
view.addGestureRecognizer(tap)
return view
}()
......@@ -271,6 +269,6 @@ class YHFindAppNewVersionView: UIView {
}
@objc func didClickUpdateBtn() {
YHAppVersionManager.goToAppStore()
}
}
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