Commit 7c6fba31906074e7516d762e9c5bbb6a58f0e8d5

Authored by yanglingyu
1 parent 539a29a6

no message

CNLiveBBASMModule.podspec
@@ -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.4' 11 + s.version = '0.0.5'
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.
@@ -30,11 +30,10 @@ TODO: Add long description of the pod here. @@ -30,11 +30,10 @@ TODO: Add long description of the pod here.
30 30
31 s.ios.deployment_target = '10.0' 31 s.ios.deployment_target = '10.0'
32 32
33 - s.vendored_libraries = ['CNLiveBBASMModule/Classes/CNLibrary/**/libs/*'] 33 +# s.vendored_libraries = ['CNLiveBBASMModule/Classes/CNLibrary/**/libs/*']
34 s.source_files = ['CNLiveBBASMModule/Classes/CNLiveBBASMImpl/**/*', 34 s.source_files = ['CNLiveBBASMModule/Classes/CNLiveBBASMImpl/**/*',
35 'CNLiveBBASMModule/Classes/CNBBASATool/**/*', 35 'CNLiveBBASMModule/Classes/CNBBASATool/**/*',
36 - 'CNLiveBBASMModule/Classes/CNFrameworks/*.framework/Headers/*',  
37 - 'CNLiveBBASMModule/Classes/CNLibrary/UPPay/inc/*'] 36 + 'CNLiveBBASMModule/Classes/CNFrameworks/*.framework/Headers/*']
38 s.vendored_frameworks = ['CNLiveBBASMModule/Classes/CNFrameworks/BaiduWallet_Portal.framework', 37 s.vendored_frameworks = ['CNLiveBBASMModule/Classes/CNFrameworks/BaiduWallet_Portal.framework',
39 'CNLiveBBASMModule/Classes/CNFrameworks/BainuoCashierSDK.framework'] 38 'CNLiveBBASMModule/Classes/CNFrameworks/BainuoCashierSDK.framework']
40 s.static_framework = true 39 s.static_framework = true
Example/CNLiveBBASMModule.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
10 086F08172730E1F700B9D7EE /* CNLiveBBASMModuleService.m in Sources */ = {isa = PBXBuildFile; fileRef = 086F08162730E1F700B9D7EE /* CNLiveBBASMModuleService.m */; }; 10 086F08172730E1F700B9D7EE /* CNLiveBBASMModuleService.m in Sources */ = {isa = PBXBuildFile; fileRef = 086F08162730E1F700B9D7EE /* CNLiveBBASMModuleService.m */; };
11 086F0990273293A100B9D7EE /* BBAPluginDescription.zip in Resources */ = {isa = PBXBuildFile; fileRef = 086F098F273293A100B9D7EE /* BBAPluginDescription.zip */; }; 11 086F0990273293A100B9D7EE /* BBAPluginDescription.zip in Resources */ = {isa = PBXBuildFile; fileRef = 086F098F273293A100B9D7EE /* BBAPluginDescription.zip */; };
  12 + 08DCFE6D273634E700659A1D /* libPaymentControlMini.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 08DCFE6C273634E700659A1D /* libPaymentControlMini.a */; };
