[iOS] fix weexsdk compile error

ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm

@@ -769,7 +769,7 @@ + (void)fireEvent:(NSString *)pageId ref:(NSString *)ref event:(NSString *)event
 {
     NSString *params = [WXUtility JSONString:args];
     auto vnode_manager = weex::core::data_render::VNodeRenderManager::GetInstance();
-    vnode_manager->FireEvent([pageId UTF8String] ? : "", [ref UTF8String] ? : "", [event UTF8String] ? : "", [params UTF8String] ? : "");
+    vnode_manager->FireEvent([pageId UTF8String] ? : "", [ref UTF8String] ? : "", [event UTF8String] ? : "", [params UTF8String] ? : "", "");
 }
 
 + (void)registerModules:(NSDictionary *)modules {

ios/sdk/WeexSDK/Sources/Utility/WXConvertUtility.h

@@ -29,33 +29,31 @@
 #define NSSTRING(cstr) ((__bridge_transfer NSString*)(CFStringCreateWithCString(NULL, (const char *)(cstr), kCFStringEncodingUTF8)))
 #define NSSTRING_NO_COPY(cstr) ((__bridge_transfer NSString*)(CFStringCreateWithCStringNoCopy(NULL, (const char *)(cstr), kCFStringEncodingUTF8, kCFAllocatorNull)))
 
-id GenValue(weex::core::data_render::Value* value);
+id _Nonnull GenValue(weex::core::data_render::Value* _Nonnull value);
 
-NSString* TO_JSON(id object);
+NSString* _Nullable TO_JSON(id _Nullable object);
 
-id TO_OBJECT(NSString* s);
+id _Nonnull TO_OBJECT(NSString* _Nonnull s);
 
-NSMutableDictionary* NSDICTIONARY(std::map<std::string, std::string>* map);
+NSMutableDictionary* _Nonnull NSDICTIONARY(std::map<std::string, std::string>* _Nullable map);
 
-NSMutableDictionary* NSDICTIONARY(std::unordered_map<std::string, std::string>* map);
+NSMutableDictionary* _Nonnull NSDICTIONARY(std::unordered_map<std::string, std::string>* _Nullable map);
 
-NSMutableDictionary* NSDICTIONARY(std::vector<std::pair<std::string, std::string>>* vec);
+NSMutableDictionary* _Nonnull NSDICTIONARY(std::vector<std::pair<std::string, std::string>>* _Nullable vec);
 
-NSMutableDictionary* NSDICTIONARY(const std::unordered_map<std::string, weex::core::data_render::VComponent::VNodeRefs>& ref_map);
+NSMutableDictionary* _Nonnull NSDICTIONARY(const std::unordered_map<std::string, weex::core::data_render::VComponent::VNodeRefs>& ref_map);
 
-NSMutableDictionary* NSDICTIONARY(weex::core::data_render::Table* table);
+NSMutableDictionary* _Nonnull NSDICTIONARY(weex::core::data_render::Table* _Nullable table);
 
-NSMutableArray* NSARRAY(std::set<std::string>* set);
+NSMutableArray* _Nonnull NSARRAY(std::set<std::string>* _Nullable set);
 
-NSMutableArray* NSARRAY(weex::core::data_render::Array* array);
+NSMutableArray* _Nonnull NSARRAY(weex::core::data_render::Array* _Nullable array);
 
-NSMutableArray* NSARRAY(std::vector<std::unordered_map<std::string, std::string>> refs);
+NSMutableArray* _Nonnull NSARRAY(std::vector<std::unordered_map<std::string, std::string>> refs);
 
-NSMutableArray* NSARRAY(const std::vector<weex::core::data_render::Value>& params);
+NSMutableArray* _Nonnull NSARRAY(const std::vector<weex::core::data_render::Value>& params);
 
-id GenValue(weex::core::data_render::Value* value);
-
-void ConvertToCString(id _Nonnull obj, void (^callback)(const char*));
+void ConvertToCString(id _Nonnull obj, void (^ _Nonnull callback)(const char* _Nullable));
 
 #endif
 

ios/sdk/WeexSDK/Sources/Utility/WXConvertUtility.mm

@@ -210,10 +210,6 @@ id TO_OBJECT(NSString* s)
 
 id GenValue(weex::core::data_render::Value* value)
 {
-    if (!value) {
-        return nil;
-    }
-
     switch (value->type) {
         case weex::core::data_render::Value::Type::ARRAY:
             return NSARRAY( weex::core::data_render::ValueTo<weex::core::data_render::Array>(value));
@@ -228,7 +224,7 @@ id GenValue(weex::core::data_render::Value* value)
         case weex::core::data_render::Value::Type::BOOL:
             return [NSNumber numberWithBool:value->b];
         default:
-            return nil;
+            return [NSNull null];
     }
 }
 

ios/sdk/WeexSDK/Sources/WeexSDK.h

@@ -64,6 +64,7 @@
 #import "WXDisplayLinkManager.h"
 #import "WXDefine.h"
 #import "WXDebugTool.h"
+#import "WXConvertUtility.h"
 #import "WXConvert.h"
 #import "WXConfigCenterProtocol.h"
 #import "WXComponentManager.h"

weex_core/Source/base/string_util.h

@@ -87,6 +87,7 @@ inline static std::string to_utf8(uint16_t* utf16, size_t length) {
   return output;
 }
 
+#ifdef OS_ANDROID
 static std::u16string to_utf16(char* utf8, size_t length) {
   std::u16string dest_str;
   dest_str.resize(length);
@@ -97,7 +98,7 @@ static std::u16string to_utf16(char* utf8, size_t length) {
 
   for (int32_t i = 0; i < length;) {
     int32_t code_point;
-    CBU8_NEXT(utf8, i, length, code_point);
+    CBU8_NEXT(utf8, i, static_cast<int32_t>(length), code_point);
 
     if (!IsValidCodepoint(code_point)) {
       success = false;
@@ -113,6 +114,7 @@ static std::u16string to_utf16(char* utf8, size_t length) {
   dest_str.shrink_to_fit();
   return dest_str;
 }
+#endif
 
 }  // namespace base
 }  // namespace weex

weex_core/Source/core/data_render/object.h

@@ -609,7 +609,7 @@ inline void ArrayCopy(Value &src, Value &dest) {
     ArrayCopyFrom(src, dest, 0, 0);
 }
 
-static void TableCopy(Value &src, Value &dest) {
+inline void TableCopy(Value &src, Value &dest) {
   if (IsNil(&src)) {
     return;
   }

weex_core/Source/core/data_render/vnode/ios/vnode_on_event_listener.mm

@@ -28,17 +28,18 @@
 namespace core {
 namespace data_render {
 
-void VNodeOnEventListener::OnEvent(VNode* node, const std::string& event,
-                                   const std::string& json_args,
-                                   const VNode::Params& param_list) {
+void VNodeOnEventListener::OnEvent(VNode *node, const std::string &event,
+                                            const std::string &json_args, const std::string dom_changes,
+                                            const VNode::Params &params)
+ {
     std::string page_id = node->component()->exec_state()->context()->page_id();
     NSString *instanceId = NSSTRING(page_id.c_str());
     WXSDKInstance *instance = [WXSDKManager instanceForID:instanceId];
     if (!instance) {
         return;
     }
     node->render_object_ref();
-    [[WXSDKManager bridgeMgr] callJSMethod:@"callJS" args:@[instanceId, @[@{@"method":@"fireEvent", @"args":@[NSSTRING(node->render_object_ref().c_str()), NSSTRING(event.c_str()), [WXUtility objectFromJSON:NSSTRING(json_args.c_str())], @{@"params": NSARRAY(param_list)}]}]]];
+    [[WXSDKManager bridgeMgr] callJSMethod:@"callJS" args:@[instanceId, @[@{@"method":@"fireEvent", @"args":@[NSSTRING(node->render_object_ref().c_str()), NSSTRING(event.c_str()), [WXUtility objectFromJSON:NSSTRING(json_args.c_str())], @{@"params": NSARRAY(params)}]}]]];
   }
 
 }  // namespace data_render

weex_core/Source/core/data_render/vnode/vcomponent.h

@@ -32,7 +32,7 @@ class VComponent : public VNode {
   typedef std::vector<VNodeRef> VNodeRefs;
   class LifecycleListener {
    public:
-    ~LifecycleListener() {}
+    virtual ~LifecycleListener() {}
     virtual void OnCreated(
         VComponent* component, Table* data, Table* props,
         const std::unordered_map<std::string, VNodeRefs>& ref_map) = 0;

weex_core/Source/core/data_render/vnode/vnode.h

@@ -41,7 +41,7 @@ class VNode {
 
   class OnEventListener {
    public:
-    ~OnEventListener() {}
+    virtual ~OnEventListener() {}
     virtual void OnEvent(VNode *node, const std::string &event,
                          const std::string &json_args,
                          const std::string dom_changes,

weex_core/Source/core/network/request_handler.h

@@ -27,6 +27,7 @@ namespace data_render {
 
 class RequestHandler {
 public:
+    virtual ~RequestHandler() {}
     virtual void Send(const char* url, std::function<void(const char*)> callback) = 0;
 };