提交修改

liushiyu
1 parent 021651bf
Showing 5 changed files with 506 additions and 21 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Extensions/NSMutableAttributedString+CNLiveExtensions.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineExchangeViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
@@ -55,6 +55,7 @@
 		79A68C4C2A26EA6000DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		79BA085D2AB18E8300D01875 /* CNLiveSaveAuthDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDB.swift */; };
 		79E496E32AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79E496E22AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift */; };
+		79E496E82AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79E496E72AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift */; };
 		79EABB892AB4497700F3A4E2 /* CNLiveSaveStandDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79EABB882AB4497700F3A4E2 /* CNLiveSaveStandDB.swift */; };
 		79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */; };
 		79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */; };
@@ -162,6 +163,7 @@
 		79A68C512A26F59C00DC3B43 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = metaCode/Info.plist; sourceTree = "<group>"; };
 		79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSaveAuthDB.swift; sourceTree = "<group>"; };
 		79E496E22AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableViewCell+CNLiveExtension.swift"; sourceTree = "<group>"; };
+		79E496E72AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSMutableAttributedString+CNLiveExtensions.swift"; sourceTree = "<group>"; };
 		79EABB882AB4497700F3A4E2 /* CNLiveSaveStandDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSaveStandDB.swift; sourceTree = "<group>"; };
 		79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoViewController.swift; sourceTree = "<group>"; };
 		79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineNickViewController.swift; sourceTree = "<group>"; };
@@ -263,6 +265,7 @@
 				790B1FB52A41938F0074CF00 /* UIImage+CNLiveExtensions.swift */,
 				7C83B4432A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift */,
 				79E496E22AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift */,
+				79E496E72AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -892,6 +895,7 @@
 				7C7C62F62A4D72E9007A912E /* CNLiveIdentityDB.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
+				79E496E82AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift in Sources */,
 				79E496E32AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift in Sources */,
 				7C83B4422A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift in Sources */,
 				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
