iOS Team / CNliveBBASMModule · Commits

Commit b38bedded76adf316b5a4cc56c840e2ec54408c9

Authored by yanglingyu
1 parent cb8fc275

cts测试appId与appkey不一致时，取zppid问题

Inline Side-by-side
Showing 4 changed files with 16 additions and 20 deletions
CNLiveBBASMModule.podspec
  View file @b38bedd
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 8
9 Pod::Spec.new do |s| 9 Pod::Spec.new do |s|
10 s.name = 'CNLiveBBASMModule' 10 s.name = 'CNLiveBBASMModule'
11 - s.version = '0.0.8' 11 + s.version = '0.0.9'
12 s.summary = 'CNLive-iOS百度小程序接入' 12 s.summary = 'CNLive-iOS百度小程序接入'
13 13
14 # This description is used to generate tags and improve search results. 14 # This description is used to generate tags and improve search results.
CNLiveBBASMModule/Classes/CNLiveBBASMImpl/CNShare/CNBBASMShareImpl.m
  View file @b38bedd
@@ -28,9 +28,9 @@ RegisterBBASMAdapter() @@ -28,9 +28,9 @@ RegisterBBASMAdapter()
28 NSString *iconUrl = content[@"iconUrl"]; 28 NSString *iconUrl = content[@"iconUrl"];
29 // 小程序页面链接 29 // 小程序页面链接
30 NSString *path = content[@"linkUrl"]; 30 NSString *path = content[@"linkUrl"];
31 - NSDictionary *categoryInfo = content[@"categoryInfo"]; 31 + NSDictionary *appInfo = content[@"appInfo"];
32 32
33 - path = [NSString stringWithFormat:@"%@/smartappLandingpage.html?title=%@&content=%@&imageUrl=%@&swanId=%@&type=smartapp",WjjH5_Host,title,sharecontent,iconUrl,[NSString stringWithFormat:@"%@/%@",categoryInfo[@"source2"],content[@"path"]]]; 33 + path = [NSString stringWithFormat:@"%@/smartappLandingpage.html?title=%@&content=%@&imageUrl=%@&swanId=%@&type=smartapp",WjjH5_Host,title,sharecontent,iconUrl,[NSString stringWithFormat:@"%@/%@",appInfo[@"appID"],content[@"path"]]];
34 34
35 35
36 NSString *mediaType = content[@"mediaType"]; 36 NSString *mediaType = content[@"mediaType"];
Example/Podfile
  View file @b38bedd
@@ -11,8 +11,8 @@ install! 'cocoapods', @@ -11,8 +11,8 @@ install! 'cocoapods',
11 :disable_input_output_paths => true # 避免Assets.car资源拷贝，引起[CP] Copy Pods Resources编译失败 11 :disable_input_output_paths => true # 避免Assets.car资源拷贝，引起[CP] Copy Pods Resources编译失败
12 target 'CNLiveBBASMModule_Example' do 12 target 'CNLiveBBASMModule_Example' do
13 pod 'CNLiveBBASMModule', :path => '../' 13 pod 'CNLiveBBASMModule', :path => '../'
14 - pod 'CNLiveTripartiteManagement/lottie-ios'  
15 - pod 'CNLiveTripartiteManagement/MJExtension' 14 + pod 'CNLiveNewTripartiteManagement/lottie-ios'
  15 + pod 'CNLiveNewTripartiteManagement/MJExtension'
16 pod 'CNLiveShareToolKit' 16 pod 'CNLiveShareToolKit'
17 pod 'CNLiveTencentopenapi' 17 pod 'CNLiveTencentopenapi'
18 pod 'MBProgressHUD' 18 pod 'MBProgressHUD'
Example/Podfile.lock
  View file @b38bedd
@@ -31,13 +31,13 @@ PODS: @@ -31,13 +31,13 @@ PODS:
31 - SMLibs (= 2.34.0) 31 - SMLibs (= 2.34.0)
32 - SSZipArchive 32 - SSZipArchive
33 - YYCache 33 - YYCache
34 - - CNLiveBBASMModule (0.0.4): 34 + - CNLiveBBASMModule (0.0.8):
35 - BBAMNPLib (~> 2.34.0) 35 - BBAMNPLib (~> 2.34.0)
36 - CNLiveBeeHive 36 - CNLiveBeeHive
37 - CNLiveEnvironment 37 - CNLiveEnvironment
  38 + - CNLiveNewTripartiteManagement/AlipaySDK-iOS
