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

“张旭”
2 parents 3cbba7ba 8ae10b35
Showing 11 changed files with 85 additions and 33 deletions
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNIDCardView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNMainView.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAddInfoViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineAuthResultViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineInputViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineShopViewController.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/CNLiveShortVideoControlView.swift
@@ -59,7 +59,7 @@ class CNIDCardView: UIView{
     func loadIDDetailData(){
 //        showLoading(message: "")
-        CNLiveMineViewModel.requestsStandInfo(identityId: "\(_idModel!.id)", type: .havedate) { result, respStatue in
+        CNLiveMineViewModel.requestsStandInfo(identityId: "\(_idModel!.id)", type: .havedate, authType: .person) { result, respStatue in
             hiddenLoading()
             if respStatue == .success {
                 let cardArray = result as! NSMutableArray
@@ -311,7 +311,7 @@ class CNFrontMainView : UIView{
                 }
             }
         }else{
-            navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: pushAnimated)
+            navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!, authType: .person), animated: pushAnimated)
         }
     }
 }
@@ -335,7 +335,7 @@ extension CNLiveMineAddInfoViewController {
                     }
                 }
             } else {
-                self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: listModel), animated: true)
+                self.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: listModel, authType: .enterprise), animated: true)
             }
         }
     }
@@ -87,10 +87,12 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
     var _status: UIStatusBarStyle! = .lightContent
     var _listModel:StandListModel!
     var _show_type:CNLiveMineAuthResultShowType!
-    init(_ listModel:StandListModel,show_type:CNLiveMineAuthResultShowType) {
+    var _authType:CNLiveMineInputAuthType!
+    init(_ listModel:StandListModel,show_type:CNLiveMineAuthResultShowType,authType:CNLiveMineInputAuthType) {
         super.init(nibName:nil, bundle:nil)
         _listModel = listModel
         _show_type = show_type
+        _authType = authType
     }
     required init?(coder: NSCoder) {
@@ -194,7 +196,7 @@ class CNLiveMineAuthResultViewController: CNLiveBaseViewController {
             }
             sendButton.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))
