新增商品UI等问题修复

张旭
1 parent e7d9e117
Showing 37 changed files with 439 additions and 228 deletions
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveCreateShopClassifyViewController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveGoodsCategoryController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveModalPresentationViewController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopNewProductController.swift
metaCode/Classes/Main/HomePage/View/CNDownSlideView.swift
metaCode/Classes/Main/HomePage/View/CNUpSlideView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveAddGoodsSelectUploadImageView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveSelUplSingleImageView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopAddGoodsSingleView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassifySwitchTableViewCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassilyIconTableViewCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopGoodsManageDetailsInputManager.swift
metaCode/Classes/Main/Model/GoodsDetail/CNLiveSelectUploadImageModel.swift
metaCode/Classes/Main/Model/GoodsDetail/CNLiveShopGoodsDetailsModel.swift
metaCode/Classes/Main/Model/GoodsManager/CNLiveShopAddEditGoodsModel.swift
metaCode/Classes/Main/Util/CNLiveCommonManager.swift
metaCode/Classes/Main/Util/CNLivePlayer/CNLivePlayerBottomNaviView.swift
metaCode/Classes/Main/Util/CNLivePlayer/CNLivePlayerControlView.swift
metaCode/Classes/Main/Util/CNLivePlayer/CNLivePlayerGestureView.swift
@@ -94,13 +94,14 @@ class UploadManager: NSObject {
         param.setValue("POST", forKey: "verb")
         param.setValue("2", forKey: "storageType")
         param.setValue(kBucketName_QN, forKey: "bucket")
-        showLoading(message: "上传处理中...")
         CNLiveNetworking.setupShowResult(true)
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.setupSignRequestKey(APPKey_wjj)
+        CNLiveNetworking.setupSignRequestKey(APPKey)//APPKey_wjj APPKey
+
         CNLiveNetworking.requestNetwork(with: .POST, urlString: "\(CNLiveEnvironmentManager.shared.img_token_url)/vod_epg/getUploadAuthForApp", 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)"
@@ -143,7 +144,7 @@ class UploadManager: NSObject {
                     showMessage(message: resp["errorMessage"] as! String)
                 }
             } else {
-                showMessage(message: error!.localizedDescription)
+                showMessage(message: error?.localizedDescription ?? "上传失败")
             }
         }
     }
@@ -51,7 +51,7 @@ class CNLiveCreateShopClassifyViewController:CNLiveBaseViewController, UITableVi
         return tableView
     }()
     lazy var bottomNavView :UIView = {
-        let bottomNavView = UIView(frame: CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height - KTabBarHeight))
+        let bottomNavView = UIView(frame: CGRect(x: 0, y: self.view.height - KTabBarHeight, width: self.view.width, height: KTabBarHeight))
         bottomNavView.backgroundColor = HexColor("F2F2F2")
         return bottomNavView
     }()
@@ -65,18 +65,27 @@ class CNLiveCreateShopClassifyViewController:CNLiveBaseViewController, UITableVi
         super.viewDidLoad()
         self.initUI()
     }
-    
+    // MARK: - 初始化UI
     /// 初始化方法
     /// @param model 要编辑的分类数据,当isEdite为YES,才需要传
     /// @param isEdite 是否是编辑 YES:是   NO:不是
