Commit 1f4fb272 authored by pete谢兆麟's avatar pete谢兆麟

授权逻辑

parent d41e6aa9
...@@ -79,8 +79,12 @@ class YHMyNameCardViewController: YHBaseViewController { ...@@ -79,8 +79,12 @@ class YHMyNameCardViewController: YHBaseViewController {
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated) super.viewWillAppear(animated)
if isCurrentUser {
requestAuthorization()
} else {
requestNameCardInfo() requestNameCardInfo()
} }
}
func createUI() { func createUI() {
gk_navigationBar.isHidden = true gk_navigationBar.isHidden = true
...@@ -219,9 +223,23 @@ extension YHMyNameCardViewController { ...@@ -219,9 +223,23 @@ extension YHMyNameCardViewController {
func requestAuthorization() { func requestAuthorization() {
self.authorModel.requestUserAuthorization { success, error in self.authorModel.requestUserAuthorization { success, error in
if self.authorModel.setModel.isclick_card != 2 {
YHCommonAlertView.show("", "授权信息同步至您的名片并对您的好友可见", "取消", "确认",fullGuestureEnable: false) {
self.authorModel.requestInformationToCardSubmit(agress: 1) { success, error in
self.requestNameCardInfo()
}
} callBack: {
self.authorModel.requestInformationToCardSubmit(agress: 2) { success, error in
self.authorModel.requestBusinessCardAuthorize { success, error in
self.requestNameCardInfo()
}
}
}
} else {
self.requestNameCardInfo() self.requestNameCardInfo()
} }
} }
}
func requestNameCardInfo() { func requestNameCardInfo() {
self.viewModel.getUserNameCardInfo(uid: self.userId) { self.viewModel.getUserNameCardInfo(uid: self.userId) {
......
...@@ -116,14 +116,6 @@ class YHMyInformationItemCell: UITableViewCell { ...@@ -116,14 +116,6 @@ class YHMyInformationItemCell: UITableViewCell {
titleLabel.attributedText = questionAttrStr titleLabel.attributedText = questionAttrStr
messageTextField.placeholder = dataSource.prompts messageTextField.placeholder = dataSource.prompts
messageTextField.text = dataSource.message messageTextField.text = dataSource.message
if dataSource.type == .constellation {
let arr = YHConstantArrayData.arrDegreeConstellation
arr.forEach { item in
if item["id"] == dataSource.message {
messageTextField.text = item["title"]
}
}
}
if dataSource.isUserKeyBoard ?? false { if dataSource.isUserKeyBoard ?? false {
nextStepImageView.isHidden = true nextStepImageView.isHidden = true
centerButton.isHidden = true centerButton.isHidden = true
...@@ -183,7 +175,7 @@ class YHMyInformationItemCell: UITableViewCell { ...@@ -183,7 +175,7 @@ class YHMyInformationItemCell: UITableViewCell {
case .constellation: case .constellation:
YHOtherPickerView.show(type: .constellation, selectTitle: self.dataSource?.message ?? "") { item in YHOtherPickerView.show(type: .constellation, selectTitle: self.dataSource?.message ?? "") { item in
print(item) print(item)
self.dataSource?.message = item.index self.dataSource?.message = item.title
self.updateAllViews() self.updateAllViews()
if let block = self.block { if let block = self.block {
block(self.dataSource ?? YHUserInformationModel()) block(self.dataSource ?? YHUserInformationModel())
......
...@@ -204,4 +204,38 @@ class YHInformationAuthorizeViewModel: YHBaseViewModel { ...@@ -204,4 +204,38 @@ class YHInformationAuthorizeViewModel: YHBaseViewModel {
callBackBlock(false, err) callBackBlock(false, err)
} }
} }
func requestInformationToCardSubmit(agress: Int, callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
let params: [String: Any] = ["information_to_card": agress,
"isclick_card": 2]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.People.authorizationSubmit
let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
//1. json字符串 转 对象
guard let _ = self else { return }
if json.code == 200 {
callBackBlock(true, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
callBackBlock(false, error)
}
} failBlock: { err in
callBackBlock(false, err)
}
}
func requestBusinessCardAuthorize(callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.People.businessCardAuthorize
let _ = YHNetRequest.postRequest(url: strUrl) { [weak self] json, code in
//1. json字符串 转 对象
guard let _ = self else { return }
if json.code == 200 {
callBackBlock(true, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
callBackBlock(false, error)
}
} failBlock: { err in
callBackBlock(false, err)
}
}
} }
...@@ -72,10 +72,13 @@ class YHAllowUseMyInfoViewController: YHBaseViewController { ...@@ -72,10 +72,13 @@ class YHAllowUseMyInfoViewController: YHBaseViewController {
open = 2 open = 2
} }
viewModel.requestAuthorizationSubmit(agress: open) {[weak self] success, error in viewModel.requestAuthorizationSubmit(agress: open) {[weak self] success, error in
guard let self = self else { return }
viewModel.requestBusinessCardAuthorize {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
self.dismiss(animated: true) self.dismiss(animated: true)
} }
} }
}
} }
extension YHAllowUseMyInfoViewController: UITableViewDelegate, UITableViewDataSource { extension YHAllowUseMyInfoViewController: UITableViewDelegate, UITableViewDataSource {
......
...@@ -67,4 +67,20 @@ class YHUserInfoSettingViewModel: YHBaseViewModel { ...@@ -67,4 +67,20 @@ class YHUserInfoSettingViewModel: YHBaseViewModel {
callBackBlock(false, err) callBackBlock(false, err)
} }
} }
func requestBusinessCardAuthorize(callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.People.businessCardAuthorize
let _ = YHNetRequest.postRequest(url: strUrl) { [weak self] json, code in
//1. json字符串 转 对象
guard let _ = self else { return }
if json.code == 200 {
callBackBlock(true, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
callBackBlock(false, error)
}
} failBlock: { err in
callBackBlock(false, err)
}
}
} }
...@@ -333,6 +333,7 @@ class YHAllApiName { ...@@ -333,6 +333,7 @@ class YHAllApiName {
static let userInfo = "super-app/user-base/info" static let userInfo = "super-app/user-base/info"
static let userAuthorization = "super-app/user/authorization" static let userAuthorization = "super-app/user/authorization"
static let cardSave = "super-app/business-card/save" static let cardSave = "super-app/business-card/save"
static let businessCardAuthorize = "super-app/business-card/authorize"
} }
} }
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