12 08DE2ED3273101B600C3BC16 /* CNAdaptSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08DE2ED2273101B600C3BC16 /* CNAdaptSwift.swift */; }; 13 08DE2ED3273101B600C3BC16 /* CNAdaptSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 08DE2ED2273101B600C3BC16 /* CNAdaptSwift.swift */; };
13 08DE2EDB27310B0500C3BC16 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08DE2EDA27310B0500C3BC16 /* SystemConfiguration.framework */; }; 14 08DE2EDB27310B0500C3BC16 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08DE2EDA27310B0500C3BC16 /* SystemConfiguration.framework */; };
14 08DE2EDD27310B0F00C3BC16 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08DE2EDC27310B0F00C3BC16 /* CoreTelephony.framework */; }; 15 08DE2EDD27310B0F00C3BC16 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08DE2EDC27310B0F00C3BC16 /* CoreTelephony.framework */; };
@@ -54,6 +55,8 @@ @@ -54,6 +55,8 @@
54 086F08152730E1F700B9D7EE /* CNLiveBBASMModuleService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveBBASMModuleService.h; sourceTree = "<group>"; }; 55 086F08152730E1F700B9D7EE /* CNLiveBBASMModuleService.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveBBASMModuleService.h; sourceTree = "<group>"; };
55 086F08162730E1F700B9D7EE /* CNLiveBBASMModuleService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveBBASMModuleService.m; sourceTree = "<group>"; }; 56 086F08162730E1F700B9D7EE /* CNLiveBBASMModuleService.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CNLiveBBASMModuleService.m; sourceTree = "<group>"; };
56 086F098F273293A100B9D7EE /* BBAPluginDescription.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = BBAPluginDescription.zip; sourceTree = "<group>"; }; 57 086F098F273293A100B9D7EE /* BBAPluginDescription.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = BBAPluginDescription.zip; sourceTree = "<group>"; };
  58 + 08DCFE6A273634E700659A1D /* UPPaymentControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPPaymentControl.h; sourceTree = "<group>"; };
  59 + 08DCFE6C273634E700659A1D /* libPaymentControlMini.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libPaymentControlMini.a; sourceTree = "<group>"; };
57 08DE2ED1273101B500C3BC16 /* CNLiveBBASMModule_Example-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CNLiveBBASMModule_Example-Bridging-Header.h"; sourceTree = "<group>"; }; 60 08DE2ED1273101B500C3BC16 /* CNLiveBBASMModule_Example-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CNLiveBBASMModule_Example-Bridging-Header.h"; sourceTree = "<group>"; };
58 08DE2ED2273101B600C3BC16 /* CNAdaptSwift.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNAdaptSwift.swift; sourceTree = "<group>"; }; 61 08DE2ED2273101B600C3BC16 /* CNAdaptSwift.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNAdaptSwift.swift; sourceTree = "<group>"; };
59 08DE2ED827310AEB00C3BC16 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; 62 08DE2ED827310AEB00C3BC16 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
@@ -119,6 +122,7 @@ @@ -119,6 +122,7 @@
119 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */, 122 6003F58E195388D20070C39A /* Foundation.framework in Frameworks */,
120 08DE2EE327310B2B00C3BC16 /* CFNetwork.framework in Frameworks */, 123 08DE2EE327310B2B00C3BC16 /* CFNetwork.framework in Frameworks */,
121 F9225E875B57360B1E21CA00 /* Pods_CNLiveBBASMModule_Example.framework in Frameworks */, 124 F9225E875B57360B1E21CA00 /* Pods_CNLiveBBASMModule_Example.framework in Frameworks */,
  125 + 08DCFE6D273634E700659A1D /* libPaymentControlMini.a in Frameworks */,
122 08DE2EDB27310B0500C3BC16 /* SystemConfiguration.framework in Frameworks */, 126 08DE2EDB27310B0500C3BC16 /* SystemConfiguration.framework in Frameworks */,
123 08DE2EDD27310B0F00C3BC16 /* CoreTelephony.framework in Frameworks */, 127 08DE2EDD27310B0F00C3BC16 /* CoreTelephony.framework in Frameworks */,
124 08DE2EF027310B6900C3BC16 /* MobileCoreServices.framework in Frameworks */, 128 08DE2EF027310B6900C3BC16 /* MobileCoreServices.framework in Frameworks */,
@@ -155,6 +159,32 @@ @@ -155,6 +159,32 @@
155 path = Resources; 159 path = Resources;
156 sourceTree = "<group>"; 160 sourceTree = "<group>";
157 }; 161 };
  162 + 08DCFE68273634E700659A1D /* UPPay */ = {
  163 + isa = PBXGroup;
  164 + children = (
  165 + 08DCFE69273634E700659A1D /* inc */,
  166 + 08DCFE6B273634E700659A1D /* libs */,
  167 + );
  168 + name = UPPay;
  169 + path = ../../../../cnlive/Desktop/CNLibrary/UPPay;
  170 + sourceTree = "<group>";
  171 + };
  172 + 08DCFE69273634E700659A1D /* inc */ = {
  173 + isa = PBXGroup;
  174 + children = (
  175 + 08DCFE6A273634E700659A1D /* UPPaymentControl.h */,
  176 + );
  177 + path = inc;
  178 + sourceTree = "<group>";
  179 + };
  180 + 08DCFE6B273634E700659A1D /* libs */ = {
  181 + isa = PBXGroup;
  182 + children = (
  183 + 08DCFE6C273634E700659A1D /* libPaymentControlMini.a */,
  184 + );
  185 + path = libs;
  186 + sourceTree = "<group>";
  187 + };
