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

张旭
2 parents f2f3e978 684d5f8a
Showing 16 changed files with 445 additions and 39 deletions
metaCode/Classes/Config/CNLiveConfigUserInfo.swift
metaCode/Classes/Environment/CNLiveEnvironment.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAuthResultViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineExchangeViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineBodyListView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
metaCode/Classes/Other/AppDelegate.swift
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_header_quest_tip_black.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_header_quest_tip_black.imageset/mine_header_quest_tip_black@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_header_quest_tip_black.imageset/mine_header_quest_tip_black@3x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_header_quest_tip_red.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_header_quest_tip_red.imageset/mine_header_quest_tip_red@2x.png
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_header_quest_tip_red.imageset/mine_header_quest_tip_red@3x.png
@@ -97,7 +97,11 @@ class UserInfoManager: NSObject {
     /// - Returns: 用户数据
     static public func readUserInfo() -> UserInfoModel {
         let user_info = UserDefaults.standard.object(forKey: "mateCode_userInfo")
-        if user_info == nil && (user_info as! String).count == 0 {
+        if user_info == nil {
+            print("获取用户信息失败")
+            return UserInfoModel()
+        }
+        if (user_info as! String).count == 0 {
             print("获取用户信息失败")
             return UserInfoModel()
         }
@@ -17,6 +17,8 @@ let APPLoginHost: String! = CNLiveEnvironmentManager.shared.loginHost
 let APPSecret: String = CNLiveEnvironmentManager.shared.appSecret
 ///当前应用的部分请求接口
 let APPBaseMCUrl: String = CNLiveEnvironmentManager.shared.base_mc_url
+/// 网家家内接口
+let APPBaseWjjUrl: String = CNLiveEnvironmentManager.shared.base_wjj_url
  
 ///当前APP的环境
 let APPCurrentEnvironment: CNLiveEnvironment = CNLiveEnvironmentManager.shared.currentEnvironment
@@ -51,6 +53,8 @@ class CNLiveEnvironmentManager: NSObject{
     var loginHost: String
     /// 码云项目的主域名
     var base_mc_url: String
+    /// 网家家域名请求
+    var base_wjj_url: String
     /// 获取IM token 请求域名
     var img_token_url: String
  
@@ -65,6 +69,7 @@ class CNLiveEnvironmentManager: NSObject{
         self.appSecret = ""
         self.base_mc_url = ""
         self.img_token_url = ""
+        self.base_wjj_url = ""
         self.currentEnvironment = .development
     }
     //重新copy 和 mutableCopy 方法
@@ -99,6 +104,7 @@ class CNLiveEnvironmentManager: NSObject{
         self.loginHost = "https://api.cnlive.com"
         self.img_token_url = "https://api.cnlive.com/open/api2"
         self.base_mc_url = "https://metacode.cnlive.com/api"
+        self.base_wjj_url = "https://apiwjj.cnlive.com"
     }
     //testFlight 环境配置
     func testFlightEnvironment(){
@@ -108,6 +114,7 @@ class CNLiveEnvironmentManager: NSObject{
         self.loginHost = "https://api.cnlive.com"
         self.img_token_url = "https://api.cnlive.com/open/api2"
         self.base_mc_url = "https://metacode.cnlive.com/api"
+        self.base_wjj_url = "https://apiwjj.cnlive.com"
     }
     //production 生产环境配置
     func productionEnvironment(){
@@ -117,6 +124,7 @@ class CNLiveEnvironmentManager: NSObject{
         self.loginHost = "https://api.cnlive.com"
         self.img_token_url = "https://api.cnlive.com/open/api2"
         self.base_mc_url = "https://metacode.cnlive.com/api"
+        self.base_wjj_url = "https://apiwjj.cnlive.com"
     }
  
 }
@@ -75,7 +75,17 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
  
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        
+        if _show_type == .result_failer || _show_type == .result_success {
+            let tempArray = NSMutableArray.init()
+            self.navigationController?.viewControllers.forEach({ item in
+                if (item.isKind(of: CNLiveMineInputViewController.self)) {
+                    tempArray.remove(item)
+                }else{
+                    tempArray.add(item)
+                }
+            })
+            self.navigationController?.viewControllers = tempArray as! [CNLiveBaseViewController]
+        }
     }
  
     override func viewDidLoad() {
@@ -126,13 +136,14 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
  
         CNLiveMineViewModel.startKeepTimeWithStand(id: "\(_listModel.id)") { [weak self] result, respStatue in
             if respStatue == .success {
+                let listBaseModel = result as! MineStandInfoBaseModel
                 self?.titleLabel.textColor = .black
                 self?.leftBtnWhite = false
                 self?.mainView.isHidden = true
                 self?.iDCardView.isHidden = false
                 self?.iDCardView.idModel = self?._listModel
                 self?.tipName.text = "恭喜您通过认证"
-                self?.tipDesc.text = "您已是中国网公益服务志愿者！"
+                self?.tipDesc.text = listBaseModel.name!.count > 0 ? "您已是\(listBaseModel.name ?? "")!" : "恭喜您通过认证"
                 self?._status = .default
                 self?.setNeedsStatusBarAppearanceUpdate()
             }else{
@@ -150,17 +161,6 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
     }
  
     @objc func sendInfoActionMothod() {
-        if _show_type == .result_failer || _show_type == .result_success {
-            let tempArray = NSMutableArray.init()
-            self.navigationController?.viewControllers.forEach({ item in
-                if (item.isKind(of: CNLiveMineInputViewController.self)) {
-                    tempArray.remove(item)
-                }else{
-                    tempArray.add(item)
-                }
-            })
-            self.navigationController?.viewControllers = tempArray as! [CNLiveBaseViewController]
-            self.navigationController?.popViewController(animated: true)
-        }
+        self.navigationController?.popViewController(animated: true)
     }
 }
@@ -6,14 +6,13 @@
 //
  
 import Foundation
+import SnapKit
  
-class CNLiveMineExchangeViewController : CNLiveBaseViewController {
+class CNLiveMineExchangeViewController : CNLiveBaseViewController, UITextFieldDelegate {
  
     lazy var backView : UIImageView = {
         let backView = UIImageView.init()
-        backView.image = UIImage(named: "mine_header_icon_back")
         backView.contentMode = .scaleToFill
-        backView.backgroundColor = HexColor("#F7F8FA")
         backView.clipsToBounds = true
         return backView
     }()
@@ -46,10 +45,13 @@ class CNLiveMineExchangeViewController : CNLiveBaseViewController {
     lazy var numberField: UITextField = {
         let numberField = UITextField.init()
         numberField.placeholder = "最低兑换100积分"
-        numberField.font = Font_16_Fit
-        numberField.keyboardType = .numberPad
+        numberField.font = BoldFont_18_Fit
+        numberField.keyboardType = .decimalPad
         numberField.clearButtonMode = .whileEditing
         numberField.backgroundColor = .white
+        numberField.textColor = .black
+        numberField.delegate = self
+        numberField.addTarget(self, action: #selector(numberChangeAction), for: .editingChanged)
         return numberField
     }()
  
@@ -59,12 +61,74 @@ class CNLiveMineExchangeViewController : CNLiveBaseViewController {
         return lineLabel
     }()
  
-//    lazy var views: NSArray = {
-//        let views = NSMutableArray.init()
-//
-//        return views
-//    }()
+    lazy var tagView: UIView = {
+        let tagView = UIView.init()
+        tagView.backgroundColor = .white
+        return tagView
+    }()
+    
+    lazy var bottemView: UIView = {
+        let bottemView = UIView.init()
+        bottemView.backgroundColor = .white
+        bottemView.layer.cornerRadius = 8
+        bottemView.layer.masksToBounds = true
+        return bottemView
+    }()
+    
+    lazy var bottemTipLabel: UILabel = {
+        let bottemTipLabel = UILabel.init()
+        bottemTipLabel.backgroundColor = .white
+        bottemTipLabel.textColor = .black
+        bottemTipLabel.font = BoldFont_14_Fit
+        bottemTipLabel.text = "元码余额 (元)"
+        return bottemTipLabel
+    }()
+    
+    lazy var priceLabel: UILabel = {
+        let priceLabel = UILabel.init()
+        priceLabel.text = "0.00"
+        priceLabel.textColor = HexColor("#F5A623")
+        priceLabel.font = BoldFont_Fit(24)
+        priceLabel.backgroundColor = .white
+        return priceLabel
+    }()
+    
+    lazy var tipBtn: UIButton = {
+        let tipBtn = UIButton.init(type: .custom)
+        tipBtn.setTitle("至少兑换100积分", for: .normal)
+        tipBtn.setTitleColor(HexColor("#E02020"), for: .normal)
+        tipBtn.setImage(UIImage(named: "mine_header_quest_tip_red"), for: .normal)
+        tipBtn.titleLabel?.font = Font_11
+        tipBtn.contentHorizontalAlignment = .left
+        tipBtn.isHidden = true
+        tipBtn.setupButtonImageAndTitlePossitionWith(padding: 3, style: .left)
+        return tipBtn
+    }()
+    
+    lazy var descBtn: UIButton = {
+        let descBtn = UIButton.init(type: .custom)
+        descBtn.setTitle("最低100积分，不足100的积分将原路返回", for: .normal)
+        descBtn.setTitleColor(HexColor("#999999"), for: .normal)
+        descBtn.setImage(UIImage(named: "mine_header_quest_tip_black"), for: .normal)
+        descBtn.titleLabel?.font = Font_11
+        descBtn.contentHorizontalAlignment = .left
+        descBtn.setupButtonImageAndTitlePossitionWith(padding: 3, style: .left)
+        return descBtn
+    }()
  
+    lazy var sendButton: UIButton = {
+        let sendButton = UIButton(type: .custom)
+        sendButton.setTitle("立即兑换", for: .normal)
+        sendButton.setTitleColor(.white, for: .normal)
+        sendButton.titleLabel?.font = BoldFont_16_Fit
+        sendButton.layer.cornerRadius = 20
+        sendButton.layer.masksToBounds = true
+        sendButton.addTarget(self, action: #selector(sendInfoActionMothod), for: .touchUpInside)
+        return sendButton
+    }()
+    
+    var tempBtn: UIButton!
+    var tempString: String!
     override func viewDidLoad() {
         super.viewDidLoad()
         navigationBarHidden = false
@@ -80,35 +144,44 @@ class CNLiveMineExchangeViewController : CNLiveBaseViewController {
         topView.addSubview(descL)
         topView.addSubview(numberField)
         topView.addSubview(lineLabel)
-        
+        topView.addSubview(tagView)
+        topView.addSubview(tipBtn)
+        view.addSubview(bottemView)
+        bottemView.addSubview(bottemTipLabel)
+        bottemView.addSubview(priceLabel)
+        view.addSubview(descBtn)
+        view.addSubview(sendButton)
+        setupWithContent()
         setupConstraints()
+        
+        setupWithSendBtnStatue(statue: false)
     }
  
     func setupConstraints() {
         backView.snp.makeConstraints { make in
             make.left.right.top.equalToSuperview()
-            make.height.equalTo(300)
+            make.height.equalTo(210)
         }
         topView.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
             make.top.equalTo(get_system_nav_height()+30)
             make.left.equalToSuperview().offset(20)
             make.right.equalToSuperview().offset(-20)
-            make.height.equalTo(200)
+            make.height.equalTo(150)
         }
         tipLabel.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(20)
-            make.left.equalToSuperview().offset(10)
+            make.top.equalToSuperview().offset(15)
+            make.left.equalToSuperview().offset(20)
         }
         descL.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(20)
-            make.right.equalToSuperview().offset(-10)
+            make.top.equalToSuperview().offset(15)
+            make.right.equalToSuperview().offset(-20)
         }
         numberField.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
             make.top.equalTo(tipLabel.snp.bottom).offset(20)
-            make.left.equalToSuperview().offset(10)
-            make.right.equalToSuperview().offset(-10)
+            make.left.equalToSuperview().offset(20)
+            make.right.equalToSuperview().offset(-20)
             make.height.equalTo(40)
         }
         lineLabel.snp.makeConstraints { make in
@@ -118,13 +191,229 @@ class CNLiveMineExchangeViewController : CNLiveBaseViewController {
             make.height.equalTo(0.5)
             make.top.equalTo(numberField.snp.bottom)
         }
+        tagView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.left.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.height.equalTo(30)
+            make.top.equalTo(lineLabel.snp.bottom).offset(10)
+        }
+        tipBtn.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.top.equalTo(tagView.snp.bottom).offset(10)
+            make.height.equalTo(15)
+            make.width.equalTo(180)
+        }
+        
+        bottemView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalTo(topView.snp.bottom).offset(20)
+            make.left.equalToSuperview().offset(20)
+            make.right.equalToSuperview().offset(-20)
+            make.height.equalTo(90)
+        }
+        bottemTipLabel.snp.makeConstraints { make in
+            make.left.top.equalToSuperview().offset(20)
+        }
+        priceLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.bottom.equalToSuperview().offset(-10)
+        }
+        
+        descBtn.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(30)
+            make.right.equalToSuperview().offset(-20)
+            make.top.equalTo(bottemView.snp.bottom).offset(10)
+            make.height.equalTo(15)
+            make.width.equalTo(180)
+        }
+        sendButton.snp.makeConstraints { make in
+            make.top.equalTo(descBtn.snp.bottom).offset(50)
+            make.left.equalToSuperview().offset(20)
+            make.right.equalToSuperview().offset(-20)
+            make.height.equalTo(40)
+        }
+        backView.setGradient(colors: [UIColor(red: 0/255.0, green: 106/255.0, blue: 229/255.0, alpha: 1),UIColor(red: 247/255.0, green: 248/255.0, blue: 250/255.0, alpha: 1)], startPoint: CGPoint(x: 0.5, y: 0), endPoint: CGPoint(x: 0.5, y: 1))
     }
  
     func setupWithContent() {
-        
+        let array: NSArray = ["1000","2000","3000","全部兑换"]
+        for (index,item) in array.enumerated() {
+            let w = (KSreenWidth-90)/4
+            let x = (index * Int(w))+(index * 10)
+            let numberBtn = UIButton.init(type: .custom)
+            numberBtn.frame = CGRect(x: Int(x), y: 0, width: Int(w), height: 30)
+            numberBtn.backgroundColor = HexColor("#F7F8FA")
+            numberBtn.setTitle((item as! String), for: .normal)
+            numberBtn.layer.cornerRadius = 5
+            numberBtn.layer.masksToBounds = true
+            numberBtn.tag = 1000 + index
+            numberBtn.titleLabel?.font = Font_14_Fit
+            numberBtn.setTitleColor(HexColor("#999999"), for: .normal)
+            numberBtn.addTarget(self, action: #selector(numberAction), for: .touchUpInside)
+            tagView.addSubview(numberBtn)
+        }
+    }
+    
+    private func setupWithSendBtnStatue(statue: Bool) {
+        var alpha = 0.3
+        if statue {
+            alpha = 1
+        }
+        sendButton.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: alpha),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: alpha)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
+        sendButton.isUserInteractionEnabled = statue
     }
  
     override var preferredStatusBarStyle: UIStatusBarStyle {
         return .lightContent
     }
+    
+    @objc func sendInfoActionMothod() {
+        
+    }
+    
+    @objc func numberAction(sender: UIButton) {
+        showErrorMessage(message: "", clear: true)
+        sender.backgroundColor = HexColor("#FFF8EE")
+        sender.layer.borderColor = HexColor("#F5A623")?.cgColor
+        sender.layer.borderWidth = 1
+        sender.setTitleColor(HexColor("#F5A623"), for: .normal)
+        if tempBtn != nil {
+            tempBtn.backgroundColor = HexColor("#F7F8FA")
+            tempBtn.layer.borderColor = HexColor("#F7F8FA")?.cgColor
+            tempBtn.layer.borderWidth = 0
+            tempBtn.setTitleColor(HexColor("#999999"), for: .normal)
+        }
+        if sender.tag == 1000 {
+            numberField.text = "1000"
+        }
+        if sender.tag == 1001 {
+            numberField.text = "2000"
+        }
+        if sender.tag == 1002 {
+            numberField.text = "3000"
+        }
+        if sender.tag == 1003 {
+            numberField.text = "全部"
+        }
+        tempBtn = sender
+    }
+}
+
+extension CNLiveMineExchangeViewController {
+    
+    @objc func numberChangeAction(textField: UITextField) {
+        if textField.text?.count == 0 {
+            tempString = ""
+        }
+        if isPurerFloat(str: textField.text!) {
+            textField.text = tempString
+        }
+        if !isPurerFloat(str: textField.text!) && textField.text!.count <= 10 {
+            tempString = textField.text
+        }
+    }
+    
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        if textField == numberField {
+            if !checkDecimal(str: textField.text?.appending(string) ?? "") {
+                if textField.text!.count > 0 && string == "." && !textField.text!.contains(".") {
+                    return true
+                }
+                return string == ""
+            }
+        }
+        return true
+    }
+    
+    func textFieldShouldEndEditing(_ textField: UITextField) -> Bool {
+        if textField == numberField && !textField.text!.isEmpty && textField.text!.count > 10 {
+            if !textField.text!.contains(".") {
+                textField.text = textField.text!.prefix(10).lowercased()
+            }else{
+                let range = textField.text!.range(of: ".")
+                let new_text = textField.text!.suffix(from: range!.upperBound)
+                if new_text.count == 0 {
+                    textField.text = textField.text!+"00"
+                }
+                if new_text.count == 1 {
+                    textField.text = textField.text!+"0"
+                }
+            }
+        }
+        return true
+    }
+    
+    /// 已经结束输入的时候调用
+    /// - Parameter textField: textField
+    func textFieldDidEndEditing(_ textField: UITextField) {
+        if textField == numberField {
+            let number = (textField.text! as NSString).floatValue
+            if number < 100 {
+                showErrorMessage(message: "至少兑换100积分")
+            }
+            if number > 10000 {
+                showErrorMessage(message: "超过已经拥有积分数")
+            }
+        }
+    }
+    
+    /// 开始显示的时候去掉提示
+    /// - Parameter textField: textField
+    /// - Returns:
+    func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool {
+        showErrorMessage(message: "", clear: true)
+        return true
+    }
+    
+    /// 显示下面的提示框
+    /// - Parameters:
+    ///   - message: 提示消息
+    ///   - clear: 是否情况消息
+    private func showErrorMessage(message: String,clear: Bool = false) {
+        if clear {
+            tipBtn.isHidden = true
+            topView.snp.remakeConstraints { make in
+                make.centerX.equalToSuperview()
+                make.top.equalTo(get_system_nav_height()+30)
+                make.left.equalToSuperview().offset(20)
+                make.right.equalToSuperview().offset(-20)
+                make.height.equalTo(150)
+            }
+            return
+        }
+        tipBtn.setTitle(message, for: .normal)
+        tipBtn.isHidden = false
+        topView.snp.remakeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.top.equalTo(get_system_nav_height()+30)
+            make.left.equalToSuperview().offset(20)
+            make.right.equalToSuperview().offset(-20)
+            make.height.equalTo(170)
+        }
+    }
+    
+    /// 判断是不是小数
+    /// - Parameter str: 需要判断的字符串
+    /// - Returns: 返回
+    private func isPurerFloat(str: String) -> Bool {
+        let scan = Scanner(string: str)
+        var val: Float = 0.0
+        if scan.scanHexFloat(&val) && scan.isAtEnd {
+            if Float(str)! >= 0 {
+                return true
+            } else {
+                return false
+            }
+        }
+        return false
+    }
+    
+    /// 判断是不是两位小数
+    /// - Parameter str: str
+    private func checkDecimal(str: String) -> Bool {
+        let pred = NSPredicate(format: "SELF MATCHES %@", "^[0-9]+(\\.[0-9]{1,2})?$")
+        return pred.evaluate(with: str)
+    }
+    
 }
