商品预览

“张旭”
1 parent 96632251
Showing 17 changed files with 831 additions and 16 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/GoodsDetail/CNLiveShopGoodsDetailsViewController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopNewProductController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopProductManagerController.swift
metaCode/Classes/Main/HomePage/View/Shop/ShopDetail/CNLiveGoodsDetailsTableViewCell.swift
metaCode/Classes/Main/HomePage/View/Shop/ShopDetail/CNLiveShopGoodsDetailsTableHeaderView.swift
metaCode/Classes/Main/HomePage/ViewModel/GoodsManager/CNLiveShopGoodListViewModel.swift
metaCode/Classes/Main/Model/GoodsManager/CNLiveShopCommentRequestShareModel.swift
metaCode/Classes/Main/Util/CNLivePlayer/CNLivePlayerControlView.swift
metaCode/Classes/Main/Util/CNLivePlayer/CNLivePlayerView.swift
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_back_g.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_back_g.imageset/DS_goods_back_g@2x.png
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_back_g.imageset/DS_goods_back_g@3x.png
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_share_g.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_share_g.imageset/DS_goods_share_g@2x.png
metaCode/Supporting Files/Assets.xcassets/Shop/DS_goods_share_g.imageset/DS_goods_share_g@3x.png
@@ -45,6 +45,7 @@ target &#39;metaCode&#39; do
   #轮播图
   pod 'FSPagerView', '0.8.3'
   #pod 'SDCycleScrollView', '~> 1.82'
+  pod 'BKCycleScrollView'
   #播放器
   pod 'ZFPlayer', :git => 'https://gitee.com/mirrors/ZFPlayer.git'
@@ -105,6 +105,9 @@
 		1965FA3E2AFB176E00F0F435 /* CNLiveShopAddGoodsSingleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1965FA3D2AFB176E00F0F435 /* CNLiveShopAddGoodsSingleView.swift */; };
 		1965FA402AFB38AA00F0F435 /* CNLiveAddGoodsSelectUploadImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1965FA3F2AFB38AA00F0F435 /* CNLiveAddGoodsSelectUploadImageView.swift */; };
 		1965FA422AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1965FA412AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift */; };
+		19AD65AA2BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19AD65A92BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift */; };
+		19AD65AC2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19AD65AB2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift */; };
+		19AD65AE2BA177C20045A444 /* CNLiveShopGoodsDetailsTableHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19AD65AD2BA177C20045A444 /* CNLiveShopGoodsDetailsTableHeaderView.swift */; };
 		19BB1FDF2AEA3A450094D962 /* CNSlideBaseNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */; };
 		19BB1FE12AEB5C220094D962 /* CNLiveShopConsoleController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */; };
 		19BB1FE32AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */; };
@@ -368,6 +371,9 @@
 		1965FA3D2AFB176E00F0F435 /* CNLiveShopAddGoodsSingleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopAddGoodsSingleView.swift; sourceTree = "<group>"; };
 		1965FA3F2AFB38AA00F0F435 /* CNLiveAddGoodsSelectUploadImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAddGoodsSelectUploadImageView.swift; sourceTree = "<group>"; };
 		1965FA412AFB79EA00F0F435 /* CNLiveGoodsCategoryController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveGoodsCategoryController.swift; sourceTree = "<group>"; };
+		19AD65A92BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveGoodsDetailsTableViewCell.swift; sourceTree = "<group>"; };
+		19AD65AB2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopCommentRequestShareModel.swift; sourceTree = "<group>"; };
+		19AD65AD2BA177C20045A444 /* CNLiveShopGoodsDetailsTableHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopGoodsDetailsTableHeaderView.swift; sourceTree = "<group>"; };
 		19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNSlideBaseNavigationController.swift; sourceTree = "<group>"; };
 		19BB1FE02AEB5C220094D962 /* CNLiveShopConsoleController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopConsoleController.swift; sourceTree = "<group>"; };
 		19BB1FE22AEB8B7C0094D962 /* CNLiveShopConsoleViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopConsoleViewModel.swift; sourceTree = "<group>"; };
@@ -856,6 +862,8 @@
 				19BB1FF12AF21A950094D962 /* CNLliveShopDetailBannerCell.swift */,
 				19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */,
 				19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */,
+				19AD65A92BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift */,
+				19AD65AD2BA177C20045A444 /* CNLiveShopGoodsDetailsTableHeaderView.swift */,
 			);
 			path = ShopDetail;
 			sourceTree = "<group>";
@@ -925,6 +933,7 @@
 				19565ED32AF9FEB4007D6727 /* CNLiveShopAddEditGoodsModel.swift */,
 				191732EA2B070943007BCC04 /* CNLiveShopGoodsManageDetailsGoodsCategoryModel.swift */,
 				191732EC2B073C52007BCC04 /* CNLiveShopClassifyListModel.swift */,
+				19AD65AB2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift */,
 			);
 			path = GoodsManager;
 			sourceTree = "<group>";
@@ -1688,6 +1697,7 @@
 				7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */,
 				798A44FB2A30999900815935 /* CNLiveAlertTool.swift in Sources */,
 				191732EB2B070943007BCC04 /* CNLiveShopGoodsManageDetailsGoodsCategoryModel.swift in Sources */,
+				19AD65AA2BA041210045A444 /* CNLiveGoodsDetailsTableViewCell.swift in Sources */,
 				19565EC02AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift in Sources */,
 				191732E92B0706B3007BCC04 /* CNLiveShopClassifyCell.swift in Sources */,
 				790D01A52A2DF65E00C5978D /* CNLiveLoginPickerView.swift in Sources */,
