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

Merge branch 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into youhua-dev

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  及时响应YHOtherPickerView的值
  护照及其他旅游证件
  去除证件ocr的提示
parents bc7153dc 8740130c
...@@ -323,16 +323,10 @@ class YHIdentityCardCell: UITableViewCell { ...@@ -323,16 +323,10 @@ class YHIdentityCardCell: UITableViewCell {
if self.type == .identity { if self.type == .identity {
self.viewModel.requestCnIDCardMessage(url, isBack: 0) {[weak self] success, error in self.viewModel.requestCnIDCardMessage(url, isBack: 0) {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
if !success {
YHHUD.flash(message: error?.errorMsg ?? "")
}
} }
} else { } else {
self.viewModel.requestHkIDCardMessage(url, isBack: 0) {[weak self] success, error in self.viewModel.requestHkIDCardMessage(url, isBack: 0) {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
if !success {
YHHUD.flash(message: error?.errorMsg ?? "")
}
} }
} }
} }
...@@ -375,16 +369,10 @@ class YHIdentityCardCell: UITableViewCell { ...@@ -375,16 +369,10 @@ class YHIdentityCardCell: UITableViewCell {
if self.type == .identity { if self.type == .identity {
self.viewModel.requestCnIDCardMessage(url, isBack: 1) {[weak self] success, error in self.viewModel.requestCnIDCardMessage(url, isBack: 1) {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
if !success {
YHHUD.flash(message: error?.errorMsg ?? "")
}
} }
} else { } else {
self.viewModel.requestHkIDCardMessage(url, isBack: 1 ) {[weak self] success, error in self.viewModel.requestHkIDCardMessage(url, isBack: 1 ) {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
if !success {
YHHUD.flash(message: error?.errorMsg ?? "")
}
} }
} }
} }
......
...@@ -215,7 +215,7 @@ class YHItemView: UIView { ...@@ -215,7 +215,7 @@ class YHItemView: UIView {
case .time: break case .time: break
case .image: break case .image: break
case .id: case .id:
if dataSource.message == "0" { if dataSource.message == "0" || dataSource.message == "11" {
messageTextField.text = "" messageTextField.text = ""
} }
let arr = YHConstantArrayData.arrIdType let arr = YHConstantArrayData.arrIdType
......
...@@ -331,15 +331,9 @@ class YHMainInformationCardTableViewCell: UITableViewCell { ...@@ -331,15 +331,9 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
if self.type == .identity { if self.type == .identity {
self.viewModel.requestCnIDCardMessage(url, isBack: 0) {[weak self] success, error in self.viewModel.requestCnIDCardMessage(url, isBack: 0) {[weak self] success, error in
if !success {
YHHUD.flash(message: error?.errorMsg ?? "")
}
} }
} else { } else {
self.viewModel.requestHkIDCardMessage(url, isBack: 0) {[weak self] success, error in self.viewModel.requestHkIDCardMessage(url, isBack: 0) {[weak self] success, error in
if !success {
YHHUD.flash(message: error?.errorMsg ?? "")
}
} }
} }
} }
...@@ -381,15 +375,9 @@ class YHMainInformationCardTableViewCell: UITableViewCell { ...@@ -381,15 +375,9 @@ class YHMainInformationCardTableViewCell: UITableViewCell {
guard let url = success else { return } guard let url = success else { return }
if self.type == .identity { if self.type == .identity {
self.viewModel.requestCnIDCardMessage(url, isBack: 1) {[weak self] success, error in self.viewModel.requestCnIDCardMessage(url, isBack: 1) {[weak self] success, error in
if !success {
YHHUD.flash(message: error?.errorMsg ?? "")
}
} }
} else { } else {
self.viewModel.requestHkIDCardMessage(url, isBack: 1 ) {[weak self] success, error in self.viewModel.requestHkIDCardMessage(url, isBack: 1 ) {[weak self] success, error in
if !success {
YHHUD.flash(message: error?.errorMsg ?? "")
}
} }
} }
} }
......
...@@ -212,6 +212,8 @@ class YHOtherPickerView: UIView { ...@@ -212,6 +212,8 @@ class YHOtherPickerView: UIView {
} }
@objc func didClickConfirmButton() { @objc func didClickConfirmButton() {
let index = pickerView.selectedRow(inComponent: 0)
userSelectedItem = arrData[index]
if let item = userSelectedItem { if let item = userSelectedItem {
selectBlock?(item) selectBlock?(item)
} }
......
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