diff --git a/ios/sdk/WeexSDK/Sources/Eagle/WXDataRenderHandler.h b/ios/sdk/WeexSDK/Sources/Eagle/WXDataRenderHandler.h index 6b80a6774f..b54b401c6e 100644 --- a/ios/sdk/WeexSDK/Sources/Eagle/WXDataRenderHandler.h +++ b/ios/sdk/WeexSDK/Sources/Eagle/WXDataRenderHandler.h @@ -23,9 +23,9 @@ NS_ASSUME_NONNULL_BEGIN @protocol WXDataRenderHandler -- (void)createPage:(NSString *)pageId template:(NSString *)jsBundleString options:(NSDictionary *)options data:(id)data; +- (void)createPage:(NSString *)pageId template:(NSString *)jsBundleString options:(NSDictionary * _Nullable)options data:(id)data; -- (void)createPage:(NSString *)pageId contents:(NSData *)contents options:(NSDictionary *)options data:(id)data; +- (void)createPage:(NSString *)pageId contents:(NSData *)contents options:(NSDictionary * _Nullable)options data:(id)data; - (void)callUpdateComponentData:(NSString*)pageId componentId:(NSString*)componentId jsonData:(NSString*)jsonData; @@ -33,13 +33,13 @@ NS_ASSUME_NONNULL_BEGIN - (void)refreshDataRenderInstance:(NSString *)pageId data:(NSString *)data; -- (void)fireEvent:(NSString *)pageId ref:(NSString *)ref event:(NSString *)event args:(NSDictionary *)args domChanges:(NSDictionary * _Nullable)domChanges; +- (void)fireEvent:(NSString *)pageId ref:(NSString *)ref event:(NSString *)event args:(NSDictionary * _Nullable)args domChanges:(NSDictionary * _Nullable)domChanges; - (void)registerModules:(NSDictionary *)modules; - (void)registerComponents:(NSArray *)components; -- (void)invokeCallBack:(NSString *)pageId function:(NSString *)funcId args:(NSDictionary *)args keepAlive:(BOOL)keepAlive; +- (void)invokeCallBack:(NSString *)pageId function:(NSString *)funcId args:(NSDictionary * _Nullable)args keepAlive:(BOOL)keepAlive; - (void)DispatchPageLifecycle:(NSString *)pageId; diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h index 4d00322396..25cbd7969a 100644 --- a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h +++ b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.h @@ -96,7 +96,7 @@ NS_ASSUME_NONNULL_BEGIN * @param completion Completion callback. JS is executed in asynchronously. * */ -+ (void)registerService:(NSString *)name withScript:(NSString *)serviceScript withOptions:(NSDictionary * _Nullable)options completion:(void(^)(BOOL result))completion; ++ (void)registerService:(NSString *)name withScript:(NSString *)serviceScript withOptions:(NSDictionary * _Nullable)options completion:(nullable void(^)(BOOL result))completion; /** * @abstract Registers a component for a given name, options and js url @@ -122,7 +122,7 @@ NS_ASSUME_NONNULL_BEGIN * @param completion Completion callback. JS is executed in asynchronously. * */ -+ (void)registerService:(NSString *)name withScriptUrl:(NSURL *)serviceScriptUrl withOptions:(NSDictionary * _Nullable)options completion:(void(^)(BOOL result))completion; ++ (void)registerService:(NSString *)name withScriptUrl:(NSURL *)serviceScriptUrl withOptions:(NSDictionary * _Nullable)options completion:(nullable void (^)(BOOL result))completion; /** * @abstract Registers a component for a given name, options and js code diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h b/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h index a157009966..28a1b05f81 100644 --- a/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h +++ b/ios/sdk/WeexSDK/Sources/Manager/WXBridgeManager.h @@ -102,7 +102,7 @@ extern "C" { * @param instance : instance id * @param data : external data **/ -- (void)refreshInstance:(NSString *)instance data:(id)data; +- (void)refreshInstance:(NSString *)instance data:(id _Nullable)data; /** * Unload @@ -114,7 +114,7 @@ extern "C" { * @param instance : instance id * @param data : parameters **/ -- (void)updateState:(NSString *)instance data:(id)data; +- (void)updateState:(NSString *)instance data:(id _Nullable)data; /** * Execute JSFramework Script diff --git a/ios/sdk/WeexSDK/Sources/Manager/WXComponentFactory.h b/ios/sdk/WeexSDK/Sources/Manager/WXComponentFactory.h index 6e46afd7c0..a4bb7757e6 100644 --- a/ios/sdk/WeexSDK/Sources/Manager/WXComponentFactory.h +++ b/ios/sdk/WeexSDK/Sources/Manager/WXComponentFactory.h @@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN @interface WXComponentConfig : WXInvocationConfig -@property (nonatomic, strong) NSDictionary *properties; +@property (nonatomic, strong) NSDictionary * _Nullable properties; - (instancetype)initWithName:(NSString *)name class:(NSString *)clazz pros:(NSDictionary * _Nullable)pros; diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.h b/ios/sdk/WeexSDK/Sources/Model/WXComponent.h index abb5b7f2d7..0528b1dc54 100644 --- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.h +++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.h @@ -182,7 +182,7 @@ NS_ASSUME_NONNULL_BEGIN * * @return A block that takes component, callbackType and a result. **/ -@property (nonatomic, copy) void (^componentCallback)(WXComponent *component, WXComponentCallbackType callbackType, id result); +@property (nonatomic, copy) void (^componentCallback)(WXComponent *component, WXComponentCallbackType callbackType, id _Nullable result); /** * @abstract Called on main thread when the component has just laid out. diff --git a/ios/sdk/WeexSDK/Sources/Protocol/WXValidateProtocol.h b/ios/sdk/WeexSDK/Sources/Protocol/WXValidateProtocol.h index f9a26a7e9f..b38f32e664 100644 --- a/ios/sdk/WeexSDK/Sources/Protocol/WXValidateProtocol.h +++ b/ios/sdk/WeexSDK/Sources/Protocol/WXValidateProtocol.h @@ -24,8 +24,8 @@ NS_ASSUME_NONNULL_BEGIN @interface WXValidateResult : NSObject -@property(nonatomic,assign)BOOL isSuccess; -@property(nonatomic,strong)NSError* error; +@property(nonatomic,assign) BOOL isSuccess; +@property(nonatomic,strong) NSError* _Nullable error; @end @@ -46,7 +46,7 @@ NS_ASSUME_NONNULL_BEGIN -(WXModuleValidateResult *)validateWithWXSDKInstance:(WXSDKInstance *)wxsdkInstance module:(NSString*) moduel method:(NSString *)method args:(nullable NSArray *)args options:(nullable NSDictionary *)options; --(WXComponentValidateResult *)validateWithWXSDKInstance:(WXSDKInstance *)wxsdkInstance component:(NSString *)componentName supercomponent:(WXComponent *)supercomponent; +-(WXComponentValidateResult *)validateWithWXSDKInstance:(WXSDKInstance *)wxsdkInstance component:(NSString *)componentName supercomponent:(nullable WXComponent *)supercomponent; @end diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXVersion.m b/ios/sdk/WeexSDK/Sources/Utility/WXVersion.m index 235891fbfd..b92b9f1329 100644 --- a/ios/sdk/WeexSDK/Sources/Utility/WXVersion.m +++ b/ios/sdk/WeexSDK/Sources/Utility/WXVersion.m @@ -20,8 +20,8 @@ #import "WXVersion.h" #import "WXDefine.h" -static const char* WeexSDKBuildTime = "2019-08-26 07:44:34 UTC"; -static const unsigned long WeexSDKBuildTimestamp = 1566805474; +static const char* WeexSDKBuildTime = "2019-08-26 08:28:24 UTC"; +static const unsigned long WeexSDKBuildTimestamp = 1566808104; NSString* GetWeexSDKVersion(void) { diff --git a/ios/sdk/WeexSDK/Sources/WebSocket/WXWebSocketHandler.h b/ios/sdk/WeexSDK/Sources/WebSocket/WXWebSocketHandler.h index 2edfd1a92e..ae4bf14176 100644 --- a/ios/sdk/WeexSDK/Sources/WebSocket/WXWebSocketHandler.h +++ b/ios/sdk/WeexSDK/Sources/WebSocket/WXWebSocketHandler.h @@ -26,15 +26,15 @@ NS_ASSUME_NONNULL_BEGIN - (void)didOpen; - (void)didFailWithError:(NSError *)error; - (void)didReceiveMessage:(id)message; -- (void)didCloseWithCode:(NSInteger)code reason:(NSString *)reason wasClean:(BOOL)wasClean; +- (void)didCloseWithCode:(NSInteger)code reason:(nullable NSString *)reason wasClean:(BOOL)wasClean; @end @protocol WXWebSocketHandler -- (void)open:(NSString *)url protocol:(NSString *)protocol identifier:(NSString *)identifier withDelegate:(id)delegate; +- (void)open:(NSString *)url protocol:(NSString *)protocol identifier:(nullable NSString *)identifier withDelegate:(id)delegate; - (void)send:(NSString *)identifier data:(NSString *)data; - (void)close:(NSString *)identifier; -- (void)close:(NSString *)identifier code:(NSInteger)code reason:(NSString *)reason; +- (void)close:(NSString *)identifier code:(NSInteger)code reason:(nullable NSString *)reason; - (void)clear:(NSString *)identifier; @end diff --git a/weex_core/Source/core/layout/layout.h b/weex_core/Source/core/layout/layout.h index d552063877..05da331467 100644 --- a/weex_core/Source/core/layout/layout.h +++ b/weex_core/Source/core/layout/layout.h @@ -27,8 +27,8 @@ #include #include #include -#include "style.h" -#include "flex_enum.h" +#include +#include namespace WeexCore { diff --git a/weex_core/Source/core/layout/style.h b/weex_core/Source/core/layout/style.h index d39d61ac79..b59ec1315d 100644 --- a/weex_core/Source/core/layout/style.h +++ b/weex_core/Source/core/layout/style.h @@ -22,7 +22,7 @@ #define WEEXCORE_FLEXLAYOUT_WXCOREFLEXENUMS_H -#include "flex_enum.h" +#include #include #include