@@ -1794,6 +1804,7 @@
 				792E57DB2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift in Sources */,
 				191732F12B084822007BCC04 /* CNLiveShopClassifyInputTableViewCell.swift in Sources */,
 				191733212B143F3A007BCC04 /* CNLiveGradientView.swift in Sources */,
+				19AD65AE2BA177C20045A444 /* CNLiveShopGoodsDetailsTableHeaderView.swift in Sources */,
 				19BB1FE62AEB93B80094D962 /* CNLiveShopUserInfoModel.swift in Sources */,
 				7CD675472A274167008354C1 /* NewPagedFlowView.m in Sources */,
 				191732ED2B073C52007BCC04 /* CNLiveShopClassifyListModel.swift in Sources */,
@@ -1861,6 +1872,7 @@
 				790B1FB42A4153E90074CF00 /* CNLiveMineBaseModel.swift in Sources */,
 				794294AA2B4D4381008AAFA0 /* CNLiveShortVideoCommentListView.swift in Sources */,
 				7978A8432A396632007C86B8 /* CNLiveMineViewModel.swift in Sources */,
+				19AD65AC2BA16CF20045A444 /* CNLiveShopCommentRequestShareModel.swift in Sources */,
 				191733022B0C4EAB007BCC04 /* CNLiveSelUplSingleImageView.swift in Sources */,
 				798A44EE2A305AAC00815935 /* CNLiveBaseNavigationController.swift in Sources */,
 				1938BD412B4BEC6900390A34 /* CNLiveAlbumListModel.swift in Sources */,
@@ -6,6 +6,11 @@
 //
 import Foundation