38 - CNLiveShareToolKit 39 - CNLiveShareToolKit
39 - CNLiveTencentopenapi 40 - CNLiveTencentopenapi
40 - - CNLiveTripartiteManagement/AlipaySDK-iOS  
41 - CNLiveUserManagement 41 - CNLiveUserManagement
42 - SSDKLightLib (= 1.1.0) 42 - SSDKLightLib (= 1.1.0)
43 - WechatOpenSDK 43 - WechatOpenSDK
@@ -50,6 +50,10 @@ PODS: @@ -50,6 +50,10 @@ PODS:
50 - CNLiveEnvironment (0.3.3) 50 - CNLiveEnvironment (0.3.3)
51 - CNLiveNewTripartiteManagement/AFNetworking (0.2.0.4): 51 - CNLiveNewTripartiteManagement/AFNetworking (0.2.0.4):
52 - AFNetworking (= 4.0.0) 52 - AFNetworking (= 4.0.0)
  53 + - CNLiveNewTripartiteManagement/AlipaySDK-iOS (0.2.0.5):
  54 + - AlipaySDK-iOS (= 15.7.4)
  55 + - CNLiveNewTripartiteManagement/lottie-ios (0.2.0.5):
  56 + - lottie-ios (= 2.5.0)
53 - CNLiveNewTripartiteManagement/MJExtension (0.2.0.4): 57 - CNLiveNewTripartiteManagement/MJExtension (0.2.0.4):
54 - MJExtension (= 3.2.1) 58 - MJExtension (= 3.2.1)
55 - CNLiveNewTripartiteManagement/QMUIKit (0.2.0.4): 59 - CNLiveNewTripartiteManagement/QMUIKit (0.2.0.4):
@@ -75,12 +79,6 @@ PODS: @@ -75,12 +79,6 @@ PODS:
75 - CNLiveTencentopenapi 79 - CNLiveTencentopenapi
76 - CNLiveUserManagement 80 - CNLiveUserManagement
77 - CNLiveTencentopenapi (0.0.3) 81 - CNLiveTencentopenapi (0.0.3)
78 - - CNLiveTripartiteManagement/AlipaySDK-iOS (0.1.9):  
79 - - AlipaySDK-iOS (= 15.7.4)  
80 - - CNLiveTripartiteManagement/lottie-ios (0.1.9):  
81 - - lottie-ios (= 2.5.0)  
82 - - CNLiveTripartiteManagement/MJExtension (0.1.9):  
83 - - MJExtension (= 3.2.1)  
84 - CNLiveUserManagement (0.1.5): 82 - CNLiveUserManagement (0.1.5):
85 - CNLiveNewTripartiteManagement/MJExtension 83 - CNLiveNewTripartiteManagement/MJExtension
86 - FLAnimatedImage (1.0.16) 84 - FLAnimatedImage (1.0.16)
@@ -444,10 +442,10 @@ PODS: @@ -444,10 +442,10 @@ PODS:
444 442
445 DEPENDENCIES: 443 DEPENDENCIES:
446 - CNLiveBBASMModule (from `../`) 444 - CNLiveBBASMModule (from `../`)
  445 + - CNLiveNewTripartiteManagement/lottie-ios
  446 + - CNLiveNewTripartiteManagement/MJExtension
