更换电商h5域名由 https://managemall.cnlive.com/html/mall/1/#/ 都替换成 https://managemal…

…l.cnlive.com/html/mall/kublai/#/

更换电商h5域名由 https://managemall.cnlive.com/html/mall/1/#/ 都替换成 https://managemal…
…l.cnlive.com/html/mall/kublai/#/
张旭
1 parent fdd24726
Showing 8 changed files with 28 additions and 16 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVHomeViewController.swift
metaCode/Classes/Main/HuBiLieHomePage/Util/CNLiveDownSlideTool.swift
metaCode/Classes/Main/HuBiLieHomePage/View/Home/Home/CNLiveHomeShopCategoryCell.swift
metaCode/Classes/Main/HuBiLieHomePage/View/Home/Home/CNLiveHomeTwoShopCell.swift
metaCode/Classes/Main/HuBiLieHomePage/View/VodDetail/CNLiveVodPlayShopCell.swift
metaCode/Classes/Main/HuBiLieHomePage/View/VodDetail/CNLiveVodShopExpandCell.swift
@@ -140,13 +140,17 @@ target &#39;metaCode&#39; do
  
 end
  
-#解决第三方最低版本过低,Xcode14.3 异常了arc文件 ld: file not found: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/arc/libarclite_iphoneos.a
-#clang: error: linker command failed with exit code 1 (use -v to see invocation)
+
  
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
+      #解决第三方最低版本过低,Xcode14.3 异常了arc文件 ld: file not found: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/arc/libarclite_iphoneos.a
+      #clang: error: linker command failed with exit code 1 (use -v to see invocation)
       config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
+      
+      #强制所有 Pod 生成 dSYM：
+      config.build_settings['DEBUG_INFORMATION_FORMAT'] = 'dwarf-with-dsym'
     end
   end
 end