+import YYImage
+import YYWebImage
+import SKPhotoBrowser
+import CNLiveShareToolKit
+import BKCycleScrollView
 ///分类类型
 enum CNLiveShopGoodsDetailsVCType:Int {
@@ -15,7 +20,10 @@ enum CNLiveShopGoodsDetailsVCType:Int {
     case preview
 }
-class CNLiveShopGoodsDetailsViewController:CNLiveBaseViewController{
+class CNLiveShopGoodsDetailsViewController:CNLiveBaseViewController,UITableViewDelegate,UITableViewDataSource, BKCycleScrollViewDelegate{
+    
+    let kDSGoodsDetailsTableViewCellID = "DSGoodsDetailsTableViewCell"
+    let kDSPlayerAnimateTimeInterval:CGFloat = 0.25
     /// 格式
     var type:CNLiveShopGoodsDetailsVCType?
     /// 商品id
@@ -23,8 +31,346 @@ class CNLiveShopGoodsDetailsViewController:CNLiveBaseViewController{
     /// 编辑商品预览使用
     var detailsModel:CNLiveShopGoodsDetailsModel?
+    var leftCircleBgView:CNLiveRoundedRectView?
+    var leftImageView:YYAnimatedImageView?
+    var shareCircleBgView:CNLiveRoundedRectView?
+    var shareImageView:YYAnimatedImageView?
+
+    var CSV_playerView :CNLivePlayerView?
+    
+    weak var cycleScrollView :BKCycleScrollView? = {
+        let cycleScrollView = BKCycleScrollView()
+        return cycleScrollView
+    }()
+    
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: self.view.height), style: .plain)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        tableView.tableFooterView = UIView.init()
+        tableView.backgroundColor = HexColor("#f1f2f6")
+        tableView.register(CNLiveGoodsDetailsTableViewCell.self, forCellReuseIdentifier: kDSGoodsDetailsTableViewCellID)
+        return tableView
+    }()
+        
+    //图片集合
+    lazy var imgs :NSMutableArray = {
+        let imgs = NSMutableArray()
+        return imgs
+    }()
+
     override func viewDidLoad() {
         super.viewDidLoad()
+        self.initNav()
+        self.view.insertSubview(self.tableView, belowSubview: self.topNavView)
+        navigationBarHidden = false
+        if self.type == .preview{
+            self.insertData()
+        }else{
+            self.requestGoodsInfo()
+        }
+    }
+
+    override func viewWillLayoutSubviews() {
+        super.viewWillLayoutSubviews()
+        self.tableView.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
+    }
+    
+    var isPrefersStatusBarHidden:Bool = false
+    override var prefersStatusBarHidden: Bool {
+        return self.isPrefersStatusBarHidden
+    }
+    
+    deinit {
+        if (self.cycleScrollView != nil){
+            self.cycleScrollView = nil
+        }
+        self.destroyPlayerView()
+    }
+    
+    func initNav(){
+        self.topNavView.backgroundColor = UIColor(white: 1, alpha: 0)
+        self.topLine.alpha = 0
+        self.leftNavBtns.forEach { $0.removeFromSuperview() }
+        
+        let backNavBtn = UIButton(type: .custom)
+        backNavBtn.frame = CGRect(x: 0, y: get_system_statusBar_height(), width: get_system_nav_ui_height(), height: get_system_nav_ui_height())
+        backNavBtn.addTarget(self, action: #selector(backNavBtnClick), for: .touchUpInside)
+        self.topNavView.addSubview(backNavBtn)
+        
+        self.leftCircleBgView = CNLiveRoundedRectView(frame: CGRect(x: 15, y: (backNavBtn.height - 32)/2, width: 32, height: 32))
+        self.leftCircleBgView?.fillColor = HexColor("#848484", alpha: 0.45)
+        self.leftCircleBgView?.radius = self.leftCircleBgView!.height/2
+        self.leftCircleBgView?.isUserInteractionEnabled = false
+        backNavBtn.addSubview(self.leftCircleBgView!)
+        
+        let wLeftImageView = YYAnimatedImageView(frame: CGRect(x: 15, y: (backNavBtn.height - 32)/2, width: 32, height: 32))
+        wLeftImageView.clipsToBounds = true
+        wLeftImageView.contentMode = .scaleAspectFit
+        wLeftImageView.image = UIImage(named: "DS_goods_back_g")
+        backNavBtn.addSubview(wLeftImageView)
+        
+        self.leftImageView = YYAnimatedImageView(frame: CGRect(x: 15, y: (backNavBtn.height - 32)/2, width: 32, height: 32))
+        self.leftImageView?.clipsToBounds = true
+        self.leftImageView?.contentMode = .scaleAspectFit
+        self.leftImageView?.image = UIImage(named: "DS_goods_back_g")
+        self.leftImageView?.alpha = 0
+        backNavBtn.addSubview(self.leftImageView!)
+
+        if self.goodsId?.count ?? 0 > 0{
+            let shareNavBtn = UIButton(type: .custom)
+            shareNavBtn.frame = CGRect(x: KSreenWidth-62, y: get_system_statusBar_height(), width: get_system_nav_ui_height(), height: get_system_nav_ui_height())
+            shareNavBtn.addTarget(self, action: #selector(shareNavBtnClick), for: .touchUpInside)
+            self.topNavView.addSubview(shareNavBtn)
+            
+            self.shareCircleBgView = CNLiveRoundedRectView(frame: CGRect(x: 15, y: (shareNavBtn.height - 32)/2, width: 32, height: 32))
+            self.shareCircleBgView?.fillColor = HexColor("#848484", alpha: 0.45)
+            self.shareCircleBgView?.radius = self.shareCircleBgView!.height/2
+            self.shareCircleBgView?.isUserInteractionEnabled = false
+            shareNavBtn.addSubview(self.shareCircleBgView!)
+            
+            let wShareImageView =  YYAnimatedImageView(frame: CGRect(x: 15, y: (shareNavBtn.height - 32), width: 32, height: 32))
+            wShareImageView.clipsToBounds = true
+            wShareImageView.contentMode = .scaleAspectFit
+            wShareImageView.image = UIImage(named: "DS_goods_share_g")
+            wShareImageView.alpha = 0
+            shareNavBtn.addSubview(wShareImageView)
+            
+            self.shareImageView =  YYAnimatedImageView(frame: CGRect(x: 15, y: (shareNavBtn.height - 32), width: 32, height: 32))
+            self.shareImageView?.clipsToBounds = true
+            self.shareImageView?.contentMode = .scaleAspectFit
+            self.shareImageView?.image = UIImage(named: "DS_goods_share_g")
+            self.shareImageView?.alpha = 0
+            shareNavBtn.addSubview(self.shareImageView!)
+        }
+    }
+
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return self.detailsModel?.detail_img.count ?? 0
+    }
+
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        let detailsContentModel = self.detailsModel?.detail_img[indexPath.row]
+        if detailsContentModel?.w ?? 0 > 0{
+            return floor(self.view.width / (detailsContentModel?.w ?? 0) * (detailsContentModel?.h ?? 0))
+        }else{
+            return 200
+        }
+    }
+
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: kDSGoodsDetailsTableViewCellID) as! CNLiveGoodsDetailsTableViewCell
+        let detailsContentModel = self.detailsModel?.detail_img[indexPath.row]
+        
+        var escapedUrl = detailsContentModel?.simg?.removingPercentEncoding
+        escapedUrl = escapedUrl?.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)
+        cell.displayImageView?.yy_setImage(with: URL(string: escapedUrl!), placeholder: nil, options: [.showNetworkActivity , .setImageWithFadeAnimation], completion: { image, url, from, stage, error in
+
+            if (image == nil) {
+                return
+            }
+            if (image!.size.height == detailsContentModel?.h) {
+                return
+            }
+            detailsContentModel?.w = image!.size.width
+            detailsContentModel?.h = image!.size.height
+            DispatchQueue.main.async {
+                self.tableView.reloadData()
+            }
+        })
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+
+        let browser = SKPhotoBrowser(photos: self.imgs as! [SKPhotoProtocol])
+        browser.initializePageIndex(indexPath.row)
+        currentViewController()?.present(browser, animated: true)
+    }
+    
+    // MARK: - UIScrollViewDelegate
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        if self.tableView == scrollView{
+            if self.tableView.contentOffset.y < 0{
+                self.topNavView.backgroundColor = UIColor(white: 1, alpha: 0)
+                self.leftCircleBgView?.alpha = 1
+                self.leftImageView?.alpha = 0
+                
+                self.shareCircleBgView?.alpha = 1
+                self.shareImageView?.alpha = 0
+                self.topLine.alpha = 0
+            }else if self.tableView.contentOffset.y >= 128{
+                self.topNavView.backgroundColor = UIColor(white: 1, alpha: 1)
+                self.leftCircleBgView?.alpha = 0
+                self.leftImageView?.alpha = 1
+                
+                self.shareCircleBgView?.alpha = 0
+                self.shareImageView?.alpha = 1
+                self.topLine.alpha = 1
+            }else{
+                let indexAlpha = self.tableView.contentOffset.y/128.0
+                self.leftCircleBgView?.alpha = 1 - indexAlpha
+                self.leftImageView?.alpha = indexAlpha
+                self.shareCircleBgView?.alpha = 1 - indexAlpha
+                self.shareImageView?.alpha = indexAlpha
+                self.topLine.alpha = indexAlpha
+                self.topNavView.backgroundColor = UIColor(white: 1, alpha: indexAlpha)
+            }
+        }
+    }
+    
+    // MARK: - 获取商品详情
+    func requestGoodsInfo(){
+        showLoading(message: "")
+        CNLiveShopGoodListViewModel.getGoodsInfoWithGoodsId(goodsId: self.goodsId ?? "") { result, status in
+            hiddenLoading()
+            if status == .failed{
+                showMessage(message: "获取失败")
+                return
+            }
+            if status == .success{
+                let model = result as! CNLiveShopGoodsDetailsModel
+                self.detailsModel = model
+                self.insertData()
+            }
+        }
+    }
+
+    func insertData(){
+        var headerView:CNLiveShopGoodsDetailsTableHeaderView?
+        if self.tableView.tableHeaderView == nil{
+            headerView = CNLiveShopGoodsDetailsTableHeaderView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: 0))
+            headerView!.bannerView.delegate = self
+            headerView!.clickGiveGiftBlock = {
+                
+            }
+        }else{
+            headerView = self.tableView.tableHeaderView as? CNLiveShopGoodsDetailsTableHeaderView
+        }
+        headerView!.detailsModel = self.detailsModel
+        self.tableView.tableHeaderView = headerView
+        self.tableView.reloadData()
+        self.tableView.setContentOffset(CGPointZero, animated: true)
+        for model in self.detailsModel!.detail_img {
+            let photo = SKPhoto.photoWithImageURL(model.simg ?? "")
+            photo.shouldCachePhotoURLImage = false
+            photo.photoURL = model.simg
+            self.imgs.add(photo)
+        }
     }