@@ -69,10 +69,18 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
         }
     }
  
+    public func loadDataWithPoint() {
+        CNLiveMineViewModel.requestWithCheckIn { [weak self] result, respStatue in
+            print("\(result)")
+//            if respStatue == .succ
+        }
+    }
+    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         headerView.updateHeaderView()
         tableView.reloadData()
+        loadDataWithPoint()
     }
  
     override var preferredStatusBarStyle: UIStatusBarStyle {
@@ -55,7 +55,6 @@ class MineBodyOneListViewCell : UITableViewCell {
         return tipLabel
     }()
  
-    
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
@@ -66,7 +65,6 @@ class MineBodyOneListViewCell : UITableViewCell {
         headerView.addSubview(nameLabel)
         mainView.addSubview(tipLabel)
         mainView.addSubview(lookBtn)
-        
         setupConstraints()
     }
  
@@ -129,6 +127,7 @@ class MineBodyOneListViewCell : UITableViewCell {
             make.width.equalTo(80)
             make.height.equalTo(30)
         }
+
         lookBtn.setGradient(colors: [UIColor(red: 103/255.0, green: 197/255.0, blue: 255/255.0, alpha: 1),UIColor(red: 96/255.0, green: 154/255.0, blue: 255/255.0, alpha: 1)], startPoint: CGPoint(x: 0, y: 0.5), endPoint: CGPoint(x: 1, y: 0.5))
     }
 }
