Skip to content

Commit 6a42e99

Browse files
yFeiiGY
andauthored
Fix/pod lint (#1199)
* feat(iOS): Bump version to 3.1.4 * fix:build error --------- Co-authored-by: GY <hishiguangyuan@didiglobal.com>
1 parent 5e43287 commit 6a42e99

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

DoraemonKit.podspec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
Pod::Spec.new do |s|
99
s.name = 'DoraemonKit'
10-
s.version = '3.1.4'
10+
s.version = '3.1.4.1'
1111
s.summary = 'iOS 各式各样的工具集合'
1212

1313
# This description is used to generate tags and improve search results.
@@ -69,6 +69,7 @@ iOS各式各样的工具集合
6969
ss.compiler_flags = '-Wall', '-Wextra', '-Wpedantic', '-Werror', '-fvisibility=hidden', '-Wno-gnu-conditional-omitted-operand', '-Wno-pointer-arith'
7070
ss.framework = 'IOKit'
7171
ss.dependency 'DoraemonKit/Foundation'
72+
ss.dependency 'DoraemonKit/CFoundation'
7273
end
7374

7475
s.subspec 'Core' do |ss|
@@ -135,7 +136,8 @@ iOS各式各样的工具集合
135136
'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) DoraemonWithMLeaksFinder'
136137
}
137138
ss.dependency 'DoraemonKit/Core'
138-
ss.dependency 'FBRetainCycleDetector'
139+
# FBRetainCycleDetector 存在编译问题,使用pod发布时lint不通过,因此采用壳工程配置方式引入
140+
#ss.dependency 'FBRetainCycleDetector'
139141
end
140142

141143
s.subspec 'WithMultiControl' do |ss|

iOS/DoKit/Classes/Foundation/DKMultiControlStreamManager.m

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121
#import <DoraemonKit/DKDataRequestDTOModel.h>
2222
#import <DoraemonKit/DKDataResponseDTOModel.h>
2323
#import <DoraemonKit/DKMultiControlProtocol.h>
24+
#if __has_include(<DoraemonKit/DoraemonMCCommandExcutor.h>)
25+
#define HAS_MULTI_CONTROL 1
2426
#import <DoraemonKit/DoraemonMCCommandExcutor.h>
25-
27+
#endif
2628
NS_ASSUME_NONNULL_BEGIN
2729

2830
static NSString *generateId(void);
@@ -97,7 +99,9 @@ - (void)enableMultiControlWithUrl:(NSURL *)url {
9799
DKActionDTOModel *actionDTOModel = [MTLJSONAdapter modelOfClass:DKActionDTOModel.class fromJSONDictionary:jsonDictionary error:&error];
98100
self.behaviorId = actionDTOModel.behaviorId;
99101
if (actionDTOModel.payload) {
102+
#if HAS_ENCRYPT_APOLLO
100103
[DoraemonMCCommandExcutor excuteMessageStrFromNet:actionDTOModel.payload];
104+
#endif
101105
}
102106
}
103107
}

0 commit comments

Comments
 (0)