+//
+//  NSMutableAttributedString+CNLiveExtensions.swift
+//  metaCode
+//
+//  Created by open on 2023/9/19.
+//
+
+import Foundation
+
+extension NSMutableAttributedString {
+    // =========================字体的设置=========================//
+    /// 设置字体大小
+    public func addFont(_ font: UIFont, on range: NSRange) {
+        
+        if self.length < range.location + range.length { return }
+        
+        let attrs = [NSAttributedString.Key.font: font]
+        self.addAttributes(attrs, range: range)
+    }
+    
+    /// 设置字体颜色
+    public func addForegroundColor(_ color: UIColor, range: NSRange) {
+        
+        if self.length < range.location + range.length {
+            return
+        }
+        
+        let attrs = [NSAttributedString.Key.foregroundColor: color]
+        self.addAttributes(attrs, range: range)
+    }
+    
+    /// 设置字体的背景颜色
+    public func addBackgroundColor(_ color: UIColor, range: NSRange) {
+        
+        if self.length < range.location + range.length {
+            return
+        }
+        
+        let attrs = [NSAttributedString.Key.backgroundColor: color]
+        self.addAttributes(attrs, range: range)
+    }
+}
+
+extension NSMutableAttributedString {
+    
+    //=========================文本的处理==========================//
+    /// 字符间距的设置 字符间距 正值间距加宽，负值间距变窄
+    public func addKern(_ kern: Int, range: NSRange) {
+        
+        if self.length < range.location + range.length { return }
+        
+        let attrs = [NSAttributedString.Key.kern: kern]
+        self.addAttributes(attrs, range: range)
+    }
+    
+    
+    /// 设置字体倾斜度，正值右倾，负值左倾
+    public func addObliqueness(_ obliqueness: CGFloat, range: NSRange) {
+        
+        if self.length < range.location + range.length { return }
+        
+        let attrs = [NSAttributedString.Key.obliqueness: obliqueness]
+        self.addAttributes(attrs, range: range)
+    }
+    
+    /// 设置字体的横向拉伸，正值拉伸 ，负值压缩
+    public func addExpansion(_ expansion: CGFloat, range: NSRange) {
+        
+        if self.length < range.location + range.length { return }
+        
+        let attrs = [NSAttributedString.Key.expansion: expansion]
+        self.addAttributes(attrs, range: range)
+    }
+    /// 文字书写方向
+    public func addWritingDirection(_ direction: NSWritingDirection, range: NSRange) {
+        
+        if self.length < range.location + range.length { return }
+        
+        
+        var value: (Int) = (0)
+        
+        
+        if direction == .leftToRight {
+            if #available(iOS 9.0, *) {
+                value = (NSWritingDirectionFormatType.override.rawValue |  NSWritingDirection.leftToRight.rawValue)
+            } else {
+                // Fallback on earlier versions
+            }
+        } else {
+            if #available(iOS 9.0, *) {
+                value = (NSWritingDirectionFormatType.override.rawValue |  NSWritingDirection.rightToLeft.rawValue)
+            } else {
+                // Fallback on earlier versions
+            }
+        }
+        
+        /**
+         NSAttributedString.Key.writingDirection接收的是一个数组
+         */
+        
+        /**
+         //@[@(NSWritingDirectionLeftToRight | NSWritingDirectionEmbedding)]
+         //@[@(NSWritingDirectionLeftToRight | NSWritingDirectionOverride)]
+         //@[@(NSWritingDirectionRightToLeft | NSWritingDirectionEmbedding)]
+         //@[@(NSWritingDirectionRightToLeft | NSWritingDirectionOverride)]
+         // NSWritingDirectionOverride 和 NSWritingDirectionEmbedding 是指定Unicode双向定义的格式控制算法（具体的没太搞清楚）
+         */
+        
+        let attrs = [NSAttributedString.Key.writingDirection: [value]]
+        self.addAttributes(attrs, range: range)
+    }
+}
+
+extension NSMutableAttributedString {
+    
+    //=========================删除线==========================//
+    /// 设置删除线 NSUnderlineStyle: none不设置，single单细线删除，thick粗单线， Double双细线
+    public func addStrikethrough(style: NSUnderlineStyle = .single, color: UIColor? = nil, range: NSRange) {
+        
+        if self.length < range.location + range.length {
+            return
+        }
+        
+        let attr1 = [NSAttributedString.Key.strikethroughStyle: style.rawValue]
+        self.addAttributes(attr1, range: range)
+        
+        if let tempColor = color {
+            let attr2 = [NSAttributedString.Key.strikethroughColor: tempColor]
+            self.addAttributes(attr2, range: range)
+        }
+    }
+    
+    
+    //=========================下划线==========================//
+    /// 设置下划线 NSUnderlineStyle: none不设置，single单细线删除，thick粗单线， Double双细线
+    public func addUnderLine(style: NSUnderlineStyle = .single, color: UIColor? = nil, range: NSRange) {
+        
+        if self.length < range.location + range.length {
+            return
+        }
+
+        let attrs = [NSAttributedString.Key.underlineStyle: NSUnderlineStyle.single.rawValue]
+        self.addAttributes(attrs, range: range)
+        
+        if let tempColor = color {
+            let attr2 = [NSAttributedString.Key.underlineColor: tempColor]
+            self.addAttributes(attr2, range: range)
+        }
+    }
+}
+
+extension NSMutableAttributedString {
+    //=========================文字的效果==========================//
+    /// 设置文字的描边
+    public func addStroke(color: UIColor, width: CGFloat, range: NSRange) {
+        
+        /**
+         设置文字描边颜色，需要NSStrokeWidthAttributeName设置描边宽度，这样就能使文字空心.
+         
+         NSStrokeWidthAttributeName,该值改变笔画宽度（相对于字体 size 的百分比），负值填充效果，正值中空效果，默认为 0，即不改变。正数只改变描边宽度。负数同时改变文字的描边和填充宽度。例如，对于常见的空心字，这个值通常为 3.0。
+         同时设置了空心描边和文字前景两个属性，并且NSStrokeWidthAttributeName 属性设置为整数，文字前景色就无效果了
+         */
+   
+        if self.length < range.location + range.length { return }
+        
+        let attrs = [
+            NSAttributedString.Key.strokeWidth: width,
+            NSAttributedString.Key.strokeColor: color
+            ] as [NSAttributedString.Key : Any]
+        self.addAttributes(attrs, range: range)
+    }
+    
+    /// 阴影
+    public func addShadow(_ shadow: NSShadow, range: NSRange) {
+        if self.length < range.location + range.length { return }
+        let attrs = [NSAttributedString.Key.shadow: shadow]
+        self.addAttributes(attrs, range: range)
+    }
+    
+    /// 设置文字的特殊NSAttributedString.Key这一个凸版印刷效果)
+    public func addTextEffect(effect: NSAttributedString.TextEffectStyle = .letterpressStyle, range: NSRange) {
+        if self.length < range.location + range.length { return }
+        let attrs = [NSAttributedString.Key.textEffect: effect]
+        self.addAttributes(attrs, range: range)
+    }
+}
+
+extension NSMutableAttributedString {
+    
+    //=========================偏移量==========================//
+    /// 设置上下偏移量 正数上移，负数下移
+    public func addBaselineOffset(_ offset: CGFloat, range: NSRange) {
+        if self.length < range.location + range.length { return }
+        let attrs = [NSAttributedString.Key.baselineOffset: offset]
+        self.addAttributes(attrs, range: range)
+    }
+    
+    /// 设置行间距
+    public func addLineSpacing(_ style: NSMutableParagraphStyle, range: NSRange) {
+        
+        
+        /**
+         具体请看： https://www.jianshu.com/p/b0afc45bb642
+         
+         NSAttributedString.Key.paragraphStyle     设置文本段落排版，为NSParagraphStyle对象
+         
+         paragraphStyle.lineSpacing            = 0.0; //增加行高
+         paragraphStyle.headIndent             = 0;   //头部缩进，相当于左padding
+         paragraphStyle.tailIndent             = 0;   //相当于右padding
+         paragraphStyle.lineHeightMultiple     = 0;   //行间距是多少倍
+         paragraphStyle.alignment              = NSTextAlignmentLeft;//对齐方式
+         paragraphStyle.firstLineHeadIndent    = 0;   //首行头缩进
+         paragraphStyle.paragraphSpacing       = 0;   //段落后面的间距
+         paragraphStyle.paragraphSpacingBefore = 0;   //段落之前的间距
+         */
+        
+        if self.length < range.location + range.length { return }
+        
+        let attrs = [NSAttributedString.Key.paragraphStyle: style]
+        self.addAttributes(attrs, range: range)
+    }
+}
+
+extension NSMutableAttributedString {
+
+    /// 插入图片
+    public func addTextAttachment(image: UIImage?, imageFrame: CGRect, atIndex index: Int) {
+        
+        let attachment = NSTextAttachment.init()
+        attachment.image = image
+        attachment.bounds = imageFrame
+        let att = NSAttributedString(attachment: attachment)
+        self.insert(att, at: index)
+    }
+}
+
+
@@ -11,16 +11,120 @@ class CNLiveMineExchangeViewController : CNLiveBaseViewController {
     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
     }()
