From 314c6857488604138e33051321e7009972a057b0 Mon Sep 17 00:00:00 2001 From: wangzhitong Date: Fri, 19 Jan 2024 19:39:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20Log=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 10 +---- .../HelloUniMPDemo.xcodeproj/project.pbxproj | 18 -------- HelloUniMPDemo/Podfile | 8 +--- UniMPSDK/Log/Libs/liblibLog.a | 3 ++ unimp.podspec | 42 ++++++++++--------- 5 files changed, 28 insertions(+), 53 deletions(-) create mode 100644 UniMPSDK/Log/Libs/liblibLog.a diff --git a/.gitattributes b/.gitattributes index cf8b265..ca16f1c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,12 +2,4 @@ UniMPSDK/Masonry/Libs/Masonry.framework/Masonry filter=lfs diff=lfs merge=lfs -text UniMPSDK/Video/Libs/IJKMediaFrameworkWithSSL.framework/IJKMediaFrameworkWithSSL filter=lfs diff=lfs merge=lfs -text UniMPSDK/Video/Libs/DCUniVideoPublic.framework/DCUniVideoPublic filter=lfs diff=lfs merge=lfs -text -UniMPSDK/QQ/Libs/TencentOpenAPI.framework/TencentOpenAPI filter=lfs diff=lfs merge=lfs -text -UniMPSDK/Audio/Libs/libopencore-amrnb.a filter=lfs diff=lfs merge=lfs -text -UniMPSDK/Audio/Libs/libmp3lame.a filter=lfs diff=lfs merge=lfs -text -UniMPSDK/Barcode/Libs/libuchardet.a filter=lfs diff=lfs merge=lfs -text -UniMPSDK/Barcode/Libs/libDCUniZXing.a filter=lfs diff=lfs merge=lfs -text -UniMPSDK/Camera&Gallery/Libs/liblibCamera.a filter=lfs diff=lfs merge=lfs -text -UniMPSDK/Core/Libs/liblibPDRCore.a filter=lfs diff=lfs merge=lfs -text -UniMPSDK/Core/Libs/liblibWeex.a filter=lfs diff=lfs merge=lfs -text -UniMPSDK/Core/Libs/libSDWebImage.a filter=lfs diff=lfs merge=lfs -text \ No newline at end of file +UniMPSDK/QQ/Libs/TencentOpenAPI.framework/TencentOpenAPI filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/HelloUniMPDemo/HelloUniMPDemo.xcodeproj/project.pbxproj b/HelloUniMPDemo/HelloUniMPDemo.xcodeproj/project.pbxproj index 50db044..4fc662d 100644 --- a/HelloUniMPDemo/HelloUniMPDemo.xcodeproj/project.pbxproj +++ b/HelloUniMPDemo/HelloUniMPDemo.xcodeproj/project.pbxproj @@ -159,7 +159,6 @@ 2F8F66FE2B568AB4003E6DCC /* Sources */, 2F8F66FF2B568AB4003E6DCC /* Frameworks */, 2F8F67002B568AB4003E6DCC /* Resources */, - 0077D58063A7D1947C3D0C98 /* [CP] Embed Pods Frameworks */, BFF9F57BCF0484F206111522 /* [CP] Copy Pods Resources */, ); buildRules = ( @@ -220,23 +219,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 0077D58063A7D1947C3D0C98 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-HelloUniMPDemo/Pods-HelloUniMPDemo-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-HelloUniMPDemo/Pods-HelloUniMPDemo-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-HelloUniMPDemo/Pods-HelloUniMPDemo-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 15E3B50BBE06F99B7E6CAAA5 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/HelloUniMPDemo/Podfile b/HelloUniMPDemo/Podfile index 081a459..42d5ec9 100644 --- a/HelloUniMPDemo/Podfile +++ b/HelloUniMPDemo/Podfile @@ -1,6 +1,3 @@ -# Uncomment the next line to define a global platform for your project - -#source 'https://gitee.com/mirrors/CocoaPods-Specs.git' source 'https://github.com/Cocoapods/Specs.git' source 'https://gitcode.net/dcloud/unimpsdk-ios.git' @@ -12,12 +9,10 @@ target 'HelloUniMPDemo' do ## 根据功能对照表添加，建议一次不要Pod太多模块容易超时 ## Core、Video、LivePusher、Camera&Gallery、Map-XXX 等模块文件较大建议单独pod install ## Payment-Stripe、Payment-Paypal、Oauth-Google、Oauth-Facebook 为海外SDK建议设置代理后pod install - - ##本地引用 -# pod 'unimp', :path => "../", :subspecs => [ pod 'unimp', :git => "https://gitcode.net/dcloud/unimpsdk-ios.git", :tag => "3.99", :subspecs => [ 'Core', ##核心库(必需) +# 'Log', ##Debug模式下打印log 发布时可去掉 # 'Accelerometer', ##加速度传感器 # 'Contacts', ##通讯录 # 'Audio', ##音频 @@ -64,6 +59,7 @@ target 'HelloUniMPDemo' do # 'Oauth-Sina', ##新浪微博登录 # 'Oauth-Google', ##Google登录 # 'Oauth-Facebook', ##Facebook登录 iOS12+ + ] end diff --git a/UniMPSDK/Log/Libs/liblibLog.a b/UniMPSDK/Log/Libs/liblibLog.a new file mode 100644 index 0000000..8943f1e --- /dev/null +++ b/UniMPSDK/Log/Libs/liblibLog.a @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84624dddc9967f4222596a2a62b2d17efb91be85a25256660c0648e7fc54868a +size 149592 diff --git a/unimp.podspec b/unimp.podspec index 8ff2297..afbedec 100644 --- a/unimp.podspec +++ b/unimp.podspec @@ -10,13 +10,11 @@ Pod::Spec.new do |s| s.name = "unimp" s.version = "3.99" - s.summary = "A short description of unimp." + s.summary = "UniMPSDK" s.homepage = "https://gitcode.net/dcloud/unimpsdk-ios" s.license = { :type => 'MIT', :file => 'LICENSE' } s.author = { "wangzhitong" => "wangzhitong@dcloud.io" } - # s.source = { :path => "." } s.source = { :git => "https://gitcode.net/dcloud/unimpsdk-ios.git", :tag => "#{s.version}"} - s.default_subspec = 'Core' ### 基础库(必选) @@ -32,7 +30,7 @@ Pod::Spec.new do |s| ss.libraries = 'c++','iconv' end - ### 组件 + ### 子模块 s.subspec 'Accelerometer' do |ss| ss.frameworks = 'Accelerate' @@ -341,25 +339,29 @@ Pod::Spec.new do |s| ss.dependency 'unimp/Statistic' end -s.subspec 'Masonry' do |ss| - ss.public_header_files = 'UniMPSDK/Masonry/Headers/**/*{.h,.swift}' - ss.source_files = 'UniMPSDK/Masonry/Headers/**/*.{h,swift}' - ss.vendored_frameworks = 'UniMPSDK/Masonry/Libs/*.{framework}' -end + s.subspec 'Log' do |ss| + ss.source_files = 'UniMPSDK/Log/Headers/**/*.{h,swift}' + end -s.subspec 'BaiduMapCommon' do |ss| - ss.vendored_libraries = 'UniMPSDK/BaiduMapCommon/Libs/*.{a}' -end + s.subspec 'Masonry' do |ss| + ss.public_header_files = 'UniMPSDK/Masonry/Headers/**/*{.h,.swift}' + ss.source_files = 'UniMPSDK/Masonry/Headers/**/*.{h,swift}' + ss.vendored_frameworks = 'UniMPSDK/Masonry/Libs/*.{framework}' + end -s.subspec 'Wechat-Nopay' do |ss| - ss.public_header_files = 'UniMPSDK/Wechat-Nopay/Headers/**/*{.h,.swift}' - ss.source_files = 'UniMPSDK/Wechat-Nopay/Headers/**/*.{h,swift}' - ss.vendored_libraries = 'UniMPSDK/Wechat-Nopay/Libs/*.{a}' -end + s.subspec 'BaiduMapCommon' do |ss| + ss.vendored_libraries = 'UniMPSDK/BaiduMapCommon/Libs/*.{a}' + end -s.subspec 'QQ' do |ss| - ss.vendored_frameworks = 'UniMPSDK/QQ/Libs/*.{framework}' -end + s.subspec 'Wechat-Nopay' do |ss| + ss.public_header_files = 'UniMPSDK/Wechat-Nopay/Headers/**/*{.h,.swift}' + ss.source_files = 'UniMPSDK/Wechat-Nopay/Headers/**/*.{h,swift}' + ss.vendored_libraries = 'UniMPSDK/Wechat-Nopay/Libs/*.{a}' + end + + s.subspec 'QQ' do |ss| + ss.vendored_frameworks = 'UniMPSDK/QQ/Libs/*.{framework}' + end -- GitLab