商家上滑逻辑 , 未认证禁止左右滑

张旭
1 parent 66900eda
Showing 10 changed files with 359 additions and 90 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/CNLiveDownShopDetailController.swift
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/CNCustomIndexView.swift
metaCode/Classes/Main/HomePage/View/CNLliveShopDetailBannerCell.swift
metaCode/Classes/Main/HomePage/View/CNUpSlideView.swift
metaCode/Classes/Main/Model/CNLiveShopDetailModel.swift
metaCode/Classes/Main/Util/CNLiveAdaptTool.swift
metaCode/Classes/Other/AppDelegate.swift
@@ -42,10 +42,10 @@ target &#39;metaCode&#39; do
   #分类滚动切换视图
   pod 'JXSegmentedView', :git => 'https://gitee.com/mirrors/JXSegmentedView.git'
   pod 'JXPagingView/Paging'
-
-
+  #轮播图
+  pod 'FSPagerView', '~> 0.8.3'
   #应用调试工具
-  pod 'FWDebug', :configurations => ['Debug']
+#  pod 'FWDebug', :configurations => ['Debug']
   target 'metaCodeTests' do
     inherit! :search_paths
@@ -21,6 +21,8 @@
 		19BB1FEC2AF0AB8E0094D962 /* CNLiveDownShopDetailController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FEB2AF0AB8E0094D962 /* CNLiveDownShopDetailController.swift */; };
 		19BB1FEE2AF0E1EC0094D962 /* CNLiveShopDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FED2AF0E1EC0094D962 /* CNLiveShopDetailViewModel.swift */; };
 		19BB1FF02AF0E5B30094D962 /* CNLiveShopDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FEF2AF0E5B30094D962 /* CNLiveShopDetailModel.swift */; };
+		19BB1FF22AF21A950094D962 /* CNLliveShopDetailBannerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB1FF12AF21A950094D962 /* CNLliveShopDetailBannerCell.swift */; };
+		19BB202B2AF382150094D962 /* CNLiveAdaptTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19BB202A2AF382150094D962 /* CNLiveAdaptTool.swift */; };
 		19CC4D472ADD006600308E2A /* CNDownSlideSingleCourseCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */; };
 		19CC4D492ADD06C500308E2A /* UITableView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D482ADD06C500308E2A /* UITableView+Extension.swift */; };
 		19CC4D4B2ADD086F00308E2A /* CNUpSlideDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D4A2ADD086F00308E2A /* CNUpSlideDetailViewController.swift */; };
@@ -153,6 +155,8 @@
 		19BB1FEB2AF0AB8E0094D962 /* CNLiveDownShopDetailController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownShopDetailController.swift; sourceTree = "<group>"; };
 		19BB1FED2AF0E1EC0094D962 /* CNLiveShopDetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailViewModel.swift; sourceTree = "<group>"; };
 		19BB1FEF2AF0E5B30094D962 /* CNLiveShopDetailModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailModel.swift; sourceTree = "<group>"; };
+		19BB1FF12AF21A950094D962 /* CNLliveShopDetailBannerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLliveShopDetailBannerCell.swift; sourceTree = "<group>"; };
+		19BB202A2AF382150094D962 /* CNLiveAdaptTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAdaptTool.swift; sourceTree = "<group>"; };
 		19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNDownSlideSingleCourseCell.swift; sourceTree = "<group>"; };
 		19CC4D482ADD06C500308E2A /* UITableView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableView+Extension.swift"; sourceTree = "<group>"; };
 		19CC4D4A2ADD086F00308E2A /* CNUpSlideDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNUpSlideDetailViewController.swift; sourceTree = "<group>"; };
@@ -308,6 +312,7 @@
 				19CC4D512ADD129800308E2A /* CNUpSlideAnimationTransition.swift */,
 				19FA201A2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift */,
 				19D2CE622AE8B65D00691757 /* CNLiveDownSlideTool.swift */,
+				19BB202A2AF382150094D962 /* CNLiveAdaptTool.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
@@ -639,6 +644,7 @@
 				19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */,
 				19CC4D4E2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift */,
 				19BB1FE92AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift */,
+				19BB1FF12AF21A950094D962 /* CNLliveShopDetailBannerCell.swift */,
 			);
 			name = View;
 			path = HomePage/View;
@@ -979,6 +985,7 @@
 				79282A3C2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift in Sources */,
 				19D2CE632AE8B65D00691757 /* CNLiveDownSlideTool.swift in Sources */,
 				790B1FB82A41B6A60074CF00 /* CNLiveMineMessageViewController.swift in Sources */,
