Skip to content

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

处理 我的 界面

parent 364058fe
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 272 additions and 357 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 1d79476f
This diff is collapsed.
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift
View file @ 1d79476f
...@@ -175,21 +175,6 @@ extension YHServiceCenterMainViewModel { ...@@ -175,21 +175,6 @@ extension YHServiceCenterMainViewModel {
model.isFinished = true model.isFinished = true
arrContactStausItmes.append(model) arrContactStausItmes.append(model)
<<<<<<< HEAD
// if resultModel.supplement_not_submit_num > 0 {
// let model2 = YHContactMainItemStatusModel()
// model2.type = 2
// model2.isFinished = false
// arrContactStausItmes.append(model2)
// } else {
// let model2 = YHContactMainItemStatusModel()
// model2.type = 2
// model2.isFinished = true
// arrContactStausItmes.append(model2)
// }
=======
//我的证件 //我的证件
if resultModel.supplement_not_submit_num > 0 { if resultModel.supplement_not_submit_num > 0 {
let model2 = YHContactMainItemStatusModel() let model2 = YHContactMainItemStatusModel()
...@@ -202,43 +187,22 @@ extension YHServiceCenterMainViewModel { ...@@ -202,43 +187,22 @@ extension YHServiceCenterMainViewModel {
model2.isFinished = true model2.isFinished = true
arrContactStausItmes.append(model2) arrContactStausItmes.append(model2)
} }
>>>>>>> develop
if resultModel.my_document { if resultModel.my_document {
//我的文书 //我的文书
<<<<<<< HEAD
// let model4 = YHContactMainItemStatusModel()
// model4.type = 4
// model4.isFinished = true
// arrContactStausItmes.append(model4)
// }
=======
let model4 = YHContactMainItemStatusModel() let model4 = YHContactMainItemStatusModel()
model4.type = 4 model4.type = 4
model4.isFinished = true model4.isFinished = true
arrContactStausItmes.append(model4) arrContactStausItmes.append(model4)
} }
>>>>>>> develop
if resultModel.my_signature { if resultModel.my_signature {
//我的签字 //我的签字
<<<<<<< HEAD
// let model5 = YHContactMainItemStatusModel()
// model5.type = 5
// model5.isFinished = true
// arrContactStausItmes.append(model5)
// }
=======
let model5 = YHContactMainItemStatusModel() let model5 = YHContactMainItemStatusModel()
model5.type = 5 model5.type = 5
model5.isFinished = true model5.isFinished = true
arrContactStausItmes.append(model5) arrContactStausItmes.append(model5)
} }
>>>>>>> develop
//我的评分 //我的评分
...@@ -249,10 +213,10 @@ extension YHServiceCenterMainViewModel { ...@@ -249,10 +213,10 @@ extension YHServiceCenterMainViewModel {
if resultModel.scheme_position_switch == 1 { if resultModel.scheme_position_switch == 1 {
//我的方案 //我的方案
// let model6 = YHContactMainItemStatusModel() let model6 = YHContactMainItemStatusModel()
// model6.type = 6 model6.type = 6
// model6.isFinished = true model6.isFinished = true
// arrContactStausItmes.append(model6) arrContactStausItmes.append(model6)
} }
} else { } else {
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ 1d79476f
...@@ -240,136 +240,87 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource { ...@@ -240,136 +240,87 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
vc.modalPresentationStyle = .custom vc.modalPresentationStyle = .custom
self.navigationController?.present(vc, animated: true) self.navigationController?.present(vc, animated: true)
return return
<<<<<<< HEAD let item: PersonalModuleItem = items[indexPath.row]
} else { switch item.type {
case .myMessage://我的消息
let vc = YHTestViewController() printLog("我的消息")
self.navigationController?.pushViewController(vc) goTabBarBy(tabType: .message)
YHHUD.flash(message: "已登录: 功能完善中...") case .scoreCenter:////积分中心
printLog("积分中心")
if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
printLog(param)
var token : String = param
var url = YHBaseUrlManager.shared.curH5URL() + "superApp/integral"
let addtionString = randomAlphanumericString(6)//随机6个字母或者数字
let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置，这里以第六个字符后面为例
token.insert(contentsOf: addtionString, at: indexToInsert)
url = url + "?param=" + token
let vc = YHHomeWebViewController()
vc.vcTitle = "积分中心"
vc.url = url
self.navigationController?.pushViewController(vc)
}
case .myTestCode://我的测评码
printLog("我的测评码")
let vc = YHHomeWebViewController()
vc.vcTitle = "香港身份测评码"
vc.showSavePicBottomFlag = true
vc.url = "https://cdn-public.galaxy-immi.com/app/cepingma.png"
self.navigationController?.pushViewController(vc)
case .appointGalaxyBay://预约银河湾
printLog("预约银河湾")
let vc = YHHomeWebViewController()
vc.vcTitle = "预约银河湾"
vc.url = "https://upload.cdn.galaxy-immi.com/sell/product/images/page-1686138671996.png"
self.navigationController?.pushViewController(vc)
default:
printLog("不需要响应")
}
} }
return
<<<<<<< HEAD private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
// let item: PersonalModuleItem = items[indexPath.row]; return 1.0
// // 预览文件预研 杜宇todo
// if item.title == "我的消息" {
// YHHUD.flash(message: "预览image")
// self.openXLSXRemoteFile(urlString: "https://upload-cdn.galaxy-immi.com/crm/production/1620280305822.jpg")
// } else if item.title == "我的进度" {
// YHHUD.flash(message: "预览pdf")
// self.openXLSXRemoteFile(urlString: "https://upload-cdn.galaxy-immi.com/crm/production/1620271660487.pdf")
// } else if item.title == "积分中心" {
// YHHUD.flash(message: "预览xlsx")
// self.openXLSXRemoteFile(urlString: "https://test-cdn.galaxy-immi.com/4001001/8979989729091623170120240321152216.xlsx?Expires=1711007546&OSSAccessKeyId=LTAI5tNFvK2xGRrBeJ2z8R2j&Signature=UfM6tRcws5ObN4rp/3ZESEWbM2E%3D&v=1711005746")
// } else if item.title == "推荐有理" {
//
// } else if item.title == "我的海报" {
//
// } else if item.title == "我的测评码" {
//
// }
=======
let item: PersonalModuleItem = items[indexPath.row];
// 预览文件预研 杜宇todo
if item.title == "我的消息" {
} else if item.title == "我的进度" {
} else if item.title == "积分中心" {
} else if item.title == "推荐有理" {
} else if item.title == "我的海报" {
} else if item.title == "我的测评码" {
=======
>>>>>>> develop
} }
>>>>>>> develop
private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
return 1.0
}
let item: PersonalModuleItem = items[indexPath.row] func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
switch item.type {
case .myMessage://我的消息 return UIView()
printLog("我的消息")
goTabBarBy(tabType: .message)
case .scoreCenter:////积分中心
printLog("积分中心")
if let param = YHLoginManager.shared.userModel?.token,param.count>5 {
printLog(param)
var token : String = param
var url = YHBaseUrlManager.shared.curH5URL() + "superApp/integral"
let addtionString = randomAlphanumericString(6)//随机6个字母或者数字
let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置，这里以第六个字符后面为例
token.insert(contentsOf: addtionString, at: indexToInsert)
url = url + "?param=" + token
let vc = YHHomeWebViewController()
vc.vcTitle = "积分中心"
vc.url = url
self.navigationController?.pushViewController(vc)
}
case .myTestCode://我的测评码
printLog("我的测评码")
let vc = YHHomeWebViewController()
vc.vcTitle = "香港身份测评码"
vc.showSavePicBottomFlag = true
vc.url = "https://cdn-public.galaxy-immi.com/app/cepingma.png"
self.navigationController?.pushViewController(vc)
case .appointGalaxyBay://预约银河湾
printLog("预约银河湾")
let vc = YHHomeWebViewController()
vc.vcTitle = "预约银河湾"
vc.url = "https://upload.cdn.galaxy-immi.com/sell/product/images/page-1686138671996.png"
self.navigationController?.pushViewController(vc)
default:
printLog("不需要响应")
} }
}
private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
return 1.0
}
private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
return 1.0
}
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
return UIView() func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
return UIView()
}
} }
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { extension YHMyViewController {
return UIView() func randomAlphanumericString(_ length: Int) -> String {
} let letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
} let randomString = (0..<length).map{ _ in String(letters.randomElement()!) }.reduce("", +)
return randomString
extension YHMyViewController { }
func randomAlphanumericString(_ length: Int) -> String { @objc func loginSuccess() {
let letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" printLog("登录成功，进行相应的 UI刷新操作")
let randomString = (0..<length).map{ _ in String(letters.randomElement()!) }.reduce("", +) updateUserUI()
return randomString }
}
@objc func logoutSuccess() {
@objc func loginSuccess() { updateUserUI()
printLog("登录成功，进行相应的 UI刷新操作") }
updateUserUI()
} func updateUserUI() {
if YHLoginManager.shared.isLogin() {
@objc func logoutSuccess() { headerView.nickName = YHLoginManager.shared.userModel?.nickname ?? "Hi, 银河用户".local
updateUserUI() } else {
} headerView.nickName = "登录/注册"
}
func updateUserUI() {
if YHLoginManager.shared.isLogin() {
headerView.nickName = YHLoginManager.shared.userModel?.nickname ?? "Hi, 银河用户".local
} else {
headerView.nickName = "登录/注册"
} }
} }
}
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