-            CNLiveMineViewModel.startKeepTimeWithStand(id: "\(_listModel.id)") { [weak self] result, respStatue in
+            CNLiveMineViewModel.startKeepTimeWithStand(id: "\(_listModel.id)", authType: _authType) { [weak self] result, respStatue in
                 if respStatue == .success {
                     let listBaseModel = result as! MineStandInfoBaseModel
                     self?.titleLabel.textColor = .black
@@ -9,6 +9,11 @@ import Foundation
 import EmptyDataSet_Swift
 import HXPHPicker
 import APButton
+enum CNLiveMineInputAuthType {
+    case person//个人认证
+    case enterprise//企业认证
+}
+
 typealias resultUploadImageBlock = (_ url: String) -> Void
 class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDelegate, UITableViewDataSource, EmptyDataSetSource, EmptyDataSetDelegate, PhotoPickerControllerDelegate{
@@ -56,9 +61,11 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
     var select_image: UIImage!
     var _listModel:StandListModel!
     var tempCell:MineBodyInputAuthCell!
-    init(listModel:StandListModel) {
+    var _authType:CNLiveMineInputAuthType!
+    init(listModel:StandListModel,authType:CNLiveMineInputAuthType) {
        super.init(nibName:nil, bundle:nil)
         _listModel = listModel
+        _authType = authType
     }
     required init?(coder: NSCoder) {
@@ -73,9 +80,7 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
         view.backgroundColor = HexColor("#F7F8FA")
         loadStandInfoData()
-        
-
-        
+    
         view.addSubview(sendButton)
         sendButton.snp.makeConstraints { make in
             make.bottom.equalToSuperview().offset(-get_system_tabbar_ui_offsetHeight() - 20)
@@ -103,7 +108,7 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
     private func loadStandInfoData() {
         showLoading(message: "")
-        CNLiveMineViewModel.requestsStandInfo(identityId: "\(_listModel.id)", type: .nodate) {[weak self] result, respStatue in
+        CNLiveMineViewModel.requestsStandInfo(identityId: "\(_listModel.id)", type: .nodate, authType: _authType) {[weak self] result, respStatue in
             if respStatue == .success {
                 self?.dataArray.addObjects(from: result as! [Any])
                 if (self?.dataArray.count)! > 0 {
@@ -140,7 +145,7 @@ class CNLiveMineInputViewController : CNLiveBaseViewController, UITableViewDeleg
                     showMessage(message: "上传成功")
                     sendButton.stopAnimating()
                     DispatchQueue.main.asyncAfter(deadline: .now()+1) { [self] in
-                        self.navigationController?.pushViewController(CNLiveMineAuthResultViewController.init(_listModel,show_type: .result_success), animated: true)
+                        self.navigationController?.pushViewController(CNLiveMineAuthResultViewController.init(_listModel,show_type: .result_success, authType: _authType), animated: true)
                     }
                 }
             }
@@ -258,7 +258,7 @@ class CNLiveMineShopViewController : CNLiveBaseViewController, UITextViewDelegat
                 self.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .two, listModel: _listModel, tempArray: temp_array), animated: true)
                 return
             }
-            let uploadKey = UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
+            _ = UploadManager.uploadImage(imageData: image.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in
                 print("获取进度==>\(progress)")
             }, successBlock: { [self] key,url in
                 hiddenLoading()
@@ -309,10 +309,10 @@ class CNLiveMineShopViewController : CNLiveBaseViewController, UITextViewDelegat
                 self.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .three, listModel: _listModel, tempArray: temp_array), animated: true)
                 return
             }
-            let uploadKey = UploadManager.uploadImage(imageData: image_one.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
+            _ = UploadManager.uploadImage(imageData: image_one.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
                 temp_dict_one.removeObject(forKey: "content")
                 temp_dict_one.setObject(url, forKey: "content" as NSCopying)
-                let uploadKey = UploadManager.uploadImage(imageData: image_two.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
+                _ = UploadManager.uploadImage(imageData: image_two.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
                     hiddenLoading()
                     temp_dict_two.removeObject(forKey: "content")
                     temp_dict_two.setObject(url, forKey: "content" as NSCopying)
@@ -364,7 +364,7 @@ class CNLiveMineShopViewController : CNLiveBaseViewController, UITextViewDelegat
                 uploadWithMessage()
                 return
             }
-            let uploadKey = UploadManager.uploadImage(imageData: image_one.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
+            _ = UploadManager.uploadImage(imageData: image_one.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
                 temp_dict_one.removeObject(forKey: "content")
                 temp_dict_one.setObject(url, forKey: "content" as NSCopying)
                 if image_two == nil {
@@ -372,7 +372,7 @@ class CNLiveMineShopViewController : CNLiveBaseViewController, UITextViewDelegat
                     temp_array.addObjects(from: threeArray as! [Any])
                     uploadWithMessage()
                 }else{
-                    let uploadKey = UploadManager.uploadImage(imageData: image_two.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
+                    _ = UploadManager.uploadImage(imageData: image_two.jpegData(compressionQuality: 1.0)! as NSData, progressBlock: {key, progress in }, successBlock: { [self] key,url in
                         hiddenLoading()
                         temp_dict_two.removeObject(forKey: "content")
                         temp_dict_two.setObject(url, forKey: "content" as NSCopying)
@@ -405,7 +405,7 @@ class CNLiveMineShopViewController : CNLiveBaseViewController, UITextViewDelegat
             if respStatue == .success {
                 showMessage(message: "上传成功")
                 DispatchQueue.main.asyncAfter(deadline: .now()+1) { [self] in
-                    self.navigationController?.pushViewController(CNLiveMineAuthResultViewController.init(StandListModel.init(), show_type: .detail_shop), animated: true)
+                    self.navigationController?.pushViewController(CNLiveMineAuthResultViewController.init(StandListModel.init(), show_type: .detail_shop, authType: .person), animated: true)
                 }
             } else {
             }
@@ -218,6 +218,7 @@ final class StandListModel: BaseModel {//, TableCodable {
 // !!!: /api/identityApi/getIdentity 接口标记
 class MineStandInfoBaseModel: BaseModel {
     var authInfos = [MineStandInfoModel]()
+    var enterpriseAuthInfos = [MineStandInfoModel]()
     var icon: String?
     var name: String?
     var identityId: Int = 0
@@ -461,11 +461,14 @@ class CNLiveMineViewModel: NSObject {
         }
     }
+    
     /// 获取身份信息数据
     /// - Parameters:
-    ///   - identityId: 身份id
+    ///   - identityId: 身份 id
+    ///   - type: 获取身份信息类型
+    ///   - authType: 认证类型 (只有当type为.nodate时有效)
     ///   - resultBlock: 返回
-    static func requestsStandInfo(identityId: String, type: CNLiveMineGetWriteType, resultBlock: @escaping resultNewsBlock) {
+    static func requestsStandInfo(identityId: String, type: CNLiveMineGetWriteType, authType: CNLiveMineInputAuthType,resultBlock: @escaping resultNewsBlock) {
         let param = NSMutableDictionary()
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         param.setValue(identityId, forKey: "identityId")
@@ -475,6 +478,7 @@ class CNLiveMineViewModel: NSObject {
         CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupShowResult(true)
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseMCUrl+"/identityApi/getIdentity", param: param as! [String: String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -487,17 +491,37 @@ class CNLiveMineViewModel: NSObject {
                         let newsModel = dictionaryToModel(resp as! [String : Any], MineStandInfoBaseModel.self,"data") as! MineStandInfoBaseModel
                         if type == .nodate {
                             let tempArray = NSMutableArray()
-                            for authinfo in newsModel.authInfos {
-                                if authinfo.input {
-                                    tempArray.add(authinfo)
+                            if authType == .person {
+                                for authinfo in newsModel.authInfos {
+                                    if authinfo.input {
+                                        tempArray.add(authinfo)
+                                    }
+                                }
+                            }
+                            if authType == .enterprise {
+                                for authinfo in newsModel.enterpriseAuthInfos {
+                                    if authinfo.input {
+                                        tempArray.add(authinfo)
+                                    }
                                 }
                             }
                             resultBlock(tempArray,.success)
                         }else if (type == .effect) {
                             resultBlock(newsModel,.success)
                         }else {
-                            let tempArray = NSMutableArray.init(array: newsModel.authInfos)
-                            resultBlock(tempArray,.success)
+                            if newsModel.authInfos.count > 0 {
+                                let tempArray = NSMutableArray.init(array: newsModel.authInfos)
+                                resultBlock(tempArray,.success)
+                            } else if newsModel.enterpriseAuthInfos.count > 0 {
+                                let tempArray = NSMutableArray.init(array: newsModel.enterpriseAuthInfos)
+                                resultBlock(tempArray,.success)
+                            } else if  newsModel.authInfos.count > 0 && newsModel.enterpriseAuthInfos.count > 0 {
+                                let tempArray_ent = NSMutableArray.init(array: newsModel.enterpriseAuthInfos)
+                                let tempArray_persion = NSMutableArray.init(array: newsModel.authInfos)
+                                resultBlock([tempArray_persion, tempArray_ent],.success)
+                            } else {
+                                resultBlock(Array<Any>(),.success)
+                            }
                         }
                     }
                 } else {
@@ -598,7 +622,7 @@ class CNLiveMineViewModel: NSObject {
     /// 结果检查逻辑
     /// - Parameter id: 当前身份
-    static func startKeepTimeWithStand(id: String, resultBlock: @escaping resultNewsBlock) {
+    static func startKeepTimeWithStand(id: String, authType: CNLiveMineInputAuthType,resultBlock: @escaping resultNewsBlock) {
         // 定义需要计时的时间
         var timeCount = 20
         // 在global线程里创建一个时间源
@@ -615,7 +639,7 @@ class CNLiveMineViewModel: NSObject {
                 // 返回主线程处理一些事件，更新UI等等
                 DispatchQueue.main.async {
                     showLoading(message: "")
-                    CNLiveMineViewModel.requestsStandInfo(identityId: id, type: .effect) { result, respStatue in
+                    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 {
@@ -178,6 +178,10 @@ class CNLiveShortVideoViewController : CNLiveBaseViewController, UITableViewDele
             }
             self.playVideo(at: indexPath)
         }
+        player.playerDidToEnd = {[weak self] asset in
+            guard let self = self else { return }
+            self.controlView.videoPlayer((self.player)!)
+        }
         NotificationCenter.default.addObserver(self, selector: #selector(removePlayerAction), name: Notification.Name.PlayerManage.kPlayerDestroyNotification, object: nil)
     }
@@ -105,6 +105,7 @@ class CNLiveShortVideoCommentListView: UIView, UITableViewDelegate, UITableViewD
         return array
     }()
+    var isReset: Bool! = false
     var total_hd: Int! = 0
     var videoId: String!
     var contentSid: String!
@@ -153,6 +154,7 @@ class CNLiveShortVideoCommentListView: UIView, UITableViewDelegate, UITableViewD
     func addRefreshView() {
         let headerRefreshView: CNLiveHeaderRefresh = CNLiveHeaderRefresh(refreshingBlock: { [weak self] in
             guard let self = self else { return }
+            self.isReset = true
             self.pageNum = 0
             self.requestDataSource()
         })
@@ -274,7 +276,7 @@ extension CNLiveShortVideoCommentListView {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: kShortVideoCommentListTableViewCellIdentifier) as? CNLiveShortVideoCommentListTableViewCell else {
             return CNLiveShortVideoCommentListTableViewCell()
         }
-        cell.setupWithDataSource(commentData: (dataArray[indexPath.row] as! ShortVideoHomeCommentListModel).comment, replyData: (dataArray[indexPath.row] as! ShortVideoHomeCommentListModel).replyData, tableView_h: (dataArray[indexPath.row] as! ShortVideoHomeCommentListModel).tableView_h, tableView_top: (dataArray[indexPath.row] as! ShortVideoHomeCommentListModel).tableView_top, indexPath: indexPath, pageNumber: self.pageNum)
+        cell.setupWithDataSource(commentData: (dataArray[indexPath.row] as! ShortVideoHomeCommentListModel).comment, replyData: (dataArray[indexPath.row] as! ShortVideoHomeCommentListModel).replyData, tableView_h: (dataArray[indexPath.row] as! ShortVideoHomeCommentListModel).tableView_h, tableView_top: (dataArray[indexPath.row] as! ShortVideoHomeCommentListModel).tableView_top, indexPath: indexPath, isReset: isReset)
         cell.reloadRowBlock = {[weak self] viewCell, cell_h  in
             guard let self = self else { return }
             let commentModel_temp = self.dataArray[viewCell.indexPath_current.row] as! ShortVideoHomeCommentListModel
@@ -533,10 +535,8 @@ class CNLiveShortVideoCommentListTableViewCell: UITableViewCell , UITableViewDel
         contentView.addSubview(tableView)
     }
-    func setupWithDataSource(commentData: ShortVideoHomeCommentFListModel, replyData: ShortVideoHomeCommentRListModel, tableView_h: CGFloat, tableView_top: CGFloat, indexPath: IndexPath, pageNumber: Int) {
-        if pageNumber == 0 {
-            dataSource.removeAllObjects()
-        }
+    func setupWithDataSource(commentData: ShortVideoHomeCommentFListModel, replyData: ShortVideoHomeCommentRListModel, tableView_h: CGFloat, tableView_top: CGFloat, indexPath: IndexPath, isReset: Bool) {
+        dataSource.removeAllObjects()
         dataSource.addObjects(from: replyData.replys)
         tableView_height = tableView_h
         indexPath_current = indexPath
@@ -574,6 +574,7 @@ class CNLiveShortVideoCommentListTableViewCell: UITableViewCell , UITableViewDel
                 make.right.equalToSuperview().offset(-10)
                 make.height.equalTo(commentData.nickLayout.textBoundingRect.size.height)
             }
+            self.tableView.snp.removeConstraints()
             self.tableView.removeFromSuperview()
             if replyData.replyCount ?? 0 > 2 {
                 self.contentView.addSubview(self.tableView)
@@ -29,6 +29,7 @@ class CNLiveShortVideoControlView: UIView, ZFPlayerMediaControl {
         return sliderView
     }()
+    var bufferComplete: Bool! = false
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -70,9 +71,8 @@ class CNLiveShortVideoControlView: UIView, ZFPlayerMediaControl {
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
     func videoPlayer(_ videoPlayer: ZFPlayerController, loadStateChanged state: ZFPlayerLoadState) {
-        if (state == .stalled || state == .prepare) && videoPlayer.currentPlayerManager.isPlaying {
+        if (state == .stalled) && videoPlayer.currentPlayerManager.isPlaying && !bufferComplete {
             self.sliderView.startAnimating()
         } else {
             self.sliderView.stopAnimating()
@@ -86,6 +86,21 @@ class CNLiveShortVideoControlView: UIView, ZFPlayerMediaControl {
     func videoPlayer(_ videoPlayer: ZFPlayerController, bufferTime: TimeInterval) {
         self.sliderView.bufferValue = videoPlayer.bufferProgress
     }
+    
+    func videoPlayer(_ videoPlayer: ZFPlayerController) {
+        videoPlayer.currentPlayerManager.play()
+        self.bufferComplete = true
+    }
+    
+    
+    func videoPlayer(_ videoPlayer: ZFPlayerController, reachabilityChanged status: ZFReachabilityStatus) {
+        if status == .reachableVia2G
+            || status == .reachableVia3G
+            || status == .reachableVia4G
+            || status == .reachableVia5G {
+            showMessage(message: "正在使用流量播放")
+        }
+    }
     func gestureSingleTapped(_ gestureControl: ZFPlayerGestureControl) {
         if (self.player?.currentPlayerManager.isPlaying == true) {