+    lazy var topView: UIView = {
+        let topView = UIView.init()
+        topView.backgroundColor = .white
+        topView.layer.cornerRadius = 8
+        topView.layer.masksToBounds = true
+        return topView
+    }()
+    
+    lazy var tipLabel: UILabel = {
+        let tipLabel = UILabel.init()
+        tipLabel.text = "输入积分数"
+        tipLabel.textColor = .black
+        tipLabel.font = BoldFont_15_Fit
+        return tipLabel
+    }()
+    
+    lazy var descL: UILabel = {
+        let descL = UILabel.init()
+        descL.text = "可兑积分:10.28w"
+        descL.textColor = HexColor("#999999")
+        descL.backgroundColor = .white
+        descL.font = Font_14_Fit
+        return descL
+    }()
+    
+    lazy var numberField: UITextField = {
+        let numberField = UITextField.init()
+        numberField.placeholder = "最低兑换100积分"
+        numberField.font = Font_16_Fit
+        numberField.keyboardType = .numberPad
+        numberField.clearButtonMode = .whileEditing
+        numberField.backgroundColor = .white
+        return numberField
+    }()
+    
+    lazy var lineLabel: UILabel = {
+        let lineLabel = UILabel.init()
+        lineLabel.backgroundColor = HexColor("#D9DBE4")
+        return lineLabel
+    }()
+    
+//    lazy var views: NSArray = {
+//        let views = NSMutableArray.init()
+//
+//        return views
+//    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         navigationBarHidden = false
         titleName = "积分兑换"
+        titleLabel.textColor = .white
+        leftBtnWhite = true
         topNavView.backgroundColor = .clear
+        setNeedsStatusBarAppearanceUpdate()
+        
+        view.insertSubview(backView, belowSubview: topNavView)
+        view.addSubview(topView)
+        topView.addSubview(tipLabel)
+        topView.addSubview(descL)
+        topView.addSubview(numberField)
+        topView.addSubview(lineLabel)
+        
+        setupConstraints()
     }
