Merge branch 'main' into feature/update-vue-docs

Tencent · Nov 13, 2023 · e0e6c61 · e0e6c61
2 parents b11a1dd + 85b7853
commit e0e6c61
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 5 deletions.
diff --git a/framework/examples/ios-demo/HippyDemo/RenderPage/HippyDemoViewController.mm b/framework/examples/ios-demo/HippyDemo/RenderPage/HippyDemoViewController.mm
@@ -35,6 +35,33 @@
 
 static NSString *const engineKey = @"Demo";
 
+static NSString *formatLog(NSDate *timestamp, HippyLogLevel level, NSString *fileName, NSNumber *lineNumber, NSString *message) {
+    static NSArray *logLevelMap = @[@"TRACE", @"INFO", @"WARN", @"ERROR", @"FATAL"];
+    static NSDateFormatter *formatter;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        formatter = [NSDateFormatter new];
+        formatter.dateFormat = formatter.dateFormat = @"yyyy-MM-dd HH:mm:ss.SSS";
+    });
+
+    NSString *levelStr = level < 0 || level > logLevelMap.count ? logLevelMap[1] : logLevelMap[level];
+
+    if(fileName){
+        return [[NSString alloc] initWithFormat:@"[%@][%@:%d][%@]%@",
+                [formatter stringFromDate:timestamp],
+                fileName.lastPathComponent,
+                lineNumber.intValue,
+                levelStr,
+                message
+        ];
+    }else{
+        return [[NSString alloc] initWithFormat:@"[%@]%@",
+                [formatter stringFromDate:timestamp],
+                message
+        ];
+    }
+}
+
 @interface HippyDemoViewController () <HippyMethodInterceptorProtocol, HippyBridgeDelegate, HippyRootViewDelegate> {
     DriverType _driverType;
     RenderType _renderType;
@@ -99,7 +126,12 @@ - (void)viewDidLoad {
 
 - (void)registerLogFunction {
     HippySetLogFunction(^(HippyLogLevel level, HippyLogSource source, NSString *fileName, NSNumber *lineNumber, NSString *message) {
-        NSLog(@"hippy says:%@ in file %@ at line %@", message, fileName, lineNumber);
+        NSString *log = formatLog([NSDate date], level, fileName, lineNumber, message);
+        if([log hasSuffix:@"\n"]){
+            fprintf(stderr, "%s", log.UTF8String);
+        }else{
+            fprintf(stderr, "%s\n", log.UTF8String);
+        }
     });
 }
 

diff --git a/framework/ios/base/bridge/HippyBridge.mm b/framework/ios/base/bridge/HippyBridge.mm
@@ -414,7 +414,7 @@ - (void)loadBundleURL:(NSURL *)bundleURL
         }
         return;
     }
-    HippyLogInfo(@"Begin loading bundle(%s) at %s", HP_CSTR_NOT_NULL(bundleURL.absoluteString.lastPathComponent.UTF8String), HP_CSTR_NOT_NULL(bundleURL.absoluteString.UTF8String));
+    HippyLogInfo(@"[HP PERF] Begin loading bundle(%s) at %s", HP_CSTR_NOT_NULL(bundleURL.absoluteString.lastPathComponent.UTF8String), HP_CSTR_NOT_NULL(bundleURL.absoluteString.UTF8String));
     [_bundleURLs addObject:bundleURL];
     dispatch_async(HippyBridgeQueue(), ^{
         [self beginLoadingBundle:bundleURL completion:completion];
@@ -509,15 +509,15 @@ - (void)loadInstanceForRootView:(NSNumber *)rootTag withProperties:(NSDictionary
 - (void)innerLoadInstanceForRootView:(NSNumber *)rootTag withProperties:(NSDictionary *)props {
     HippyAssert(_moduleName, @"module name must not be null");
     HippyLogInfo(@"[Hippy_OC_Log][Life_Circle],Running application %@ (%@)", _moduleName, props);
-    HippyLogInfo(@"Begin loading instance for HippyBridge(%p)", self);
+    HippyLogInfo(@"[HP PERF] Begin loading instance for HippyBridge(%p)", self);
     NSDictionary *param = @{@"name": _moduleName,
                             @"id": rootTag,
                             @"params": props ?: @{},
                             @"version": _HippySDKVersion};
     footstone::value::HippyValue value = [param toHippyValue];
     std::shared_ptr<footstone::value::HippyValue> domValue = std::make_shared<footstone::value::HippyValue>(value);
     self.javaScriptExecutor.pScope->LoadInstance(domValue);
-    HippyLogInfo(@"End loading instance for HippyBridge(%p)", self);
+    HippyLogInfo(@"[HP PERF] End loading instance for HippyBridge(%p)", self);
 }
 
 - (void)rootViewSizeChangedEvent:(NSNumber *)tag params:(NSDictionary *)params {

diff --git a/modules/footstone/include/footstone/logging.h b/modules/footstone/include/footstone/logging.h
@@ -119,7 +119,8 @@ class LogMessage {
     }
 
     std::ostringstream s;
-    s<<"thread:"<<pthread_self()<<", "<<log_msg<<std::endl;
+    s<<"["<<file<<":"<<line<<"]"
+     <<"[thread:"<<pthread_self()<<"], "<<log_msg<<std::endl;
 
     if (LogMessage::delegate_) {
       delegate_(s, TDF_LOG_WARNING);

diff --git a/modules/ios/base/HippyLog.mm b/modules/ios/base/HippyLog.mm
@@ -23,6 +23,7 @@
 #import "HippyLog.h"
 #import "HippyBridge.h"
 #import "HippyRedBox.h"
+#include "footstone/logging.h"
 
 #pragma mark NativeLog Methods
 
@@ -62,6 +63,12 @@ void HippySetLogThreshold(HippyLogLevel threshold) {
 
 void HippySetLogFunction(HippyLogFunction logFunction) {
     HPCurrentLogFunction = logFunction;
+
+    footstone::log::LogMessage::InitializeDelegate([](const std::ostringstream& stream,
+                                                      footstone::log::LogSeverity severity) {
+        NSString* message = [NSString stringWithUTF8String:stream.str().c_str()];
+        HPCurrentLogFunction(HippyLogLevelInfo, HippyLogSourceNative, nil, nil, message);
+    });
 }
 
 HippyLogFunction HippyGetLogFunction() {