447 - CNLiveShareToolKit 447 - CNLiveShareToolKit
448 - CNLiveTencentopenapi 448 - CNLiveTencentopenapi
449 - - CNLiveTripartiteManagement/lottie-ios  
450 - - CNLiveTripartiteManagement/MJExtension  
451 - MBProgressHUD 449 - MBProgressHUD
452 450
453 SPEC REPOS: 451 SPEC REPOS:
@@ -458,7 +456,6 @@ SPEC REPOS: @@ -458,7 +456,6 @@ SPEC REPOS:
458 - CNLiveNewTripartiteManagement 456 - CNLiveNewTripartiteManagement
459 - CNLiveRequestBastKit 457 - CNLiveRequestBastKit
460 - CNLiveShareToolKit 458 - CNLiveShareToolKit
461 - - CNLiveTripartiteManagement  
462 - CNLiveUserManagement 459 - CNLiveUserManagement
463 https://gitee.com/baidu/swan-ios-specs.git: 460 https://gitee.com/baidu/swan-ios-specs.git:
464 - BaiduBCE 461 - BaiduBCE
@@ -497,15 +494,14 @@ SPEC CHECKSUMS: @@ -497,15 +494,14 @@ SPEC CHECKSUMS:
497 AlipaySDK-iOS: 8659cdb4403de7e5f26ad8b699864a9cbe53384c 494 AlipaySDK-iOS: 8659cdb4403de7e5f26ad8b699864a9cbe53384c
498 BaiduBCE: ca933eadbccac8f8254976c9181ca5f45ded948b 495 BaiduBCE: ca933eadbccac8f8254976c9181ca5f45ded948b
499 BBAMNPLib: 070a935319cfd816f29d00c88012a496f7448229 496 BBAMNPLib: 070a935319cfd816f29d00c88012a496f7448229
500 - CNLiveBBASMModule: d73533f069ffa1859e7188421c01a55042a9b245 497 + CNLiveBBASMModule: d7fd9bfd6db7c2a1b390356ca79ab4f3f76f6b8c
501 CNLiveBeeHive: 1e105b15b6ccaad546258fcf91231563beb853d4 498 CNLiveBeeHive: 1e105b15b6ccaad546258fcf91231563beb853d4
502 CNLiveCommonCategory: 11c736c733ab9c3ea27426d2fafff31a92f0286e 499 CNLiveCommonCategory: 11c736c733ab9c3ea27426d2fafff31a92f0286e
503 CNLiveEnvironment: 6af0a2f332b704ffdec67106b4ba044c7f8da371 500 CNLiveEnvironment: 6af0a2f332b704ffdec67106b4ba044c7f8da371
504 - CNLiveNewTripartiteManagement: a1bb02063ca4ffabe9b181c033b0aecfa372dba2 501 + CNLiveNewTripartiteManagement: db7e1ba0a79312520194fde2fb78026a0f5e3eea
505 CNLiveRequestBastKit: c6ae13843ee0f96082c58230dc92c249edd6220f 502 CNLiveRequestBastKit: c6ae13843ee0f96082c58230dc92c249edd6220f
506 CNLiveShareToolKit: 8d3a9529e7a299e1d62943ae0d1236b70aee2ec2 503 CNLiveShareToolKit: 8d3a9529e7a299e1d62943ae0d1236b70aee2ec2
507 CNLiveTencentopenapi: d7c4cea634f51cae6aa61286dc3847193246dc6d 504 CNLiveTencentopenapi: d7c4cea634f51cae6aa61286dc3847193246dc6d
508 - CNLiveTripartiteManagement: 9754e873f5fe77f05a05586b1fd302f7dd8f9be2  
509 CNLiveUserManagement: ead053f2d701b01ea8fb5f1da572be788f2dd3cf 505 CNLiveUserManagement: ead053f2d701b01ea8fb5f1da572be788f2dd3cf
510 FLAnimatedImage: 8f3e854ebf9680b71f0b6e700939687fc4d82b4b 506 FLAnimatedImage: 8f3e854ebf9680b71f0b6e700939687fc4d82b4b
511 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a 507 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
@@ -527,6 +523,6 @@ SPEC CHECKSUMS: @@ -527,6 +523,6 @@ SPEC CHECKSUMS:
527 Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089 523 Weibo_SDK: 5a4d08f7e1fedbb635435e4585c8c0439c7da089
528 YYCache: 8105b6638f5e849296c71f331ff83891a4942952 524 YYCache: 8105b6638f5e849296c71f331ff83891a4942952
529 525
530 -PODFILE CHECKSUM: bf2490a3d5a56388ee390fcf8e17b6d15a27eda9 526 +PODFILE CHECKSUM: 9cdcda91661964c8692e6f2a81afe7a99b215d88
531 527
532 COCOAPODS: 1.11.2 528 COCOAPODS: 1.11.2