Commit 64316004 authored by David黄金龙's avatar David黄金龙

1、删除 不使用的item

2、添加版本展示
parent 092b8e31
...@@ -35,11 +35,21 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget ...@@ -35,11 +35,21 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
return btn return btn
}() }()
lazy var versionLabel:UILabel = {
let btn = UILabel()
btn.text = "版本号:V0.1.8测试服"
btn.textColor = UIColor(hex: 0x949DB5, alpha: 1.0)
btn.font = UIFont.PFSC_R(ofSize: 13)
btn.textAlignment = .center
return btn
}()
lazy var items: [PersonalModuleItem] = { lazy var items: [PersonalModuleItem] = {
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: "设备相关".local, type:.deviceInfo)] PersonalModuleItem(title: "设备相关".local, type:.deviceInfo)]
}() }()
...@@ -55,18 +65,40 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget ...@@ -55,18 +65,40 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
self.view.backgroundColor = .white self.view.backgroundColor = .white
view.addSubview(tableView) view.addSubview(tableView)
view.addSubview(logoutBtn) view.addSubview(logoutBtn)
view.addSubview(versionLabel)
tableView.snp.makeConstraints { make in tableView.snp.makeConstraints { make in
make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar) make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
make.left.right.equalToSuperview() make.left.right.equalToSuperview()
make.bottom.equalTo(logoutBtn.snp.top).offset(-30) make.bottom.equalTo(versionLabel.snp.top).offset(-30)
}
versionLabel.snp.makeConstraints { make in
make.left.equalToSuperview().offset(20)
make.right.equalToSuperview().offset(-20)
make.height.equalTo(18)
make.bottom.equalTo(logoutBtn.snp.top).offset(-kMargin)
} }
logoutBtn.snp.makeConstraints { make in logoutBtn.snp.makeConstraints { make in
make.left.equalToSuperview().offset(20) make.left.equalToSuperview().offset(20)
make.right.equalToSuperview().offset(-20) make.right.equalToSuperview().offset(-20)
make.height.equalTo(48.0) make.height.equalTo(48.0)
make.bottom.equalToSuperview().offset(-30) make.bottom.equalToSuperview().offset(-30)
} }
#if DEBUG
let version = "版本号:V" + UIDevice.appVersion() + "_" + UIDevice.appBuild() + "开发服"
versionLabel.text = version
#elseif TESTENV
let version = "版本号:V" + UIDevice.appVersion() + "_" + UIDevice.appBuild() + "测试服"
versionLabel.text = version
#else
let version = "版本号:V" + UIDevice.appVersion() + "_" + UIDevice.appBuild()
versionLabel.text = version
#endif
} }
@objc func logout() { @objc func logout() {
......
...@@ -70,19 +70,6 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget { ...@@ -70,19 +70,6 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
PersonalModuleItem(icon: "mine_item_code", title: "我的测评码".local, type:.myTestCode), PersonalModuleItem(icon: "mine_item_code", title: "我的测评码".local, type:.myTestCode),
PersonalModuleItem(icon: "mine_item_appoint", title: "预约银河湾".local, type:.appointGalaxyBay) PersonalModuleItem(icon: "mine_item_appoint", title: "预约银河湾".local, type:.appointGalaxyBay)
] ]
#if DEBUG
let version = "app版本号:" + UIDevice.appVersion() + "_" + UIDevice.appBuild()
arrData.append(PersonalModuleItem(icon: "mine_item_appoint", title: version, type:.none))
#elseif TESTENV
let version = "app版本号:" + UIDevice.appVersion() + "_" + UIDevice.appBuild()
arrData.append(PersonalModuleItem(icon: "mine_item_appoint", title: version, type:.none))
#else
#endif
return arrData return arrData
}() }()
...@@ -253,13 +240,14 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource { ...@@ -253,13 +240,14 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
var token : String = param var token : String = param
//待h5端同学提供 //待h5端同学提供
var url = "https:www.baidu.com" var url = "https:www.baidu.com"
var addtionString = randomAlphanumericString(6)//随机6个字母或者数字 let addtionString = randomAlphanumericString(6)//随机6个字母或者数字
let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置,这里以第六个字符后面为例 let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置,这里以第六个字符后面为例
token.insert(contentsOf: addtionString, at: indexToInsert) token.insert(contentsOf: addtionString, at: indexToInsert)
url = url + "?param=" + token url = url + "?param=" + token
YHHUD.flash(message: "还需要H5同学给URL") YHHUD.flash(message: "还需要H5同学给URL")
printLog(url)
let vc = YHHomeWebViewController() let vc = YHHomeWebViewController()
vc.url = url vc.url = url
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
......
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