Release 0.1.9

SensorsFocus.podspec

@@ -1,22 +1,36 @@
 Pod::Spec.new do |s|
   s.name         = 'SensorsFocus'
-  s.version      = "0.1.8"
+  s.version      = "0.1.9"
   s.summary      = 'The official iOS SDK of Sensors Focus.'
   s.homepage     = 'http://www.sensorsdata.cn'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }
   s.source       = { :git => 'https://github.com/sensorsdata/sf-sdk-ios.git', :tag => 'v' + s.version.to_s}
   s.author       = 'Sensors Data'
   s.platform     = :ios
   s.ios.deployment_target = '8.0'
+  s.swift_versions = '4.0'
   s.requires_arc = true
+  s.static_framework = true
   s.cocoapods_version = '>= 1.5.0'
+  s.libraries = 'icucore', 'sqlite3', 'z'
+  s.module_map = 'SensorsFocus/SensorsFocus/module.modulemap'
+  s.pod_target_xcconfig = { 'PRODUCT_BUNDLE_IDENTIFIER': 'com.sensorsdata.SensorsFocus' }
+
   s.ios.framework = 'UIKit', 'Foundation'
-  s.dependency 'SensorsAnalyticsSDK', '>=2.0.3'
-  s.pod_target_xcconfig = { 'PRODUCT_BUNDLE_IDENTIFIER': 'com.sensorsdata.SensorsFocus'}
-  s.static_framework = true
 
-  base_dir = 'SensorsFocus/'
+  base_dir = 'SensorsFocus/SensorsFocus/Source/'
   s.resource = base_dir + 'SensorsFocus.bundle'
-  s.vendored_frameworks = base_dir + 'SensorsFocus.framework'
+
+  s.subspec 'Core' do |core|
+    core.source_files = base_dir + 'Core/**/*.{h,m}'
+    core.public_header_files = base_dir + 'Core/Base/SFConfigOptions.h', base_dir + 'Core/Base/SensorsFocus.h', base_dir + 'Core/Model/SensorsFocusActionModel.h', base_dir + 'Core/Base/SFInteractionProtocol.h'
+  end
+
+  s.subspec 'Popup' do |popup|
+    popup.dependency 'SensorsFocus/Core'
+    popup.source_files = base_dir + 'Popup/**/*.{h,m}'
+    popup.public_header_files = base_dir + 'Core/Base/SFConfigOptions.h', base_dir + 'Core/Base/SensorsFocus.h', base_dir + 'Core/Model/SensorsFocusActionModel.h', base_dir + 'Core/Base/SFInteractionProtocol.h'
+#    popup.private_header_files = base_dir + 'Popup/**/*.h'
+  end
 
 end

SensorsFocus/SensorsFocus.framework/Headers/SFInteractionProtocol.h

@@ -27,28 +27,28 @@
 
  @param planID 计划 ID
  */
-- (void)popupLoadSuccessWithPlanID:(NSString *)planID NS_SWIFT_NAME(popupLoadSuccess(planID:));
+- (void)popupLoadSuccessWithPlanID:(nullable NSString *)planID NS_SWIFT_NAME(popupLoadSuccess(planID:));
 /**
  弹窗加载失败回调
 
  @param planID 计划 ID
  @param error 失败错误信息
  */
-- (void)popupLoadFailedWithPlanID:(NSString *)planID error:(NSError *)error NS_SWIFT_NAME(popupLoadFailed(planID:error:));
+- (void)popupLoadFailedWithPlanID:(nullable NSString *)planID error:(nonnull NSError *)error NS_SWIFT_NAME(popupLoadFailed(planID:error:));
 
 /**
  点击弹窗中的控件回调
 
  @param planID 计划 ID
  @param action 点击动作描述对象
  */
-- (void)popupDidClickWithPlanID:(NSString *)planID action:(SensorsFocusActionModel *)action NS_SWIFT_NAME(popupDidClick(planID:action:));
+- (void)popupDidClickWithPlanID:(nullable NSString *)planID action:(nonnull SensorsFocusActionModel *)action NS_SWIFT_NAME(popupDidClick(planID:action:));
 
 /**
  弹窗关闭回调
 
  @param planID 计划 ID
  */
-- (void)popupDidCloseWithPlanID:(NSString *)planID NS_SWIFT_NAME(popupClose(planID:));
+- (void)popupDidCloseWithPlanID:(nullable NSString *)planID NS_SWIFT_NAME(popupClose(planID:));
 
 @end