-    func initWithModel(model:CNLiveShopClassifyModel,isEdite:Bool){
+    init(model:CNLiveShopClassifyModel,isEdite:Bool){
+        super.init(nibName: nil, bundle: nil)
         self.shopClassifyModel = model
         //设置店铺id
         self.shopClassifyModel?.shop_id = DSUserInfoManager.shared.dsUserInfo.id
         self.isEdite = isEdite
     }
-    // MARK: - 初始化UI
+    convenience init(){
+        self.init(model: CNLiveShopClassifyModel(), isEdite: false)
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+   
     func initUI(){
         self.view.addSubview(self.tableView)
         self.initTopNav()
@@ -84,8 +93,9 @@ class CNLiveCreateShopClassifyViewController:CNLiveBaseViewController, UITableVi
     }
     func initTopNav(){
+        navigationBarHidden = false
         if self.isEdite == true{
-            self.title = "编辑店铺分类"
+            titleName = "编辑店铺分类"
             let deleteNavBtn = UIButton(type: .custom)
             deleteNavBtn.frame = CGRect(x: 0, y: KStatusBarHeight, width: KNavigationHeight-KStatusBarHeight, height: KNavigationHeight-KStatusBarHeight)
             deleteNavBtn.backgroundColor = .clear
@@ -94,7 +104,7 @@ class CNLiveCreateShopClassifyViewController:CNLiveBaseViewController, UITableVi
             deleteNavBtn.addTarget(self, action: #selector(deleteNavBtnClick), for: .touchUpInside)
             self.rightNavBtns = [deleteNavBtn]
         }else{
-            self.title = "创建店铺分类"
+            titleName = "创建店铺分类"
             //初始化model,赋值一些默认数据
             self.shopClassifyModel = CNLiveShopClassifyModel()
@@ -111,6 +121,7 @@ class CNLiveCreateShopClassifyViewController:CNLiveBaseViewController, UITableVi
     func initBottomNav(){
         self.bottomNavView.backgroundColor = .white
+        self.view.addSubview(self.bottomNavView)
         let  cancelBtn = UIButton(type: .custom)
         cancelBtn.frame = CGRect(x: 0, y: 0, width: 130, height: KTabBarHeight)
@@ -479,7 +479,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
     ///创建店铺分类
     @objc func createBtnClick(){
-        let vc = CNLiveCreateShopClassifyViewController()  
+        let vc = CNLiveCreateShopClassifyViewController()
         vc.classifyType = .oneLevelClassify
         vc.successCompleteBlock = {
             self.postShopClassify()
@@ -8,31 +8,44 @@
 import Foundation
 typealias completionBlock = (_ finished:Bool)->Void
+typealias confirmActionBlock = ()->Void
 class CNLiveModalPresentationViewController:UIViewController{
-    var _contentView:UIView?
-    var contentView:UIView?{
-        get{
-            _contentView
-        }
-        set{
-            _contentView = newValue
-            
-        }
-    }
+    var confirmBlock:confirmActionBlock?
+    lazy var contentView :UIView = {
+        let contentView = UIView(frame: CGRect(x: 0, y: 0, width: 200, height: 200))
+        return contentView
+    }()
+    
+    lazy var bgView :UIView = {
+        let bgView = UIView(frame: CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height))
+        bgView.backgroundColor = .black
+        bgView.alpha = 0.2
+        return bgView
+    }()
     override func viewDidLoad() {
         super.viewDidLoad()
         self.view.backgroundColor = .clear
+        self.view.addSubview(self.bgView)
+        self.view.addSubview(self.contentView)
     }
+    @objc func cancelButtonAction(){
+        self.hidingAnimationWithCompletion { finished in
+            
+        }
+    }
+    @objc func confirmButtonAction(){
+        if ((self.confirmBlock?()) != nil){
+            self.confirmBlock!()
+        }
+    }
     func showingAnimationWithCompletion(completion:@escaping completionBlock){
-        
-        self.contentView?.transform = CGAffineTransformMakeTranslation(0, self.view.height-(self.contentView?.top)!)
-
+ 
         UIView.animate(withDuration: 0.3, delay: 0.0, options: .curveEaseOut) {
-            self.contentView?.transform = CGAffineTransformIdentity
+            self.contentView.top = (self.view.height-self.contentView.height)/2
         } completion: { finished in
             completion(finished)
         }
@@ -40,13 +53,10 @@ class CNLiveModalPresentationViewController:UIViewController{
     func hidingAnimationWithCompletion(completion:@escaping completionBlock){
         UIView.animate(withDuration: 0.3, delay: 0.0, options: .curveEaseOut) {
-            self.contentView?.transform = CGAffineTransformMakeTranslation(0, self.view.height-self.contentView!.top)
+            self.contentView.top = self.view.height
         } completion: { finished in
-            self.contentView?.transform = CGAffineTransformIdentity
             completion(finished)
+            self.view.removeFromSuperview()
         }
     }
-    
-
-
 }
@@ -51,8 +51,8 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         }
         vc.finishBlock = {
             var singleView = self.getShopClassifyView()
-            singleView.contentTextField.text = "\(self.selectShopClassifyVC.firCategoryName ?? "") \(self.selectShopClassifyVC.secCategoryName ?? "")"
-            singleView.layoutSubviews()
+            singleView?.contentTextField.text = "\(self.selectShopClassifyVC.firCategoryName ?? "") \(self.selectShopClassifyVC.secCategoryName ?? "")"
+            singleView?.layoutSubviews()
         }
         self.addChild(vc)
         vc.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
@@ -155,8 +155,8 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         self.dataModel.initDataSource()
         for i in 0..<self.dataModel.list.count {
             let model = self.dataModel.list[i]
-            let singleView = CNLiveShopAddGoodsSingleView.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 50))
-            singleView.addEditGoodsListModel = model
+            let singleView = CNLiveShopAddGoodsSingleView.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 50), model: model)
+//            singleView.addEditGoodsListModel = model
             singleView.tag = i+1
             //完成frame更新通知
             singleView.updateFrameBlock = {
@@ -200,8 +200,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
     }
     func reloadBgScrollViewContentViewModel(model:CNLiveShopAddEditGoodsListModel,index:Int,isScrollToBottom:Bool){
-        let singleView = CNLiveShopAddGoodsSingleView()
-        singleView.addEditGoodsListModel = model
+        let singleView = CNLiveShopAddGoodsSingleView(frame: CGRect(x: 0, y: self.bgScrollView.height, width: self.bgScrollView.width, height: 50), model: model)
         singleView.tag = index
         singleView.updateFrameBlock = {
             self.viewWillLayoutSubviews()
@@ -229,7 +228,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
             }
         }
         self.bgScrollView.addSubview(singleView)
-        singleView.frame = CGRect(x: 0, y: self.bgScrollView.height, width: self.bgScrollView.width, height: singleView.height)
+        
         self.bgScrollView.contentSize = CGSize(width: self.bgScrollView.width, height: self.bgScrollView.contentSize.height+50)
         if (isScrollToBottom) {
             self.bgScrollView.scrollToBottom()
@@ -287,7 +286,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
     }
     // MARK: - 获取店铺分类view
-    func getShopClassifyView()->CNLiveShopAddGoodsSingleView{
+    func getShopClassifyView()->CNLiveShopAddGoodsSingleView?{
         for singleView in self.bgScrollView.subviews {
             if singleView.isKind(of: CNLiveShopAddGoodsSingleView.self){
                 let single = singleView as! CNLiveShopAddGoodsSingleView
@@ -296,7 +295,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                 }
             }
         }
-        return CNLiveShopAddGoodsSingleView()
+        return nil
     }
     // MARK: - 显示选取店铺分类界面
     func displaySelectShopClassifyVC(){
@@ -85,6 +85,8 @@ class CNDownSlideView:UIView{
             }else if(type == UpDownTypeShopDetail){
             }else if(type == UpDownTypeShopControlConsole){
+                currentViewController()?.addChild(self.shopConsoleVC)
+                self.shopConsoleVC.didMove(toParent: currentViewController())
                 self.addSubview(self.shopConsoleVC.view)
             }
         }
@@ -55,6 +55,7 @@ class CNUpSlideView:UIView{
             }else if(type == UpDownTypeShopDetail){
                 currentViewController()?.addChild(self.upSlideVC)//看行不行
+                self.upSlideVC.didMove(toParent: currentViewController())
                 self.addSubview(self.upSlideVC.view)
             }else if(type == UpDownTypeShopControlConsole){
@@ -11,6 +11,7 @@ import UniformTypeIdentifiers
 import AVFoundation
 import HXPHPicker
 import SKPhotoBrowser
+import AVKit
 ///类型
 enum CNLiveSelectUploadImageViewDisplayType:Int {
     ///选择
@@ -38,8 +39,8 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
     // MARK: - 属性
     /// 显示类型
-    var _displayType:CNLiveSelectUploadImageViewDisplayType?
-    var displayType:CNLiveSelectUploadImageViewDisplayType?{
+    var _displayType:CNLiveSelectUploadImageViewDisplayType = .select
+    var displayType:CNLiveSelectUploadImageViewDisplayType{
         get{
             _displayType
         }
@@ -50,7 +51,7 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
     }
     /// 高度类型
-    var heightStyle:CNLiveSelectUploadImageViewHeightStyle?
+    var heightStyle:CNLiveSelectUploadImageViewHeightStyle = .autoCalc
     /// 每张图的间距 默认DS_adapt_length(15)
     var _space:CGFloat = 15
     var space:CGFloat{
@@ -101,13 +102,13 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
         }
     }
     /// 是否显示选取封面
-    var _isDisplySelectCover:Bool?
+    var _isDisplySelectCover:Bool = false
     var isDisplySelectCover:Bool?{
         get{
             _isDisplySelectCover
         }
         set{
-            _isDisplySelectCover = newValue
+            _isDisplySelectCover = newValue!
             self.resetUI()
         }
     }
@@ -133,7 +134,7 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
             self.uploadImageUrls.removeAll()
             self.replaceImageUrls.removeAll()
             for imageUrl in self.networkImageArr{
-                var uploadImageModel = CNLiveSelectUploadImageModel()
+                let uploadImageModel = CNLiveSelectUploadImageModel()
                 uploadImageModel.imageUrl = imageUrl
                 uploadImageModel.isUploading = false
                 self.uploadImageUrls.append(uploadImageModel)
@@ -189,19 +190,19 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
     }
     /// 是否可以选择视频 (目前只能选取一个，在索引1显示)
-    var _isAbleSelectVideo:Bool?
+    var _isAbleSelectVideo:Bool = false
     var isAbleSelectVideo:Bool?{
         get{
             _isAbleSelectVideo
         }
         set{
-            _isAbleSelectVideo = newValue
+            _isAbleSelectVideo = newValue!
             self.resetUI()
         }
     }
     // MARK: - 上传操作
     /// 是否正在上传图片中
-    var isUploading:Bool?
+    var isUploading:Bool = false
     /// 开始上传图片
     var beginUploadImageCallBack:beginUploadImageCallBackBlock?
     /// 结束上传图片
@@ -277,7 +278,7 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
      @return 网络图片Url数组
      */
     func getCurrentSelectImageUrls()->Array<String>{
-        var imageUrls = NSMutableArray()
+        let imageUrls = NSMutableArray()
         for uploadImageModel in self.uploadImageUrls{
             if uploadImageModel.isUploading == true || uploadImageModel.imageUrl?.isEmpty == true{
                 return Array()
@@ -383,14 +384,18 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
         didSet {
             if self.heightStyle == .autoCalc{
                 //算出带X图片的间距 X图片宽高均为DS_adapt_length(17)
-                var addXRSpace = self.rSpace - 17*0.5
-                var addXSpace = self.space - 17*0.5
+                let addXRSpace = self.rSpace - 17*0.5
+                let addXSpace = self.space - 17*0.5
                 let column = self.maxSelectImageCount < self.column ? self.maxSelectImageCount : self.column
+                
                 let totalSpace = self.lSpace + addXRSpace + addXSpace*CGFloat(column - 1)
-                let aHeight = column == 0 ? 0.0 : (frame.size.width - totalSpace / CGFloat(column))
+                let aHeight = column == 0 ? 0.0 : ((frame.size.width - totalSpace) / CGFloat(column))
                 let subviewsCount = self.subviews.count
-                let row = subviewsCount / column + (subviewsCount % column > 0 ? 1 : 0)
+                var row = 1
+                if column > 0{
+                    row = subviewsCount / column + (subviewsCount % column > 0 ? 1 : 0)
+                }
                 let height = aHeight * CGFloat(row) + (row > 1 ? addXSpace : 0) + 10
                 var isNeedCallBack = false
                 if self.height != 0 && self.height != height{
@@ -415,6 +420,8 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
     override init(frame: CGRect) {
         super.init(frame: frame)
+        self.initData()
+        self.resetUI()
     }
     required init?(coder: NSCoder) {
@@ -476,26 +483,34 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
         if self.displayType == .select{
             var lastIsSelectImage = false
             if self.isAbleSelectVideo == true{
+                //可以选择视频,索引1
+                //前2个为 选择图片和选择视频占位图,最多7个图片 1个视频
                 let model1 = CNLiveSelectUploadImageModel()
                 model1.isSelectPhotoPlaceholder = true
+                //选择照片
                 let singleImageView1 = self.createSingleImageView()
                 singleImageView1.tag = 1+DS_SUIV_ADD_TAG_COUNT
                 singleImageView1.setModel(model: model1, isHideDeleteBtn: isHideDeleteBtn, isCover: false)
                 self.addSubview(singleImageView1)
+                //选择视频
                 let singleImageView2 = self.createSingleImageView()
                 singleImageView2.tag = 2+DS_SUIV_ADD_TAG_COUNT
                 singleImageView2.setModel(model: self.uploadVideoModel!, isHideDeleteBtn: isHideDeleteBtn, isCover: false)
                 self.addSubview(singleImageView2)
             }else if self.uploadImageUrls.count < self.maxSelectImageCount{
+                //不可以选择视频,最后一个图片
                 lastIsSelectImage = true
             }
             var lastView:CNLiveSelUplSingleImageView? = nil
             for i in 0..<self.uploadImageUrls.count {
+                //给图片赋值
                 let model = self.uploadImageUrls[i]
-                var singleImageView = self.createSingleImageView()
-                if self.isAbleSelectVideo! == true{
+                let singleImageView = self.createSingleImageView()
+                if self.isAbleSelectVideo == true{
+                    //有2个默认占位图
                     singleImageView.tag = i+3+DS_SUIV_ADD_TAG_COUNT
                 }else{
+                    //全是图片,没有占位图
                     singleImageView.tag = i+1+DS_SUIV_ADD_TAG_COUNT
                 }
                 singleImageView.setModel(model: model, isHideDeleteBtn: isHideDeleteBtn, isCover: i == 0 ? true : false)
@@ -503,11 +518,12 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
                 lastView = singleImageView
             }
             if lastIsSelectImage{
-                var model = CNLiveSelectUploadImageModel()
+                //最后一张图片
+                let model = CNLiveSelectUploadImageModel()
                 model.isSelectPhotoPlaceholder = true
-                var singleImageView = self.createSingleImageView()
+                let singleImageView = self.createSingleImageView()
                 if (lastView != nil){
-                    singleImageView.tag = lastView!.tag
+                    singleImageView.tag = lastView!.tag + 1
                 }else{
                     singleImageView.tag = DS_SUIV_ADD_TAG_COUNT+1
                 }
@@ -515,22 +531,25 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
                 self.addSubview(singleImageView)
             }
         }else{
+            //纯展示,不可选择
             if self.networkVideoUrl?.count ?? 0 > 0{
-                var model = CNLiveSelectUploadImageModel()
+                //给视频配置model
+                let model = CNLiveSelectUploadImageModel()
                 model.videoUrl = self.networkVideoUrl
                 model.imageUrl = self.networkVideoImageUrl
                 model.isVideo = true
-                var singleImageView = self.createSingleImageView()
+                let singleImageView = self.createSingleImageView()
                 singleImageView.tag = 1+DS_SUIV_ADD_TAG_COUNT
                 singleImageView.setModel(model: model, isHideDeleteBtn: isHideDeleteBtn, isCover: false)
                 self.addSubview(singleImageView)
             }
             for i in 0..<self.networkImageArr.count {
-                var model = CNLiveSelectUploadImageModel()
+                //给图片配置model
+                let model = CNLiveSelectUploadImageModel()
                 model.imageUrl = self.networkImageArr[i]
-                var singleImageView = self.createSingleImageView()
+                let singleImageView = self.createSingleImageView()
                 if self.networkVideoUrl!.count > 0{
                     singleImageView.tag = i + 2+DS_SUIV_ADD_TAG_COUNT
                 }else{
@@ -545,7 +564,7 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
     /// 创建单个视图
     func createSingleImageView()->CNLiveSelUplSingleImageView{
-        var singleImageView = CNLiveSelUplSingleImageView()
+        let singleImageView = CNLiveSelUplSingleImageView()
         singleImageView.deleteImage = self.deleteImage
         singleImageView.isDisplySelectCover = self.isDisplySelectCover
         singleImageView.displayType = self.displayType
@@ -572,11 +591,13 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
     // MARK: - 选取图片/视频
     func selectImageModel(model:CNLiveSelectUploadImageModel){
-        self.clickCallBack!()
+        if self.clickCallBack != nil{
+            self.clickCallBack!()
+        }
         UIApplication.shared.keyWindow?.endEditing(true)
-        if model.isVideo! == true{
-            if model.localVideoUrl != nil{
-                CNLiveCommonManager.shared.skipPlayerVCWithPlayURL(playURL: URL(string: model.videoUrl!)!, coverImage: model.image!, coverImageUrl: nil)
+        if (model.isVideo == true){
+            if (model.localVideoUrl != nil){
+                CNLiveCommonManager.shared.skipPlayerVCWithPlayURL(playURL: URL(string: model.videoUrl ?? "")!, coverImage: model.image!, coverImageUrl: nil)
             }else if model.videoUrl?.count ?? 0 > 0{
                 CNLiveCommonManager.shared.skipPlayerVCWithPlayURL(playURL: model.localVideoUrl!, coverImage: nil, coverImageUrl: model.imageUrl)
             }else{
@@ -593,7 +614,7 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
                 currentViewController()?.present(pickerController, animated: true)
             }
         }else{
-            if model.isSelectPhotoPlaceholder! == true{
+            if (model.isSelectPhotoPlaceholder != nil) && (model.isSelectPhotoPlaceholder == true){
                 if self.uploadImageUrls.count >= self.maxSelectImageCount{
                     let message = String(format: "最多只能选取%ld张图片", self.maxSelectImageCount)
                     showMessage(message: message)
@@ -612,17 +633,18 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
                 currentViewController()?.present(pickerController, animated: true)
             }else{
-                if model.isUploading! == true || model.imageUrl == nil{
+                if model.isUploading == true || model.imageUrl == nil{
                     return
                 }
                 let subviews = self.subviews
                 var currentPage = 0
                 var images = [SKPhoto]()
                 for i in 0..<self.uploadImageUrls.count {
-                    var cmodel = self.uploadImageUrls[i]
-                    if cmodel.isUploading == nil && cmodel.imageUrl?.count ?? 0 > 0{
+                    let cmodel = self.uploadImageUrls[i]
+                    if cmodel.isUploading == false && cmodel.imageUrl?.count ?? 0 > 0{
                         let photo = SKPhoto.photoWithImageURL(cmodel.imageUrl!)
                         photo.shouldCachePhotoURLImage = false
+                        photo.photoURL = cmodel.imageUrl
                         images.append(photo)
                     }
                     if cmodel.imageUrl == model.imageUrl{
@@ -639,28 +661,42 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
     // MARK: - 删除图片/视频
     func delteImageModel(model:CNLiveSelectUploadImageModel){
-        self.clickCallBack!()
+        if  self.clickCallBack?() != nil{
+            self.clickCallBack!()
+        }
+        
         UIApplication.shared.keyWindow?.endEditing(true)
         let subviews = self.subviews
         for i in 0..<subviews.count {
             let singleImageView = self.viewWithTag(i+1+DS_SUIV_ADD_TAG_COUNT) as! CNLiveSelUplSingleImageView
+            //TODO 目前imageUrl为nil
             if model.imageUrl == singleImageView.model?.imageUrl{
+                //要删除model的imageUrl和subview的imageUrl相等
                 if singleImageView.model?.isVideo == true{
+                    //subview是视频
                     if singleImageView.model?.isUploading == true{
+                        //subview正在上传中
                         UploadManager.shared.cancelUploadKey(key: singleImageView.model!.uploadKey!)
                     }else{
+                        //subview上传完成
+                        //标记当前有视频,并替换model
                         self.replaceVideoUrls.append(singleImageView.model!)
                         let videoModel = CNLiveSelectUploadImageModel()
                         videoModel.isVideo = true
                         self.uploadVideoModel = videoModel
                     }
                 }else{
+                    //subview是纯图片
                     if singleImageView.model?.isUploading == true{
+                        //上传中
                         UploadManager.shared.cancelUploadKey(key: singleImageView.model!.uploadKey!)
                     }else{
-                        let index = self.uploadImageUrls.firstIndex(of: singleImageView.model!)!
-                        self.uploadImageUrls.remove(at: index)
-                        self.replaceImageUrls.append(singleImageView.model!)
+                        //上传完成
+                        if let index = self.uploadImageUrls.firstIndex(of: singleImageView.model!){
+                            //移除上传完成的model
+                            self.uploadImageUrls.remove(at: index)
+                            self.replaceImageUrls.append(singleImageView.model!)
+                        }
                     }
                 }
                 break
@@ -668,85 +704,116 @@ class CNLiveAddGoodsSelectUploadImageView: UIView,UIImagePickerControllerDelegat
         }
         self.resetUI()
         self.autoAdjustHeight()
-        self.changeUploadDataCallBack!(self.getCurrentSelectImageUrls(),self.getCurrentSelectVideoUrl())
+        if self.changeUploadDataCallBack?(self.getCurrentSelectImageUrls(),self.getCurrentSelectVideoUrl()) != nil{
+            self.changeUploadDataCallBack!(self.getCurrentSelectImageUrls(),self.getCurrentSelectVideoUrl())
+        }
     }
     // MARK: - PickerControllerDelegate
     func pickerController(_ pickerController: HXPHPicker.PhotoPickerController, didFinishSelection result: HXPHPicker.PickerResult) {
- 
-        
-        let photoAssets = result.photoAssets
-        for asset in photoAssets{
-            if asset.mediaType == .video
-            {
-                let videoFileName = "\(asset.phAsset?.localIdentifier ?? "").mp4".replacingOccurrences(of: "-", with: "").replacingOccurrences(of: "/", with: "")
-                let videoURL = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent(videoFileName)
-                
-                let videoData = NSData(contentsOf: videoURL) ?? NSData()
-                self.splitVideoFileUrlFps(splitFileUrl: videoURL, fps: 1) { isSucc,firstImage in
-                    if isSucc{
-                        self.uploadVideoModel?.videoUrl = nil
-                        self.uploadVideoModel?.image = firstImage.first
-                        self.uploadVideoModel?.localVideoUrl = videoURL
-                        self.uploadVideoModel?.isUploading = true
-                        
-                        self.uploadVideoModel?.uploadKey = UploadManager.uploadVideo(videoData: videoData, progressBlock: { [weak self] key, progress in
-                            self!.uploadVideoModel?.uploadingPercent = progress
-                            self?.replaceVideoModelInSubviews(model: (self?.uploadVideoModel)!, target: firstImage.first!)
-                        }, successBlock: { [weak self] key,url in
-                            self?.uploadVideoModel?.videoUrl = url
-                            self?.uploadVideoModel?.isUploading = false
-                            self?.uploadVideoModel?.uploadKey = nil
-                            self?.replaceVideoModelInSubviews(model: (self?.uploadVideoModel)!, target: firstImage.first!)
-                            self?.uploadingCount = self!.uploadingCount - 1
-                            if self?.uploadingCount == 0{
+        result.getVideoURL { videoUrls in
+            if videoUrls.count == 0{
+                return
+            }
+            let videoUrl = videoUrls.first! as URL
+            let videoData:NSData
+            do {
+                videoData = try NSData(contentsOf: videoUrl) ?? NSData()
+                print(videoData)
+            }catch{
+                print("无法加载视频数据")
+            }
+            self.splitVideoFileUrlFps(splitFileUrl: videoUrl, fps: 1) { isSucc,firstImage in
+                if isSucc{
+                    self.uploadVideoModel?.videoUrl = nil
+                    self.uploadVideoModel?.image = firstImage.first
+                    self.uploadVideoModel?.localVideoUrl = videoUrl
+                    self.uploadVideoModel?.isUploading = true
+                    
+                    self.uploadVideoModel?.uploadKey = UploadManager.uploadVideo(videoData: videoData, progressBlock: { [weak self] key, progress in
+                        self!.uploadVideoModel?.uploadingPercent = progress
+                        self?.replaceVideoModelInSubviews(model: (self?.uploadVideoModel)!, target: firstImage.first!)
+                    }, successBlock: { [weak self] key,url in
+                        self?.uploadVideoModel?.videoUrl = url
+                        self?.uploadVideoModel?.isUploading = false
+                        self?.uploadVideoModel?.uploadKey = nil
+                        self?.replaceVideoModelInSubviews(model: (self?.uploadVideoModel)!, target: firstImage.first!)
+                        self?.uploadingCount = self!.uploadingCount - 1
+                        if self?.uploadingCount == 0{
+                            if ((self?.endUploadImageCallBack?()) != nil){
                                 self?.endUploadImageCallBack!()
                             }
+                        }
+                        if ((self?.changeUploadDataCallBack?((self?.getCurrentSelectImageUrls())!,(self?.getCurrentSelectVideoUrl())!)) != nil){
                             self?.changeUploadDataCallBack!((self?.getCurrentSelectImageUrls())!,(self?.getCurrentSelectVideoUrl())!)
-                        })
+                        }
+                    })
+                    DispatchQueue.main.async {
                         self.resetUI()
                         self.autoAdjustHeight()
                         self.uploadingCount = self.uploadingCount + 1
                         if self.uploadingCount == 1{
-                            self.beginUploadImageCallBack!()
+                            if ((self.beginUploadImageCallBack?()) != nil){
+                                self.beginUploadImageCallBack!()
+                            }
                         }
+
                     }
                 }
-            }else if asset.mediaType == .photo{
-                let image = asset.localImageAsset?.image
-                let imageData = asset.localImageAsset?.imageData
-                var model = CNLiveSelectUploadImageModel()
+            }
+            
+        }
+        result.getImage { [weak self] img, photoAsset, index in
+            if photoAsset.mediaType == .video {
+                return
+            }
+            if let image = img {
+                let imageData = image.jpegData(compressionQuality: 1.0)! as NSData
+                let model = CNLiveSelectUploadImageModel()
                 model.image = image
                 model.isUploading = true
-                self.uploadVideoModel?.uploadKey = UploadManager.uploadImage(imageData: imageData! as NSData) { [weak self] key, percent in
+                self!.uploadVideoModel?.uploadKey = UploadManager.uploadImage(imageData: imageData) { [weak self] key, percent in
                     model.uploadingPercent = percent
-                    self?.replaceImageModelInDataArr(model: model, target: image!)
+                    self?.replaceImageModelInDataArr(model: model, target: image)
                 } successBlock: { key, url in
                     model.imageUrl = url
                     model.isUploading = false
                     model.uploadKey = nil
-                    self.replaceImageModelInDataArr(model: model, target: image!)
+                    self!.replaceImageModelInDataArr(model: model, target: image)
-                    self.uploadingCount = self.uploadingCount - 1
+                    self!.uploadingCount = self!.uploadingCount - 1
-                    if self.uploadingCount == 0{
-                        self.endUploadImageCallBack!()
+                    if self!.uploadingCount == 0{
+                        if self!.endUploadImageCallBack?() != nil{
+                            self!.endUploadImageCallBack!()
+                        }
+                    }
+                    
+                    if self!.changeUploadDataCallBack?(self!.getCurrentSelectImageUrls(),self!.getCurrentSelectVideoUrl()) != nil{
+                        self!.changeUploadDataCallBack!(self!.getCurrentSelectImageUrls(),self!.getCurrentSelectVideoUrl())
                     }
-                    self.changeUploadDataCallBack!(self.getCurrentSelectImageUrls(),self.getCurrentSelectVideoUrl())
                 }
-                self.uploadImageUrls.append(model)
-                self.resetUI()
-                self.autoAdjustHeight()
-                self.uploadingCount = self.uploadingCount + 1
-                if self.uploadingCount == 1{
-                    self.beginUploadImageCallBack!()
+                self!.uploadImageUrls.append(model)
+                self!.resetUI()
+                self!.autoAdjustHeight()
+                self!.uploadingCount = self!.uploadingCount + 1
+                if self!.uploadingCount == 1{
+                    if self!.beginUploadImageCallBack?() != nil{
+                        self!.beginUploadImageCallBack!()
+                    }
                 }
+            }else{
+                print("failed")
             }
+        } completionHandler: { (images) in
+            
         }
         pickerController.dismiss(animated: true)
     }
-    
+       
+ 
+
     // MARK: - 获取视频的第一帧
     func splitVideoFileUrlFps(splitFileUrl: URL, fps: Float, splitCompleteClosure: @escaping (Bool, [UIImage]) -> Void) {
@@ -89,13 +89,13 @@ class CNLiveSelUplSingleImageView: UIView {
         self.model = model
         self.isHideDeleteBtn = isHideDeleteBtn
         self.isCover = isCover
-        if self.model?.isSelectPhotoPlaceholder! == true{
+        if (self.model?.isSelectPhotoPlaceholder != nil && self.model?.isSelectPhotoPlaceholder == true){
             self.displayImageView?.image = UIImage(named: "DS_SelUplImageView_selectImage")
             self.progressLab?.isHidden = true
             self.deleteBtn?.isHidden = true
             self.playImageView?.isHidden = true
             self.coverBtn?.isHidden = true
-        }else if self.model?.isVideo! == true{
+        }else if (self.model?.isVideo == true && self.model?.isVideo != nil){
             if self.model?.videoUrl?.count ?? 0 > 0{
                 self.displayImageView?.image = self.model?.image
                 if self.model?.image == nil{
@@ -108,9 +108,9 @@ class CNLiveSelUplSingleImageView: UIView {
                     self.deleteBtn?.isHidden = false
                 }
                 self.playImageView?.isHidden = false
-            }else if self.model?.isUploading! == true{
+            }else if (self.model?.isUploading != nil && self.model?.isUploading == true){
                 self.displayImageView?.image = self.model?.image
-                self.progressLab?.text = String(format: "%.0f%%", (self.model?.uploadingPercent)!*100)
+                self.progressLab?.text = String(format: "%.0f%%", (self.model!.uploadingPercent)*100)
                 self.progressLab?.isHidden = false
                 self.deleteBtn?.isHidden = false
                 self.playImageView?.isHidden = true
@@ -133,12 +133,12 @@ class CNLiveSelUplSingleImageView: UIView {
                     self.deleteBtn?.isHidden = false
                 }
             }else if self.model?.isUploading! == true{
-                self.progressLab?.text = String(format: "%.0f%%", (self.model?.uploadingPercent)!*100)
+                self.progressLab?.text = String(format: "%.0f%%", self.model?.uploadingPercent ?? 0 * 100)
                 self.progressLab?.isHidden = false
                 self.deleteBtn?.isHidden = false
             }
             self.playImageView?.isHidden = true
-            self.coverBtn?.isHidden = self.isDisplySelectCover! == true ? false : true
+            self.coverBtn?.isHidden = (self.isDisplySelectCover != nil && self.isDisplySelectCover == true) ? false : true
             if self.isCover == true{
                 self.coverBtn?.setTitle("主页", for: .normal)
                 self.coverBtn?.setTitleColor(HexColor("#F5A623"), for: .normal)
@@ -189,8 +189,8 @@ class CNLiveSelUplSingleImageView: UIView {
         self.deleteImageView?.frame = CGRect(x: self.deleteBtn!.width-17, y: 0, width: 17, height: 17)
         self.displayImageView?.frame = CGRect(x: 0, y: self.deleteImageView!.height/2, width: self.width-self.deleteImageView!.width/2, height: self.width-self.deleteImageView!.height/2)
         self.progressLab?.frame = self.displayImageView!.frame
-        self.playImageView?.frame = CGRect(x: self.displayImageView!.width-26/2, y: self.displayImageView!.top+self.displayImageView!.height-26/2, width: 26, height: 26)
-        self.coverBtn?.frame = CGRect(x: self.displayImageView!.left, y: self.displayImageView!.bottom, width: self.displayImageView!.width, height: 20)
+        self.playImageView?.frame = CGRect(x: (self.displayImageView!.width-26)/2, y: self.displayImageView!.top+(self.displayImageView!.height-26)/2, width: 26, height: 26)
+        self.coverBtn?.frame = CGRect(x: self.displayImageView!.left, y: self.displayImageView!.bottom-20, width: self.displayImageView!.width, height: 20)
     }
     // MARK: - initUI
@@ -47,7 +47,7 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate, UITextViewDeleg
     var delectButton = UIButton()
     var rightImageView = UIImageView()
     var contentSwitch = UISwitch()
-    var uploadImageView = CNLiveAddGoodsSelectUploadImageView(frame: CGRectZero)
+    var uploadImageView = CNLiveAddGoodsSelectUploadImageView()
     var contentTextBgView = CNLiveRoundedRectView()
     var contentTextView = CNLiveShopTextView()
     var addBtn = UIButton()
@@ -59,9 +59,9 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate, UITextViewDeleg
     //开始输入前的文本
     var beginText:String?
-    override init(frame: CGRect) {
+    init(frame: CGRect,model:CNLiveShopAddEditGoodsListModel) {
         super.init(frame: frame)
-
+        self.addEditGoodsListModel = model
         NotificationCenter.default.addObserver(self, selector: #selector(textFieldTextDidChangeNotification), name: Notification.Name("UITextFieldTextDidChangeNotification"), object:nil)
         self.addObserver(self, forKeyPath: "tag",options: [.new,.old],context: nil)
@@ -101,7 +101,7 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate, UITextViewDeleg
         {
             self.titleLabel.textColor = HexColor("#333333")
             if (self.addEditGoodsListModel?.subtitle?.count ?? 0 > 0) {
-                self.titleLabel.text = "\(self.addEditGoodsListModel?.title ?? "")+\(self.addEditGoodsListModel?.subtitle ?? "")"
+                self.titleLabel.text = "\(self.addEditGoodsListModel?.title ?? "")\(self.addEditGoodsListModel?.subtitle ?? "")"
             }else{
                 self.titleLabel.text = self.addEditGoodsListModel?.title ?? ""
             }
@@ -169,8 +169,8 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate, UITextViewDeleg
             self.uploadImageView = CNLiveAddGoodsSelectUploadImageView(frame: CGRectZero)
             self.uploadImageView.column = 3
             self.uploadImageView.maxSelectImageCount = (model.maxSelectImageCount! as NSString).integerValue
-            self.uploadImageView.isAbleSelectVideo = model.isAbleSelectVideo
-            self.uploadImageView.isDisplySelectCover = model.isAbleSelectCover
+            self.uploadImageView.isAbleSelectVideo = model.isAbleSelectVideo ?? false
+            self.uploadImageView.isDisplySelectCover = model.isAbleSelectCover ?? false
             if model.id?.isEmpty == true {
                 self.uploadImageView.deleteImage = UIImage(named: "DS_shop_manageGoodsDetails_delete")
             }
@@ -252,7 +252,7 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate, UITextViewDeleg
             if (self.addEditGoodsListModel!.contentType == "1") {
                 if (self.addEditGoodsListModel!.isDelect ?? false) {
                     self.delectButton.frame = CGRect(x: KSreenWidth-50, y: 0, width: 40, height: 50)
-                    self.contentTextField.frame = CGRect(x: self.titleLabel.right+15, y: 0, width: self.width-self.titleLabel.right+15*2-40, height: 50)
+                    self.contentTextField.frame = CGRect(x: self.titleLabel.right+15, y: 0, width: self.width-self.titleLabel.right-15*2-40, height: 50)
                 }else{
                     self.contentTextField.frame = CGRect(x: self.titleLabel.right+15, y: 0, width: self.width-self.titleLabel.right-15*2, height: 50)
                 }
@@ -271,7 +271,7 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate, UITextViewDeleg
             }
             self.addSubview(self.contentTextField)
         }else if (self.addEditGoodsListModel!.style == "3") {
-            self.uploadImageView.frame = CGRect(x: 0, y: self.titleLabel.bottom+2, width: self.width, height: 0)
+            self.uploadImageView.frame = CGRect(x: 0, y: self.titleLabel.bottom+2, width: self.width, height: 50)
             if (self.height == 0) {
                 self.height = self.uploadImageView.bottom+15
                 if ((self.updateFrameBlock) != nil) {
@@ -311,9 +311,9 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate, UITextViewDeleg
     }
     @objc func selectDelectParamAction(){
         AlertTool.showSystemAlert(title: "确认删除？", message: nil, actionTitles: ["取消","确定"], style: .alert, actionStyles:[.cancel,.default] ) { index in
-            if (index == 1) {
-                if ((self.updateFrameBlock) != nil) {
-                    self.updateFrameBlock!()
+            if (index == 2) {
+                if ((self.changeFrameBlock) != nil) {
+                    self.changeFrameBlock!(true, self.addEditGoodsListModel!, self)
                 }
             }
         }
@@ -522,7 +522,7 @@ class CNLiveShopAddGoodsSingleView: UIView, UITextFieldDelegate, UITextViewDeleg
         cs = CharacterSet(charactersIn: string).inverted
         let filterArr = string.components(separatedBy: cs)
         // 对比一下是否为数字
-        return  filterArr.count == string.count ? true:false
+        return  filterArr.first!.count == string.count ? true:false
     }
 }
@@ -49,6 +49,7 @@ class CNLiveShopClassifySwitchTableViewCell: UITableViewCell {
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
+        self.initUI()
     }
     required init?(coder: NSCoder) {
@@ -16,7 +16,7 @@ class CNLiveShopClassilyIconTableViewCell: UITableViewCell {
     var selectUploadImageView:CNLiveAddGoodsSelectUploadImageView?{
         get{
             if _selectUploadImageView == nil{
-                _selectUploadImageView = CNLiveAddGoodsSelectUploadImageView()
+                _selectUploadImageView = CNLiveAddGoodsSelectUploadImageView(frame: CGRect(x: 0, y: 40, width: 120, height: 120))
                 _selectUploadImageView?.maxSelectImageCount = 1
                 _selectUploadImageView?.isAbleSelectVideo = false
                 _selectUploadImageView?.deleteImage = UIImage(named: "DS_happ_daren_dynamic_delete")
@@ -60,6 +60,7 @@ class CNLiveShopClassilyIconTableViewCell: UITableViewCell {
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
+        self.initUI()
     }
     required init?(coder: NSCoder) {
@@ -78,6 +79,6 @@ class CNLiveShopClassilyIconTableViewCell: UITableViewCell {
             make.top.equalTo(0)
             make.height.equalTo(40)
         }
-        self.selectUploadImageView?.frame = CGRect(x: 0, y: 40, width: 120, height: 120)
+        
     }    
 }
@@ -87,14 +87,22 @@ class CNLiveShopGoodsManageDetailsInputManager:NSObject{
         let modalViewController = CNLiveModalPresentationViewController()
         modalViewController.contentView = contentView
+        
+        currentViewController()?.addChild(modalViewController)
+        modalViewController.didMove(toParent: currentViewController())
+        currentViewController()?.view.addSubview(modalViewController.view)
         modalViewController.showingAnimationWithCompletion { finished in
         }
         self.modalViewController = modalViewController
-        cancelButton.addTarget(modalViewController, action: #selector(cancelButtonAction), for: .touchUpInside)
+        cancelButton.addTarget(self, action: #selector(cancelButtonAction), for: .touchUpInside)
+        confirmButton.addTarget(self, action: #selector(confirmButtonAction), for: .touchUpInside)
         self.completerBlock = completeBlock
+        self.modalViewController.confirmBlock = {
+            self.confirmButtonAction()
+        }
     }
     @objc func cancelButtonAction(){
@@ -16,7 +16,7 @@ class CNLiveSelectUploadImageModel: BaseModel,Equatable {
     /**
      是否是视频
      */
-    var isVideo:Bool?
+    var isVideo:Bool = false
     /**
      本地视频路径
      */
@@ -36,7 +36,7 @@ class CNLiveSelectUploadImageModel: BaseModel,Equatable {
     /**
      是否正在上传中
      */
-    var isUploading:Bool?
+    var isUploading:Bool = false
     /**
      上传的key 用于取消上传
      */
@@ -44,7 +44,7 @@ class CNLiveSelectUploadImageModel: BaseModel,Equatable {
     /**
      上传百分比 0~1
      */
-    var uploadingPercent:CGFloat?
+    var uploadingPercent:CGFloat = 0
     static func == (lhs: CNLiveSelectUploadImageModel, rhs: CNLiveSelectUploadImageModel) -> Bool {
@@ -170,7 +170,7 @@ class CNLiveShopGoodsDetailsModel:BaseModel{
     /**
      是否开启赠送礼物 1开启 0关闭
      */
-    var is_gift:Bool?
+    var is_gift:Bool = false
     /**
      banner第一个视频
      */
@@ -11,6 +11,7 @@ class CNLiveShopAddEditGoodsModel: BaseModel {
     ///列表
     var list = [CNLiveShopAddEditGoodsListModel]()
     func initDataSource(){
+        if self.list.count > 0 {return}
         var dataArr:Array<Any> = []
         let dic1 = ["style":"1","isHaveTo":true,"title":"商品分类","contentType":"2"] as [String : Any]
         let dic2 = ["style":"1","isHaveTo":true,"title":"店铺分类","contentType":"2"] as [String : Any]
@@ -18,7 +19,7 @@ class CNLiveShopAddEditGoodsModel: BaseModel {
         let dic4 = ["style":"3","isHaveTo":true,"title":"商品轮播","isDisplayLine":true,"isAbleSelectVideo":true,"isAbleSelectCover":true,"maxSelectImageCount":"7"] as [String : Any]
         let dic5 = ["style":"1","isHaveTo":true,"title":"商品名称","isDisplayLine":true,"contentType":"1"] as [String : Any]
         let dic6 = ["style":"4","isHaveTo":false,"title":"商品副标题","isDisplayLine":true,"placeholder":"请在此输入..."] as [String : Any]
-        let dic7 = ["style":"1","isHaveTo":true,"title":"本店售价","subtitle":"(实际售价)","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"2","contentTextColor":"0xFC1541","contentType":"1"] as [String : Any]
+        let dic7 = ["style":"1","isHaveTo":true,"title":"本店售价","subtitle":"(实际售价)","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"2","contentTextColor":"#FC1541","contentType":"1"] as [String : Any]
         let dic8 = ["style":"1","isHaveTo":true,"title":"市场售价","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"2","contentType":"1"] as [String : Any]
         let dic9 = ["style":"1","isHaveTo":false,"title":"商品重量","subtitle":"(kg)","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"3","contentType":"1"] as [String : Any]
         let dic10 = ["style":"5","isHaveTo":false,"title":"最低起售","subtitle":"(件)","isDisplayLine":true,"desc":"如起售数超出库存买家无法购买","decimalLength":"3","contentType":"4"] as [String : Any]
@@ -68,7 +69,7 @@ class CNLiveShopAddEditGoodsModel: BaseModel {
 //         ["style":"3","isHaveTo":true,"title":"商品轮播","isDisplayLine":true,"isAbleSelectVideo":true,"isAbleSelectCover":true,"maxSelectImageCount":"7"],
 //         ["style":"1","isHaveTo":true,"title":"商品名称","isDisplayLine":true,"contentType":"1"],
 //         ["style":"4","isHaveTo":false,"title":"商品副标题","isDisplayLine":true,"placeholder":"请在此输入..."],
-//         ["style":"1","isHaveTo":true,"title":"本店售价","subtitle":"(实际售价)","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"2","contentTextColor":"0xFC1541","contentType":"1"],
+//         ["style":"1","isHaveTo":true,"title":"本店售价","subtitle":"(实际售价)","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"2","contentTextColor":"#FC1541","contentType":"1"],
 //         ["style":"1","isHaveTo":true,"title":"市场售价","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"2","contentType":"1"],
 //         ["style":"1","isHaveTo":false,"title":"商品重量","subtitle":"(kg)","isDisplayLine":true,"contentTextFieldkeyboardType":"2","decimalLength":"3","contentType":"1"],
 //         ["style":"5","isHaveTo":false,"title":"最低起售","subtitle":"(件)","isDisplayLine":true,"desc":"如起售数超出库存买家无法购买","decimalLength":"3","contentType":"4"],
@@ -122,7 +123,7 @@ class CNLiveShopAddEditGoodsListModel: BaseModel {
     var contentTextFieldkeyboardType:String?
     /// 样式一属性 小数点位数
     var decimalLength:String?
-    /// 样式一属性 内容输入框颜色 默认0x787878
+    /// 样式一属性 内容输入框颜色 默认#787878
     var contentTextColor: String?
     /// 样式一属性 1输入框 2选择 3开关 4可以增加数量
     var contentType:String?
@@ -18,7 +18,7 @@ class CNLiveCommonManager: NSObject{
     /// @param coverImage 封面图
     /// @param coverImageUrl 封面图url
     func skipPlayerVCWithPlayURL(playURL:URL,coverImage:UIImage?,coverImageUrl:String?){
-        var vc = CNLivePlayerViewController()
+        let vc = CNLivePlayerViewController()
         vc.setPlayUrl(playUrl: playURL, isLive: false)
         vc.coverImageUrl = coverImageUrl
         currentViewController()?.navigationController?.pushViewController(vc, animated: false)
@@ -37,14 +37,14 @@ class CNLivePlayerBottomNaviView:UIView{
     // MARK: - 属性
     /// 是否是横屏
-    var _isLandscape:Bool?
+    var _isLandscape:Bool = false
     var isLandscape:Bool?{
         get{
             _isLandscape
         }
         set{
-            _isLandscape = newValue
-            if _isLandscape!{
+            _isLandscape = newValue!
+            if _isLandscape{
                 self.frameImageView?.image = UIImage(named: "DS_player_reduce")
             }else{
                 self.frameImageView?.image = UIImage(named: "DS_player_magnify")
@@ -46,7 +46,7 @@ class CNLivePlayerControlView:UIView,CNLivePlayerGestureViewDelegate{
     /// 播放器
     weak var player:PLPlayer?
     /// 视频链接是否为直播
-    var isLive:Bool?
+    var isLive:Bool = false
     // MARK: - UI
     /// 封面图
     var _coverImageView:UIImageView?
@@ -241,7 +241,9 @@ class CNLivePlayerControlView:UIView,CNLivePlayerGestureViewDelegate{
         }
         set{
             _coverImageUrl = newValue
-            self.coverImageView?.kf.setImage(with: URL(string: _coverImageUrl!))
+            if _coverImageUrl != nil{
+                self.coverImageView?.kf.setImage(with: URL(string: _coverImageUrl!))
+            }
         }
     }
@@ -258,9 +260,9 @@ class CNLivePlayerControlView:UIView,CNLivePlayerGestureViewDelegate{
     }
     /// 是否隐藏信息视图
-    var isAlphaMessage:Bool?
+    var isAlphaMessage:Bool = false
     /// 是否锁屏
-    var isLockScreen:Bool?
+    var isLockScreen:Bool = false
     /// 全屏样式
     var _fullScreenType:CNLivePlayerFullScreenType?
     var fullScreenType:CNLivePlayerFullScreenType?{
@@ -274,13 +276,13 @@ class CNLivePlayerControlView:UIView,CNLivePlayerGestureViewDelegate{
     }
     /// 是否全屏
-    var _isFullScreen:Bool?
+    var _isFullScreen:Bool = false
     var isFullScreen:Bool?{
         get{
             _isFullScreen
         }
         set{
-            _isFullScreen = newValue
+            _isFullScreen = newValue!
 //            [DSCnliveShopSDKManager sharedManager].isNeedLandscapeMask = _isFullScreen;
         }
@@ -312,7 +314,7 @@ class CNLivePlayerControlView:UIView,CNLivePlayerGestureViewDelegate{
      fullScreenType == DSPlayerFullScreenTypeInWindowOrientation 时默认 50
      fullScreenType == DSPlayerFullScreenTypeFullDisplayOfVideoInterface 时默认 导航高度
      */
-    var _portraitTopNaviHeight:CGFloat = 0
+    var _portraitTopNaviHeight:CGFloat = 50
     var portraitTopNaviHeight:CGFloat{
         get{
             if (_portraitTopNaviHeight > 0) {
@@ -419,7 +421,7 @@ class CNLivePlayerControlView:UIView,CNLivePlayerGestureViewDelegate{
         }
         set{
             _autoHideControlsTime = newValue
-            if _autoHideControlsTime <= 0 && !self.isAlphaMessage! && self.player?.status == .statusPlaying{
+            if _autoHideControlsTime <= 0 && !self.isAlphaMessage && self.player?.status == .statusPlaying{
                 self.isAlphaMessage = true
                 self.hideOrDisplayControls()
             }
@@ -551,8 +553,8 @@ class CNLivePlayerControlView:UIView,CNLivePlayerGestureViewDelegate{
     @objc func lockBtnClick(){
         self.autoHideControlsTime = CGFloat(kDSPlayerAutoHideControlsTime)
-        self.isLockScreen = !self.isLockScreen!
-        if self.isLockScreen!{
+        self.isLockScreen = !self.isLockScreen
+        if self.isLockScreen{
             self.lockBtn?.setBackgroundImage(UIImage(named: "DS_player_lock_close"), for: .normal)
             self.topNaviView?.isUserInteractionEnabled = false
             self.bottomNaviView?.isUserInteractionEnabled = false
@@ -570,8 +572,8 @@ class CNLivePlayerControlView:UIView,CNLivePlayerGestureViewDelegate{
     func hideOrDisplayControls(){
         self.switchAlphaMessageStateCallBack!()
         UIView.animate(withDuration: CGFloat(kDSPlayerAnimateTimeInterval)) {
-            if self.isLockScreen! == false{
-                if self.isAlphaMessage!{
+            if self.isLockScreen == false{
+                if self.isAlphaMessage{
                     self.topNaviView?.alpha = 0
                     self.bottomNaviView?.alpha = 0
                     self.bottomProgressView?.alpha = 1
@@ -588,7 +590,7 @@ class CNLivePlayerControlView:UIView,CNLivePlayerGestureViewDelegate{
                     self.bottomProgressView?.alpha = 0
                 }
             }else{
-                if (self.isAlphaMessage!) {
+                if (self.isAlphaMessage) {
                     self.topNaviView?.alpha = 0
                     self.bottomNaviView?.alpha = 0
                     self.bottomProgressView?.alpha = 1
@@ -674,7 +676,7 @@ class CNLivePlayerControlView:UIView,CNLivePlayerGestureViewDelegate{
     func gestureViewSingleTap(gestureView: CNLivePlayerGestureView, recognizer: UITapGestureRecognizer) {
         self.autoHideControlsTime = CGFloat(kDSPlayerAutoHideControlsTime)
-        self.isAlphaMessage = !self.isAlphaMessage!
+        self.isAlphaMessage = !self.isAlphaMessage
         self.hideOrDisplayControls()
     }
@@ -697,7 +699,7 @@ class CNLivePlayerControlView:UIView,CNLivePlayerGestureViewDelegate{
             self.isUserInteractionEnabled = false
             let velocity = panGestureRecognizer.velocity(in: panGestureRecognizer.view)
             if abs(velocity.y) < abs(velocity.x){
-                if self.isLive!{
+                if self.isLive{
                     panGestureRecognizer.isEnabled = false
                     let delayTime = DispatchTime.now() + DispatchTimeInterval.seconds(Int(0.1))
                     DispatchQueue.main.asyncAfter(deadline: delayTime) {
@@ -41,12 +41,14 @@ class CNLivePlayerGestureView:UIView{
         }
         set{
             _style = newValue
-            self.removeGestureRecognizer(self.singleTapGestureRecognizer!)
-            self.singleTapGestureRecognizer = nil
-            self.removeGestureRecognizer(self.doubleTapGestureRecognizer!)
-            self.doubleTapGestureRecognizer = nil
-            self.removeGestureRecognizer(self.panGestureRecognizer!)
-            self.panGestureRecognizer = nil
+            if self.singleTapGestureRecognizer != nil && self.doubleTapGestureRecognizer != nil && self.panGestureRecognizer != nil{
+                self.removeGestureRecognizer(self.singleTapGestureRecognizer!)
+                self.singleTapGestureRecognizer = nil
+                self.removeGestureRecognizer(self.doubleTapGestureRecognizer!)
+                self.doubleTapGestureRecognizer = nil
+                self.removeGestureRecognizer(self.panGestureRecognizer!)
+                self.panGestureRecognizer = nil
+            }
             self.addGesture()
         }
     }
@@ -60,12 +62,14 @@ class CNLivePlayerGestureView:UIView{
         }
         set{
             _private_style = newValue
-            self.removeGestureRecognizer(self.singleTapGestureRecognizer!)
-            self.singleTapGestureRecognizer = nil
-            self.removeGestureRecognizer(self.doubleTapGestureRecognizer!)
-            self.doubleTapGestureRecognizer = nil
-            self.removeGestureRecognizer(self.panGestureRecognizer!)
-            self.panGestureRecognizer = nil
+            if self.singleTapGestureRecognizer != nil && self.doubleTapGestureRecognizer != nil && self.panGestureRecognizer != nil{
+                self.removeGestureRecognizer(self.singleTapGestureRecognizer!)
+                self.singleTapGestureRecognizer = nil
+                self.removeGestureRecognizer(self.doubleTapGestureRecognizer!)
+                self.doubleTapGestureRecognizer = nil
+                self.removeGestureRecognizer(self.panGestureRecognizer!)
+                self.panGestureRecognizer = nil
+            }
             self.addGesture()
         }
     }
@@ -12,13 +12,13 @@ class CNLivePlayerLoadingView:UIView,CAAnimationDelegate{
     /**
      是否在加载中
      */
-    var _isLoading:Bool?
+    var _isLoading:Bool = false
     var isLoading:Bool?{
         get{
             _isLoading
         }
         set{
-            _isLoading = newValue
+            _isLoading = newValue!
         }
     }
@@ -76,7 +76,7 @@ class CNLivePlayerProgressSlider:UIView{
             }else if (_value < 0) {
                 _value = 0
             }
-            if self.isDraggingSlideBlock!{
+            if !self.isDraggingSlideBlock{
                 self.slider?.value = Float(_value)
             }
         }
@@ -94,7 +94,7 @@ class CNLivePlayerProgressSlider:UIView{
     //滑块
     var slider:CNLivePlayerSlider?
     //是否在拖动滑块
-    var isDraggingSlideBlock:Bool?
+    var isDraggingSlideBlock:Bool = false
     // MARK: - init
     init() {
@@ -23,13 +23,13 @@ class CNLivePlayerTopNaviView:UIView{
     /// 返回按钮
     var backBtn:UIButton?
     /// 返回按钮图片
-    var backImageView:UIImageView?
+    var backImageView:UIImageView = UIImageView()
     /// 标题
     var titleLab:UILabel?
     // MARK: - 属性
     /// 是否是横屏
-    var isLandscape:Bool?
+    var isLandscape:Bool = false
     // MARK: - 回调
     /// 点击返回回调
@@ -39,6 +39,7 @@ class CNLivePlayerTopNaviView:UIView{
     init() {
         super.init(frame: CGRectZero)
         self.initUI()
+        self.isLandscape = false
     }
     required init?(coder: NSCoder) {
@@ -47,8 +48,8 @@ class CNLivePlayerTopNaviView:UIView{
     override func layoutSubviews() {
         super.layoutSubviews()
         self.bgGradientView?.frame = CGRect(x: 0, y: 0, width: self.width, height: self.height)
-        self.backBtn?.frame = CGRect(x: self.isLandscape! ? KStatusBarHeight : 5, y: self.height-44, width: 44, height: 44)
-        self.backImageView?.frame = CGRect(x: (self.backBtn!.width-22)/2, y: (self.backBtn!.height-22)/2, width: 22, height: 22)
+        self.backBtn?.frame = CGRect(x: self.isLandscape ? KStatusBarHeight : 5, y: self.height-44, width: 44, height: 44)
+        self.backImageView.frame = CGRect(x: (self.backBtn!.width-22)/2, y: (self.backBtn!.height-22)/2, width: 22, height: 22)
     }
     // MARK: - initUI
     func initUI(){
@@ -64,10 +65,10 @@ class CNLivePlayerTopNaviView:UIView{
         self.addSubview(self.backBtn!)
         self.backImageView = UIImageView()
-        self.backImageView?.clipsToBounds = true
-        self.backImageView?.contentMode = .scaleAspectFit
-        self.backImageView?.image = UIImage(named: "DS_player_nav_back")
-        self.backBtn?.addSubview(self.backImageView!)
+        self.backImageView.clipsToBounds = true
+        self.backImageView.contentMode = .scaleAspectFit
+        self.backImageView.image = UIImage(named: "DS_player_nav_back")
+        self.backBtn?.addSubview(self.backImageView)
     }
@@ -25,36 +25,36 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
     /// 初始化视频链接地址 为空为停止播放
     var playUrl:URL?
     /// 视频链接是否为直播
-    var isLive:Bool?
+    var isLive:Bool = false
     // MARK: - 播放属性
     /// 是否循环播放（默认NO）
-    var _isLoopPlay:Bool?
-    var isLoopPlay:Bool?{
+    var _isLoopPlay:Bool = false
+    var isLoopPlay:Bool{
         get{
             _isLoopPlay
         }
         set{
             _isLoopPlay = newValue
-            if self.isLive!{
+            if self.isLive{
                 return
             }
-            self.player?.loopPlay = _isLoopPlay!
+            self.player?.loopPlay = _isLoopPlay
         }
     }
     /// 开始播放时间
-    var startPlayTime:Double?
+    var startPlayTime:Double = 0.0
     /// 获取播放时间
     func getPlayTime() -> Double{
         return CMTimeGetSeconds(self.player!.currentTime)
     }
     /// 是否播放完成
-    var isPlayEnd:Bool?
+    var isPlayEnd:Bool = false
     /// 是否用户手动暂停
-    var isUserStop:Bool?
+    var isUserStop:Bool = false
     /// 控制器是否在进行disappear
-    var _viewControllerIsDisappear:Bool?
+    var _viewControllerIsDisappear:Bool = false
     var viewControllerIsDisappear:Bool?{
         get{
             _viewControllerIsDisappear
@@ -65,7 +65,7 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
             }else if (_viewControllerIsDisappear == false && viewControllerIsDisappear == true) {
                 self.pauseWithIsRemoveKVOsAndNotifications(isRemove: true)
             }
-            _viewControllerIsDisappear = newValue
+            _viewControllerIsDisappear = newValue!
         }
     }
@@ -130,20 +130,22 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
             self?.switchAlphaMessageStateCallBack!(self!)
         }
         controlView.switchLockScreenCallBack = {[weak self] in
-            self?.switchLockScreenCallBack!(self!)
+            if ((self?.switchLockScreenCallBack?(self!)) != nil){
+                self?.switchLockScreenCallBack!(self!)
+            }
         }
         return controlView
     }()
     // MARK: - 屏幕方向
     /// 是否开启检测设备转屏 默认开启
-    var _isMonitorDeviceOrientation:Bool?
+    var _isMonitorDeviceOrientation:Bool = true
     var isMonitorDeviceOrientation:Bool?{
         get{
             _isMonitorDeviceOrientation
         }
         set{
-            _isMonitorDeviceOrientation = newValue
+            _isMonitorDeviceOrientation = newValue!
             self.removeNotification()
             self.registerNotification()
         }
@@ -181,7 +183,7 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
                         self.previewView.frame = CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenHeight)
                         self.layoutSubviews()
-                        if (!self.controlView.isAlphaMessage!) {
+                        if (!self.controlView.isAlphaMessage) {
                             self.controlView.lockBtn!.alpha = 1
                         }
                     }
@@ -279,7 +281,7 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
         return KVOs
     }()
     //是否是本地的url
-    var isLocalUrl:Bool?
+    var isLocalUrl:Bool = false
     /// 初始化视频
     /// @param playUrl 视频链接地址 为空为停止播放
@@ -311,7 +313,7 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
         }
         option.setOptionValue(format, forKey: PLPlayerOptionKeyVideoPreferFormat)
         option.setOptionValue(kPLLogNone, forKey: PLPlayerOptionKeyLogLevel)
-        if self.isLive!{
+        if self.isLive{
             self.player = PLPlayer(liveWith: self.playUrl as URL?, option: nil)
             self.player?.loopPlay = false
             self.controlView.bottomNaviView?.isHidden = false
@@ -322,7 +324,7 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
             self.controlView.bottomProgressView?.isHidden = true
         }else{
             self.player = PLPlayer(url: self.playUrl, option: nil)
-            self.player!.loopPlay = self.isLoopPlay!
+            self.player!.loopPlay = self.isLoopPlay
             self.controlView.bottomNaviView?.isHidden = false
             self.controlView.bottomNaviView?.playBtn!.isHidden = false
@@ -400,7 +402,9 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
         })
     }
     func invalidateTimer(){
-        CNLiveTimer.bk_removeTimer(timer: self.timer!)
+        if self.timer != nil{
+            CNLiveTimer.bk_removeTimer(timer: self.timer!)
+        }
     }
     // MARK: - 初始化界面
@@ -498,10 +502,12 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
                 self.controlView.bottomNaviView?.isUserInteractionEnabled = true
                 self.controlView.circlePlayBtn?.setBackgroundImage(UIImage(named: "DS_player_circle_pause"), for: .normal)
                 self.controlView.bottomNaviView?.playImageView!.image = UIImage(named: "DS_player_pause")
-                self.playerPlayingCallBack!(self)
-                if self.startPlayTime! > 0{
+                if                 ((self.playerPlayingCallBack?(self)) != nil){
+                    self.playerPlayingCallBack!(self)
+                }
+                if self.startPlayTime > 0{
                     self.controlView.loadingView?.startAnimate()
-                    self.player?.seek(to: CMTime(value: CMTimeValue(Int(self.startPlayTime!)*30), timescale: 30))
+                    self.player?.seek(to: CMTime(value: CMTimeValue(Int(self.startPlayTime)*30), timescale: 30))
                     self.startPlayTime = 0
                 }
                 break
@@ -509,7 +515,10 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
                 self.controlView.loadingView?.stopAnimate()
                 self.controlView.circlePlayBtn?.setBackgroundImage(UIImage(named: "DS_player_circle_start"), for: .normal)
                 self.controlView.bottomNaviView?.playImageView!.image = UIImage(named: "DS_player_start")
-                self.playerPausedCallBack!(self)
+                if ((self.playerPausedCallBack?(self)) != nil){
+                    self.playerPausedCallBack!(self)
+                }
+                
                 break
             case .statusStopped:
                 self.controlView.loadingView?.stopAnimate()
@@ -527,7 +536,9 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
                 self.controlView.bottomNaviView?.playImageView!.image = UIImage(named: "DS_player_start")
                 self.controlView.gestureView?.private_style = .none
                 self.controlView.bottomNaviView?.progressSlider?.isUserInteractionEnabled = false
-                self.playerDidToEndCallBack!(self)
+                if ((self.playerDidToEndCallBack?(self)) != nil){
+                    self.playerDidToEndCallBack!(self)
+                }
                 break
             @unknown default: break
@@ -630,7 +641,7 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
             var currentOrientation = UIDevice.current.orientation
             //设备方向和屏幕方向一直不操作 设备方向为倒向不操作 锁屏且屏幕方向为正不操作
             if (self.currentOrientation == currentOrientation || currentOrientation == .portraitUpsideDown ||
-                (self.controlView.isLockScreen! && currentOrientation == .portrait)) {
+                (self.controlView.isLockScreen && currentOrientation == .portrait)) {
                 return
             }
             //修改
@@ -667,7 +678,7 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
      */
     @objc func didBecomeActiveNotification(){
         DispatchQueue.main.async {
-            if !self.isUserStop! && !self.isPlayEnd!{
+            if !self.isUserStop && !self.isPlayEnd{
                 self.play()
                 self.setNeedsLayout()
             }
@@ -19,7 +19,7 @@ class CNLivePlayerViewController:CNLiveBaseViewController{
     /**
      视频链接是否为直播
      */
-    var isLive:Bool?
+    var isLive:Bool = false
     /// 初始化视频
     /// @param playUrl 视频链接地址 为空为停止播放
@@ -32,7 +32,7 @@ class CNLivePlayerViewController:CNLiveBaseViewController{
         }else{
             self.isLocalUrl = false
         }
-        self.playerView?.setPlayUrl(playUrl: self.playUrl!, isLive: self.isLive!)
+        self.playerView?.setPlayUrl(playUrl: self.playUrl!, isLive: self.isLive)
         self.playerView?.startPlayTime = playTime
     }
     // MARK: - 封面图
@@ -75,11 +75,14 @@ class CNLivePlayerViewController:CNLiveBaseViewController{
                 _playerView = CNLivePlayerView()
                 _playerView?.controlView.fullScreenType = .inCurrentViewOrientation
                 _playerView?.popCallBack = {[weak self] in
-                    self!.popActionCallBack!(self!.playerView!.getPlayTime(), self!.playerView!.isUserStop!, self!.playerView!.isPlayEnd!)
+                    if                     ((self!.popActionCallBack?(self!.playerView!.getPlayTime(), self!.playerView!.isUserStop, self!.playerView!.isPlayEnd)) != nil)
+                    {
+                        self!.popActionCallBack!(self!.playerView!.getPlayTime(), self!.playerView!.isUserStop, self!.playerView!.isPlayEnd)
+                    }
                 }
                 _playerView?.switchAlphaMessageStateCallBack = { playerView in
                     UIView.animate(withDuration: kDSPlayerAnimateTimeInterval) {
-                        if (playerView.controlView.isLockScreen! || playerView.controlView.isAlphaMessage!) {
+                        if (playerView.controlView.isLockScreen || playerView.controlView.isAlphaMessage) {
                             self.isStatusBarHidden = true
                             self.setNeedsStatusBarAppearanceUpdate()
                         }else {
@@ -105,7 +108,7 @@ class CNLivePlayerViewController:CNLiveBaseViewController{
     }
     //是否是本地的url
-    private var isLocalUrl:Bool?
+    private var isLocalUrl:Bool = false
     var isStatusBarLight:Bool = true
     var isStatusBarHidden:Bool = true
@@ -124,7 +127,7 @@ class CNLivePlayerViewController:CNLiveBaseViewController{
         }else{
             self.isLocalUrl = false
         }
-        self.playerView?.setPlayUrl(playUrl: self.playUrl!, isLive: self.isLive!)
+        self.playerView?.setPlayUrl(playUrl: self.playUrl!, isLive: self.isLive)
     }
     // MARK: - viewDidLoad
@@ -154,7 +157,7 @@ class CNLivePlayerViewController:CNLiveBaseViewController{
     }
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
-        if (!self.isLocalUrl!) {
+        if (!self.isLocalUrl) {
 //            if ([DSNetworkRequest shareClient].netStatus == DSNetworkStatusNotReachable) {
 //                self.playerView.controlView.failureView.hidden = NO;
 //                self.playerView.controlView.failureView.errorMessage = @"当前网络不可用,请检查网络后重试";
@@ -164,7 +167,7 @@ class CNLivePlayerViewController:CNLiveBaseViewController{
 //                DS_showMessage(@"当前正在用流量播放");
 //            }
         }
-        if (!self.playerView!.isUserStop! && !self.playerView!.isPlayEnd!) {
+        if (!self.playerView!.isUserStop && !self.playerView!.isPlayEnd) {
             self.playerView?.play()
         }
     }
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_SelUplImageView_delete@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "DS_SelUplImageView_delete@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_SelUplImageView_play@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "DS_SelUplImageView_play@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_SelUplImageView_selectImage@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "DS_SelUplImageView_selectImage@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_SelUplImageView_selectVideo@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "DS_SelUplImageView_selectVideo@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}