产品问题修改

liushiyu
1 parent aad74940
Showing 24 changed files with 364 additions and 37 deletions
metaCode.xcodeproj/project.pbxproj
metaCode.xcodeproj/xcshareddata/xcschemes/metaCode.xcscheme
metaCode/Classes/Config/CNLiveConfigUserInfo.swift
metaCode/Classes/Config/Database/CNLiveSaveAuthStateDB.swift
metaCode/Classes/Environment/CNLiveEnvironment.swift
metaCode/Classes/Main/LoginPage/ViewModel/CNLiveLoginViewModel.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAuthFormViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAuthResultViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineHeaderView.swift
metaCode/Classes/Main/MinePage/View/CNLiveMineSubBodyListView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
metaCode/Classes/Main/VideoPage/Controller/CNLiveShortVideoViewController.swift
metaCode/Classes/Main/VideoPage/View/CNLiveShortVideoCommentListView.swift
metaCode/Classes/Main/VideoPage/View/CNLiveShortVideoContentListView.swift
metaCode/Classes/Main/VideoPage/View/CNLiveShortVideoListTableViewCell.swift
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_enter_yellow.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/MinePage/mine_form_auth_enter_yellow.imageset/mine_form_auth_enter_yellow@2x.png
@@ -178,6 +178,7 @@
 		7978A8432A396632007C86B8 /* CNLiveMineViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7978A8422A396632007C86B8 /* CNLiveMineViewModel.swift */; };
 		79803E272AD68D3100F05F68 /* CNLiveMineShopViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79803E262AD68D3100F05F68 /* CNLiveMineShopViewController.swift */; };
 		79803E292AD6991200F05F68 /* CNLiveMineInputMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79803E282AD6991200F05F68 /* CNLiveMineInputMessageView.swift */; };
+		79868B192B874294008E0F5C /* CNLiveSaveAuthStateDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79868B182B874293008E0F5C /* CNLiveSaveAuthStateDB.swift */; };
 		7987BF3D2A497644000A1ABC /* CNLiveMineQuestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7987BF3C2A497644000A1ABC /* CNLiveMineQuestViewController.swift */; };
 		798916E92B04532D00D08302 /* CNLiveSavePointDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798916E82B04532D00D08302 /* CNLiveSavePointDB.swift */; };
 		798916ED2B048E8200D08302 /* CNLiveShopTransViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798916EC2B048E8200D08302 /* CNLiveShopTransViewController.swift */; };