+    // MARK: - 销毁播放器
+    func destroyPlayerView(){
+        self.CSV_playerView?.stop()
+        if self.CSV_playerView?.currentOrientation != .portrait{
+            self.CSV_playerView?.currentOrientation = .portrait
+        }
+        self.CSV_playerView?.superview?.removeFromSuperview()
+        self.CSV_playerView?.removeFromSuperview()
+        self.CSV_playerView = nil
+    }
+
+    // MARK: - BKCycleScrollViewDelegate
+    func cycleScrollView(_ cycleScrollView: BKCycleScrollView, play playIndex: UInt, superView: UIView) {
+        let dataModel = cycleScrollView.displayDataArr![Int(playIndex)] as BKCycleScrollDataModel
+        if (self.CSV_playerView == nil){
+            let playerView = CNLivePlayerView()
+            self.CSV_playerView = playerView
+            if dataModel.imageUrl.count > 0{
+                self.CSV_playerView?.controlView.coverImageUrl = dataModel.imageUrl
+            }else if dataModel.image.size != CGSizeZero{
+                self.CSV_playerView?.controlView.coverImage = dataModel.image
+            }
+            self.CSV_playerView?.controlView.fullScreenType = .inWindowOrientation
+            self.CSV_playerView?.controlView.topNaviView?.backBtn?.isHidden = true
+            self.CSV_playerView?.isMonitorDeviceOrientation = false
+            self.CSV_playerView?.controlView.gestureView?.panGestureRecognizer?.isEnabled = false
+            self.CSV_playerView?.controlView.coverImageViewContentMode = .scaleAspectFill
+            self.CSV_playerView?.switchInterfaceOrientationCallBack = { playerView in
+                if playerView.controlView.isFullScreen!{
+                    playerView.controlView.bottomProgressView?.isHidden = true
+                }else{
+                    playerView.controlView.bottomProgressView?.isHidden = false
+                }
+                if #available(iOS 11.0, *) {
+                    self.setNeedsUpdateOfHomeIndicatorAutoHidden()
+                } else {
+                    
+                }
+                UIView.animate(withDuration: self.kDSPlayerAnimateTimeInterval) {
+                    //iPhoneX系列在横屏时隐藏状态栏
+                    if playerView.controlView.isAlphaMessage == false{
+                        if (isiPhoneXSeries || Double(UIDevice.current.systemVersion) ?? 0 >= 13) && (playerView.controlView.isFullScreen != nil) {
+                            self.isPrefersStatusBarHidden = true
+                        }else{
+                            self.isPrefersStatusBarHidden = false
+                        }
+                        self.setNeedsStatusBarAppearanceUpdate()
+                    }
+                    if playerView.controlView.isFullScreen ?? false{
+                        playerView.isMonitorDeviceOrientation = true
+                    }else{
+                        playerView.isMonitorDeviceOrientation = false
+                    }
+                }
+                if playerView.currentOrientation == .portrait{
+                    playerView.controlView.gestureView?.panGestureRecognizer?.isEnabled = false
+                }else{
+                    if playerView.controlView.isLockScreen{
+                        playerView.controlView.gestureView?.panGestureRecognizer?.isEnabled = false
+                    }else{
+                        playerView.controlView.gestureView?.panGestureRecognizer?.isEnabled = true
+                    }
+                }
+            }
+            self.CSV_playerView?.playerPlayingCallBack = {
+                playerView in
+                self.cycleScrollView?.playVideo()
+            }
+            self.CSV_playerView?.playerPausedCallBack = {
+                playerView in
+                self.cycleScrollView?.pauseVideo()
+            }
+            self.CSV_playerView?.playerDidToEndCallBack = {
+                playerView in
+                self.cycleScrollView?.stopVideo()
+                self.destroyPlayerView()
+            }
+        }
+        superView.addSubview(self.CSV_playerView!)
+        self.CSV_playerView!.frame = superView.bounds
+        let model = cycleScrollView.displayDataArr?[Int(playIndex)]
+        self.CSV_playerView?.setPlayUrl(playUrl: URL(string: model?.videoUrl ?? "") ?? URL(fileURLWithPath: ""), isLive: false)
+        self.CSV_playerView?.play()
+    }
+    
+    func cycleScrollView(_ cycleScrollView: BKCycleScrollView, pause pauseIndex: UInt) {
+        self.CSV_playerView?.pauseWithIsRemoveKVOsAndNotifications(isRemove: false)
+    }
+    
+    func cycleScrollView(_ cycleScrollView: BKCycleScrollView, stop stopIndex: UInt) {
+        self.destroyPlayerView()
+    }
+        
+    // MARK: - BtnAction
+    @objc func backNavBtnClick(){
+        self.navigationController?.popViewController(animated: true)
+    }
+
+    @objc func shareNavBtnClick(){
+        CNLiveShopGoodListViewModel.postGetShareDataWithType(type: 2, targetId: self.goodsId!, ext: "") {[weak self] result, status in
+            let model = result as! CNLiveShopCommentRequestShareModel
+            CNLiveShareManager.showShareViewWithParam(forShareTitle: model.share_title, shareUrl: model.url, shareDesc: model.share_desc, shareImage: model.share_img, screenFull: false, hiddenWjj: true, hiddenQQ: false, hiddenWB: true, hiddenLifeCircle: true, hiddenWechatCircle: false, hiddenWechat: false, hiddenSafari: false, formVC: self, topImage: nil, topTitles: nil, platformType: .all) { str in
+                
+            } completerBlock: { resultType, platformType, typtString in
+                if (resultType == .succ) {
+                    showMessage(message: "分享成功")
+                }
+                if (resultType == .fail) {
+                    showMessage(message: "分享失败")
+                }
+            }
+        }
+    }
 }
