Merge branch 'master' into dev

@@ -12,6 +12,7 @@
 #import <React/RCTConvert.h>
 #import <React/RCTDefines.h>
 #import <React/fishhook.h>
+#import <React/RCTLog.h> 
 
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
 #import <os/log.h>
@@ -94,6 +95,9 @@ static void my_os_log_error_impl(void *dso, os_log_t log, os_log_type_t type, co
 
 - (void)start
 {
+  if(!RCTLOG_ENABLED){
+    return;
+  }
   [self stop];
   _socket = [[RCTSRWebSocket alloc] initWithURL:_url];
   _socket.delegate = self;

@@ -530,6 +530,10 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init)
 
 - (void)_connect;
 {
+  if(!RCTLOG_ENABLED){
+    return;
+  }
+  
   if (!_scheduledRunloops.count) {
     [self scheduleInRunLoop:[NSRunLoop RCTSR_networkRunLoop] forMode:NSDefaultRunLoopMode];
   }

@@ -32,11 +32,12 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig     = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++14" }
   s.preserve_paths          = "package.json", "LICENSE", "LICENSE-docs", "PATENTS"
   s.cocoapods_version       = ">= 1.2.0"
+  s.frameworks              = "Foundation", "UIKit"
 
   s.subspec "Core" do |ss|
     ss.dependency             "Yoga", "#{package["version"]}.React"
-    ss.dependency             "YH_Analytics"
-    ss.source_files         = "React/**/*.{c,h,m,mm,S,cpp},"
+    ss.dependency             "YH_Analytics", "3.1.8"
+    ss.source_files         = "React/**/*.{c,h,m,mm,S,cpp}"
     ss.exclude_files        = "**/__tests__/*",
                               "IntegrationTests/*",
                               "React/DevSupport/*",
@@ -54,12 +55,7 @@ Pod::Spec.new do |s|
     ss.header_dir           = "React"
     ss.framework            = "JavaScriptCore"
     ss.libraries            = "stdc++"
-    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"" }
-    ss.xcconfig             = { "HEADER_SEARCH_PATHS" => [
-                                "${PODS_ROOT}/../YH_Mall/Controls/YH_ThemeManager.{h,m}",
-                                "${PODS_ROOT}/../YH_Mall_iPhone/Views/Custom/YH_ThemeButton.{h,m}",
-                                ].join(' ') 
-                              }
+    ss.pod_target_xcconfig  = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)/YH_Analytics\" \"${PODS_ROOT}/../YH_Mall/Controls\" \"${PODS_ROOT}/../YH_Mall_iPhone/Views/Custom\" \"${PODS_ROOT}/../YH_Mall/Definition\" \"${PODS_ROOT}/../YH_Mall/Dependences/MJRefresh\"" }
   end
 
   s.subspec "CxxBridge" do |ss|

@@ -8,6 +8,7 @@
  */
 
 #import "RCTAssert.h"
+#import "YH_Analytics.h"
 #import <React/RCTLog.h>
 
 NSString *const RCTErrorDomain = @"RCTErrorDomain";

@@ -14,7 +14,7 @@
 #import <React/RCTUtils.h>
 
 #ifndef RCTLOG_ENABLED
-#define RCTLOG_ENABLED 1
+#define RCTLOG_ENABLED 0
 #endif
 
 /**

@@ -10,6 +10,9 @@
 #import "RCTScrollView.h"
 
 #import <UIKit/UIKit.h>
+#import "YH_ThemeManager.h"
+#import "YH_ThemeButton.h"
+#import "YH_SystemNotification.h"
 
 #import <React/RCTConvert.h>
 #import <React/RCTEventDispatcher.h>