@@ -441,6 +442,7 @@
 		7978A8422A396632007C86B8 /* CNLiveMineViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineViewModel.swift; sourceTree = "<group>"; };
 		79803E262AD68D3100F05F68 /* CNLiveMineShopViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineShopViewController.swift; sourceTree = "<group>"; };
 		79803E282AD6991200F05F68 /* CNLiveMineInputMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInputMessageView.swift; sourceTree = "<group>"; };
+		79868B182B874293008E0F5C /* CNLiveSaveAuthStateDB.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNLiveSaveAuthStateDB.swift; sourceTree = "<group>"; };
 		7987BF3C2A497644000A1ABC /* CNLiveMineQuestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineQuestViewController.swift; sourceTree = "<group>"; };
 		798916E82B04532D00D08302 /* CNLiveSavePointDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveSavePointDB.swift; sourceTree = "<group>"; };
 		798916EC2B048E8200D08302 /* CNLiveShopTransViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopTransViewController.swift; sourceTree = "<group>"; };
@@ -1125,6 +1127,7 @@
 		79579CAA2AAAE905006E5B38 /* Database */ = {
 			isa = PBXGroup;
 			children = (
+				79868B182B874293008E0F5C /* CNLiveSaveAuthStateDB.swift */,
 				7C7C62F52A4D72E9007A912E /* CNLiveIdentityDB.swift */,
 				79BA085C2AB18E8300D01875 /* CNLiveSaveAuthDB.swift */,
 				79EABB882AB4497700F3A4E2 /* CNLiveSaveStandDB.swift */,
@@ -1883,6 +1886,7 @@
 				79A267832AF8D7BC0088D9F6 /* CNLiveShopBodyCustomView.swift in Sources */,
 				1917335E2B328495007BCC04 /* CNLiveCouponListTableViewCell.swift in Sources */,
 				791C1C8C2AFB85F8003E6362 /* CNLiveShopBodyExpressView.swift in Sources */,
+				79868B192B874294008E0F5C /* CNLiveSaveAuthStateDB.swift in Sources */,
 				790D019A2A2DCAE400C5978D /* CNLiveViewController.swift in Sources */,
 				191733192B10A05D007BCC04 /* CNLivePlayerProgressView.swift in Sources */,
 				79803E272AD68D3100F05F68 /* CNLiveMineShopViewController.swift in Sources */,
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1430"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "818163B72A25CFCC00579C86"
+               BuildableName = "metaCode.app"
+               BlueprintName = "metaCode"
+               ReferencedContainer = "container:metaCode.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "818163CD2A25CFCF00579C86"
+               BuildableName = "metaCodeTests.xctest"
+               BlueprintName = "metaCodeTests"
+               ReferencedContainer = "container:metaCode.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "818163D72A25CFCF00579C86"
+               BuildableName = "metaCodeUITests.xctest"
+               BlueprintName = "metaCodeUITests"
+               ReferencedContainer = "container:metaCode.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "818163B72A25CFCC00579C86"
+            BuildableName = "metaCode.app"
+            BlueprintName = "metaCode"
+            ReferencedContainer = "container:metaCode.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Debug"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "818163B72A25CFCC00579C86"
+            BuildableName = "metaCode.app"
+            BlueprintName = "metaCode"
+            ReferencedContainer = "container:metaCode.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
@@ -241,14 +241,24 @@ class StandSortManager: NSObject {
         if have_id_auths.count == 0 {
             //1.29 需求 如果第一次的时候没有进行排序,则把已经认证的放在第一位
             let tempArray = NSMutableArray()
-            for item in stands.reverseObjectEnumerator().allObjects {
+            var haveArray = Array<Any>()
+            for item in stands {
                 let listModel = item as! StandListModel
                 if listModel.auth {
-                    tempArray.insert(listModel, at: 0)
+                    //2.21 需求把已经认证的第一次展示的时候再通过认证的时间先后顺序进行排序
+//                    tempArray.insert(listModel, at: 0)
+                    haveArray.append(listModel)
                 } else {
+                    //2.21 需求把未进行认证的第一次展示的时候根据后台返回的排序顺序进行排序,如果用户在进行了排序,则按照用户的排序为主
                     tempArray.add(listModel)
                 }
             }
+            haveArray = haveArray.sorted (by: { (item01, item02) -> Bool in
+                return (item01 as! StandListModel).createTime < (item02 as! StandListModel).createTime
+            })
+            haveArray.forEach { item in
+                tempArray.insert(item, at: 0)
+            }
             return tempArray
         }
         print("allList接口里面===>\(have_id_auths)")
+//
+//  CNLiveSavePointDB.swift
+//  metaCode
+//
+//  Created by open on 2023/11/15.
+//
+
+import Foundation
+
+let CNLiveSaveAuthStateCacheKey = "kCNLiveSaveAuthStateCacheKey"
+class CNLiveSaveAuthStateDB: NSObject {
+    
+    static let shared = CNLiveSaveAuthStateDB.init()
+    
+    open func save(object: MineStandInfoBaseModel, key: String) {
+        var temp_dic = NSMutableDictionary.init(contentsOfFile: userFileDir+"\(key)storage.plist")
+        if (temp_dic == nil) {
+            temp_dic = NSMutableDictionary.init()
+        }
+        temp_dic?.setObject((object.toJSON() ?? Dictionary()) as Dictionary, forKey: CNLiveSaveAuthStateCacheKey as NSCopying)
+        temp_dic?.write(toFile: userFileDir+"\(key)storage.plist", atomically: true)
+    }
+    
+    open func take(key: String) -> MineStandInfoBaseModel {
+        let temp_dic = NSMutableDictionary.init(contentsOfFile: userFileDir+"\(key)storage.plist")
+        if (temp_dic == nil) {
+            return MineStandInfoBaseModel()
+        }
+        let resp = temp_dic?.object(forKey: CNLiveSaveAuthStateCacheKey)
+        let listModel = dictionaryToModel(resp as! [String : Any], MineStandInfoBaseModel.self,"") as! MineStandInfoBaseModel
+        return listModel
+    }
+    
+    private lazy var userFileDir: String = {
+        let userFileDir = NSString()
+        var path: String = ""
+        path = "\(fileDir)/userId_\(UserInfoManager.shared.userInfo.uid)/"
+        let fileManager = FileManager.default
+        var isDir: ObjCBool = false
+        let exist: Bool = fileManager.fileExists(atPath: path, isDirectory: &isDir)
+        if !(isDir.boolValue && exist) {
+            do {
+                try fileManager.createDirectory(atPath: path, withIntermediateDirectories: true)
+            } catch {
+                debugPrint("文件目录创建失败")
+                return ""
+            }
+        }
+        return path as String
+    }()
+
+    private lazy var fileDir: String = {
+        let path = "\(NSHomeDirectory())/Documents/metaCode/saveAuthState"
+        let fileManager = FileManager.default
+        var isDir: ObjCBool = false
+        let exist: Bool = fileManager.fileExists(atPath: path, isDirectory: &isDir)
+        if !(isDir.boolValue && exist) {
+            do {
+                try fileManager.createDirectory(atPath: path, withIntermediateDirectories: true)
+            } catch {
+                debugPrint("文件目录创建失败")
+                return ""
+            }
+        }
+        return path as String
+    }()
+}
@@ -21,7 +21,7 @@ let APPId_wjj_b: String  = CNLiveMCEnvironmentManager.shared.appId_wjj_b
 ///网家家B端应用的APPKey
 let APPKey_wjj_b: String = CNLiveMCEnvironmentManager.shared.appKey_wjj_b
 ///当前应用的登录请求域名
-let APPLoginHost: String! = CNLiveMCEnvironmentManager.shared.loginHost
+let APPLoginHost: String = CNLiveMCEnvironmentManager.shared.loginHost
 ///当前应用的Secret
 let APPSecret: String = CNLiveMCEnvironmentManager.shared.appSecret
 ///当前应用的部分请求接口
@@ -43,7 +43,8 @@ class CNLiveLoginViewModel : NSObject {
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPLoginHost+"/open/api2/user/sendVerifyCode", param: param, cacheType: .networkOnly) { task, result, error in
+        CNLiveNetworking.setupShowResult(true)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: CNLiveMCEnvironmentManager.shared.loginHost+"/open/api2/user/sendVerifyCode", param: param, cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
                 let resp = result as! NSDictionary
@@ -85,7 +85,7 @@ class CNLiveMineAddInfoViewController : CNLiveBaseViewController, UITableViewDel
         super.viewDidLoad()
         switch _show_type {
         case .add:
-            titleName = "添加身份"
+            titleName = "官方认证"
         case .info:
             titleName = "身份信息"
             tableView.dragInteractionEnabled = true
@@ -307,7 +307,7 @@ extension CNLiveMineAddInfoViewController {
                 return MineStandInfoTableViewCell()
             }
             let authModel = dataArray[indexPath.row] as! MineAuthListModel
-            cell.setupWithAuthDataSource(icon: authModel.icon!, name: authModel.name!,number: authModel.code!)
+            cell.setupWithAuthDataSource(icon: authModel.icon!, name: authModel.name!,number: authModel.code!,identityId: "\(authModel.identityId)")
             cell.userInteractionEnabledWhileDragging = false
             return cell
         }
@@ -84,15 +84,43 @@ class CNLiveMineAuthFormViewController: CNLiveBaseViewController, UITableViewDel
         }
         cell.clickBlock = {[weak self] view in
             guard let self = self else { return }
+            showLoading(message: "")
             let titleLabel = view.viewWithTag(1000) as! UILabel
             if titleLabel.text == "个人认证" {
-                self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _listModel, authType: .person), animated: true)
+                CNLiveMineViewModel.requestsStandInfo(identityId: "\(_listModel.id)", type: .nodate, authType: .person) {[self] result, respStatue in
+                    if respStatue == .success {
+                        let model = (result as! [MineStandInfoModel]).first
+                        if model?.inputType == 17 || model == nil {
+                            showMessage(message: "此权限对您暂未开放,请先到首页学习成长")
+                            return
+                        }
+                        self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._listModel, authType: .person), animated: true)
+                    }
+                }
             }
             if titleLabel.text == "企业认证" {
-                self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _listModel, authType: .enterprise), animated: true)
+                CNLiveMineViewModel.requestsStandInfo(identityId: "\(_listModel.id)", type: .nodate, authType: .enterprise) {[self] result, respStatue in
+                    if respStatue == .success {
+                        let model = (result as! [MineStandInfoModel]).first
+                        if model?.inputType == 17 || model == nil {
+                            showMessage(message: "此权限对您暂未开放,请先到首页学习成长")
+                            return
+                        }
+                        self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._listModel, authType: .enterprise), animated: true)
+                    }
+                }
             }
             if titleLabel.text == "机构认证" {
-                self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _listModel, authType: .agency), animated: true)
+                CNLiveMineViewModel.requestsStandInfo(identityId: "\(_listModel.id)", type: .nodate, authType: .agency) {[self] result, respStatue in
+                    if respStatue == .success {
+                        let model = (result as! [MineStandInfoModel]).first
+                        if model?.inputType == 17 || model == nil {
+                            showMessage(message: "此权限对您暂未开放,请先到首页学习成长")
+                            return
+                        }
+                        self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._listModel, authType: .agency), animated: true)
+                    }
+                }
             }
         }
         let obj = dataArray[indexPath.section]
