Commit 95c2f8eb235922b91457d43ea45a9b7e7227a7fc
1 parent
b63089ba
默认中国
Showing
2 changed files
with
28 additions
and
32 deletions
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
| @@ -392,38 +392,34 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate { | @@ -392,38 +392,34 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate { | ||
| 392 | 392 | ||
| 393 | // MARK: - 三方登录 | 393 | // MARK: - 三方登录 |
| 394 | func thirdPartyLoginWithType(type:CNLiveSendAuthResp,model:CNThreeLoginModel){ | 394 | func thirdPartyLoginWithType(type:CNLiveSendAuthResp,model:CNThreeLoginModel){ |
| 395 | - //test | ||
| 396 | - let vc = CNThreeLoginViewController(model: model) | ||
| 397 | - self.navigationController?.pushViewController(vc, animated: true) | ||
| 398 | - return | ||
| 399 | 395 | ||
| 400 | -// showLoading(message: "") | ||
| 401 | -// CNLiveLoginViewModel.thirdPartyLoginWithType(type: type, model: model) {[weak self] result, status in | ||
| 402 | -// hiddenLoading() | ||
| 403 | -// if status == .success{ | ||
| 404 | -// //登录成功 | ||
| 405 | -// let window = UIApplication.shared.delegate?.window | ||
| 406 | -// window??.rootViewController = CNLiveBaseTabBarViewController.init() | ||
| 407 | -// }else{ | ||
| 408 | -// if let res = result as? String{ | ||
| 409 | -// if res == "42013"{ | ||
| 410 | -// if (type == CNLiveSendAuthRespApple) { | ||
| 411 | -// let window = UIApplication.shared.delegate?.window | ||
| 412 | -// window??.rootViewController = CNLiveBaseTabBarViewController.init() | ||
| 413 | -// return | ||
| 414 | -// } | ||
| 415 | -// | ||
| 416 | -// //未注册,需要绑定手机号 | ||
| 417 | -// //跳转绑定手机号页面 | ||
| 418 | -// let vc = CNThreeLoginViewController(model: model) | ||
| 419 | -// | ||
| 420 | -// self!.navigationController?.pushViewController(vc, animated: true) | ||
| 421 | -// } | ||
| 422 | -// }else{ | ||
| 423 | -// | ||
| 424 | -// } | ||
| 425 | -// } | ||
| 426 | -// } | 396 | + showLoading(message: "") |
| 397 | + CNLiveLoginViewModel.thirdPartyLoginWithType(type: type, model: model) {[weak self] result, status in | ||
| 398 | + hiddenLoading() | ||
| 399 | + if status == .success{ | ||
| 400 | + //登录成功 | ||
| 401 | + let window = UIApplication.shared.delegate?.window | ||
| 402 | + window??.rootViewController = CNLiveBaseTabBarViewController.init() | ||
| 403 | + }else{ | ||
| 404 | + if let res = result as? String{ | ||
| 405 | + if res == "42013"{ | ||
| 406 | + if (type == CNLiveSendAuthRespApple) { | ||
| 407 | + let window = UIApplication.shared.delegate?.window | ||
| 408 | + window??.rootViewController = CNLiveBaseTabBarViewController.init() | ||
| 409 | + return | ||
| 410 | + } | ||
| 411 | + | ||
| 412 | + //未注册,需要绑定手机号 | ||
| 413 | + //跳转绑定手机号页面 | ||
| 414 | + let vc = CNThreeLoginViewController(model: model) | ||
| 415 | + | ||
| 416 | + self!.navigationController?.pushViewController(vc, animated: true) | ||
| 417 | + } | ||
| 418 | + }else{ | ||
| 419 | + | ||
| 420 | + } | ||
| 421 | + } | ||
| 422 | + } | ||
| 427 | } | 423 | } |
| 428 | 424 | ||
| 429 | } | 425 | } |
metaCode/Classes/Main/MinePage/Controller/CNLiveMineChangePhoneController.swift
| @@ -22,7 +22,7 @@ class CNLiveMineChangePhoneController:CNLiveBaseViewController{ | @@ -22,7 +22,7 @@ class CNLiveMineChangePhoneController:CNLiveBaseViewController{ | ||
| 22 | lazy var countryLabel: UILabel = { | 22 | lazy var countryLabel: UILabel = { |
| 23 | let titleLabel = UILabel() | 23 | let titleLabel = UILabel() |
| 24 | titleLabel.textColor = HexColor("#333333") | 24 | titleLabel.textColor = HexColor("#333333") |
| 25 | - titleLabel.text = "国家" | 25 | + titleLabel.text = "中国" |
| 26 | titleLabel.font = Font_15 | 26 | titleLabel.font = Font_15 |
| 27 | return titleLabel | 27 | return titleLabel |
| 28 | }() | 28 | }() |