iOS Team / CNLiveMateCode · Commits

Commit 03f8a7735e881235c06ccb6d862786c396f8dc01

Authored by 张旭
1 parent fdd24726

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

…l.cnlive.com/html/mall/kublai/#/
Inline Side-by-side
Showing 8 changed files with 28 additions and 16 deletions
... ... @@ -140,13 +140,17 @@ target 'metaCode' do
140 140  
141 141 end
142 142  
143   -#解决第三方最低版本过低,Xcode14.3 异常了arc文件 ld: file not found: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/arc/libarclite_iphoneos.a
144   -#clang: error: linker command failed with exit code 1 (use -v to see invocation)
  143 +
145 144  
146 145 post_install do |installer|
147 146 installer.pods_project.targets.each do |target|
148 147 target.build_configurations.each do |config|
  148 + #解决第三方最低版本过低,Xcode14.3 异常了arc文件 ld: file not found: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/arc/libarclite_iphoneos.a
  149 + #clang: error: linker command failed with exit code 1 (use -v to see invocation)
149 150 config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
  151 +
  152 + #强制所有 Pod 生成 dSYM：
  153 + config.build_settings['DEBUG_INFORMATION_FORMAT'] = 'dwarf-with-dsym'
150 154 end
151 155 end
152 156 end
... ...
metaCode.xcodeproj/project.pbxproj
  View file @03f8a77
... ... @@ -2972,7 +2972,7 @@
2972 2972 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
2973 2973 CODE_SIGN_IDENTITY = "Apple Development";
2974 2974 CODE_SIGN_STYLE = Automatic;
2975   - CURRENT_PROJECT_VERSION = 1.2.0.25.05.10.13;
  2975 + CURRENT_PROJECT_VERSION = 1.2.0.25.05.10.14;
2976 2976 DEBUG_INFORMATION_FORMAT = dwarf;
2977 2977 DEVELOPMENT_TEAM = 94X49GG3ZW;
2978 2978 ENABLE_BITCODE = NO;
... ... @@ -3228,7 +3228,7 @@
3228 3228 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
3229 3229 CODE_SIGN_IDENTITY = "Apple Development";
3230 3230 CODE_SIGN_STYLE = Automatic;
3231   - CURRENT_PROJECT_VERSION = 1.2.0.25.05.10.13;
  3231 + CURRENT_PROJECT_VERSION = 1.2.0.25.05.10.14;
3232 3232 DEVELOPMENT_TEAM = 94X49GG3ZW;
3233 3233 ENABLE_BITCODE = NO;
3234 3234 ENABLE_MODULE_VERIFIER = NO;
... ...
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVHomeViewController.swift
  View file @03f8a77