158 6003F581195388D10070C39A = { 188 6003F581195388D10070C39A = {
159 isa = PBXGroup; 189 isa = PBXGroup;
160 children = ( 190 children = (
@@ -181,6 +211,7 @@ @@ -181,6 +211,7 @@
181 6003F58C195388D20070C39A /* Frameworks */ = { 211 6003F58C195388D20070C39A /* Frameworks */ = {
182 isa = PBXGroup; 212 isa = PBXGroup;
183 children = ( 213 children = (
  214 + 08DCFE68273634E700659A1D /* UPPay */,
184 08DE2EEF27310B6900C3BC16 /* MobileCoreServices.framework */, 215 08DE2EEF27310B6900C3BC16 /* MobileCoreServices.framework */,
185 08DE2EED27310B6200C3BC16 /* AddressBook.framework */, 216 08DE2EED27310B6200C3BC16 /* AddressBook.framework */,
186 08DE2EEB27310B5A00C3BC16 /* AddressBookUI.framework */, 217 08DE2EEB27310B5A00C3BC16 /* AddressBookUI.framework */,
@@ -606,7 +637,10 @@ @@ -606,7 +637,10 @@
606 INFOPLIST_FILE = "CNLiveBBASMModule/CNLiveBBASMModule-Info.plist"; 637 INFOPLIST_FILE = "CNLiveBBASMModule/CNLiveBBASMModule-Info.plist";
607 IPHONEOS_DEPLOYMENT_TARGET = 10.0; 638 IPHONEOS_DEPLOYMENT_TARGET = 10.0;
608 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; 639 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
609 - LIBRARY_SEARCH_PATHS = "$(inherited)"; 640 + LIBRARY_SEARCH_PATHS = (
  641 + "$(inherited)",
  642 + "$(PROJECT_DIR)/UPPay/libs",
  643 + );
610 MODULE_NAME = ExampleApp; 644 MODULE_NAME = ExampleApp;
611 PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAdd.debug; 645 PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAdd.debug;
612 PRODUCT_NAME = "$(TARGET_NAME)"; 646 PRODUCT_NAME = "$(TARGET_NAME)";
@@ -636,7 +670,10 @@ @@ -636,7 +670,10 @@
636 INFOPLIST_FILE = "CNLiveBBASMModule/CNLiveBBASMModule-Info.plist"; 670 INFOPLIST_FILE = "CNLiveBBASMModule/CNLiveBBASMModule-Info.plist";
637 IPHONEOS_DEPLOYMENT_TARGET = 10.0; 671 IPHONEOS_DEPLOYMENT_TARGET = 10.0;
638 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; 672 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
639 - LIBRARY_SEARCH_PATHS = "$(inherited)"; 673 + LIBRARY_SEARCH_PATHS = (
  674 + "$(inherited)",
  675 + "$(PROJECT_DIR)/UPPay/libs",
  676 + );
640 MODULE_NAME = ExampleApp; 677 MODULE_NAME = ExampleApp;
641 PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAdd.debug; 678 PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.CNLiveNetAdd.debug;
642 PRODUCT_NAME = "$(TARGET_NAME)"; 679 PRODUCT_NAME = "$(TARGET_NAME)";
Example/Podfile.lock
@@ -497,7 +497,7 @@ SPEC CHECKSUMS: @@ -497,7 +497,7 @@ SPEC CHECKSUMS:
497 AlipaySDK-iOS: 8659cdb4403de7e5f26ad8b699864a9cbe53384c 497 AlipaySDK-iOS: 8659cdb4403de7e5f26ad8b699864a9cbe53384c
498 BaiduBCE: ca933eadbccac8f8254976c9181ca5f45ded948b 498 BaiduBCE: ca933eadbccac8f8254976c9181ca5f45ded948b
499 BBAMNPLib: 070a935319cfd816f29d00c88012a496f7448229 499 BBAMNPLib: 070a935319cfd816f29d00c88012a496f7448229
500 - CNLiveBBASMModule: 4cd2560a0be15333e55c0990f7d5771855799e68 500 + CNLiveBBASMModule: d73533f069ffa1859e7188421c01a55042a9b245
501 CNLiveBeeHive: 1e105b15b6ccaad546258fcf91231563beb853d4 501 CNLiveBeeHive: 1e105b15b6ccaad546258fcf91231563beb853d4
502 CNLiveCommonCategory: 11c736c733ab9c3ea27426d2fafff31a92f0286e 502 CNLiveCommonCategory: 11c736c733ab9c3ea27426d2fafff31a92f0286e
503 CNLiveEnvironment: 6af0a2f332b704ffdec67106b4ba044c7f8da371 503 CNLiveEnvironment: 6af0a2f332b704ffdec67106b4ba044c7f8da371
CNLiveBBASMModule/Classes/CNLibrary/UPPay/inc/UPPaymentControl.h renamed to Example/UPPay/inc/UPPaymentControl.h
CNLiveBBASMModule/Classes/CNLibrary/UPPay/libs/libPaymentControlMini.a renamed to Example/UPPay/libs/libPaymentControlMini.a
No preview for this file type