@@ -185,7 +185,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         previewBtn.setTitleColor(HexColor("#3A3A3A"), for: .normal)
         previewBtn.titleLabel?.font = Font_15
         previewBtn.addTarget(self, action: #selector(previewBtnClick), for: .touchUpInside)
-//        self.bottomNavView.addSubview(previewBtn)
+        self.bottomNavView.addSubview(previewBtn)
         let saveBtn = UIButton(type: .custom)
         saveBtn.frame = CGRect(x: previewBtn.right, y: 0, width: self.view.width - previewBtn.right, height: KTabBarHeight)
@@ -441,10 +441,14 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         }
         goodsDetailsModel.detail_img = Array(contentDetailsImage) as! [CNLiveGoodsDetailsContentModel]
         let kvArray = NSMutableArray()
-        kvArray.add(["k":"品名","v":singleView18.contentTextField.text])
-        kvArray.add(["k":"规格","v":singleView19.contentTextField.text])
-        kvArray.add(["k":"寄送区域","v":singleView20.contentTextField.text])
-        kvArray.add(["k":"发货时效","v":singleView21.contentTextField.text])
+        let str18 = (singleView18.contentTextField.text ?? "") as String
+        let str19 = (singleView19.contentTextField.text ?? "") as String
+        let str20 = (singleView20.contentTextField.text ?? "") as String
+        let str21 = (singleView21.contentTextField.text ?? "") as String
+        kvArray.add(["k":"品名","v":str18])
+        kvArray.add(["k":"规格","v":str19])
+        kvArray.add(["k":"寄送区域","v":str20])
+        kvArray.add(["k":"发货时效","v":str21])
         let tempArray = NSMutableArray(array: self.bgScrollView.subviews)
         let subArr = tempArray.subarray(with: NSRange(location: 0, length: tempArray.index(of: singleView19)))
@@ -157,7 +157,10 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let goodsModel = self.dataArray[indexPath.row] as! CNLiveShopGoodsListModel
-        
+        let vc = CNLiveShopNewProductController.init()
+        vc.type = .edit
+        vc.goodsId = goodsModel.id!
+        self.navigationController?.pushViewController(vc, animated: true)        
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return 167
+//
+//  CNLiveGoodsDetailsTableViewCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/3/12.
+//
+
+import Foundation
+import YYImage
+
+class CNLiveGoodsDetailsTableViewCell:UITableViewCell{
+    var displayImageView:YYAnimatedImageView?
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        self.selectionStyle = .none
+        self.initUI()
+        self.initLayout()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    // MARK: - initUI
+    func initUI(){
+        self.displayImageView = YYAnimatedImageView()
+        self.displayImageView?.contentMode = .scaleAspectFill
+        self.displayImageView?.clipsToBounds = true
+        self.contentView.addSubview(self.displayImageView!)
+    }
+
+    // MARK: - initLayout
+    func initLayout(){
+        self.displayImageView!.snp.makeConstraints({ make in
+            make.left.top.right.bottom.equalTo(self)
+        })
+    }
+}
+//
+//  CNLiveShopGoodsDetailsTableHeaderView.swift
+//  metaCode
+//
+//  Created by zx on 2024/3/13.
+//
+
+import Foundation
+import YYImage
+import BKCycleScrollView
+
+typealias clickGiveGiftCallBackBlock = () -> Void
+
+// MARK: - 顶部轮播图
+class CNLiveShopGoodsDetailsTableHeaderView:UIView{
+    
+    let kCNLliveShopDetailBannerCellID = "kCNLliveShopDetailBannerCellID"
+    
+    /// 顶部轮播图
+    lazy var bannerView: BKCycleScrollView = {
+        let bannerView = BKCycleScrollView(frame: CGRect(x: 0, y: 0, width: self.width, height: self.width))
+//        bannerView.placeholderImage = [UIImage get1_1PlaceholderImage];
+        bannerView.isAutoScroll = false
+        return bannerView
+    }()
+    
+    /// 数据
+    var _detailsModel:CNLiveShopGoodsDetailsModel?
+    var detailsModel:CNLiveShopGoodsDetailsModel?{
+        get{
+            _detailsModel
+        }
+        set{
+            _detailsModel = newValue!
+            let bannerDataArr = NSMutableArray()
+            if _detailsModel?.video?.video_url?.count ?? 0 > 0{
+                let model = BKCycleScrollDataModel()
+                model.videoUrl = _detailsModel!.video!.video_url!
+                model.imageUrl = _detailsModel?.video?.video_img ?? ""
+                model.image = _detailsModel?.video?.video_image ?? UIImage()
+                bannerDataArr.add(model)
+            }
+            for imageModel in detailsModel!.image {
+                let model = BKCycleScrollDataModel()
+                model.imageUrl = imageModel.simg ?? ""
+                bannerDataArr.add(model)
+            }
+            self.bannerView.displayDataArr = bannerDataArr as? [BKCycleScrollDataModel]
+            self.titleLab.text = self.detailsModel?.title
+            self.titleLab.height = self.titleLab.text?.calculateHeightWith(width: self.titleLab.width, font: self.titleLab.font) ?? 0
+            self.subtitleLab.text = self.detailsModel?.ads
+            self.subtitleLab.y = self.titleLab.bottom+15
+            self.subtitleLab.height = self.subtitleLab.text?.calculateHeightWith(width: self.titleLab.width, font: self.titleLab.font) ?? 0
+            self.initTopStyleSubUI()
+            self.initGuigeSubUI()
+            self.initBottomDescSubUI()
+            self.height = self.bottomDescView.bottom
+        }
+    }
+    
+    /**
+     点击送礼回调
+     */
+    var clickGiveGiftBlock:clickGiveGiftCallBackBlock?
+    lazy var titleLab: UILabel = {
+        let titleLab = UILabel.init(frame: CGRectMake(20, self.bannerView.bottom+15, self.width-40, 0))
+        titleLab.textColor = HexColor("#3a3a3a")
+        titleLab.textAlignment = .center
+        titleLab.numberOfLines = 0
+        titleLab.font = Font_17
+        titleLab.adjustsFontSizeToFitWidth=true
+        return titleLab
+    }()
+
+    lazy var subtitleLab: UILabel = {
+        let subtitleLab = UILabel.init(frame: CGRectMake(20, self.titleLab.bottom+15, self.width-40, 0))
+        subtitleLab.textColor = HexColor("#828282")
+        subtitleLab.textAlignment = .center
+        subtitleLab.numberOfLines = 0
+        subtitleLab.font = Font_14
+        subtitleLab.adjustsFontSizeToFitWidth=true
+        return subtitleLab
+    }()
+
+    lazy var topStyleView :UIView = {
+        let topStyleView = UIView(frame: CGRect(x: 0, y: self.subtitleLab.bottom+15, width: self.width, height: 0))
+        return topStyleView
+    }()
+
+    lazy var guigeView :UIView = {
+        let guigeView = UIView(frame: CGRect(x: 0, y: self.topStyleView.bottom, width: self.width, height: 0))
+        return guigeView
+    }()
+
+    lazy var bottomDescView :UIView = {
+        let bottomDescView = UIView(frame: CGRect(x: 0, y: self.guigeView.bottom, width: self.width, height: 0))
+        return bottomDescView
+    }()
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.backgroundColor = .white
+        self.initUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func initUI(){
+        self.addSubview(self.bannerView)
+        self.addSubview(self.titleLab)
+        self.addSubview(self.subtitleLab)
+        self.addSubview(self.topStyleView)
+        self.addSubview(self.guigeView)
+        self.addSubview(self.bottomDescView)
+    }
+   
+    func initTopStyleSubUI(){
+        self.topStyleView.subviews.forEach { $0.removeFromSuperview() }
+        self.topStyleView.y = (self.detailsModel?.ads?.count ?? 0 > 0 ? self.subtitleLab.bottom : self.titleLab.bottom)+15
+        
+        let priceLabel = UILabel(frame: CGRect(x: 20, y: 0, width: KSreenWidth-20*2, height: 55))
+        priceLabel.textColor = HexColor("#ff725c")
+        priceLabel.font = SystemFont_Fit(45)
+        priceLabel.text = String(format: "¥%@", self.detailsModel?.price ?? 0)
+        priceLabel.textAlignment = .center
+        self.topStyleView.addSubview(priceLabel)
+        self.topStyleView.height = 55
+        
+        if self.detailsModel?.prices?.count ?? 0 > 0 && Float(self.detailsModel?.prices ?? "0") ?? 0 > Float(self.detailsModel?.price ?? "0") ?? 0{
+            let originalPriceLab = UILabel(frame: CGRect(x: 20, y: self.topStyleView.height, width: KSreenWidth-20*2, height: 20))
+            originalPriceLab.textColor = HexColor("#999999")
+            originalPriceLab.font = Font_14
+            originalPriceLab.textAlignment = .center
+            let originalPrice = NSAttributedString(string: String(format: " ¥%@  ", self.detailsModel?.prices ?? "0"), attributes: [NSAttributedString.Key.strikethroughStyle:NSUnderlineStyle.single ])
+            originalPriceLab.attributedText = originalPrice
+            self.topStyleView.addSubview(originalPriceLab)
+            self.topStyleView.height = self.topStyleView.height+20
+        }
+        if self.detailsModel?.is_gift == true{
+            let fAdsImageView = YYAnimatedImageView(frame: CGRect(x: 0, y: self.topStyleView.height+15, width: self.width, height: 50))
+            fAdsImageView.clipsToBounds = true
+            fAdsImageView.contentMode = .scaleAspectFill
+            fAdsImageView.isUserInteractionEnabled = true
+            fAdsImageView.kf.setImage(with: URL(string: self.detailsModel?.give_goods_img ?? ""))
+            self.topStyleView.addSubview(fAdsImageView)
+            
+            let giveGoodsTap = UITapGestureRecognizer(target: self, action: #selector(giveGoodsTap))
+            fAdsImageView.addGestureRecognizer(giveGoodsTap)
+            self.topStyleView.height = self.topStyleView.height + 15 + 50
+        }
+        self.topStyleView.height = self.topStyleView.height + 20
+        let line = YYAnimatedImageView(frame: CGRect(x: 20, y: self.topStyleView.height-DS_RRV_ONE_PIXEL, width: self.topStyleView.width-40, height: DS_RRV_ONE_PIXEL))
+        line.backgroundColor = HexColor("#e4e4e4")
+        self.topStyleView.addSubview(line)
+    }
+
+    func initGuigeSubUI(){
+        self.guigeView.y = self.topStyleView.bottom
+        self.guigeView.subviews.forEach { $0.removeFromSuperview() }
+        
+        let titleDataArr = NSMutableArray()
+        if self.detailsModel?.attr.count ?? 0 > 0{
+            for i in 0..<(self.detailsModel?.attr.count ?? 0){
+                let model = self.detailsModel?.attr[i]
+                if model?.k?.count ?? 0 > 0 && model?.v?.count ?? 0 > 0{
+                    titleDataArr.add(["left":model!.k,"right":model!.v])
+                }
+            }
+        }
+        if self.detailsModel?.attrArray.count ?? 0 > 0{
+            for i in 0..<(self.detailsModel?.attrArray.count ?? 0){
+                let dict = self.detailsModel?.attrArray[i]
+                let k = dict?["k"] as? String
+                let v = dict?["v"] as? String
+                if k?.count ?? 0 > 0 && v?.count ?? 0 > 0{
+                    titleDataArr.add(["left":(dict?["k"] as! String),"right":(dict?["v"] as! String)])
+                }
+            }
+        }
+        if self.detailsModel?.storageArray.count ?? 0 > 0{
+            for i in 0..<(self.detailsModel?.storageArray.count ?? 0){
+                let dict = self.detailsModel?.storageArray[i]
+                let k = dict?["k"] as? String
+                let v = dict?["v"] as? String
+                if k?.count ?? 0 > 0 && v?.count ?? 0 > 0{
+                    titleDataArr.add(["left":(dict?["k"] as! String),"right":(dict?["v"] as! String)])
+                }
+            }
+        }
+        if titleDataArr.count == 0{
+            self.guigeView.height = 0
+            return
+        }
+        let markLine = YYAnimatedImageView(frame: CGRect(x: 120, y: 0, width: self.guigeView.width-240, height: DS_RRV_ONE_PIXEL))
+        markLine.backgroundColor = HexColor("#b4b4b4")
+        self.guigeView.addSubview(markLine)
+        
+        let markLab = UILabel(frame: CGRect(x: markLine.left+(markLine.width-87.5)/2, y: 17, width: 87.5, height: 20))
+        markLab.textColor = HexColor("#666666")
+        markLab.textAlignment = .center
+        markLab.numberOfLines = 0
+        markLab.font = Font_14
+        markLab.backgroundColor = .white
+        markLab.text = "已选规格"
+        self.guigeView.addSubview(markLab)
+        
+        markLine.centerY = markLab.centerY
+        var lastView:UIView?
+        for i in 0..<titleDataArr.count {
+            let dic = titleDataArr[i] as! Dictionary<String, Any>
+            let view = UIView(frame: CGRect(x: 20, y: (lastView != nil) ? lastView!.bottom : (markLab.bottom+13), width: self.guigeView.width-40, height: 35))
+            self.guigeView.addSubview(view)
+            
+            let leftLab = UILabel(frame: CGRect(x: 25, y: 0, width: 60, height: 35))
+            leftLab.textColor = HexColor("#6d6d6d")
+            leftLab.textAlignment = .center
+            leftLab.numberOfLines = 0
+            leftLab.font = Font_14
+            leftLab.text = dic["left"] as? String
+            view.addSubview(leftLab)
+            leftLab.height = (leftLab.text?.calculateHeightWith(width: leftLab.width, font:leftLab.font) ?? 0) + 15
+            
+            let rightLab = UILabel(frame: CGRect(x: 125, y: 0, width: 195, height: 35))
+            rightLab.textColor = HexColor("#aaaaaa")
+            rightLab.textAlignment = .center
+            rightLab.numberOfLines = 0
+            rightLab.font = Font_14
+            rightLab.text = dic["right"] as? String
+            view.addSubview(rightLab)
+            rightLab.height = (rightLab.text?.calculateHeightWith(width: rightLab.width, font: rightLab.font) ?? 0) + 15
+            
+            if rightLab.height > leftLab.height{
+                view.height = rightLab.height
+            }else{
+                view.height = leftLab.height
+            }
+            let line = YYAnimatedImageView(frame: CGRect(x: 0, y: 0, width: view.width, height: DS_RRV_ONE_PIXEL))
+            line.backgroundColor = HexColor("#d4d4d4")
+            view.addSubview(line)
+            lastView = view
+        }
+        
+        let leftLine = YYAnimatedImageView(frame: CGRect(x: lastView!.x, y: markLab.bottom+13, width: DS_RRV_ONE_PIXEL, height: lastView!.bottom-(markLab.bottom+13)))
+        leftLine.backgroundColor = HexColor("#d4d4d4")
+        self.guigeView.addSubview(leftLine)
+        
+        let middleLine = YYAnimatedImageView(frame: CGRect(x: lastView!.x+108, y: markLab.bottom+13, width: DS_RRV_ONE_PIXEL, height: lastView!.bottom-(markLab.bottom+13)))
+        middleLine.backgroundColor = HexColor("#d4d4d4")
+        self.guigeView.addSubview(middleLine)
+        
+        let rightLine = YYAnimatedImageView(frame: CGRect(x: lastView!.right-DS_RRV_ONE_PIXEL, y: markLab.bottom+13, width: DS_RRV_ONE_PIXEL, height: lastView!.bottom-(markLab.bottom+13)))
+        rightLine.backgroundColor = HexColor("#d4d4d4")
+        self.guigeView.addSubview(rightLine)
+        
+        let bottomLine = YYAnimatedImageView(frame: CGRect(x: lastView!.x, y: lastView!.bottom, width: lastView!.width, height: DS_RRV_ONE_PIXEL))
+        bottomLine.backgroundColor = HexColor("#d4d4d4")
+        self.guigeView.addSubview(bottomLine)
+        
+        let line = YYAnimatedImageView(frame: CGRect(x: 20, y: bottomLine.bottom+20, width: self.guigeView.width-40, height: DS_RRV_ONE_PIXEL))
+        line.backgroundColor = HexColor("#e4e4e4")
+        self.guigeView.addSubview(line)
+        self.guigeView.height = line.bottom
+    }
+
+    func initBottomDescSubUI(){
+        self.bottomDescView.y = self.guigeView.bottom
+        self.bottomDescView.subviews.forEach { $0.removeFromSuperview() }
+
+        let markLine = YYAnimatedImageView(frame: CGRect(x: 120, y: 0, width: self.bottomDescView.width-240, height: DS_RRV_ONE_PIXEL))
+        markLine.backgroundColor = HexColor("#b4b4b4")
+        self.bottomDescView.addSubview(markLine)
+        
+        let markLab = UILabel.init(frame: CGRectMake(markLine.left+(markLine.width-87.5)/2, 17, 87.5, 20))
+        markLab.textColor = HexColor("#666666")
+        markLab.textAlignment = .center
+        markLab.numberOfLines = 0
+        markLab.font = Font_14
+        markLab.backgroundColor = .white
+        markLab.text = "商品详情"
+        self.bottomDescView.addSubview(markLab)
+        
+        markLine.centerY = markLab.centerY
+        self.bottomDescView.height = markLab.bottom+20
+    }
+    
+    @objc func giveGoodsTap(){
+        if (self.clickGiveGiftBlock != nil){
+            self.clickGiveGiftBlock!()
+        }
+    }
+}
@@ -367,4 +367,35 @@ class CNLiveShopGoodListViewModel:NSObject{
         }
     }