+				19BB202B2AF382150094D962 /* CNLiveAdaptTool.swift in Sources */,
 				798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
 				790D01822A2D88FC00C5978D /* CNLiveConfigMacro.swift in Sources */,
 				19CC4D4B2ADD086F00308E2A /* CNUpSlideDetailViewController.swift in Sources */,
@@ -1045,6 +1052,7 @@
 				79396EED2A319F220053E1AF /* NSObject+CNLiveExtensions.swift in Sources */,
 				19FA201B2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift in Sources */,
 				7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */,
+				19BB1FF22AF21A950094D962 /* CNLliveShopDetailBannerCell.swift in Sources */,
 				790D018B2A2D8B3300C5978D /* CNLiveLoginViewController.swift in Sources */,
 				19CC4D562ADD19C200308E2A /* String+Extension.swift in Sources */,
 				7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */,
@@ -7,12 +7,153 @@
 import Foundation
-class CNLiveDownShopDetailController:CNLiveBaseViewController{
+class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewDelegate, UICollectionViewDataSource,UICollectionViewDelegateFlowLayout{
+    
+    let kCNLiveShopDetailDefaultCellID = "kCNLiveShopDetailDefaultCellID"
+    let kCNLiveShopDetailHeaderViewID = "kCNLiveShopDetailHeaderViewID"
+    
+    let kCNLiveShopDetailBannerCellID = "kCNLiveShopDetailBannerCellID"
+    
+    
+    lazy var shopDetailModel: CNLiveShopDetailModel = {
+        let shopDetailModel = CNLiveShopDetailModel()
+        return shopDetailModel
+    }()
+    
+    lazy var collectionView: UICollectionView = {
+        let layout = UICollectionViewFlowLayout.init()
+        let collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
+        collectionView.delegate = self
+        collectionView.dataSource = self
+        collectionView.backgroundColor = .white
+//        collectionView.register(CNLiveShopConsoleHeaderView.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: kCNLiveShopConsoleCollectionReusableHeaderViewID)
+        collectionView.register(CNLliveShopDetailBannerCell.self, forCellWithReuseIdentifier: kCNLiveShopDetailBannerCellID)
+        collectionView.register(UICollectionViewCell.self, forCellWithReuseIdentifier: kCNLiveShopDetailDefaultCellID)
+        
+        return collectionView
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         self.getShopDetailApi()
+        
+        self.view.addSubview(collectionView)
+        collectionView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(KNavigationHeight)
+            make.left.bottom.right.equalToSuperview()
+        }
+    }
+    
+    // MARK: - UICollectionViewDelegate
+    func numberOfSections(in collectionView: UICollectionView) -> Int {
+        if self.shopDetailModel.is_seller != nil{
+            if self.shopDetailModel.is_seller == true{
+                return 5
+            }else{//非商家,不处理
+                return 3
+            }
+        }else{
+            return 1
+        }
+    }
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        if self.shopDetailModel.is_seller != nil {
+            if (self.shopDetailModel.is_seller == true) {
+                if (section == 4) {
+                    let count = self.shopDetailModel.dynamic.count
+                    return count == 0 ? 1 : count
+                }else {
+                    return 1
+                }
+            }else {
+                return 1
+            }
+        }else{
+            return 1
+        }
+    }
+//    func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
+//        if (kind == UICollectionView.elementKindSectionHeader){
+//            let headerView:CNLiveShopConsoleHeaderView = collectionView .dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: kCNLiveShopDetailHeaderViewID, for: indexPath) as! CNLiveShopConsoleHeaderView
+//
+//            return headerView
+//        }else{
+//             return
+//    }
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        switch indexPath.section {
+        case 0:
+            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailBannerCellID, for: indexPath) as! CNLliveShopDetailBannerCell
+
+            cell.shopDetailModel = self.shopDetailModel
+            return cell
+//        case 1:
+//            
+//        case 2:
+//        case 3:
+//        case 4:
+        default:
+            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailDefaultCellID, for: indexPath)
+            return cell
+        }
+        
     }
+    // MARK: - UICollectionViewDelegateFlowLayout
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+        if (self.shopDetailModel.is_seller != nil && self.shopDetailModel.is_seller == true) {
+            switch (indexPath.section) {
+                case 0:
+                    return CGSize(width: KSreenWidth, height: CNLiveAdaptTool.adaptLength(length: 210))
+                case 1:
+                    return CGSize(width: KSreenWidth, height: 50)
+                case 2:
+                    return CGSize(width: KSreenWidth, height: 50)
+                case 3:
+                    return CGSize(width: KSreenWidth, height: 50)
+                case 4:
+                    return CGSize(width: KSreenWidth, height: 50)
+                default:
+                    return CGSizeZero
+            }
+        }else {
+            return CGSizeZero
+//            switch (indexPath.section) {
+//                case 0:
+//                {
+//                    if (self.mainHPModel.is_show_btn) {
+//                        return CGSizeMake(self.view.width, DS_adapt_length(262));
+//                    }else {
+//                        return CGSizeMake(self.view.width, DS_adapt_length(262) - DS_adapt_length(50));
+//                    }
+//                }
+//                    break;
+//                case 1:
+//                {
+//                    if (self.mainHPModel.is_show_btn) {
+//                        return CGSizeMake(self.view.width, DS_adapt_length(145));
+//                    }else {
+//                        return CGSizeMake(self.view.width, 0.000001);
+//                    }
+//                }
+//                    break;
+//                case 2:
+//                {
+//                    if (self.mainHPModel.is_show_user) {
+//                        return CGSizeMake(self.view.width, DS_adapt_length(191));
+//                    }else {
+//                        return CGSizeMake(self.view.width, 0.000001);
+//                    }
+//                }
+//                    break;
+//                default:
+//                {
+//                    return CGSizeZero;
+//                }
+//                    break;
+//            }
+        }
+    }
     //MARK: - 网络请求获取店铺详情
     func getShopDetailApi()
@@ -21,14 +162,9 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController{
         CNLiveShopDetailViewModel.requestShopDetailInfo(storeId: "") { result, status in
             hiddenLoading()
             if status == .success{
-                let shopDetailModel = result as! CNLiveShopDetailModel
-//                if shopUserModel.type != "3"{
-//                    //type 1商家或者8达人
-//                    let shopConsoleModel = CNLiveShopConsoleModel()
-//                    shopConsoleModel.initDataSource()
-//                    self.dataModel = shopConsoleModel
-//                    self.collectionView.reloadData()
-//                }
+                let model = result as! CNLiveShopDetailModel
+                self.shopDetailModel = model
+                self.collectionView.reloadData()
             }else if (status == .failed){
 //                self.NetApiStatus = .apiError
             }else if (status == .noNetwork){
@@ -385,13 +385,24 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             bannerView?.layer.cornerRadius = 4
             bannerView?.layer.masksToBounds = false
         }
+        let identityModel = dataArray[index] as! StandListModel
+        bannerView?.idModel = identityModel
+        if (identityModel.auth == true){
+            bannerView?.baseScrollView.isScrollEnabled = true
+        }else{
+            if (identityModel.downType == 3 || identityModel.downType == 4 || identityModel.upType == 3 || identityModel.upType == 4)
+            {
+//                bannerView?.baseScrollView.isScrollEnabled = false
+            }else{
+                bannerView?.baseScrollView.isScrollEnabled = true
+            }
+        }
+        
         bannerView?.superScrollView = flowView.scrollView
         bannerView?.associatedVCView = self.view
         bannerView?.delegate  = self
         bannerView?.upSlideView.webView.navigationDelegate = self
         bannerView?.downSlideView.webView.navigationDelegate = self
-        let identityModel = dataArray[index] as! StandListModel
-        bannerView?.idModel = identityModel
         return bannerView
     }
@@ -13,7 +13,6 @@ class CNCustomIndexTopView : UIView{
     ///关闭按钮事件回调
     var closeAction: closeBlock?
-    
     //MARK: - 懒加载
     ///标题
     lazy var titleLabel: UILabel = {
@@ -125,6 +124,8 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
             self.downSlideView.downPath = _idModel?.upPath
             self.topNavView.setTitleString(title:(_idModel?.name)!)
+            
+            self.colorDataArr = NSMutableArray(array: NSArray(objects: UIColor.white,KVCBackgroupColor!,HexColor(_idModel!.backgroundColor)!))
         }
     }
@@ -147,7 +148,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
     ///颜色数据
     lazy var colorDataArr: NSMutableArray = {
-        let colorDataArr = NSMutableArray(array: NSArray(objects: UIColor.white,KVCBackgroupColor!,UIColor("#004FE0")!))
+        let colorDataArr = NSMutableArray(array: NSArray(objects: UIColor.white,KVCBackgroupColor!,UIColor.yellow))//UIColor("#004FE0")!
         return colorDataArr
     }()
@@ -420,8 +421,21 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         }
         //滑动结束 网页类型downType=1时把topNavView 放到scrollView的上层