@@ -205,7 +205,7 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
                     self?.iDCardView.isHidden = false
                     self?.iDCardView.idModel = self?._listModel
                     self?.tipName.text = "恭喜您通过认证"
-                    self?.tipDesc.text = listBaseModel.name!.count > 0 ? "您已是\(listBaseModel.name ?? "")!" : "恭喜您通过认证"
+                    self?.tipDesc.text = listBaseModel.name.count > 0 ? "您已是\(listBaseModel.name)" : "恭喜您通过认证"
                     self?._status = .default
                     self?.setNeedsStatusBarAppearanceUpdate()
                     NotificationCenter.default.post(name: Notification.Name.StandAuth.StandAuthNotificationSuccess, object: nil)
@@ -39,7 +39,7 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
         dataArray.add([""])
         let array01 : [Dictionary] = [["name":"我的身份","icon":"mine_header_icon_identity"]]
         dataArray.add(array01)
-        let array02 : [Dictionary] = [["name":"添加身份","icon":"mine_list_icon_add_identity"]]
+        let array02 : [Dictionary] = [["name":"官方认证","icon":"mine_list_icon_add_identity"]]
         dataArray.add(array02)
         let array03 : [Dictionary] = [["name":"帮助与反馈","icon":"mine_list_icon_help_feedback"],
                                      ["name":"更多设置","icon":"mine_list_icon_set_more"]]