@@ -2972,7 +2972,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.2.0.25.05.10.13;
+				CURRENT_PROJECT_VERSION = 1.2.0.25.05.10.14;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
@@ -3228,7 +3228,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.2.0.25.05.10.13;
+				CURRENT_PROJECT_VERSION = 1.2.0.25.05.10.14;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -200,7 +200,7 @@ class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource
  
         if homePageStyleListMdl.id == "3337"{
             //电商搜索页面
-            let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/goods/search/search?uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
+            let urlString = hubilieDSHost+"pages/goods/search/search?uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
             CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: kCNDownSlideContentsModelModelProduct , contentId: "" , pid: "" , shareUrl: "" , thirdUrl: urlString , title: "" , s_to: "" ,trailerId: "" , controller: nil, slideModel: nil)
  
         }else {
@@ -10,6 +10,11 @@ import CNLiveShareToolKit
  
 typealias downSlideVodResultBlock = (_ vodPlayModel:CNLiveVodPlayModel,_ contentId:String,_ url:String,_ result: CNLiveVodAlbumListBaseModel?,_ status:CNLiveDownSlideResponseType) -> Void
  
+//忽必烈专用电商host
+let hubilieDSHost = "https://managemall.cnlive.com/html/mall/kublai/#/"
+//网家家电商host
+let wjjDSHost = "https://managemall.cnlive.com/html/mall/1/#/"
+
 class CNLiveDownSlideTool:NSObject{
  
     class func pushWebVCWithContentsMdl(model:String,contentId:String,pid:String,shareUrl:String,thirdUrl:String,title:String,s_to:String,trailerId:String,controller:UIViewController?,slideModel:CNLiveDownSlideModel?){//contentMdl:CNLiveDownSlideContentsModel
@@ -208,7 +213,10 @@ class CNLiveDownSlideTool:NSObject{
             if thirdUrl.count > 0 ,thirdUrl != "" ,thirdUrl != "null"{
                 urlString = thirdUrl
             }else{
-                urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/detail/detail?"+"id=\(contentId)&uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
+                
+                urlString = hubilieDSHost+"pages/main/detail/detail?"+"id=\(contentId)&uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
+                //忽必烈专用电商 https://managemall.cnlive.com/html/mall/kublai/#/
+//                urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/detail/detail?"+"id=\(contentId)&uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
             }
             let regURL = URL(string: urlString)
             let webVC = CNWebViewController()
@@ -268,16 +276,16 @@ class CNLiveDownSlideTool:NSObject{
         var urlString = ""
         if type == "1"{
             //订单
-            urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/orders/orderList/orderList?scene=app&state=\(state)"
+            urlString = hubilieDSHost+"pages/orders/orderList/orderList?scene=app&state=\(state)"
         }else if type == "2"{
             //购物车
-            urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/cartList/cartList?scene=app"
+            urlString = hubilieDSHost+"pages/main/cartList/cartList?scene=app"
         }else if type == "3"{
             //地址管理
-            urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/users/addressList/addressList?scene=app"
+            urlString = hubilieDSHost+"pages/users/addressList/addressList?scene=app"
         }else if type == "4"{
             //我的售后
-            urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/orders/orderList/orderList?state=6"
+            urlString = hubilieDSHost+"pages/orders/orderList/orderList?state=6"
         }
         let regURL = URL(string: urlString)
         let webVC = CNWebViewController()
@@ -134,7 +134,7 @@ class CNLiveHomeShopCategoryCell:UITableViewCell{
         let index = imageView.tag-1000
         if let slideModel = self.slideModel?.group[index]{
  
-            let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/goods/category/category?categoryId=\(slideModel.id)&uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
+            let urlString = hubilieDSHost+"pages/goods/category/category?categoryId=\(slideModel.id)&uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
             CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: kCNDownSlideContentsModelModelProduct , contentId: "" , pid: "" , shareUrl: "" , thirdUrl: urlString , title: "" , s_to: "" ,trailerId: "" , controller: nil, slideModel: nil)
  
  
@@ -195,7 +195,7 @@ class CNLiveHomeTwoShopCell: UITableViewCell {
         let imageView = ges.view as! UIImageView
         let i = imageView.tag-1000
         let contentMdl = (self.slideModel?.contents[i])!
-        let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/detail/detail?"+"id=\(contentMdl.contentId)&uid=\(UserInfoManager.shared.userInfo.uid)"
+        let urlString = hubilieDSHost+"pages/main/detail/detail?"+"id=\(contentMdl.contentId)&uid=\(UserInfoManager.shared.userInfo.uid)"
  
         CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: contentMdl.model , contentId: contentMdl.contentId , pid: contentMdl.pid , shareUrl: contentMdl.shareUrl , thirdUrl: urlString , title: contentMdl.title , s_to: contentMdl.s_to ,trailerId: contentMdl.trailerId , controller: nil, slideModel: nil)
     }
@@ -155,12 +155,12 @@ class CNLiveVodPlayShopCell:UITableViewCell, UICollectionViewDelegate, UICollect
         if let vodPlayShopModel = self.albumListArr[indexPath.row] as? CNLiveVodPlayShopModel{
             //相关推荐的商品
  
-            let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/detail/detail?"+"id=\(vodPlayShopModel.id)&uid=\(UserInfoManager.shared.userInfo.uid)"
+            let urlString = hubilieDSHost+"pages/main/detail/detail?"+"id=\(vodPlayShopModel.id)&uid=\(UserInfoManager.shared.userInfo.uid)"
  
             CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: kCNDownSlideContentsModelModelProduct , contentId: "" , pid: "" , shareUrl: "" , thirdUrl: urlString , title: vodPlayShopModel.title , s_to: "" ,trailerId: "" , controller: nil, slideModel: nil)
         }else if let albumModel = self.albumListArr[indexPath.row] as? CNLiveAlbumModel{
             //默认商品
-            let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/detail/detail?"+"id=\(albumModel.contentId)&uid=\(UserInfoManager.shared.userInfo.uid)"
+            let urlString = hubilieDSHost+"pages/main/detail/detail?"+"id=\(albumModel.contentId)&uid=\(UserInfoManager.shared.userInfo.uid)"
  
             CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: kCNDownSlideContentsModelModelProduct , contentId: "" , pid: "" , shareUrl: "" , thirdUrl: urlString , title: albumModel.title , s_to: "" ,trailerId: "" , controller: nil, slideModel: nil)
         }
@@ -224,12 +224,12 @@ class CNLiveVodShopExpandCell: UITableViewCell {
         let i = imageView.tag-1000
         if self.vodPlayShopModel?.count ?? 0 > 0{
             let contentMdl = (self.vodPlayShopModel?[i])!
-            let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/detail/detail?"+"id=\(contentMdl.id)&uid=\(UserInfoManager.shared.userInfo.uid)"
+            let urlString = hubilieDSHost+"pages/main/detail/detail?"+"id=\(contentMdl.id)&uid=\(UserInfoManager.shared.userInfo.uid)"
  
             CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: kCNDownSlideContentsModelModelProduct , contentId: "" , pid: "" , shareUrl: "" , thirdUrl: urlString , title: contentMdl.title , s_to: "" ,trailerId: "" , controller: nil, slideModel: nil)
         }else if self.albumModels?.count ?? 0 > 0{
             let contentMdl = (self.albumModels?[i])!
-            let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/detail/detail?"+"id=\(contentMdl.contentId)&uid=\(UserInfoManager.shared.userInfo.uid)"
+            let urlString = hubilieDSHost+"pages/main/detail/detail?"+"id=\(contentMdl.contentId)&uid=\(UserInfoManager.shared.userInfo.uid)"
  
             CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: kCNDownSlideContentsModelModelProduct , contentId: "" , pid: "" , shareUrl: "" , thirdUrl: urlString , title: contentMdl.title , s_to: "" ,trailerId: "" , controller: nil, slideModel: nil)
         }