1.1.7.25.04.26.16 , QMUITips在iOS18.4闪退的问题

“张旭”
1 parent 3e88ec43
Showing 10 changed files with 186 additions and 159 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Base/CNLiveBaseTabBarViewController.swift
metaCode/Classes/Main/HomePages/ViewModel/CNLiveHomePageViewModel.swift
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVHomeViewController.swift
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVPlayerViewController.swift
metaCode/Classes/Main/HuBiLieHomePage/View/VodDetail/CNLiveVodIntroductionCell.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineViewController.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineViewModel.swift
metaCode/Classes/Other/AppDelegate.swift
@@ -2343,10 +2343,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-metaCode/Pods-metaCode-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-metaCode/Pods-metaCode-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-metaCode/Pods-metaCode-resources.sh\"\n";
@@ -2382,10 +2386,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-metaCode/Pods-metaCode-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-metaCode/Pods-metaCode-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-metaCode/Pods-metaCode-frameworks.sh\"\n";
@@ -2960,7 +2968,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.7.25.04.25.21;
+				CURRENT_PROJECT_VERSION = 1.1.7.25.04.26.16;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
@@ -3216,7 +3224,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.1.7.25.04.25.21;
+				CURRENT_PROJECT_VERSION = 1.1.7.25.04.26.16;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -3454,6 +3462,7 @@
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "metaCode/Classes/Vendors/metaCode-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -48,6 +48,11 @@ class CNLiveBaseTabBarViewController: UITabBarController
                 }
             }
         }
+        CNLiveHomePageViewModel.requestGetHomePageTopBannerGift{[weak self] result, status in
+            guard let self = self else { return }
+            let giftModel = result as? CNLiveHomePageHuBiLieGiftModel
+            metaAppDelegate.giftModel = giftModel
+        }
     }
     // MARK: - 控制器的信息
     func setUpTabBar() {
@@ -278,13 +278,13 @@ class CNLiveHomePageViewModel:NSObject,URLSessionTaskDelegate{
         CNLiveNetworking.requestNetwork(with: .GET, urlString: "https://wjj.ys1.cnliveimg.com/download/mc/extInfoData/extInfo.json", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
-                let resp = result as! NSDictionary
-                let type = resp["type"] as! String
-                let data = resp["data"] as! NSDictionary
-                let share_app_banner = data["share_app_banner"] as! NSDictionary
-                let home_image = share_app_banner["home_image"] as! String
-                let jumpUrl = share_app_banner["jumpUrl"] as! String
-                let mine_image = share_app_banner["mine_image"] as! String
+                let resp = result as? NSDictionary
+//                let type = resp?["type"] as? String
+//                let data = resp?["data"] as? NSDictionary
+//                let share_app_banner = data?["share_app_banner"] as? NSDictionary
+//                let home_image = share_app_banner?["home_image"] as? String
+//                let jumpUrl = share_app_banner?["jumpUrl"] as? String
+//                let mine_image = share_app_banner?["mine_image"] as? String
                 let dataMdl = newDictionaryToModel(resp as! [String : Any], CNLiveHomePageHuBiLieGiftModel.self)
                 resultBlock(dataMdl,.success)
@@ -143,7 +143,7 @@ class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource
         return dataArray
     }()
     var currStyleIndex = 0
-    var giftModel:CNLiveHomePageHuBiLieGiftModel?//送礼分享model
+//    var giftModel:CNLiveHomePageHuBiLieGiftModel?//送礼分享model
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -174,6 +174,7 @@ class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource
         view.addSubview(pageStyleBtn3)
         view.addSubview(pageStyleBtn4)
+        
         view.addSubview(shareGiftBtn)
         shareGiftBtn.snp.makeConstraints { make in
             make.right.equalToSuperview().offset(-15)
@@ -181,6 +182,7 @@ class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource
             make.height.equalTo(20)
             make.centerY.equalTo(self.pageStyleBtn1.snp.centerY)
         }
+        shareGiftBtn.isHidden = true
         view.addSubview(tableView)
         tableView.frame = CGRect(x: 0, y: self.pageStyleBtn1.bottom+10, width: KSreenWidth, height: KSreenHeight-KTabBarHeight-self.pageStyleBtn1.bottom-10)
@@ -445,7 +447,7 @@ class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource
             guard let self = self else { return }
             if status == .success{
                 let giftModel = result as! CNLiveHomePageHuBiLieGiftModel
-                self.giftModel = giftModel
+                metaAppDelegate.giftModel = giftModel
             }
         }
     }
