Skip to content

G
galaxy-iOS
Commit 0f7084c6 authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

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

parents 5d0a589f f5cf58cb
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 73 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHDatePickView.swift
View file @ 0f7084c6
......@@ -34,32 +34,17 @@ class YHDatePickView: UIView {
var pickerView: UIPickerView!
var lastIsTaday: Bool = false {
didSet {
if lastIsTaday {
guard let type = type else { return }
switch type {
case .yyyymmdd:
pickerView.selectRow(0, inComponent: 0, animated: true)
pickerView.selectRow(self.currentDateCom.month! - 1, inComponent: 1, animated: true)
pickerView.selectRow(self.currentDateCom.day! - 1, inComponent: 2, animated: true)
case .yyyymm:
pickerView.selectRow(0, inComponent: 0, animated: true)
pickerView.selectRow(self.currentDateCom.month! - 1, inComponent: 1, animated: true)
case .yyyy:
pickerView.selectRow(0, inComponent: 0, animated: true)
}
} else {
guard let type = type else { return }
switch type {
case .yyyymmdd:
pickerView.selectRow(100, inComponent: 0, animated: true)
pickerView.selectRow(self.currentDateCom.month! - 1, inComponent: 1, animated: true)
pickerView.selectRow(self.currentDateCom.day! - 1, inComponent: 2, animated: true)
case .yyyymm:
pickerView.selectRow(100, inComponent: 0, animated: true)
pickerView.selectRow(self.currentDateCom.month! - 1, inComponent: 1, animated: true)
case .yyyy:
pickerView.selectRow(100, inComponent: 0, animated: true)
}
guard let type = type else { return }
switch type {
case .yyyymmdd:
pickerView.selectRow(99, inComponent: 0, animated: true)
pickerView.selectRow(self.currentDateCom.month! - 1, inComponent: 1, animated: true)
pickerView.selectRow(self.currentDateCom.day! - 1, inComponent: 2, animated: true)
case .yyyymm:
pickerView.selectRow(99, inComponent: 0, animated: true)
pickerView.selectRow(self.currentDateCom.month! - 1, inComponent: 1, animated: true)
case .yyyy:
pickerView.selectRow(99, inComponent: 0, animated: true)
}
}
}
......@@ -226,23 +211,11 @@ class YHDatePickView: UIView {
var date = ""
switch type {
case .yyyymmdd:
if lastIsTaday {
date = String(format: "%02ld%@%02ld%@%02ld", (self.currentDateCom.year!) - self.pickerView.selectedRow(inComponent: 0),Self.separator, self.pickerView.selectedRow(inComponent: 1) + 1,Self.separator, self.pickerView.selectedRow(inComponent: 2) + 1)
} else {
date = String(format: "%02ld%@%02ld%@%02ld", (self.currentDateCom.year!) - self.pickerView.selectedRow(inComponent: 0) + 100,Self.separator, self.pickerView.selectedRow(inComponent: 1) + 1,Self.separator, self.pickerView.selectedRow(inComponent: 2) + 1)
}
date = String(format: "%02ld%@%02ld%@%02ld", (self.currentDateCom.year!) + self.pickerView.selectedRow(inComponent: 0) - 99, Self.separator, self.pickerView.selectedRow(inComponent: 1) + 1,Self.separator, self.pickerView.selectedRow(inComponent: 2) + 1)
case .yyyymm:
if lastIsTaday {
date = String(format: "%02ld%@%02ld", (self.currentDateCom.year!) - self.pickerView.selectedRow(inComponent: 0) ,Self.separator, self.pickerView.selectedRow(inComponent: 1) + 1)
} else {
date = String(format: "%02ld%@%02ld", (self.currentDateCom.year!) - self.pickerView.selectedRow(inComponent: 0) + 100 ,Self.separator, self.pickerView.selectedRow(inComponent: 1) + 1)
}
date = String(format: "%02ld%@%02ld", (self.currentDateCom.year!) + self.pickerView.selectedRow(inComponent: 0) - 99, Self.separator, self.pickerView.selectedRow(inComponent: 1) + 1)
case .yyyy:
if lastIsTaday {
date = String(format: "%02ld", (self.currentDateCom.year!) - self.pickerView.selectedRow(inComponent: 0))
} else {
date = String(format: "%02ld", (self.currentDateCom.year!) - self.pickerView.selectedRow(inComponent: 0) + 100)
}
date = String(format: "%02ld", (self.currentDateCom.year!) + self.pickerView.selectedRow(inComponent: 0) - 99)
}
if self.backDate != nil {
self.backDate!(date)
......@@ -279,7 +252,7 @@ extension YHDatePickView: UIPickerViewDelegate,UIPickerViewDataSource {
}
return 200
} else if component == 1 {
if self.pickerView.selectedRow(inComponent: 0) == 0 {
if self.pickerView.selectedRow(inComponent: 0) == 99 {
if lastIsTaday {
return self.currentDateCom.month!
}
......@@ -290,7 +263,7 @@ extension YHDatePickView: UIPickerViewDelegate,UIPickerViewDataSource {
if type == .yyyy {
return 0
}
if self.pickerView.selectedRow(inComponent: 0) == 0 && self.pickerView.selectedRow(inComponent: 1) == self.currentDateCom.month! - 1 {
if self.pickerView.selectedRow(inComponent: 0) == 99 && self.pickerView.selectedRow(inComponent: 1) == self.currentDateCom.month! - 1 {
if lastIsTaday {
return self.currentDateCom.day!
}
......@@ -338,10 +311,7 @@ extension YHDatePickView: UIPickerViewDelegate,UIPickerViewDataSource {
func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
if component == 0 {
if lastIsTaday {
return "\((currentDateCom.year!) - row)"
}
return "\((currentDateCom.year!) - row + 100)"
return "\((currentDateCom.year!) + row - 99)"
} else if component == 1 {
return "\(row + 1)"
} else {
......@@ -351,11 +321,18 @@ extension YHDatePickView: UIPickerViewDelegate,UIPickerViewDataSource {
func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
if component == 1, self.type == .yyyymmdd {
pickerView.reloadComponent(2)
pickerView.reloadComponent(1)
}
if component == 0, lastIsTaday {
pickerView.reloadComponent(1)
if self.type == .yyyymmdd {
pickerView.reloadComponent(2)
}
}
if component == 1, lastIsTaday, self.type == .yyyymmdd {
pickerView.reloadComponent(2)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/V/YHOtherSelecteItemView.swift
View file @ 0f7084c6
......@@ -239,21 +239,30 @@ extension YHOtherSelecteItemView {
if textField.isEmpty == true {
noTextTipsLable.isHidden = false
noTextTipsLable.snp.remakeConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(6)
make.height.equalTo(20)
make.left.equalTo(subHoldView.snp.left)
make.right.equalTo(subHoldView.snp.right)
}
bottomLine.snp.remakeConstraints { make in
make.top.equalTo(noTextTipsLable.snp.bottom).offset(6)
make.left.right.equalToSuperview()
make.height.equalTo(0.5)
make.bottom.equalToSuperview()
if longTimeButton.isSelected {
noTextTipsLable.isHidden = true
bottomLine.snp.remakeConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(kMargin)
make.bottom.left.right.equalToSuperview()
make.height.equalTo(0.5)
}
} else {
noTextTipsLable.isHidden = false
noTextTipsLable.snp.remakeConstraints { make in
make.top.equalTo(titleLabel.snp.bottom).offset(6)
make.height.equalTo(20)
make.left.equalTo(subHoldView.snp.left)
make.right.equalTo(subHoldView.snp.right)
}
bottomLine.snp.remakeConstraints { make in
make.top.equalTo(noTextTipsLable.snp.bottom).offset(6)
make.left.right.equalToSuperview()
make.height.equalTo(0.5)
make.bottom.equalToSuperview()
}
}
}
else {
noTextTipsLable.isHidden = true
......@@ -263,9 +272,6 @@ extension YHOtherSelecteItemView {
make.height.equalTo(0.5)
}
}
} else {
noTextTipsLable.isHidden = true
titleLabel.snp.remakeConstraints { make in
......@@ -298,11 +304,9 @@ extension YHOtherSelecteItemView {
if longTimeButton.isSelected {
longTimeButton.snp.remakeConstraints { make in
make.left.equalTo(titleLabel.snp.right).offset(40)
make.centerY.equalToSuperview()
make.centerY.equalTo(titleLabel)
make.height.equalTo(32)
make.width.equalTo(43)
}
......@@ -312,12 +316,10 @@ extension YHOtherSelecteItemView {
make.right.equalToSuperview()
make.bottom.top.left.equalToSuperview()
}
} else {
longTimeButton.snp.remakeConstraints { make in
make.right.equalToSuperview()
make.centerY.equalToSuperview()
make.centerY.equalTo(titleLabel)
make.height.equalTo(32)
make.width.equalTo(43)
}
......@@ -327,9 +329,7 @@ extension YHOtherSelecteItemView {
make.right.equalTo(longTimeButton.snp.left).offset(-4)
make.bottom.top.left.equalToSuperview()
}
}
} else {
rightIcon.snp.removeConstraints()
rightIcon.isHidden = false
......
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @ 0f7084c6
......@@ -320,6 +320,9 @@ class YHNetRequest: NSObject {
// 发送强制更新通知
NotificationCenter.default.post(name: YhConstant.YhNotification.didForceUpgradeNotifiction, object: nil)
YHHUD.hide()
guard let errorBlock = self.failure else { return }
let errorModel = YHErrorModel(errorCode: Int32(statusCode), errorMsg: errorResponseMsg)
errorBlock(errorModel)
}
return
}
......@@ -333,6 +336,9 @@ class YHNetRequest: NSObject {
UIViewController.current?.navigationController?.popToRootViewController(animated: false)
goTabBarBy(tabType: .home)
YHHUD.hide()
guard let errorBlock = self.failure else { return }
let errorModel = YHErrorModel(errorCode: Int32(statusCode), errorMsg: errorResponseMsg)
errorBlock(errorModel)
}
return
}
......
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