+    func setupConstraints() {
+        backView.snp.makeConstraints { make in
+            make.left.right.top.equalToSuperview()
+            make.height.equalTo(300)
+        }
+        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)
+        }
+        tipLabel.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(20)
+            make.left.equalToSuperview().offset(10)
+        }
+        descL.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(20)
+            make.right.equalToSuperview().offset(-10)
+        }
+        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.height.equalTo(40)
+        }
+        lineLabel.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.left.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.height.equalTo(0.5)
+            make.top.equalTo(numberField.snp.bottom)
+        }
+    }
+    func setupWithContent() {
+        
+    }
+    
+    override var preferredStatusBarStyle: UIStatusBarStyle {
+        return .lightContent
+    }
 }
@@ -428,20 +428,112 @@ class MineEarnHeaderView: UIView {
         return mainView
     }()
+    lazy var exlChangeView: UIImageView = {
+        let exlChangeView = UIImageView.init()
+        exlChangeView.backgroundColor = .white
+        exlChangeView.layer.cornerRadius = 5
+        exlChangeView.layer.masksToBounds = true
+        exlChangeView.isUserInteractionEnabled = true
+        exlChangeView.image = UIImage(named: "mine_header_earn_point_left")
+        return exlChangeView
+    }()
+    
+    lazy var exrChangeView: UIImageView = {
+        let exrChangeView = UIImageView.init()
+        exrChangeView.backgroundColor = .white
+        exrChangeView.layer.cornerRadius = 5
+        exrChangeView.layer.masksToBounds = true
+        exrChangeView.image = UIImage(named: "mine_header_earn_point_right")
+        return exrChangeView
+    }()
+    
+    lazy var left_tipLabel: UILabel = {
+        let left_tipLabel = UILabel.init()
+        left_tipLabel.backgroundColor = .clear
+        left_tipLabel.text = "积分兑换"
+        left_tipLabel.textColor = .white
+        left_tipLabel.textAlignment = .left
+        left_tipLabel.font = BoldFont_14_Fit
+        return left_tipLabel
+    }()
+    
+    lazy var right_tipLabel: UILabel = {
+        let right_tipLabel = UILabel.init()
+        right_tipLabel.backgroundColor = .clear
+        right_tipLabel.text = "元码余额收益(元)"
+        right_tipLabel.textColor = .white
+        right_tipLabel.textAlignment = .left
+        right_tipLabel.font = BoldFont_14_Fit
+        return right_tipLabel
+    }()
+    
+    lazy var left_Label: UILabel = {
+        let left_Label = UILabel.init()
+        left_Label.backgroundColor = .clear
+        left_Label.text = "1024.28W"
+        left_Label.textColor = .white
+        left_Label.textAlignment = .left
+        left_Label.font = BoldFont_18_Fit
+        return left_Label
+    }()
+    
+    lazy var right_Label: UILabel = {
+        let right_Label = UILabel.init()
+        right_Label.backgroundColor = .clear
+        right_Label.text = "10.28"
+        right_Label.textColor = .white
+        right_Label.textAlignment = .left
+        right_Label.font = BoldFont_18_Fit
+        return right_Label
+    }()
+    
     lazy var exChangeBtn : UIButton = {
         let exChangeBtn = UIButton.init(type: .custom)
-        exChangeBtn.backgroundColor = .blue
+        exChangeBtn.size = CGSize(width: 50, height: 20)
+        exChangeBtn.backgroundColor = .clear
+        exChangeBtn.titleLabel?.font = Font_12
+        exChangeBtn.setTitleColor(.white, for: .normal)
         exChangeBtn.setTitle("去兑换", for: .normal)
+        exChangeBtn.setImage(UIImage(named: "mine_list_icon_right_white_more"), for: .normal)
+        exChangeBtn.setupButtonImageAndTitlePossitionWith(padding: 0, style: .right)
         exChangeBtn.addTarget(self, action: #selector(pushExChangeMethod), for: .touchUpInside)
         return exChangeBtn
     }()
+    lazy var tipView: UIView = {
+        let tipView = UIView.init()
+        tipView.backgroundColor = HexColor("#F7F8FA")
+        tipView.layer.cornerRadius = 5
+        tipView.layer.masksToBounds = true
+        return tipView
+    }()
+    
+    lazy var tipLabel: UILabel = {
+        let tipLabel = UILabel.init()
+        tipLabel.text = "兑换比例：10000积分=1元码余额 \n 积分到账可能会有延迟"
+        tipLabel.textColor = HexColor("#999999")
+        tipLabel.font = Font_13_Fit
+        tipLabel.numberOfLines = 2
+        tipLabel.lineBreakMode = .byCharWrapping
+        return tipLabel
+    }()
+    
     override init(frame: CGRect) {
         super.init(frame: frame)
         addSubview(mainView)
-        mainView.addSubview(exChangeBtn)
+        mainView.addSubview(exlChangeView)
+        mainView.addSubview(exrChangeView)
+        exlChangeView.addSubview(left_Label)
+        exlChangeView.addSubview(left_tipLabel)
+        exlChangeView.addSubview(exChangeBtn)
+        
+        exrChangeView.addSubview(right_Label)
+        exrChangeView.addSubview(right_tipLabel)
+        
+        mainView.addSubview(tipView)
+        tipView.addSubview(tipLabel)
         setupConstraints()
     }
@@ -453,10 +545,57 @@ class MineEarnHeaderView: UIView {
             make.left.equalToSuperview().offset(20)
             make.right.equalToSuperview().offset(-20)
         }
-        exChangeBtn.snp.makeConstraints { make in
-            make.center.equalToSuperview()
+        
+        tipView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.left.equalToSuperview().offset(10)
+            make.right.bottom.equalToSuperview().offset(-10)
             make.height.equalTo(50)
-            make.width.equalTo(100)
+        }
+        
+        tipLabel.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(2.5)
+            make.left.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.bottom.equalToSuperview().offset(-2.5)
+        }
+        
+        exlChangeView.snp.makeConstraints { make in
+            make.left.top.equalToSuperview().offset(10)
+            make.width.equalTo((KSreenWidth - 70)*0.56)
+            make.bottom.equalTo(tipView.snp.top).offset(-10)
+        }
+        
+        exrChangeView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(10)
+            make.right.equalToSuperview().offset(-10)
+            make.width.equalTo((KSreenWidth - 70)*0.44)
+            make.bottom.equalTo(tipView.snp.top).offset(-10)
+        }
+        
+        left_tipLabel.snp.makeConstraints { make in
+            make.left.top.equalToSuperview().offset(10)
+        }
+        
+        left_Label.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(10)
+            make.bottom.equalToSuperview().offset(-20)
+        }
+        
+        exChangeBtn.snp.makeConstraints { make in
+            make.centerY.equalTo(left_tipLabel)
+            make.right.equalToSuperview().offset(-10)
+            make.left.equalTo(left_tipLabel.snp.right).offset(5)
+            make.width.equalTo(50)
+        }
+        
+        right_tipLabel.snp.makeConstraints { make in
+            make.left.top.equalToSuperview().offset(10)
+        }
+        
+        right_Label.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(10)
+            make.bottom.equalToSuperview().offset(-20)
         }
     }