+    // MARK: - 获取分享数据
+    /// 获取分享数据
+    /// @param type 分享类型 1文创商品 2普通商品 3主题活动 4店铺首页 5达人 6动态 7达人列表 8礼物分享 9优选库首页 10电影作品详情 12服务号 ...
+    /// @param targetId 目标id
+    /// @param ext 后台要求的附加参数
+    /// @param result 结果
+    static func postGetShareDataWithType(type:NSInteger,targetId:String,ext:String,resultBlock: @escaping downSlideResultBlock){
+        let param = NSMutableDictionary()
+        param.setValue("\(type)", forKey: "type")
+        param.setValue(targetId, forKey: "id")
+        param.setValue(ext, forKey: "ext")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupDSRequest(true)
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId_wjj, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseWjjBUrl+"/api/v1/getShareData", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let respDic = result as! NSDictionary
+                let resp = respDic["data"] as! NSDictionary
+                let shareModel = newDictionaryToModel(resp as! [String : Any], CNLiveShopCommentRequestShareModel.self)
+                resultBlock(shareModel,.success)
+            }else{
+                resultBlock(NSNull(),.failed)
+            }
+        }
+    }
+    
 }
+//
+//  CNLiveShopCommentRequestShareModel.swift
+//  metaCode
+//
+//  Created by zx on 2024/3/13.
+//
+
+import Foundation
+
+/// 第一级
+class CNLiveShopCommentRequestShareModel:BaseModel{
+
+    ///分享url
+    var url: String = ""
+    ///微信分享类型 1h5 2小程序
+    var wx_type:Int = 1
+    ///
+    var mini_app_id: String = ""
+    ///小程序跳转路径
+    var mini_app_url: String = ""
+    ///分享标题
+    var share_title: String = ""
+    ///分享简介
+    var share_desc: String = ""
+    ///分享图片
+    var share_img: String = ""
+    ///
+    var share_type: String = ""
+    ///小程序appid
+    var app_id: String = ""
+    ///商品数据
+    var goods = CNLiveShopCommentRequestShareGoodsModel()
+}
+
+/// 商品属性
+class CNLiveShopCommentRequestShareGoodsModel:BaseModel{
+    ///现价
+    var price: String = ""
+    ///原价
+    var prices: String = ""
+}
@@ -436,14 +436,14 @@ class CNLivePlayerControlView:UIView,CNLivePlayerGestureViewDelegate{
         }
         set{
             _autoHideBrightnessViewTime = newValue
-            UIView.animate(withDuration: CGFloat(kDSPlayerAnimateTimeInterval)) {
-                [weak self] in
-                if self!.autoHideBrightnessViewTime <= 0{
-                    self!.brightnessView?.alpha = 0
-                }else{
-                    self?.brightnessView?.alpha = 1
-                }
-            }
+//            UIView.animate(withDuration: CGFloat(kDSPlayerAnimateTimeInterval)) {
+//                [weak self] in
+//                if self!.autoHideBrightnessViewTime <= 0{
+//                    self!.brightnessView?.alpha = 0
+//                }else{
+//                    self?.brightnessView?.alpha = 1
+//                }
+//            }
         }
     }
     //滑动手势操作内容
@@ -128,7 +128,9 @@ class CNLivePlayerView:UIView,PLPlayerDelegate{
             self?.play()
         }
         controlView.switchAlphaMessageStateCallBack = {[weak self] in
-            self?.switchAlphaMessageStateCallBack!(self!)
+            if ((self?.switchAlphaMessageStateCallBack?(self!)) != nil){
+                self?.switchAlphaMessageStateCallBack!(self!)
+            }
         }
         controlView.switchLockScreenCallBack = {[weak self] in
             if ((self?.switchLockScreenCallBack?(self!)) != nil){
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_goods_back_g@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "DS_goods_back_g@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "DS_goods_share_g@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "DS_goods_share_g@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}