... ... @@ -200,7 +200,7 @@ class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource
200 200  
201 201 if homePageStyleListMdl.id == "3337"{
202 202 //电商搜索页面
203   - let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/goods/search/search?uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
  203 + let urlString = hubilieDSHost+"pages/goods/search/search?uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
204 204 CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: kCNDownSlideContentsModelModelProduct , contentId: "" , pid: "" , shareUrl: "" , thirdUrl: urlString , title: "" , s_to: "" ,trailerId: "" , controller: nil, slideModel: nil)
205 205  
206 206 }else {
... ...
metaCode/Classes/Main/HuBiLieHomePage/Util/CNLiveDownSlideTool.swift
  View file @03f8a77
... ... @@ -10,6 +10,11 @@ import CNLiveShareToolKit
10 10  
11 11 typealias downSlideVodResultBlock = (_ vodPlayModel:CNLiveVodPlayModel,_ contentId:String,_ url:String,_ result: CNLiveVodAlbumListBaseModel?,_ status:CNLiveDownSlideResponseType) -> Void
12 12  
  13 +//忽必烈专用电商host
  14 +let hubilieDSHost = "https://managemall.cnlive.com/html/mall/kublai/#/"
  15 +//网家家电商host
  16 +let wjjDSHost = "https://managemall.cnlive.com/html/mall/1/#/"
  17 +
13 18 class CNLiveDownSlideTool:NSObject{
14 19  
15 20 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{
208 213 if thirdUrl.count > 0 ,thirdUrl != "" ,thirdUrl != "null"{
209 214 urlString = thirdUrl
210 215 }else{
211   - urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/detail/detail?"+"id=\(contentId)&uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
  216 +
  217 + urlString = hubilieDSHost+"pages/main/detail/detail?"+"id=\(contentId)&uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
  218 + //忽必烈专用电商 https://managemall.cnlive.com/html/mall/kublai/#/
  219 +// urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/detail/detail?"+"id=\(contentId)&uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
212 220 }
213 221 let regURL = URL(string: urlString)
214 222 let webVC = CNWebViewController()
... ... @@ -268,16 +276,16 @@ class CNLiveDownSlideTool:NSObject{
268 276 var urlString = ""
269 277 if type == "1"{
270 278 //订单
271   - urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/orders/orderList/orderList?scene=app&state=\(state)"
  279 + urlString = hubilieDSHost+"pages/orders/orderList/orderList?scene=app&state=\(state)"
272 280 }else if type == "2"{
273 281 //购物车
274   - urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/cartList/cartList?scene=app"
  282 + urlString = hubilieDSHost+"pages/main/cartList/cartList?scene=app"
275 283 }else if type == "3"{
276 284 //地址管理
277   - urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/users/addressList/addressList?scene=app"
  285 + urlString = hubilieDSHost+"pages/users/addressList/addressList?scene=app"
278 286 }else if type == "4"{
279 287 //我的售后
280   - urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/orders/orderList/orderList?state=6"
  288 + urlString = hubilieDSHost+"pages/orders/orderList/orderList?state=6"
281 289 }
282 290 let regURL = URL(string: urlString)
283 291 let webVC = CNWebViewController()
... ...
metaCode/Classes/Main/HuBiLieHomePage/View/Home/Home/CNLiveHomeShopCategoryCell.swift
  View file @03f8a77
... ... @@ -134,7 +134,7 @@ class CNLiveHomeShopCategoryCell:UITableViewCell{
134 134 let index = imageView.tag-1000
135 135 if let slideModel = self.slideModel?.group[index]{
136 136  
137   - let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/goods/category/category?categoryId=\(slideModel.id)&uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
  137 + let urlString = hubilieDSHost+"pages/goods/category/category?categoryId=\(slideModel.id)&uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
138 138 CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: kCNDownSlideContentsModelModelProduct , contentId: "" , pid: "" , shareUrl: "" , thirdUrl: urlString , title: "" , s_to: "" ,trailerId: "" , controller: nil, slideModel: nil)
139 139  
140 140  
... ...
metaCode/Classes/Main/HuBiLieHomePage/View/Home/Home/CNLiveHomeTwoShopCell.swift
  View file @03f8a77
... ... @@ -195,7 +195,7 @@ class CNLiveHomeTwoShopCell: UITableViewCell {
195 195 let imageView = ges.view as! UIImageView
196 196 let i = imageView.tag-1000
197 197 let contentMdl = (self.slideModel?.contents[i])!
198   - let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/detail/detail?"+"id=\(contentMdl.contentId)&uid=\(UserInfoManager.shared.userInfo.uid)"
  198 + let urlString = hubilieDSHost+"pages/main/detail/detail?"+"id=\(contentMdl.contentId)&uid=\(UserInfoManager.shared.userInfo.uid)"
199 199  
200 200 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)
201 201 }
... ...
metaCode/Classes/Main/HuBiLieHomePage/View/VodDetail/CNLiveVodPlayShopCell.swift
  View file @03f8a77
... ... @@ -155,12 +155,12 @@ class CNLiveVodPlayShopCell:UITableViewCell, UICollectionViewDelegate, UICollect
155 155 if let vodPlayShopModel = self.albumListArr[indexPath.row] as? CNLiveVodPlayShopModel{
156 156 //相关推荐的商品
157 157  
158   - let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/detail/detail?"+"id=\(vodPlayShopModel.id)&uid=\(UserInfoManager.shared.userInfo.uid)"
  158 + let urlString = hubilieDSHost+"pages/main/detail/detail?"+"id=\(vodPlayShopModel.id)&uid=\(UserInfoManager.shared.userInfo.uid)"
159 159  
160 160 CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: kCNDownSlideContentsModelModelProduct , contentId: "" , pid: "" , shareUrl: "" , thirdUrl: urlString , title: vodPlayShopModel.title , s_to: "" ,trailerId: "" , controller: nil, slideModel: nil)
161 161 }else if let albumModel = self.albumListArr[indexPath.row] as? CNLiveAlbumModel{
162 162 //默认商品
163   - let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/detail/detail?"+"id=\(albumModel.contentId)&uid=\(UserInfoManager.shared.userInfo.uid)"
  163 + let urlString = hubilieDSHost+"pages/main/detail/detail?"+"id=\(albumModel.contentId)&uid=\(UserInfoManager.shared.userInfo.uid)"
164 164  
165 165 CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: kCNDownSlideContentsModelModelProduct , contentId: "" , pid: "" , shareUrl: "" , thirdUrl: urlString , title: albumModel.title , s_to: "" ,trailerId: "" , controller: nil, slideModel: nil)
166 166 }
... ...
metaCode/Classes/Main/HuBiLieHomePage/View/VodDetail/CNLiveVodShopExpandCell.swift
  View file @03f8a77
... ... @@ -224,12 +224,12 @@ class CNLiveVodShopExpandCell: UITableViewCell {
224 224 let i = imageView.tag-1000
225 225 if self.vodPlayShopModel?.count ?? 0 > 0{
226 226 let contentMdl = (self.vodPlayShopModel?[i])!
227   - let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/detail/detail?"+"id=\(contentMdl.id)&uid=\(UserInfoManager.shared.userInfo.uid)"
  227 + let urlString = hubilieDSHost+"pages/main/detail/detail?"+"id=\(contentMdl.id)&uid=\(UserInfoManager.shared.userInfo.uid)"
228 228  
229 229 CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: kCNDownSlideContentsModelModelProduct , contentId: "" , pid: "" , shareUrl: "" , thirdUrl: urlString , title: contentMdl.title , s_to: "" ,trailerId: "" , controller: nil, slideModel: nil)
230 230 }else if self.albumModels?.count ?? 0 > 0{
231 231 let contentMdl = (self.albumModels?[i])!
232   - let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/main/detail/detail?"+"id=\(contentMdl.contentId)&uid=\(UserInfoManager.shared.userInfo.uid)"
  232 + let urlString = hubilieDSHost+"pages/main/detail/detail?"+"id=\(contentMdl.contentId)&uid=\(UserInfoManager.shared.userInfo.uid)"
233 233  
234 234 CNLiveDownSlideTool.pushWebAndVodVCWithContentsMdl(model: kCNDownSlideContentsModelModelProduct , contentId: "" , pid: "" , shareUrl: "" , thirdUrl: urlString , title: contentMdl.title , s_to: "" ,trailerId: "" , controller: nil, slideModel: nil)
235 235 }
... ...