Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

张旭
2 parents cef83720 6ddc064c
Showing 5 changed files with 80 additions and 15 deletions
metaCode/Classes/Main/MinePage/Controller/CNLiveMineInputViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineBodyListView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineInfoAlertView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -78,7 +78,7 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
     }
     private func loadStandInfoData() {
-        CNLiveMineViewModel.requestsStandInfo(identityId: "\(_listModel.id)") {[weak self] result, respStatue in
+        CNLiveMineViewModel.requestsStandInfo(identityId: "\(_listModel.id)", type: .nodate) {[weak self] result, respStatue in
             if respStatue == .success {
                 self?.dataArray.addObjects(from: result as! [Any])
                 self?.tableView.reloadData()
@@ -155,10 +155,11 @@ extension CNLiveMineInputViewController {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let infoModel = self.dataArray[indexPath.row] as! MineStandInfoModel
-        if infoModel.children.count > 0 {
+        if infoModel.inputType == 3 || infoModel.inputType == 4 {
+            let show_type: CNLiveStandListAlertShowType  = infoModel.children.count > 0 ? .custom : .date
             self.view.endEditing(true)
             DispatchQueue.main.asyncAfter(deadline: .now()+0.5) {
-                MineStandListAlertView.showStandListView(infos: infoModel.children as NSArray,name: "选择\(infoModel.name ?? "")") {[weak self] text in
+                MineStandListAlertView.showStandListView(infos: infoModel.children as NSArray,name: "选择\(infoModel.name ?? "")", show_type: show_type) {[weak self] text in
                     infoModel.value = text
                     self?.tableView.reloadData()
                     let is_result = self?.inspectResult()
@@ -703,6 +703,13 @@ class MineBodyInputAuthCell: UITableViewCell, UITextFieldDelegate {
                 make.centerY.equalToSuperview()
                 make.right.equalTo(moreBtn.snp.left)
             }
+        }else if (infoModel.inputType == 4) {//禁止输入  显示下拉时间显示
+            contentField.isUserInteractionEnabled = false
+            moreBtn.isHidden = false
+            contentField.snp.remakeConstraints { make in
+                make.centerY.equalToSuperview()
+                make.right.equalTo(moreBtn.snp.left)
+            }
         }
     }
@@ -7,10 +7,7 @@
 import Foundation
-//enum CNLiveMineInfoAlertShowType {
-//    case gender
-//    case birthday
-//}
+
 typealias CloseGenderResultBlock = (_ text: String) ->Void
 class MineInfoAlertView: UIView {
@@ -105,7 +102,6 @@ class MineInfoAlertView: UIView {
     lazy var datePicker: UIDatePicker = {
         let datePicker = UIDatePicker.init()
         datePicker.locale = Locale(identifier: "zh_CN")
-        datePicker.timeZone = TimeZone.init(identifier: "UTC")
         datePicker.setValue(HexColor("#3C3C3C"), forKey: "textColor")
         datePicker.datePickerMode = .date
         datePicker.isHidden = true
@@ -545,6 +541,11 @@ class UpdataAlertView: UIView {
     }
 }
+
+enum CNLiveStandListAlertShowType {
+    case custom
+    case date
+}
 class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSource {
     lazy var tapGesture = UITapGestureRecognizer()
@@ -568,9 +569,34 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
         pickerView.backgroundColor = .white
         pickerView.delegate = self
         pickerView.dataSource = self
+        pickerView.isHidden = !(_show_type == .custom)
         return pickerView
     }()
+    lazy var datePicker: UIDatePicker = {
+        let datePicker = UIDatePicker.init()
+        datePicker.locale = Locale(identifier: "zh_CN")
+        datePicker.setValue(HexColor("#3C3C3C"), forKey: "textColor")
+        datePicker.datePickerMode = .date
+        datePicker.isHidden = !(_show_type == .date)
+        if #available(iOS 13.4, *) {
+            datePicker.preferredDatePickerStyle = .wheels
+        } else {
+            // Fallback on earlier versions
+        }
+        if UserInfoManager.shared.userInfo.birthday.count > 0 {
+            let dateFomatter = DateFormatter()
+            dateFomatter.dateFormat = "yyyy-MM-dd"
+            dateFomatter.locale = Locale.init(identifier: "zh_CN")
+            let date = dateFomatter.date(from: UserInfoManager.shared.userInfo.birthday)
+            datePicker.setDate(date!, animated: true)
+        }
+        datePicker.minimumDate = Date.init(timeIntervalSince1970: -60*60*24*365*60)
+        datePicker.maximumDate = Date.init(timeInterval: 60*60*24*365*10, since: Date.init())
+        datePicker.addTarget(self, action: #selector(dateChangeAction), for: .valueChanged)
+        return datePicker
+    }()
+    
     lazy var nameLable : UILabel = {
         let nameLable = UILabel.init()
         nameLable.backgroundColor = .white
@@ -605,17 +631,27 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
     }()
     var text: String?
-    var result: CloseGenderResultBlock?
     var _infos: NSArray?
-    init(frame: CGRect, infos: NSArray) {
+    var _show_type: CNLiveStandListAlertShowType?
+    var result: CloseGenderResultBlock?
+    init(frame: CGRect, infos: NSArray, show_type: CNLiveStandListAlertShowType) {
         super.init(frame: frame)
         _infos = infos
-        text = (infos.firstObject as! MineStandInfoModel).name
+        _show_type = show_type//56842.5+7840.34
+        if _show_type == .custom {
+            text = (infos.firstObject as! MineStandInfoModel).name
+        }else{
+            let formatter = DateFormatter()
+            formatter.dateFormat = "yyyy-MM-dd"
+            text = formatter.string(from: datePicker.date)
+        }
+        
         addSubview(grayMaskView)
         addSubview(backView)
         backView.addSubview(pickerView)
+        backView.addSubview(datePicker)
         backView.addSubview(nameLable)
         backView.addSubview(lineLable)
         backView.addSubview(closeButton)
@@ -658,10 +694,15 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
             make.left.right.equalToSuperview()
             make.top.equalTo(lineLable.snp.bottom)
         }
+        datePicker.snp.makeConstraints { make in
+            make.bottom.equalToSuperview()
+            make.left.right.equalToSuperview()
+            make.top.equalTo(lineLable.snp.bottom)
+        }
     }
-    static public func showStandListView(infos: NSArray, name: String, result: @escaping CloseGenderResultBlock) {
-        let pickerView = MineStandListAlertView.init(frame: .zero, infos: infos)
+    static public func showStandListView(infos: NSArray, name: String, show_type: CNLiveStandListAlertShowType, result: @escaping CloseGenderResultBlock) {
+        let pickerView = MineStandListAlertView.init(frame: .zero, infos: infos, show_type: show_type)
         pickerView.result = result
         pickerView.nameLable.text = name
         let window = UIApplication.shared.windows.last
@@ -719,4 +760,12 @@ class MineStandListAlertView: UIView, UIPickerViewDelegate, UIPickerViewDataSour
             result!(text ?? "")
         }
     }
+    
+    @objc func dateChangeAction(sender: UIDatePicker) {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd"
+        let date = formatter.string(from: datePicker.date)
+        print("获取到的时间是:\(date)")
+        text = date
+    }
 }
@@ -180,7 +180,7 @@ class MineStandInfoBaseModel: BaseModel {
 class MineStandInfoModel: BaseModel {
     var authInfoId: Int = 0
     var name: String?
-    var inputType: Int = 0//1 文本输入 2数字输入 3下拉选择 4后台生成时间 5后台生成编码 6头像类型
+    var inputType: Int = 0//1文本输入 2数字输入 3下拉选择 4后台生成时间 5后台生成编码 6头像类型
     var sort: Int = 0
     var nonEmpty: Bool = false
     var input: Bool = false
@@ -31,6 +31,11 @@ enum CNLiveMineSortType {
     case authlist //我的身份信息列表界面
     case minelist //我的界面->我的身份
 }
+
+enum CNLiveMineGetWriteType {
+    case nodate //未填写
+    case havedate //已填写
+}
 typealias resultBlock = (_ type: CNLiveMineRequestType,_ result: Bool) -> Void
 typealias resultNewsBlock = (_ result: Any,_ respStatue :CNLiveMineResponseType) -> Void
 class CNLiveMineViewModel: NSObject {
@@ -392,7 +397,7 @@ class CNLiveMineViewModel: NSObject {
     /// - Parameters:
     ///   - identityId: 身份id
     ///   - resultBlock: 返回
-    static func requestsStandInfo(identityId: String, resultBlock: @escaping resultNewsBlock) {
+    static func requestsStandInfo(identityId: String, type: CNLiveMineGetWriteType, resultBlock: @escaping resultNewsBlock) {
         let param = NSMutableDictionary()
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         param.setValue(identityId, forKey: "identityId")
@@ -406,6 +411,9 @@ class CNLiveMineViewModel: NSObject {
                 let errorCode = "\(resp["errorCode"] ?? "0")"
                 if (errorCode == "0") {
                     let newsModel = dictionaryToModel(resp as! [String : Any], MineStandInfoBaseModel.self,"data") as! MineStandInfoBaseModel
+//                    for <#item#> in <#items#> {
+//                        <#code#>
+//                    }
                     resultBlock(newsModel.authInfos,.success)
                 } else {
                     showMessage(message: resp["errorMessage"] as! String)