@@ -558,22 +558,23 @@ class CNLiveMineViewModel: NSObject {
             timeCount = timeCount - 1
             // 时间到了取消时间源
             if timeCount <= 0 {
+                
                 codeTimer.cancel()
-            }
-            // 返回主线程处理一些事件，更新UI等等
-            DispatchQueue.main.async {
-                showLoading(message: "")
-                CNLiveMineViewModel.requestsStandInfo(identityId: id, type: .effect) { result, respStatue in
-                    if respStatue == .success {
-                        let listBaseModel = result as! MineStandInfoBaseModel
-                        if listBaseModel.authTime > 0 {
-                            showMessage(message: listBaseModel.name!.count > 0 ? "恭喜您通过认证，您已是\(listBaseModel.name ?? "")" : "恭喜您通过认证")
-                            resultBlock(listBaseModel, .success)
-                            NotificationCenter.default.post(name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
-                        } else {
-                            showMessage(message: "审核失败，请您修改后重新提交")
-                            resultBlock(listBaseModel, .failed)
-                            NotificationCenter.default.post(name: Notification.Name.StandAuth.StandAuthNotificationUnSuccess, object: nil)
+                // 返回主线程处理一些事件，更新UI等等
+                DispatchQueue.main.async {
+                    showLoading(message: "")
+                    CNLiveMineViewModel.requestsStandInfo(identityId: id, type: .effect) { result, respStatue in
+                        if respStatue == .success {
+                            let listBaseModel = result as! MineStandInfoBaseModel
+                            if listBaseModel.authTime > 0 {
+                                showMessage(message: listBaseModel.name!.count > 0 ? "恭喜您通过认证，您已是\(listBaseModel.name ?? "")" : "恭喜您通过认证")
+                                resultBlock(listBaseModel, .success)
+                                NotificationCenter.default.post(name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
+                            } else {
+                                showMessage(message: "审核失败，请您修改后重新提交")
+                                resultBlock(listBaseModel, .failed)
+                                NotificationCenter.default.post(name: Notification.Name.StandAuth.StandAuthNotificationUnSuccess, object: nil)
+                            }
                         }
                     }
                 }