@@ -453,147 +455,144 @@ class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource
     //MARK: - 获取首页配置
     func getHomePageTopConfigListApi(){
 //        self.getHomePageTopBannerGift()
-        CNLiveHomePageViewModel.requestGetHomePageTopBannerGift{[weak self] result, status in
+//        CNLiveHomePageViewModel.requestGetHomePageTopBannerGift{[weak self] result, status in
+//            guard let self = self else { return }
+//            let giftModel = result as! CNLiveHomePageHuBiLieGiftModel
+//            metaAppDelegate.giftModel = giftModel
+            
+        CNLiveHomePageViewModel.requestGetHomePageTopConfigList{[weak self] result, status in
             guard let self = self else { return }
             if status == .success{
-                let giftModel = result as! CNLiveHomePageHuBiLieGiftModel
-                self.giftModel = giftModel
+                                
+                let dataModelArr = result as! [CNLiveHomePageHuBiLieModel]
+                let dataModel = dataModelArr.first!
-                CNLiveHomePageViewModel.requestGetHomePageTopConfigList{[weak self] result, status in
-                    guard let self = self else { return }
-                    if status == .success{
-                                        
-                        let dataModelArr = result as! [CNLiveHomePageHuBiLieModel]
-                        let dataModel = dataModelArr.first!
-                        
-                        let img = dataModel.img
-                        if img.count > 0{
-                            self.iconImgView.kf.setImage(with: URL(string: img))
-                            self.iconImgView.isHidden = false
-                            
-                            self.iconImgView.snp.remakeConstraints { make in
-                                make.left.equalTo(15)
-                                make.top.equalTo(KStatusBarHeight+10)
-                                make.width.equalTo(74)
-                                make.height.equalTo(32)
-                            }
-                            self.searBarView.snp.remakeConstraints { make in
-                                make.left.equalTo(self.iconImgView.snp.right).offset(10)
-                                make.top.equalTo(self.iconImgView.snp.top)
-                                make.right.equalToSuperview().offset(-15)
-                                make.height.equalTo(32)
-                            }
-                        }else{
-                            self.iconImgView.isHidden = true
-                            self.iconImgView.image = nil
-                            self.iconImgView.snp.remakeConstraints { make in
-                                make.left.equalTo(15)
-                                make.top.equalTo(KStatusBarHeight+10)
-                                make.width.equalTo(0)
-                                make.height.equalTo(32)
-                            }
-                            self.searBarView.snp.remakeConstraints { make in
-                                make.left.equalTo(self.iconImgView.snp.right)
-                                make.top.equalTo(self.iconImgView.snp.top)
-                                make.right.equalToSuperview().offset(-15)
-                                make.height.equalTo(32)
-                            }
+                let img = dataModel.img
+                if img.count > 0{
+                    self.iconImgView.kf.setImage(with: URL(string: img))
+                    self.iconImgView.isHidden = false
+                    
+                    self.iconImgView.snp.remakeConstraints { make in
+                        make.left.equalTo(15)
+                        make.top.equalTo(KStatusBarHeight+10)
+                        make.width.equalTo(74)
+                        make.height.equalTo(32)
+                    }
+                    self.searBarView.snp.remakeConstraints { make in
+                        make.left.equalTo(self.iconImgView.snp.right).offset(10)
+                        make.top.equalTo(self.iconImgView.snp.top)
+                        make.right.equalToSuperview().offset(-15)
+                        make.height.equalTo(32)
+                    }
+                }else{
+                    self.iconImgView.isHidden = true
+                    self.iconImgView.image = nil
+                    self.iconImgView.snp.remakeConstraints { make in
+                        make.left.equalTo(15)
+                        make.top.equalTo(KStatusBarHeight+10)
+                        make.width.equalTo(0)
+                        make.height.equalTo(32)
+                    }
+                    self.searBarView.snp.remakeConstraints { make in
+                        make.left.equalTo(self.iconImgView.snp.right)
+                        make.top.equalTo(self.iconImgView.snp.top)
+                        make.right.equalToSuperview().offset(-15)
+                        make.height.equalTo(32)
+                    }
+                }
+                
+                let homePageListMdls = dataModel.pageStyleList
+                self.homePageStyleListMdls = homePageListMdls
+                for (idx,mdl) in homePageListMdls.enumerated() {
+                    if idx == 0{
+                        self.pageStyleBtn1.setTitle(mdl.showName, for: .normal)
+                        var width = 60
+                        if mdl.showName.count <= 2{
+                            width = 60
+                        }else if mdl.showName.count == 3{
+                            width = 80
+                        }else{
+                            width = 100
                         }
-                        
-                        let homePageListMdls = dataModel.pageStyleList
-                        self.homePageStyleListMdls = homePageListMdls
-                        for (idx,mdl) in homePageListMdls.enumerated() {
-                            if idx == 0{
-                                self.pageStyleBtn1.setTitle(mdl.showName, for: .normal)
-                                var width = 60
-                                if mdl.showName.count <= 2{
-                                    width = 60
-                                }else if mdl.showName.count == 3{
-                                    width = 80
-                                }else{
-                                    width = 100
-                                }
-                                //x10 3字80 2字60 高25 y:self.searBarView.bottom+20
-                                self.pageStyleBtn1.snp.makeConstraints { make in
-                                    make.left.equalTo(10)
-                                    make.width.equalTo(width)
-                                    make.height.equalTo(25)
-                                    make.top.equalTo(self.searBarView.snp.bottom).offset(20)
-                                }
-                                self.changeBtn(btn: self.pageStyleBtn1, isHighLight: true)
-                                self.pageStyleBtn1.isHidden = false
-        //                        self.group.enter()
-                                self.getPageApi(pageID: mdl.pageId)
-
-                            }else if idx == 1{
-                                self.pageStyleBtn2.setTitle(mdl.showName, for: .normal)
-                                var width = 60
-                                if mdl.showName.count <= 2{
-                                    width = 60
-                                }else if mdl.showName.count == 3{
-                                    width = 80
-                                }else{
-                                    width = 100
-                                }
-                                self.pageStyleBtn2.snp.makeConstraints { make in
-                                    make.left.equalTo(self.pageStyleBtn1.snp.right)
-                                    make.width.equalTo(width)
-                                    make.height.equalTo(self.pageStyleBtn1.snp.height)
-                                    make.top.equalTo(self.pageStyleBtn1.snp.top)
-                                }
-                                self.changeBtn(btn: self.pageStyleBtn2, isHighLight: false)
-                                self.pageStyleBtn2.isHidden = false
-                            }else if idx == 2{
-                                self.pageStyleBtn3.setTitle(mdl.showName, for: .normal)
-                                var width = 60
-                                if mdl.showName.count <= 2{
-                                    width = 60
-                                }else if mdl.showName.count == 3{
-                                    width = 80
-                                }else{
-                                    width = 100
-                                }
-                                self.pageStyleBtn3.snp.makeConstraints { make in
-                                    make.left.equalTo(self.pageStyleBtn2.snp.right)
-                                    make.width.equalTo(width)
-                                    make.height.equalTo(self.pageStyleBtn1.snp.height)
-                                    make.top.equalTo(self.pageStyleBtn1.snp.top)
-                                }
-                                self.changeBtn(btn: self.pageStyleBtn3, isHighLight: false)
-                                self.pageStyleBtn3.isHidden = false
-                            }else if idx == 3{
-                                self.pageStyleBtn4.setTitle(mdl.showName, for: .normal)
-                                var width = 60
-                                if mdl.showName.count <= 2{
-                                    width = 60
-                                }else if mdl.showName.count == 3{
-                                    width = 80
-                                }else{
-                                    width = 100
-                                }
-                                self.pageStyleBtn4.snp.makeConstraints { make in
-                                    make.left.equalTo(self.pageStyleBtn3.snp.right)
-                                    make.width.equalTo(width)
-                                    make.height.equalTo(self.pageStyleBtn1.snp.height)
-                                    make.top.equalTo(self.pageStyleBtn1.snp.top)
-                                }
-                                self.changeBtn(btn: self.pageStyleBtn4, isHighLight: false)
-                                self.pageStyleBtn4.isHidden = false
-                            }else{
-                                
-                            }
+                        //x10 3字80 2字60 高25 y:self.searBarView.bottom+20
+                        self.pageStyleBtn1.snp.makeConstraints { make in
+                            make.left.equalTo(10)
+                            make.width.equalTo(width)
+                            make.height.equalTo(25)
+                            make.top.equalTo(self.searBarView.snp.bottom).offset(20)
                         }
-        //                self.group.notify(queue: .main) {
-        //                    // 所有网络请求都已完成，在这里执行你的任务
-        //                    self.tableView.mj_header?.endRefreshing()
-        //                    self.tableView.reloadData()
-        //                }
+                        self.changeBtn(btn: self.pageStyleBtn1, isHighLight: true)
+                        self.pageStyleBtn1.isHidden = false
+//                        self.group.enter()
+                        self.getPageApi(pageID: mdl.pageId)
+                    }else if idx == 1{
+                        self.pageStyleBtn2.setTitle(mdl.showName, for: .normal)
+                        var width = 60
+                        if mdl.showName.count <= 2{
+                            width = 60
+                        }else if mdl.showName.count == 3{
+                            width = 80
+                        }else{
+                            width = 100
+                        }
+                        self.pageStyleBtn2.snp.makeConstraints { make in
+                            make.left.equalTo(self.pageStyleBtn1.snp.right)
+                            make.width.equalTo(width)
+                            make.height.equalTo(self.pageStyleBtn1.snp.height)
+                            make.top.equalTo(self.pageStyleBtn1.snp.top)
+                        }
+                        self.changeBtn(btn: self.pageStyleBtn2, isHighLight: false)
+                        self.pageStyleBtn2.isHidden = false
+                    }else if idx == 2{
+                        self.pageStyleBtn3.setTitle(mdl.showName, for: .normal)
+                        var width = 60
+                        if mdl.showName.count <= 2{
+                            width = 60
+                        }else if mdl.showName.count == 3{
+                            width = 80
+                        }else{
+                            width = 100
+                        }
+                        self.pageStyleBtn3.snp.makeConstraints { make in
+                            make.left.equalTo(self.pageStyleBtn2.snp.right)
+                            make.width.equalTo(width)
+                            make.height.equalTo(self.pageStyleBtn1.snp.height)
+                            make.top.equalTo(self.pageStyleBtn1.snp.top)
+                        }
+                        self.changeBtn(btn: self.pageStyleBtn3, isHighLight: false)
+                        self.pageStyleBtn3.isHidden = false
+                    }else if idx == 3{
+                        self.pageStyleBtn4.setTitle(mdl.showName, for: .normal)
+                        var width = 60
+                        if mdl.showName.count <= 2{
+                            width = 60
+                        }else if mdl.showName.count == 3{
+                            width = 80
+                        }else{
+                            width = 100
+                        }
+                        self.pageStyleBtn4.snp.makeConstraints { make in
+                            make.left.equalTo(self.pageStyleBtn3.snp.right)
+                            make.width.equalTo(width)
+                            make.height.equalTo(self.pageStyleBtn1.snp.height)
+                            make.top.equalTo(self.pageStyleBtn1.snp.top)
+                        }
+                        self.changeBtn(btn: self.pageStyleBtn4, isHighLight: false)
+                        self.pageStyleBtn4.isHidden = false
                     }else{
-                        self.getHomePageTopConfigListApi()
+                        
                     }
                 }
+//                self.group.notify(queue: .main) {
+//                    // 所有网络请求都已完成，在这里执行你的任务
+//                    self.tableView.mj_header?.endRefreshing()
+//                    self.tableView.reloadData()
+//                }
+
+            }else{
+                self.getHomePageTopConfigListApi()
             }
         }
@@ -672,6 +671,8 @@ class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource
             guard let self = self else { return }
             if status == .success{
+                self.shareGiftBtn.isHidden = !metaAppDelegate.isGift
+                
                 self.dataArray.removeAllObjects()
                 let array = result as! [Any]
                 let newDataArray = NSMutableArray()
@@ -681,18 +682,19 @@ class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource
                         let layout = CNLiveDownSlideModelLayout.init(model: model)
                         let cellModel = layout.getCellHModel()
-                        if cellModel.type == SlideModelTypeBanner1{
+                        
+                        if cellModel.type == SlideModelTypeBanner1 && metaAppDelegate.isGift{
                             //banner 写死第一个gift
-                            let giftType = self.giftModel?.type
-                            let giftMineImageUrl = self.giftModel?.data?.share_app_banner?.mine_image
-                            let giftBannerImageUrl = self.giftModel?.data?.share_app_banner?.home_image
-                            let giftJumpUrl = self.giftModel?.data?.share_app_banner?.jumpUrl
+                            let giftType = metaAppDelegate.giftModel?.type ?? SlideModelTypeApp_ext_info
+                            let giftMineImageUrl = metaAppDelegate.giftModel?.data?.share_app_banner?.mine_image ?? "https://wjj.ys1.cnliveimg.com/download/mc/extInfoData/ver-001/mine_banner_bg.jpg"
+                            let giftBannerImageUrl = metaAppDelegate.giftModel?.data?.share_app_banner?.home_image ?? "https://wjj.ys1.cnliveimg.com/download/mc/extInfoData/ver-001/home_banner_bg.jpg"
+                            let giftJumpUrl = metaAppDelegate.giftModel?.data?.share_app_banner?.jumpUrl ?? "http://wjjh5.cnlive.com/cnYmHbl.html?channelName=ymhbl"
                             let giftContentMdl = CNLiveDownSlideContentsModel()
-                            giftContentMdl.poster = giftBannerImageUrl ?? ""
-                            giftContentMdl.model = giftType ?? SlideModelTypeApp_ext_info
+                            giftContentMdl.poster = giftBannerImageUrl
+                            giftContentMdl.model = giftType
                             giftContentMdl.title = "忽必烈电视剧"
-                            giftContentMdl.shareUrl = giftJumpUrl ?? "http://wjjh5.cnlive.com/cnYmHbl.html?channelName=ymhbl"
+                            giftContentMdl.shareUrl = giftJumpUrl
                             cellModel.contents.insert(giftContentMdl, at: 0)
                         }
                         newDataArray.addObjects(from: [cellModel])
@@ -771,9 +771,11 @@ class CNLiveTVPlayerViewController:UIViewController, UITableViewDataSource, UITa
             dataDic.setValue(total_fee, forKey: "total_fee")
             //后台设置一个 com.cnlive.metaCode.new 1 3 78 其他com.cnlive.metaCode.2
+    
             //苹果内购
             CNLivePayCostModule.showApplePayViw(withParamDict: dataDic as! [AnyHashable : Any], fromVC: currentViewController()!) {[weak self] result in
                 guard let self = self else { return }
+                hiddenLoading()
                 if result == CNLivePayCostTypeResultSucc{
                     print("succ")
                     //刷新页面
@@ -158,12 +158,14 @@ class CNLiveVodIntroductionCell:UITableViewCell{
             make.height.equalTo(40)
         }
-        self.contentView.addSubview(shareGiftBtn)
-        shareGiftBtn.snp.makeConstraints { make in
-            make.right.equalToSuperview().offset(-10)
-            make.width.equalTo(64)
-            make.height.equalTo(21)
-            make.centerY.equalTo(self.titleLabel.snp.centerY)
+        if  metaAppDelegate.isGift{
+            self.contentView.addSubview(shareGiftBtn)
+            shareGiftBtn.snp.makeConstraints { make in
+                make.right.equalToSuperview().offset(-10)
+                make.width.equalTo(64)
+                make.height.equalTo(21)
+                make.centerY.equalTo(self.titleLabel.snp.centerY)
+            }
         }
@@ -48,9 +48,11 @@ class CNLiveMineViewController : CNLiveBaseViewController, UITableViewDelegate, 
 //        dataArray.add([""])
         let array1 : [Dictionary] = [["name":"播放记录","icon":"mine_list_icon_help_feedback"]]
         dataArray.add(array1)
-
-        let array0 : [Dictionary] = [["name":"送礼","icon":""]]
-        dataArray.add(array0)
+        
+        if  metaAppDelegate.isGift{
+            let array0 : [Dictionary] = [["name":"送礼","icon":""]]
+            dataArray.add(array0)
+        }
         let array01 : [Dictionary] = [["name":"已购内容","icon":"mine_list_icon_help_feedback"]]
         dataArray.add(array01)
@@ -23,6 +23,8 @@ class UpdateInfoModel: BaseModel {
     var status:String = ""
     var createTime:String = ""
+    var gift = false//是否忽必烈礼物
+    
     /**
      /api/identityApi/list
      接口的数据 id createTime为公共参数
@@ -883,6 +883,7 @@ class CNLiveMineViewModel: NSObject {
                         let ver1 = "\(userInfoModel.version.split(separator: "_").last ?? "0")"
                         let ver2 = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String
                         print("获取的新版本号=>\(ver1),原来的版本号=>\(ver2)")
+                        metaAppDelegate.isGift = userInfoModel.gift
                         if CNLiveMineViewModel.compare(v1: ver1, v2: ver2) {
                             resultBlock(userInfoModel,.success)
                         } else {
@@ -20,6 +20,8 @@ import ZFPlayer
 class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
     var isCaptured = false //是否录屏中
+    var isGift = false//是否忽必烈礼物
+    var giftModel:CNLiveHomePageHuBiLieGiftModel?//送礼分享model
 //    var orientationLock = UIInterfaceOrientationMask.allButUpsideDown // 默认支持方向
 //    func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {