Commit c7aa883e531e36c0aee05de389129e2b78533a64

Authored by yinqiaojuan
2 parents 9646dd75 2c8da2e4

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveBPersonalVerificationModule

# Conflicts:
#	CNLiveBPersonalVerificationModule.podspec
CNLiveBPersonalVerificationModule.podspec
... ... @@ -11,11 +11,6 @@ Pod::Spec.new do |s|
11 11 s.version = '0.0.6'
12 12 s.summary = 'B端个人资料认证开发'
13 13  
14   -# This description is used to generate tags and improve search results.
15   -# * Think: What does it do? Why did you write it? What is the focus?
16   -# * Try to keep it short, snappy and to the point.
17   -# * Write the description between the DESC delimiters below.
18   -# * Finally, don't worry about the indent, CocoaPods strips it!
19 14  
20 15 s.description = <<-DESC
21 16 TODO: Add long description of the pod here.
... ... @@ -90,13 +85,16 @@ s.subspec &#39;CNBPersonCardInfo&#39; do |card|
90 85 card.subspec 'Controller' do |controller|
91 86 controller.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Controller/*.{h,m}'
92 87 controller.dependency 'CNLiveBPersonalVerificationModule/CNBPersonCardInfo/View'
  88 + controller.dependency 'CNLiveBPersonalVerificationModule/CNBInstitutionInfo/Controller'
  89 + controller.ios.vendored_frameworks = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipOcrSdk.framework','CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipBase.framework','CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/IdcardQuality.framework'
  90 +
93 91 end
94 92 card.subspec 'Services' do |service|
95 93 service.source_files = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/Services/*.{h,m}'
96 94 service.dependency 'CNLiveBPersonalVerificationModule/CNBPersonCardInfo/Controller'
97 95  
98 96 end
99   - card.ios.vendored_frameworks = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipOcrSdk.framework','CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipBase.framework','CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/IdcardQuality.framework'
  97 +# card.ios.vendored_frameworks = 'CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipOcrSdk.framework','CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/AipBase.framework','CNLiveBPersonalVerificationModule/Classes/CNBPersonCardInfo/baiduSDKs/IdcardQuality.framework'
100 98 card.resource_bundles = {
101 99 'CNBPersonCardInfo' => ['CNLiveBPersonalVerificationModule/Assets/CNBPersonCardInfo/CNBPersonCardInfo.bundle']
102 100 }
... ...