Merge branch 'main' into feature/arvinwli_viewpager_throttle

framework/examples/ios-demo/HippyDemo/PageManager/HippyPageCacheContainerView.m

@@ -24,7 +24,7 @@
 #import "HippyPageCacheContainerView.h"
 #import "HippyPageCacheView.h"
 #import "HippyPageCache.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 
 @interface HippyPageCacheContainerView ()<HippyPageCacheManagerObserverProtocol> {
     __weak UIView *_lastPageCacheView; //never removed from superview

framework/examples/ios-demo/HippyDemo/RenderPage/HippyDemoViewController.mm

@@ -30,7 +30,7 @@
 #import <hippy/HippyBridge.h>
 #import <hippy/HippyRootView.h>
 #import <hippy/HippyLog.h>
-#import <hippy/HippyAsserts.h>
+#import <hippy/HippyAssert.h>
 #import <hippy/UIView+Hippy.h>
 
 static NSString *const engineKey = @"Demo";

framework/examples/ios-demo/HippyDemo/TestModule.mm

@@ -30,7 +30,7 @@
 #import "HippyRedBox.h"
 #import "DemoConfigs.h"
 #import "HippyMethodInterceptorProtocol.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 
 static NSString *const engineKey = @"Demo";
 

framework/examples/ios-demo/podfile

@@ -5,8 +5,8 @@ install! 'cocoapods',
          :deterministic_uuids => false,
          :generate_multiple_pod_projects => true
 
-#use_frameworks! :linkage => :static  # 静态库framework格式
-#ENV["use_frameworks"] = "true" # for hippy when set use_frameworks!
+use_frameworks! :linkage => :static  # 静态库framework格式
+ENV["use_frameworks"] = "true" # for hippy when set use_frameworks!
 
 workspace 'HippyDemo.xcworkspace'
 

framework/ios/base/HippyDeviceBaseInfo.mm

@@ -21,7 +21,7 @@
  */
 
 #import <UIKit/UIApplication.h>
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyUtils.h"
 #import "HippyDeviceBaseInfo.h"
 #import "HippyEventDispatcher.h"

framework/ios/base/HippyDisplayLink.m

@@ -25,7 +25,7 @@
 #import <Foundation/Foundation.h>
 #import <QuartzCore/CADisplayLink.h>
 
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyBridgeModule.h"
 #import "HippyFrameUpdate.h"
 #import "HippyModuleData.h"

framework/ios/base/HippyKeyCommands.m

@@ -22,7 +22,7 @@
 
 #import "HippyKeyCommands.h"
 #import <UIKit/UIKit.h>
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyDefines.h"
 #import "HippyUtils.h"
 

framework/ios/base/bridge/HippyBridge.mm

@@ -39,7 +39,7 @@
 #import "HippyRedBox.h"
 #import "HippyTurboModule.h"
 #import "HippyUtils.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyConvert.h"
 #import "HippyDefaultImageProvider.h"
 #import "HippyI18nUtils.h"
@@ -79,7 +79,7 @@
 NSString *const HippyJavaScriptDidLoadNotification = @"HippyJavaScriptDidLoadNotification";
 NSString *const HippyJavaScriptDidFailToLoadNotification = @"HippyJavaScriptDidFailToLoadNotification";
 NSString *const HippyDidInitializeModuleNotification = @"HippyDidInitializeModuleNotification";
-NSString *const HippySDKVersion = @"unspecified";
+NSString *const HippySDKVersion = @HIPPY_STR(HIPPY_VERSION);
 
 
 static NSString *const HippyNativeGlobalKeyOS = @"OS";

framework/ios/base/enginewrapper/jsc/HippyJSCContextWrapper.mm

@@ -23,7 +23,7 @@
 #import <JavaScriptCore/JavaScriptCore.h>
 
 #import "NSObject+JSValue.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyJSCContextWrapper.h"
 #import "HippyJSStackFrame.h"
 

framework/ios/base/executors/HippyJSExecutor.mm

@@ -22,7 +22,7 @@
 
 #import <UIKit/UIDevice.h>
 #import "VFSUriHandler.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyBundleURLProvider.h"
 #import "HippyContextWrapper.h"
 #import "HippyDefines.h"

framework/ios/base/modules/HippyEventDispatcher.mm

@@ -21,7 +21,7 @@
  */
 
 #import "HippyEventDispatcher.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyUtils.h"
 
 const NSInteger HippyTextUpdateLagWarningThreshold = 3;

framework/ios/base/modules/HippyModuleData.mm

@@ -23,7 +23,7 @@
 #import "HippyModuleData.h"
 #import "HippyBridge.h"
 #import "HippyModuleMethod.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyLog.h"
 #import "HippyUtils.h"
 

framework/ios/base/modules/HippyModuleMethod.mm

@@ -24,7 +24,7 @@
 #import "HippyBridge.h"
 #import "HippyTurboModuleManager.h"
 #import "HippyUtils.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyConvert.h"
 #import "HippyLog.h"
 #import "HippyParserUtils.h"

framework/ios/base/modules/HippyModulesSetup.mm

@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyBridge.h"
 #import "HippyModuleData.h"
 #import "HippyModulesSetup.h"
@@ -176,7 +176,7 @@ - (void)setupModulesCompletion:(dispatch_block_t)completion {
             // Check for name collisions between preregistered modules
             HippyModuleData *moduleData = moduleDataByName[moduleName];
             if (moduleData) {
-                HippyLogError(@"Attempted to register HippyBridgeModule class %@ for the "
+                HippyLogWarn(@"Attempted to register HippyBridgeModule class %@ for the "
                                "name '%@', but name was already registered by class %@",
                     moduleClass, moduleName, moduleData.moduleClass);
                 continue;
@@ -202,7 +202,7 @@ - (void)setupModulesCompletion:(dispatch_block_t)completion {
                 continue;
             } else if ([moduleData.moduleClass new] != nil) {
                 // Both modules were non-nil, so it's unclear which should take precedence
-                HippyLogError(@"Attempted to register HippyBridgeModule class %@ for the "
+                HippyLogWarn(@"Attempted to register HippyBridgeModule class %@ for the "
                                "name '%@', but name was already registered by class %@",
                     moduleClass, moduleName, moduleData.moduleClass);
             }

framework/ios/debug/websocket/HippySRWebSocket.m

@@ -22,7 +22,7 @@
 
 #import <CommonCrypto/CommonDigest.h>
 
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyLog.h"
 #import "HippySRSIMDHelpers.h"
 

framework/ios/module/dev/HippyDevMenu.mm

@@ -24,7 +24,7 @@
 #import "HippyEventDispatcher.h"
 #import "HippyKeyCommands.h"
 #import "HippyWebSocketProxy.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyUtils.h"
 #import "HippyDefines.h"
 

framework/ios/module/dev/HippyRedBox.mm

@@ -25,7 +25,7 @@
 #import "HippyRedBox.h"
 #import "HippyUtils.h"
 #import "HippyWeakProxy.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyConvert.h"
 #import "HippyJSStackFrame.h"
 #import "HippyLog.h"

framework/ios/module/eventobserver/HippyEventObserverModule.mm

@@ -22,7 +22,7 @@
 
 #import "HippyEventObserverModule.h"
 #import "HippyEventDispatcher.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 
 @implementation HippyEventObserverModule {
     NSMutableDictionary *_config;

framework/ios/module/exception/HippyExceptionModule.mm

@@ -23,7 +23,7 @@
 #import "HippyExceptionModule.h"
 #import "HippyBridge.h"
 #import "HippyDefines.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyUtils.h"
 
 @implementation HippyExceptionModule

framework/ios/module/localstorage/HippyAsyncLocalStorage.mm

@@ -26,7 +26,7 @@
 #import "HippyBridge.h"
 #import "HippyDefines.h"
 #import "HippyUtils.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyConvert.h"
 #import "HippyLog.h"
 #import "HippyUtils.h"

framework/ios/module/netinfo/HippyNetInfo.mm

@@ -26,7 +26,7 @@
 #import "HippyNetInfo.h"
 #import "HippyNetInfoIntenal.h"
 
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 
 @interface HippyNetInfo ()<HippyNetworkTypeChangedDelegate> {
 }

framework/ios/module/netinfo/HippyNetInfoIntenal.m

@@ -24,7 +24,7 @@
 #import <SystemConfiguration/SystemConfiguration.h>
 
 #import "HippyNetInfoIntenal.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 
 #include <netinet/in.h>
 

framework/ios/module/network/HippyNetWork.mm

@@ -26,7 +26,7 @@
 #import "HippyBridge+VFSLoader.h"
 #import "HippyDefines.h"
 #import "HippyNetWork.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyUtils.h"
 
 static NSStringEncoding GetStringEncodingFromURLResponse(NSURLResponse *response) {

framework/ios/module/turbo/HippyOCTurboModule.mm

@@ -25,7 +25,7 @@
 #import "HippyOCTurboModule+Inner.h"
 #import "HippyTurboModuleManager.h"
 #import "HippyJSExecutor.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyLog.h"
 #import "HippyUtils.h"
 #import "NSObject+CtxValue.h"

framework/ios/module/turbo/HippyTurboModuleManager.mm

@@ -23,7 +23,7 @@
 #import "HippyJSExecutor.h"
 #import "HippyModuleData.h"
 #import "HippyTurboModuleManager.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 
 #include <unordered_map>
 

framework/ios/module/turbo/NSObject+HippyTurbo.m

@@ -21,7 +21,7 @@
  */
 
 #import "HippyModuleMethod.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyUtils.h"
 #import "NSObject+HippyTurbo.h"
 

framework/ios/utils/NSObject+CtxValue.mm

@@ -21,8 +21,8 @@
  */
 
 #import "NSObject+CtxValue.h"
-#import "HippyAsserts.h"
-
+#import "HippyAssert.h"
+#import "HippyLog.h"
 #include "driver/napi/js_ctx.h"
 #include "driver/napi/js_ctx_value.h"
 #include "footstone/string_view.h"
@@ -32,7 +32,7 @@ @implementation NSObject (CtxValue)
 
 - (CtxValuePtr)convertToCtxValue:(const CtxPtr &)context; {
     @autoreleasepool {
-        HippyAssert(NO, @"%@ must implemente convertToCtxValue method", NSStringFromClass([self class]));
+        HippyLogWarn(@"%@ must implemente convertToCtxValue method", NSStringFromClass([self class]));
         std::unordered_map<CtxValuePtr, CtxValuePtr> valueMap;
         return context->CreateObject(valueMap);
     }

hippy.podspec

@@ -129,6 +129,9 @@ Pod::Spec.new do |s|
     base.source_files = ['modules/ios/base/*.{h,m,mm}', 'modules/ios/logutils/*.{h,mm}']
     base.public_header_files = ['modules/ios/base/*.h', 'modules/ios/logutils/*.h']
     base.dependency 'hippy/Footstone'
+    base.pod_target_xcconfig = {
+      'GCC_PREPROCESSOR_DEFINITIONS' => 'HIPPY_VERSION=' + s.version.to_s,
+    }
     puts 'hippy subspec \'base\' read end'
   end
 

modules/ios/base/HippyAsserts.m → modules/ios/base/HippyAssert.m

@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyLog.h"
 
 NSString *const HippyErrorDomain = @"HippyErrorDomain";

modules/ios/base/HippyDefines.h

@@ -64,6 +64,11 @@
 #define HIPPY_CONCAT2(A, B) A##B
 #define HIPPY_CONCAT(A, B) HIPPY_CONCAT2(A, B)
 
+/**
+ * Convert number macro to string
+ */
+#define HIPPY_STR(x) HIPPY_STR_EXPAND(x)
+#define HIPPY_STR_EXPAND(x) #x
 
 /**
  * Throw an assertion for unimplemented methods.

modules/ios/base/HippyLog.mm

@@ -83,6 +83,20 @@ void HippyAddLogFunction(HippyLogFunction logFunction) {
     }
 }
 
+/**
+ * returns the topmost stacked log function for the current thread, which
+ * may not be the same as the current value of HippyCurrentLogFunction.
+ */
+static HippyLogFunction HippyGetLocalLogFunction() {
+    NSMutableDictionary *threadDictionary = [NSThread currentThread].threadDictionary;
+    NSArray<HippyLogFunction> *functionStack = threadDictionary[HippyLogFunctionStack];
+    HippyLogFunction logFunction = functionStack.lastObject;
+    if (logFunction) {
+        return logFunction;
+    }
+    return HippyGetLogFunction();
+}
+
 void HippyPerformBlockWithLogFunction(void (^block)(void), HippyLogFunction logFunction) {
     NSMutableDictionary *threadDictionary = [NSThread currentThread].threadDictionary;
     NSMutableArray<HippyLogFunction> *functionStack = threadDictionary[HippyLogFunctionStack];
@@ -96,7 +110,7 @@ void HippyPerformBlockWithLogFunction(void (^block)(void), HippyLogFunction logF
 }
 
 void HippyPerformBlockWithLogPrefix(void (^block)(void), NSString *prefix) {
-    HippyLogFunction logFunction = HippyGetLogFunction();
+    HippyLogFunction logFunction = HippyGetLocalLogFunction();
     if (logFunction) {
         HippyPerformBlockWithLogFunction(block,
                                          ^(HippyLogLevel level, HippyLogSource source,
@@ -153,7 +167,7 @@ void HippyPerformBlockWithLogPrefix(void (^block)(void), NSString *prefix) {
 }
 
 void HippyLogNativeInternal(HippyLogLevel level, const char *fileName, int lineNumber, NSString *format, ...) {
-    HippyLogFunction logFunction = HippyGetLogFunction();
+    HippyLogFunction logFunction = HippyGetLocalLogFunction();
     BOOL log = HIPPY_DEBUG || (logFunction != nil);
     if (log && level >= HippyGetLogThreshold()) {
         // Get message

modules/ios/base/HippyUtils.h

@@ -142,4 +142,16 @@ HIPPY_EXTERN NSString *HippySchemeFromURLString(NSString *urlString);
 //Get String Encoding From HTTP URL Response
 HIPPY_EXTERN NSStringEncoding HippyGetStringEncodingFromURLResponse(NSURLResponse *response);
 
+
+#pragma mark -
+
+/// 工具类
+@interface HippyUtils : NSObject
+
+/// SDK版本号
++ (NSString *)sdkVersion;
+
+@end
+
+
 NS_ASSUME_NONNULL_END

modules/ios/base/HippyUtils.m

@@ -21,7 +21,7 @@
  */
 
 #import "HippyUtils.h"
-#import "HippyAsserts.h"
+#import "HippyAssert.h"
 #import "HippyLog.h"
 #import <objc/message.h>
 #import <CommonCrypto/CommonCrypto.h>
@@ -698,3 +698,14 @@ id HippyJSONClean(id object) {
 
     return HippyMakeError(errorMessage, nil, errorInfo);
 }
+
+
+#pragma mark - 
+
+@implementation HippyUtils
+
++ (NSString *)sdkVersion {
+    return @(HIPPY_STR(HIPPY_VERSION));
+}
+
+@end