@@ -496,6 +496,7 @@ class MineEarnHeaderView: UIView {
         exChangeBtn.setTitle("去兑换", for: .normal)
         exChangeBtn.setImage(UIImage(named: "mine_list_icon_right_white_more"), for: .normal)
         exChangeBtn.setupButtonImageAndTitlePossitionWith(padding: 0, style: .right)
+        exChangeBtn.sizeToFit()
         exChangeBtn.addTarget(self, action: #selector(pushExChangeMethod), for: .touchUpInside)
         return exChangeBtn
     }()
@@ -287,5 +287,12 @@ final class MineAuthListModel: BaseModel , TableCodable {
     }
 }
  
-
+// !!!: /Daren/integral/checkIn.action 数据返回
+class MinePointCheckInModel: BaseModel {
+    var scores = [String]()
+    var status: String? = ""
+    var score: String? = ""
+    var times: String? = ""
+    var url: String? = ""
+}
  
@@ -566,7 +566,7 @@ class CNLiveMineViewModel: NSObject {
                     CNLiveMineViewModel.requestsStandInfo(identityId: id, type: .effect) { result, respStatue in
                         if respStatue == .success {
                             let listBaseModel = result as! MineStandInfoBaseModel
-                            if listBaseModel.authTime > 0 {
+                            if listBaseModel.authTime > 0 || listBaseModel.code!.count > 0 {
                                 showMessage(message: listBaseModel.name!.count > 0 ? "恭喜您通过认证，您已是\(listBaseModel.name ?? "")" : "恭喜您通过认证")
                                 resultBlock(listBaseModel, .success)
                                 NotificationCenter.default.post(name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
@@ -584,6 +584,45 @@ class CNLiveMineViewModel: NSObject {
         codeTimer.resume()
     }
  
+//!!!: 积分相关接口请求
+    
+    /// 获取积分余额相关数据接口
+    /// - Parameter resultBlock: 返回
+    static func requestWithCheckIn(resultBlock: @escaping resultNewsBlock) {
+        let param = NSMutableDictionary()
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjUrl+"/Daren/integral/checkIn.action", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    let listModel = dictionaryToModel(resp as! [String : Any], MinePointCheckInModel.self,"data") as! MinePointCheckInModel
+                    resultBlock(listModel,.success)
+                } else {
+                    showMessage(message: resp["errorMessage"] as! String)
+                    resultBlock(NSNull(),.failed)
+                }
+            } else {
+                if CNLiveNetworking.isNetworking() {
+                    showMessage(message: "获取失败")
+                    resultBlock(NSNull(),.failed)
+                } else {
+                    showMessage(message: "似乎与网络断开链接")
+                    resultBlock(NSNull(),.noNetwork)
+                }
+            }
+        }
+    }
+    
+    /// 获取任务列表接口
+    /// - Parameter resultBlock: 返回
+    static func requestWithTaskList(resultBlock: @escaping resultNewsBlock) {
+        
+    }
+    
     /// 获取十位时间戳
     static var timeStamp: Int {
         let timeInterval: TimeInterval = NSDate().timeIntervalSince1970
@@ -68,11 +68,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let ver : String = Bundle.main.infoDictionary?["CFBundleVersion"] as! String
         let p : Dictionary = ["platform_id":kAppBundleID,"uuid":uuid,"plat":"i","ver":ver,"appId":APPId,"timestamp":String(NSNumber(floatLiteral: Date().timeIntervalSince1970).intValue),"clientPlat":"i","frmId":"ios"]
         CNLiveNetworking.setupDefaultParam(p)
+        
+        let shop_dic : Dictionary = ["Phone-Model":"iPhone","Uid":UserInfoManager.shared.userInfo.uid ?? "","CFBundleShortVersionString":ver,"Shop-Version":"0.6.2"]
+        CNLiveNetworking.setupDSShopParam(shop_dic)
+        
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupSignKey(APPKey)
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setResponseSerializerType(.JSON)
         CNLiveNetworking.setupBaseURL(APPLoginHost)
+        
+
+        
     }
  
  
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_header_quest_tip_black@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_header_quest_tip_black@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_header_quest_tip_red@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_header_quest_tip_red@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}