Commit 6d04863e authored by Steven杜宇's avatar Steven杜宇

// bug修复

parent af62b344
...@@ -13,7 +13,7 @@ class YHFriendRequestView: UIView { ...@@ -13,7 +13,7 @@ class YHFriendRequestView: UIView {
var sendBlock:((String?)->())? var sendBlock:((String?)->())?
static let cardHeight = 313.0 static let cardHeight = 313.0
let textMaxCount = 200 let textMaxCount = 200
let placeHolderStr = "在银河相遇,期待与你共话未来,互学互鉴,盼成为好友,谢谢~"
var userModel:YHMatchUserInfo = YHMatchUserInfo() { var userModel:YHMatchUserInfo = YHMatchUserInfo() {
didSet { didSet {
if let url = URL(string: self.userModel.avatar) { if let url = URL(string: self.userModel.avatar) {
...@@ -36,14 +36,6 @@ class YHFriendRequestView: UIView { ...@@ -36,14 +36,6 @@ class YHFriendRequestView: UIView {
text1 = text1Arr.joined(separator: " | ") text1 = text1Arr.joined(separator: " | ")
} }
self.professionalLabel.text = text1 self.professionalLabel.text = text1
}
}
var isSendBtnEnabled = false {
didSet {
self.sendBtn.backgroundColor = (isSendBtnEnabled ? UIColor.brandMainColor : UIColor.brandMainColor30)
self.sendBtn.isUserInteractionEnabled = isSendBtnEnabled
} }
} }
...@@ -148,7 +140,7 @@ class YHFriendRequestView: UIView { ...@@ -148,7 +140,7 @@ class YHFriendRequestView: UIView {
label.textColor = UIColor.placeHolderColor label.textColor = UIColor.placeHolderColor
label.textAlignment = .left label.textAlignment = .left
label.font = UIFont.PFSC_R(ofSize: 14) label.font = UIFont.PFSC_R(ofSize: 14)
label.text = "请输入发送申请信息" label.text = self.placeHolderStr
label.numberOfLines = 0 label.numberOfLines = 0
label.isHidden = false label.isHidden = false
return label return label
...@@ -181,20 +173,11 @@ class YHFriendRequestView: UIView { ...@@ -181,20 +173,11 @@ class YHFriendRequestView: UIView {
} }
@objc func didSendBtnClicked() { @objc func didSendBtnClicked() {
var text = self.textView.text
if isEmptyString(self.textView.text) { if isEmptyString(text) {
YHHUD.flash(message: "请输入发送申请信息") text = self.placeHolderStr
return
}
// 去除两端的空格
if var text = self.textView.text {
text = text.getRealString()
if text.isEmpty {
YHHUD.flash(message: "请输入发送申请信息")
return
}
self.sendBlock?(text)
} }
self.sendBlock?(text)
dismiss() dismiss()
} }
...@@ -230,7 +213,6 @@ class YHFriendRequestView: UIView { ...@@ -230,7 +213,6 @@ class YHFriendRequestView: UIView {
cardView.addSubview(cancelBtn) cardView.addSubview(cancelBtn)
cardView.addSubview(sendBtn) cardView.addSubview(sendBtn)
self.isSendBtnEnabled = false
blackMaskView.snp.makeConstraints { make in blackMaskView.snp.makeConstraints { make in
make.edges.equalToSuperview() make.edges.equalToSuperview()
...@@ -333,7 +315,6 @@ extension YHFriendRequestView: UITextViewDelegate { ...@@ -333,7 +315,6 @@ extension YHFriendRequestView: UITextViewDelegate {
func textViewDidChange(_ textView: UITextView) { func textViewDidChange(_ textView: UITextView) {
self.textCountLabel.text = "\(textView.text.count)/\(self.textMaxCount)" self.textCountLabel.text = "\(textView.text.count)/\(self.textMaxCount)"
self.placeHolderLabel.isHidden = !textView.text.isEmpty self.placeHolderLabel.isHidden = !textView.text.isEmpty
self.isSendBtnEnabled = !textView.text.isYHEmpty()
} }
func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool { func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
......
...@@ -19,20 +19,31 @@ class YHOrderTipsItemView: UIView { ...@@ -19,20 +19,31 @@ class YHOrderTipsItemView: UIView {
} }
} }
func getTypeString() -> String {
if let msg = self.message {
if msg.type == YHMessageType.infoFill.rawValue {
return "资料填写"
} else if msg.type == YHMessageType.cerUpload.rawValue {
return "证件上传"
} else if msg.type == YHMessageType.draft.rawValue {
return "文书定稿"
} else if msg.type == YHMessageType.fileSign.rawValue {
return "文件签字"
} else if msg.type == YHMessageType.infoSubmit.rawValue {
return "资料递交"
}
}
return ""
}
func updateData() { func updateData() {
guard let message = message else { return } guard let message = message else { return }
var typeString = "" var typeString = self.getTypeString()
if message.type == 1 {
typeString = "资料填写"
} else if message.type == 2 {
typeString = "证件上传"
} else if message.type == 3 {
typeString = "文书定稿"
} else if message.type == 4 {
typeString = "文件签字"
} else if message.type == 5 {
typeString = "资料递交"
}
lableMyOrder.text = typeString lableMyOrder.text = typeString
lableName.text = message.content lableName.text = message.content
lableTime.text = getTimeString(data: TimeInterval(message.time)) lableTime.text = getTimeString(data: TimeInterval(message.time))
...@@ -127,7 +138,13 @@ class YHOrderTipsItemView: UIView { ...@@ -127,7 +138,13 @@ class YHOrderTipsItemView: UIView {
extension YHOrderTipsItemView { extension YHOrderTipsItemView {
@objc func tapButton(gestureRecognizer:UITapGestureRecognizer) { @objc func tapButton(gestureRecognizer:UITapGestureRecognizer) {
goTabBarBy(tabType: .community) //for test hjl
if let msg = self.message {
let vc = YHMessageDetailListVC()
vc.type = Int(msg.type)
vc.title = self.getTypeString()
UIViewController.current?.navigationController?.pushViewController(vc)
}
} }
func setupUI() { func setupUI() {
......
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