Commit 8f074b7c authored by Steven杜宇's avatar Steven杜宇

// 版本update

parent f242d2aa
...@@ -3074,7 +3074,7 @@ ...@@ -3074,7 +3074,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy; PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; 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_ACTIVE_COMPILATION_CONDITIONS = TESTENV;
SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
...@@ -3280,7 +3280,7 @@ ...@@ -3280,7 +3280,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy; PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; 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_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
...@@ -3328,7 +3328,7 @@ ...@@ -3328,7 +3328,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy; PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; 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_EMIT_LOC_STRINGS = YES;
SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
SWIFT_VERSION = 5.0; SWIFT_VERSION = 5.0;
......
...@@ -49,18 +49,22 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget ...@@ -49,18 +49,22 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings), return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
PersonalModuleItem(title: "权限配置".local, type:.permissionSettings), PersonalModuleItem(title: "权限配置".local, type:.permissionSettings),
PersonalModuleItem(title: "关于我们".local, type:.aboutUs), PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
PersonalModuleItem(title: "设备相关".local, type:.deviceInfo)] PersonalModuleItem(title: "设备相关".local, type:.deviceInfo),
PersonalModuleItem(title: "版本 \(UIDevice.appVersion())", type:.version)]
#elseif TESTENV #elseif TESTENV
return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings), return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
PersonalModuleItem(title: "权限配置".local, type:.permissionSettings), PersonalModuleItem(title: "权限配置".local, type:.permissionSettings),
PersonalModuleItem(title: "关于我们".local, type:.aboutUs), PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
PersonalModuleItem(title: "设备相关".local, type:.deviceInfo)] PersonalModuleItem(title: "设备相关".local, type:.deviceInfo),
PersonalModuleItem(title: "版本 \(UIDevice.appVersion())", type:.version)]
#else #else
return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings), return [PersonalModuleItem(title: "通知设置".local, type:.notifySettings),
PersonalModuleItem(title: "权限配置".local, type:.permissionSettings), PersonalModuleItem(title: "权限配置".local, type:.permissionSettings),
// PersonalModuleItem(title: "个人信息收集清单".local, type:.infoCollectList), // PersonalModuleItem(title: "个人信息收集清单".local, type:.infoCollectList),
// PersonalModuleItem(title: "第三方信息共享清单".local, type:.infoShareList), // PersonalModuleItem(title: "第三方信息共享清单".local, type:.infoShareList),
PersonalModuleItem(title: "关于我们".local, type:.aboutUs)] PersonalModuleItem(title: "关于我们".local, type:.aboutUs),
PersonalModuleItem(title: "版本 \(UIDevice.appVersion())", type:.version)]
#endif #endif
}() }()
...@@ -111,6 +115,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget ...@@ -111,6 +115,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
versionLabel.text = version versionLabel.text = version
#endif #endif
} }
@objc func logout() { @objc func logout() {
YHHUD.show(.progress(message: "退出登录中...")) YHHUD.show(.progress(message: "退出登录中..."))
......
...@@ -26,6 +26,7 @@ enum YHPersonalModuleItemType: Int { ...@@ -26,6 +26,7 @@ enum YHPersonalModuleItemType: Int {
case infoShareList case infoShareList
case aboutUs case aboutUs
case deviceInfo case deviceInfo
case version
} }
class PersonalModuleItem { class PersonalModuleItem {
...@@ -237,14 +238,14 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource { ...@@ -237,14 +238,14 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
#if DEBUG #if DEBUG
if true { if true {
let view = YHFindAppNewVersionView.alertView() // let view = YHFindAppNewVersionView.alertView()
view.updateContentArray(["阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发。 ", // view.updateContentArray(["阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发阿斯顿发发。 ",
"阿打发打发是的发生富士达", // "阿打发打发是的发生富士达",
"阿打发打发山东发斯蒂芬撒打发撒打发手打", // "阿打发打发山东发斯蒂芬撒打发撒打发手打",
"阿斯顿发发是的发生"]) // "阿斯顿发发是的发生"])
view.show() // view.show()
// YHAppVersionForceUpdateView.alertView().show() YHAppVersionForceUpdateView.alertView().show()
return return
} }
#endif #endif
......
...@@ -18,9 +18,26 @@ class YHMySettingCell: UITableViewCell { ...@@ -18,9 +18,26 @@ class YHMySettingCell: UITableViewCell {
label.textAlignment = .left label.textAlignment = .left
label.numberOfLines = 0 label.numberOfLines = 0
label.font = UIFont.PFSC_R(ofSize: 15) label.font = UIFont.PFSC_R(ofSize: 15)
label.setContentCompressionResistancePriority(.required, for: .horizontal)
return label 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 = { lazy var arrowImgView:UIImageView = {
let arrowImgView = UIImageView(image: UIImage(named: "mine_arrow_right")) let arrowImgView = UIImageView(image: UIImage(named: "mine_arrow_right"))
return arrowImgView return arrowImgView
...@@ -41,21 +58,33 @@ class YHMySettingCell: UITableViewCell { ...@@ -41,21 +58,33 @@ class YHMySettingCell: UITableViewCell {
contentView.backgroundColor = .white contentView.backgroundColor = .white
contentView.addSubview(titleLabel) contentView.addSubview(titleLabel)
contentView.addSubview(detailLabel)
contentView.addSubview(redPointView)
contentView.addSubview(arrowImgView) contentView.addSubview(arrowImgView)
titleLabel.snp.makeConstraints { make in titleLabel.snp.makeConstraints { make in
make.centerY.equalTo(contentView) make.centerY.equalToSuperview()
make.left.equalToSuperview().offset(20) 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 arrowImgView.snp.makeConstraints { make in
make.width.equalTo(20) make.width.equalTo(20)
make.height.equalTo(20) make.height.equalTo(20)
make.centerY.equalTo(contentView) make.centerY.equalToSuperview()
make.right.equalTo(contentView).offset(-20) make.right.equalTo(contentView).offset(-20)
} }
} }
} }
...@@ -159,6 +159,14 @@ class YHUserInfoHeaderView: UIView { ...@@ -159,6 +159,14 @@ class YHUserInfoHeaderView: UIView {
return btn 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 = { private lazy var settingView:UIView = {
let view = UIView() let view = UIView()
return view return view
...@@ -198,6 +206,7 @@ class YHUserInfoHeaderView: UIView { ...@@ -198,6 +206,7 @@ class YHUserInfoHeaderView: UIView {
self.addSubview(bgImgView) self.addSubview(bgImgView)
self.addSubview(settingView) self.addSubview(settingView)
settingView.addSubview(settingBtn) settingView.addSubview(settingBtn)
settingView.addSubview(settingRedPointView)
self.addSubview(avarImgView) self.addSubview(avarImgView)
self.addSubview(userNameLabel) self.addSubview(userNameLabel)
...@@ -232,6 +241,12 @@ class YHUserInfoHeaderView: UIView { ...@@ -232,6 +241,12 @@ class YHUserInfoHeaderView: UIView {
make.centerY.equalToSuperview() 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 avarImgView.snp.makeConstraints { make in
make.size.equalTo(CGSize(width: 72, height: 72)) make.size.equalTo(CGSize(width: 72, height: 72))
make.top.equalTo(settingBtn.snp.bottom).offset(12) make.top.equalTo(settingBtn.snp.bottom).offset(12)
......
...@@ -164,7 +164,7 @@ class YHAppVersionForceUpdateView: UIView { ...@@ -164,7 +164,7 @@ class YHAppVersionForceUpdateView: UIView {
@objc func didClickExitBtn() { @objc func didClickExitBtn() {
DispatchQueue.main.async { DispatchQueue.main.async {
exit(1) exit(0)
} }
} }
} }
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