@@ -50,7 +50,7 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
                                       ["name":"新增优惠券","icon":"mine_list_icon_help_feedback"],
                                       ["name":"优惠券管理","icon":"mine_list_icon_help_feedback"],
                                       ["name":"抖音短视频","icon":"mine_list_icon_help_feedback"]]
-//        dataArray.add(array04)
+        dataArray.add(array04)
         return dataArray
     }()
@@ -274,7 +274,7 @@ extension MinePhotoUploadView {
                     })
                 }
                 if self!.temp_imageView == self!.imageView03 {
-                    let uploadKey = UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
+                    let _ = UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
                         print("获取进度==>\(progress)")
                     }, successBlock: { [weak self] key,url in
                         self!.selectedImages.replaceObject(at: 2, with: image)
@@ -6,7 +6,7 @@
 //
 import Foundation
-
+import APButton
 class MineInfoLListTableViewCell : UITableViewCell {
     lazy var mainView: UIImageView = {
@@ -39,7 +39,7 @@ class MineInfoLListTableViewCell : UITableViewCell {
     lazy var addBtn: UIButton = {
         let addBtn = UIButton.init(type: .custom)
-        addBtn.setTitle("  去添加  ", for: .normal)
+        addBtn.setTitle("  去认证  ", for: .normal)
         addBtn.setTitleColor(.white, for: .normal)
         addBtn.backgroundColor = HexColor("#67C5FF")
         addBtn.titleLabel?.font = BoldFont_15
@@ -56,11 +56,11 @@ class MineInfoLListTableViewCell : UITableViewCell {
         if is_auth {
             addBtn.backgroundColor = HexColor("#DCDCDC")
             addBtn.setTitleColor(HexColor("#666666"), for: .normal)
-            addBtn.setTitle("  已添加  ", for: .normal)
+            addBtn.setTitle("  已认证  ", for: .normal)
         }else {
             addBtn.backgroundColor = HexColor("#67C5FF")
             addBtn.setTitleColor(.white, for: .normal)
-            addBtn.setTitle("  去添加  ", for: .normal)
+            addBtn.setTitle("  去认证  ", for: .normal)
         }
     }
@@ -130,6 +130,16 @@ class MineStandInfoTableViewCell: UITableViewCell {
         return iconView
     }()
+    lazy var logoButton : APButton = {
+        let button = APButton()
+        button.layer.cornerRadius = adapt_length(length: 10)
+        button.layer.masksToBounds = true
+        button.isHidden = true
+        button.backgroundColor = .clear
+        button.activityIndicator.color = .gray
+        return button
+    }()
+    
     lazy var titleLabel: UILabel = {
         let titleLabel = UILabel.init()
         titleLabel.backgroundColor = .clear
@@ -158,11 +168,34 @@ class MineStandInfoTableViewCell: UITableViewCell {
         return timeLabel
     }()
-    public func setupWithAuthDataSource(icon: String, name: String,number: String) {
+    public func setupWithAuthDataSource(icon: String, name: String,number: String,identityId: String) {
         iconView.kf.indicatorType = .activity
         iconView.kf.setImage(with: URL(string: icon), placeholder: UIImage.imageWithColor(color: HexColor("#f9f9f9")!, size: CGSize(width: 50, height: 50)))
         titleLabel.text = name
         numberLabel.text = "编号:\(number)"
+        logoButton.isHidden = false
+        let infoModel = CNLiveSaveAuthStateDB.shared.take(key: identityId)
+        if infoModel.name.isEmpty && infoModel.identityId == 0 {
+            logoButton.startAnimating()
+            DispatchQueue.global().async {
+                CNLiveMineViewModel.requestsStandInfo(identityId: identityId, type: .havedate, authType: .agency) {[weak self] result, respStatue in
+                    guard let self = self else { return }
+                    logoButton.stopAnimating()
+                    let sub_infoModel = CNLiveSaveAuthStateDB.shared.take(key: identityId)
+                    if sub_infoModel.authInfos.count > 0 {
+                        logoButton.setImage(UIImage(named: "mine_form_auth_person_yellow"), for: .normal)
+                    } else {
+                        logoButton.setImage(UIImage(named: "mine_form_auth_enter_yellow"), for: .normal)
+                    }
+                }
+            }
+        } else {
+            if infoModel.authInfos.count > 0 {
+                logoButton.setImage(UIImage(named: "mine_form_auth_person_yellow"), for: .normal)
+            } else {
+                logoButton.setImage(UIImage(named: "mine_form_auth_enter_yellow"), for: .normal)
+            }
+        }
     }
     public func setupWithMessageDataSource(icon: String, name: String,number: String, time: String) {
@@ -188,6 +221,7 @@ class MineStandInfoTableViewCell: UITableViewCell {
         mainView.addSubview(titleLabel)
         mainView.addSubview(numberLabel)
         mainView.addSubview(timeLabel)
+        mainView.addSubview(logoButton)
         setupConstraints()
     }
@@ -211,12 +245,17 @@ class MineStandInfoTableViewCell: UITableViewCell {
         titleLabel.snp.makeConstraints { make in
             make.centerY.equalToSuperview().offset(-15)
             make.left.equalTo(iconView.snp.right).offset(10)
-            make.right.equalToSuperview().offset(-30)
+//            make.right.equalToSuperview().offset(-30)
         }
         numberLabel.snp.makeConstraints { make in
             make.centerY.equalToSuperview().offset(15)
             make.left.equalTo(iconView.snp.right).offset(10)
         }
+        logoButton.snp.makeConstraints { make in
+            make.centerY.equalTo(titleLabel)
+            make.left.equalTo(titleLabel.snp.right).offset(adapt_length(length: 5))
+            make.size.equalTo(adapt_length(length: 20))
+        }
     }
     required init?(coder: NSCoder) {
@@ -229,15 +229,15 @@ class MineStandInfoBaseModel: BaseModel {
     var authInfos = [MineStandInfoModel]()//个人认证
     var enterpriseAuthInfos = [MineStandInfoModel]()//企业认证
     var agencyAuthInfos = [MineStandInfoModel]()//机构认证
-    var icon: String?
-    var name: String?
+    var icon: String = ""
+    var name: String = ""
     var identityId: Int = 0
-    var code: String?
-    var cardImg: String?
+    var code: String = ""
+    var cardImg: String = ""
     var authTime: Int = 0
     var userStatus: Int = 0
-    var upPath: String?
-    var downPath: String?
+    var upPath: String = ""
+    var downPath: String = ""
 }
 class MineStandInfoModel: BaseModel {
@@ -516,6 +516,7 @@ class CNLiveMineViewModel: NSObject {
                         }else if (type == .effect) {
                             resultBlock(newsModel,.success)
                         }else {
+                            CNLiveSaveAuthStateDB.shared.save(object: newsModel, key: identityId)
                             if newsModel.authInfos.count > 0 {
                                 let tempArray = NSMutableArray.init(array: newsModel.authInfos)
                                 resultBlock(tempArray,.success)
@@ -652,8 +653,8 @@ class CNLiveMineViewModel: NSObject {
                     CNLiveMineViewModel.requestsStandInfo(identityId: id, type: .effect, authType: authType) { result, respStatue in
                         if respStatue == .success {
                             let listBaseModel = result as! MineStandInfoBaseModel
-                            if listBaseModel.authTime > 0 || listBaseModel.code!.count > 0 {
-                                showMessage(message: listBaseModel.name!.count > 0 ? "恭喜您通过认证，您已是\(listBaseModel.name ?? "")" : "恭喜您通过认证")
+                            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)
                             } else {
@@ -379,7 +379,7 @@ extension CNLiveShortVideoViewController {
         }
     }
     func listActionMethod(viewcell: CNLiveShortVideoListTableViewCell, button: UIButton) {
-        CNLiveShortVideoContentListView.showVideoContentListView(title: viewcell.homeModel.albumMsgModel!.albumName,dataArray: dataArray, result: {[weak self] listModel in
+        CNLiveShortVideoContentListView.showVideoContentListView(title: viewcell.homeModel.albumMsgModel!.albumName,dataArray: dataArray, episodeNow: viewcell.homeModel.albumMsgModel!.episodeNow, result: {[weak self] listModel in
             guard let self = self else { return }
             let index = self.dataArray.index(of: listModel) as NSInteger
             self.playTheIndex(index: index)
@@ -415,6 +415,19 @@ class CNLiveShortVideoCommentListTableViewCell: UITableViewCell , UITableViewDel
         return replyButton
     }()
+    lazy var deleteButton: UIButton = {
+        let deleteButton = APButton()
+        deleteButton.setTitleColor(.white, for: .normal)
+        deleteButton.activityIndicator.color = .white
+        deleteButton.backgroundColor = .clear
+        deleteButton.isHidden = true
+        deleteButton.setTitle("删除", for: .normal)
+        deleteButton.setTitleColor(HexColor("#969696"), for: .normal)
+        deleteButton.titleLabel?.font = medium_adapt_font(pointSize: 13)
+        deleteButton.addTarget(self, action: #selector(replyMethod), for: .touchUpInside)
+        return deleteButton
+    }()
+    
     lazy var replyUnfoldButton: UIButton = {
         let button = QMUIButton()
         button.imagePosition = .right
@@ -530,6 +543,13 @@ class CNLiveShortVideoCommentListTableViewCell: UITableViewCell , UITableViewDel
             make.width.equalTo(40)
             make.top.equalTo(commentLabel.snp.bottom).offset(10)
         }
+        contentView.addSubview(deleteButton)
+        deleteButton.snp.makeConstraints { make in
+            make.left.equalTo(replyButton.snp.right).offset(adapt_length(length: 5))
+            make.height.equalTo(20)
+            make.width.equalTo(40)
+            make.top.equalTo(commentLabel.snp.bottom).offset(10)
+        }
         contentView.addSubview(replyUnfoldButton)
         replyUnfoldButton.snp.makeConstraints { make in
             make.top.equalTo(timeLabel.snp.bottom)
@@ -557,10 +577,11 @@ class CNLiveShortVideoCommentListTableViewCell: UITableViewCell , UITableViewDel
         } else {
             replyUnfoldButton.isHidden = true
         }
+        replyButton.setTitle("回复", for: .normal)
         if ((contentSid == UserInfoManager.shared.userInfo.uid) || (commentData.uid == UserInfoManager.shared.userInfo.uid)) {
-            replyButton.setTitle("删除", for: .normal)
+            deleteButton.isHidden = false
         } else {
-            replyButton.setTitle("回复", for: .normal)
+            deleteButton.isHidden = true
         }
         DispatchQueue.main.async {[weak self] in
             guard let self = self else { return }
@@ -628,6 +649,7 @@ class CNLiveShortVideoCommentListTableViewCell: UITableViewCell , UITableViewDel
     @objc func replyMethod(button: UIButton) {
         if button.titleLabel?.text == "回复" {
+            let uid = commentModel == nil ? replyItemModel.fromSid : commentModel.uid
             CNLiveContentToolTextView.showCommentViewForCustom(withCommType: .reply, fromNick: commentModel == nil ? replyItemModel.fromNick : commentModel.nick, firstRespFace: false, successBlcok: {[weak self] commentString, toolbarView in
                 guard let self = self else { return }
                 CNLiveShortVideoViewModel.requestCommentWithReply(commentId: self.commentModel.commentId!, comment: commentString ?? "", toSid: self.commentModel.uid!, fromSid: UserInfoManager.shared.userInfo.uid, level: "1") {[weak self] result, respStatue in
@@ -720,7 +742,6 @@ class CNLiveShortVideoCommentListTableViewCell: UITableViewCell , UITableViewDel
     @objc func replyUnfoldMethod(button: UIButton) {
         showLoading(message: "")
-        print("这里点击的时候走了多少次")
         let replyModel: ShortVideoHomeCommentRListItemModel = self.dataSource.lastObject as! ShortVideoHomeCommentRListItemModel
         CNLiveShortVideoViewModel.requestcommentWithReplyList(commentId: commentModel.commentId!, seqId: replyModel.seqId!) {[weak self] result, respStatue in
             guard let self = self else { return }
@@ -111,9 +111,9 @@ class CNLiveShortVideoContentListView: UIView, UITableViewDelegate, UITableViewD
         }
     }
-    func setupWithDataSource(title: String,dataArray: NSMutableArray) {
+    func setupWithDataSource(title: String,dataArray: NSMutableArray,episodeNow: String) {
         dataSource = dataArray
-        titleLabel.text = title
+        titleLabel.text = "\(title)·\(episodeNow)集"
         self.tableView.reloadData()
     }
@@ -129,11 +129,11 @@ class CNLiveShortVideoContentListView: UIView, UITableViewDelegate, UITableViewD
         removeFromSuperview()
     }
-    static public func showVideoContentListView(title: String,dataArray: NSMutableArray,result: @escaping CloseVideoListResultBlock) {
+    static public func showVideoContentListView(title: String,dataArray: NSMutableArray,episodeNow: String ,result: @escaping CloseVideoListResultBlock) {
         let pickerView = CNLiveShortVideoContentListView.init(frame: CGRect.zero)
         pickerView.resultBlock = result
-        pickerView.setupWithDataSource(title: title,dataArray: dataArray)
+        pickerView.setupWithDataSource(title: title,dataArray: dataArray,episodeNow: episodeNow)
         let delegate = UIApplication.shared.delegate as! AppDelegate
         delegate.window?.addSubview(pickerView)
@@ -47,6 +47,7 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
     lazy var tipsLabel: UILabel = {
         let label = UILabel()
         label.textColor = UIColor.white
+        label.text = "当前内容需付费观看"
         label.font = semibold_adapt_font(pointSize: 15)
         label.textAlignment = .center
         label.numberOfLines = 0
@@ -142,6 +143,12 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         return payView
     }()
+    lazy var grayMaskView: UIView = {
+       let grayMaskView = UIView()
+        grayMaskView.backgroundColor = UIColor.init(white: 0, alpha: 0.6)
+       return grayMaskView
+    }()
+    
     //控制器承载图
     lazy var coverImageView: UIImageView = {
         let coverImageView = UIImageView()
@@ -162,6 +169,7 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         selectionStyle = .none
         contentView.addSubview(coverImageView)
+        contentView.addSubview(grayMaskView)
         contentView.addSubview(shareBtn)
         contentView.addSubview(commentBtn)
         contentView.addSubview(likeBtn)
@@ -226,6 +234,7 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
             self.iconBtn.isHidden = true
             self.titleLabel.isHidden = true
             self.descLabel.isHidden = true
+            self.grayMaskView.isHidden = false
             self.tipsLabel.isHidden = false
             self.payView.isHidden = false
         } else {
@@ -236,6 +245,7 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
             self.iconBtn.isHidden = false
             self.titleLabel.isHidden = false
             self.descLabel.isHidden = false
+            self.grayMaskView.isHidden = true
             self.tipsLabel.isHidden = true
             self.payView.isHidden = true
         }
@@ -311,6 +321,9 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
             make.bottom.equalTo(listBtn.snp.top).offset(-10)
             make.height.equalTo(165)
         }
+        grayMaskView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
     }
@@ -331,8 +344,8 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         self.delegate.iconActionMethod(viewcell: self, button: button)
     }
-    @objc func faviMothod(button: UIButton) {
-        self.delegate.faviActionMethod(viewcell: self, button: button as! APButton)
+    @objc func faviMothod(button: APButton) {
+        self.delegate.faviActionMethod(viewcell: self, button: button)
     }
     @objc func listMethod(button: UIButton) {
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_form_auth_enter_yellow@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_form_auth_enter_yellow@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "mine_form_auth_person_yellow@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "mine_form_auth_person_yellow@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}