-        if (scrollView.contentOffset.y == ceil(defaultOffset*2)) && self.idModel?.downType == 1{
-            self.bringSubviewToFront(self.topNavView)
+        if scrollView.contentOffset.y == ceil(defaultOffset*2) {
+            if  self.idModel?.downType == 1 {
+                self.bringSubviewToFront(self.topNavView)
+                self.topNavView.isHidden = false
+            }else if self.idModel?.downType == 0{
+                self.topNavView.isHidden = false
+                self.bringSubviewToFront(self.topNavView)
+            }else{
+                self.topNavView.isHidden = true
+            }
+        }else{
+            self.topNavView.isHidden = true
+        }
+        if scrollView.contentOffset.y == ceil(defaultOffset*2){
+            
         }
         //下滑提醒View回到初始位置
+//
+//  CNLliveShopDetailBannerCell.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/1.
+//
+
+import Foundation
+import FSPagerView
+
+class CNLliveShopDetailBannerCell:UICollectionViewCell,FSPagerViewDataSource,FSPagerViewDelegate{
+   
+    let kCNLliveShopDetailBannerCellID = "kCNLliveShopDetailBannerCellID"
+    
+    lazy var viewPager: FSPagerView = {
+        let viewPager = FSPagerView()
+        viewPager.frame = CGRect(x: 10, y: 10, width: self.contentView.width-20, height: self.contentView.height-20)
+        viewPager.dataSource = self
+        viewPager.delegate = self
+        viewPager.register(FSPagerViewCell.self, forCellWithReuseIdentifier: kCNLliveShopDetailBannerCellID)
+        //设置自动翻页事件间隔，默认值为0 (不自动翻页)
+        viewPager.automaticSlidingInterval = 1.0
+        //设置页面之间的间隔距离
+        viewPager.interitemSpacing = 8.0
+        //设置可以无限翻页，默认值为false，false时从尾部向前滚动到头部再继续循环滚动，true时可以无限滚动
+        viewPager.isInfinite = true
+        //设置转场的模式
+        viewPager.transformer = FSPagerViewTransformer(type: FSPagerViewTransformerType.depth)
+        return viewPager
+    }()
+    
+    //shopDetailModel
+    var _shopDetailModel : CNLiveShopDetailModel?
+    var shopDetailModel : CNLiveShopDetailModel? {
+        get{
+            _shopDetailModel
+        }
+        set{
+            _shopDetailModel = newValue!
+            
+        }
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.backgroundColor = .clear
+        self.setUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setUI(){
+        self.backgroundColor = .red
+        self.contentView.addSubview(self.viewPager)
+    }
+    
+    // MARK: - FSPagerViewDataSource
+    func numberOfItems(in pagerView: FSPagerView) -> Int {
+        return (self.shopDetailModel?.banner.count)!
+    }
+    func pagerView(_ pagerView: FSPagerView, cellForItemAt index: Int) -> FSPagerViewCell {
+        let cell = pagerView.dequeueReusableCell(withReuseIdentifier: kCNLliveShopDetailBannerCellID, at: index)
+        let imgUrl = self.shopDetailModel?.banner[index].simg!
+        cell.imageView?.kf.setImage(with: URL(string: imgUrl!))
+        return cell
+    }
+}
@@ -27,7 +27,7 @@ class CNUpSlideView:UIView{
         return webView
     }()
-    var upSlideVC: CNLiveDownShopDetailController = {
+    lazy var upSlideVC: CNLiveDownShopDetailController = {
         let upSlideVC = CNLiveDownShopDetailController.init()
         upSlideVC.view.width = KSreenWidth
         upSlideVC.view.height = KSreenHeight
@@ -93,79 +93,93 @@ class CNLiveShopDetailDynamicModel:BaseModel{
     ///用户id
     var uid: String?
     ///发布时间
-    var total_money: String?
-    ///总余额
-    var total_money: String?
-    ///总余额
-    var total_money: String?
-    /**
-     
-     */
-    @property (nonatomic,assign) NSTimeInterval addtime;
-    /**
-     经度
-     */
-    @property (nonatomic,copy) NSString * longitude;
-    /**
-     纬度
-     */
-    @property (nonatomic,copy) NSString * latitude;
-    /**
-     浏览数
-     */
-    @property (nonatomic,assign) NSUInteger pv;
-    /**
-     点赞数
-     */
-    @property (nonatomic,assign) NSUInteger upper;
-    /**
-     评论数
-     */
-    @property (nonatomic,assign) NSUInteger comment;
-    /**
-     定位
-     */
-    @property (nonatomic,copy) NSString * location;
-    /**
-     视频
-     */
-    @property (nonatomic,copy) NSString * video;
-    /**
-     是否点赞 1点赞 0没点
-     */
-    @property (nonatomic,assign) BOOL is_upper;
-    /**
-     是否显示 1显示 0隐藏
-     */
-    @property (nonatomic,assign) BOOL state;
-    /**
-     商品id
-     */
-    @property (nonatomic,copy) NSString * goods_id;
-    /**
-     视频封面图
-     */
-    @property (nonatomic,copy) NSString * video_img;
-    /**
-     封面图数组
-     */
-    @property (nonatomic,copy) NSArray<NSString*> * img;
-    /**
-     达人信息
-     */
-    @property (nonatomic,strong) CNDSMainHPDarenDynamicShopUserModel * shop_user;
-    /**
-     热门评论
-     */
-    @property (nonatomic,strong) CNDSMainHPDarenDynamicCommentModel * comment_content;
-    /**
-     商品
-     */
-    @property (nonatomic,strong) CNDSMainHPDarenDynamicGoodsModel * goods;
+    var addtime: Double?
+    ///经度
+    var longitude: String?
+    ///纬度
+    var latitude: String?
+    ///浏览数
+    var pv: Int = 0
+    ///点赞数
+    var upper: Int = 0
+    ///评论数
+    var comment: Int = 0
+    ///定位
+    var location: String?
+    ///视频
+    var video: String?
+    ///是否点赞 1点赞 0没点
+    var is_upper: Bool?
+    ///是否显示 1显示 0隐藏
+    var state: Bool?
+    ///商品id
+    var goods_id: String?
+    ///视频封面图
+    var video_img: String?
+    ///封面图数组
+    var img = [Array<String>]()
+    ///达人信息
+    var shop_user: CNLiveShopDetailDynamicShopUserModel?
+    ///热门评论
+    var comment_content: CNLiveShopDetailDynamicCommentModel?
+    ///商品
+    var goods: CNLiveShopDetailDynamicGoodsModel?
+}
+
+// MARK: - 达人数据
+class CNLiveShopDetailDynamicShopUserModel:BaseModel{
+    ///店铺id
+    var id: String?
+    ///达人名称
+    var title: String?
+    ///达人头像
+    var logo: String?
+    ///达人id
+    var uid: String?
+}
+
+// MARK: - 热门评论
+class CNLiveShopDetailDynamicCommentModel:BaseModel{
+    ///评论id
+    var id: String?
+    ///用户id
+    var uid: String?
+    ///评论内容
+    var content: String?
+    ///评论时间
+    var addtime: Double?
+    ///点赞数
+    var upper: Int = 0
+}
+
+// MARK: - 商品
+class CNLiveShopDetailDynamicGoodsModel:BaseModel{
+    ///商品id
+    var id: String?
+    ///商品标题
+    var title: String?
+    ///1普通商品 2文创商品
+    var shop_type: String?
+    ///
+    var type: String?
+    ///
+    var to: String?
+    ///现价
+    var price: String?
+    ///原价
+    var prices: String?
+    ///广告语
+    var ads: String?
+    ///商品封面
+    var simg: String?
 }
+// MARK: - 餐厅店铺信息
 class CNLiveShopDetailFoodsShopModel:BaseModel{
-    
+    ///店铺名称
+    var title: String?
+    ///店铺id
+    var id: String?
 }
+//
+//  CNLiveAdaptTool.swift
+//  metaCode
+//
+//  Created by zx on 2023/11/2.
+//
+
+import Foundation
+
+class CNLiveAdaptTool:NSObject{
+    class func adaptLength(length:CGFloat) -> CGFloat{
+        
+        let multiple = KSreenWidth / 375.0
+        let f_adapt_length = floor(length * multiple)
+        return f_adapt_length
+    }
+}
@@ -69,7 +69,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         let p : Dictionary = ["platform_id":kAppBundleID,"uuid":uuid,"plat":"i","ver":ver,"appId":APPId,"timestamp":String(NSNumber(floatLiteral: Date().timeIntervalSince1970).intValue),"clientPlat":"i","frmId":"ios"]
         CNLiveNetworking.setupDefaultParam(p)
-        let shop_dic : Dictionary = ["Phone-Model":"iPhone","Uid":UserInfoManager.shared.userInfo.uid ?? "","CFBundleShortVersionString":ver,"Shop-Version":"0.6.2"]
+        let shop_dic : Dictionary = ["Phone-Model":"iPhone","Uid":"","CFBundleShortVersionString":ver,"Shop-Version":"0.6.2"]
         CNLiveNetworking.setupDSShopParam(shop_dic)
         CNLiveNetworking.setupShowDataResult(false)