[RC] 增加logger机制

qiang_yu · qiang_yu · commit b5a3752b91fa · 2018-09-03T19:55:17.000+08:00
diff --git a/CSJSBridge/CSJSBridgeActionHandlerManager.m b/CSJSBridge/CSJSBridgeActionHandlerManager.m
@@ -8,6 +8,7 @@
 
 #import "CSJSBridgeActionHandlerManager.h"
 #import "CSJSHandler.h"
+#import "CSJSLog.h"
 
 @interface CSJSBridgeActionHandlerManager()
 
@@ -57,7 +58,7 @@ + (instancetype)shareManager
             id handler = [[handlerClass alloc] init];
             if(!handler)
             {
-                NSLog(@"<< handlerClass not exist:%@ >>",handlerClassString);
+                CSLog(@"handlerClass not exist:%@",handlerClassString);
             }
             else{
                 if ([handler conformsToProtocol:@protocol(CSJSHandlerProtocol)]) {
@@ -66,11 +67,11 @@ + (instancetype)shareManager
                     CSJSHandler *jsHandler = (CSJSHandler *)handler;
                     jsHandler.handlerName = handlerName;
                 }else{
-                    NSLog(@"<< handler:%@ not conform to protocol:%@ >>",handler, NSStringFromProtocol(@protocol(CSJSHandlerProtocol)));
+                    CSLog(@"handler:%@ not conform to protocol:%@",handler, NSStringFromProtocol(@protocol(CSJSHandlerProtocol)));
                 }
             }
         }];
-        NSLog(@"<< supportJsHandlerMap:%@ >>",_supportJSHandlersMap);
+        CSLog(@"supportJsHandlerMap:%@",_supportJSHandlersMap);
     }
     return _supportJSHandlersMap;
 }
@@ -89,7 +90,7 @@ - (void)callHandler:(NSString *)handlerName
 {
     id <CSJSHandlerProtocol>handler = self.supportJSHandlersMap[handlerName];
     if (!handler) {
-        NSLog(@"<< error,handler:%@ not register >>",handlerName);
+        CSLog(@"error,handler:%@ not register",handlerName);
     }
     else
     {
@@ -99,7 +100,7 @@ - (void)callHandler:(NSString *)handlerName
         }
         else
         {
-            NSLog(@"<< error,handler not respondsToSelector 'callAppActionWithMessage: '>>");
+            NSLog(@"error,handler not respondsToSelector 'callAppActionWithMessage: '");
         }
     }
 }
diff --git a/CSJSBridge/CSJSBridgeManager.h b/CSJSBridge/CSJSBridgeManager.h
@@ -0,0 +1,20 @@
+//
+//  CSJSBridgeManager.h
+//  CSWebViewJavascriptBridge_Example
+//
+//  Created by 余强 on 2018/9/3.
+//  Copyright © 2018年 289067005@qq.com. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "CSJSLoggerProtocol.h"
+
+@interface CSJSBridgeManager : NSObject
+
++ (instancetype)shareManager;
+
++ (void)registerLogger:(id<CSJSLoggerProtocol>)logger;
+
++ (id<CSJSLoggerProtocol>)customLogger;
+
+@end
diff --git a/CSJSBridge/CSJSBridgeManager.m b/CSJSBridge/CSJSBridgeManager.m
@@ -0,0 +1,40 @@
+//
+//  CSJSBridgeManager.m
+//  CSWebViewJavascriptBridge_Example
+//
+//  Created by 余强 on 2018/9/3.
+//  Copyright © 2018年 289067005@qq.com. All rights reserved.
+//
+
+#import "CSJSBridgeManager.h"
+
+@interface CSJSBridgeManager()
+
+@property (nonatomic,strong) id<CSJSLoggerProtocol>logger;
+
+@end
+
+@implementation CSJSBridgeManager
+
++ (instancetype)shareManager
+{
+    static CSJSBridgeManager *manager = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        manager = [[self alloc] init];
+    });
+    return manager;
+}
+
++ (void)registerLogger:(id<CSJSLoggerProtocol>)logger
+{
+    NSParameterAssert(logger);
+    [CSJSBridgeManager shareManager].logger = logger;
+}
+
++ (id<CSJSLoggerProtocol>)customLogger
+{
+    return [[self shareManager] logger];
+}
+
+@end
diff --git a/CSJSBridge/CSJSCustomLogger.h b/CSJSBridge/CSJSCustomLogger.h
@@ -0,0 +1,14 @@
+//
+//  CSJSCustomLogger.h
+//  CSWebViewJavascriptBridge_Example
+//
+//  Created by 余强 on 2018/9/3.
+//  Copyright © 2018年 289067005@qq.com. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "CSJSLoggerProtocol.h"
+
+@interface CSJSCustomLogger : NSObject<CSJSLoggerProtocol>
+
+@end
diff --git a/CSJSBridge/CSJSCustomLogger.m b/CSJSBridge/CSJSCustomLogger.m
@@ -0,0 +1,18 @@
+//
+//  CSJSCustomLogger.m
+//  CSWebViewJavascriptBridge_Example
+//
+//  Created by 余强 on 2018/9/3.
+//  Copyright © 2018年 289067005@qq.com. All rights reserved.
+//
+
+#import "CSJSCustomLogger.h"
+
+@implementation CSJSCustomLogger
+
+- (void)JSCustomLog:(NSString *)log
+{
+    NSLog(@"--------JSCustomLog---------");
+}
+
+@end
diff --git a/CSJSBridge/CSJSLog.h b/CSJSBridge/CSJSLog.h
@@ -0,0 +1,17 @@
+//
+//  CSJSLog.h
+//  CSWebViewJavascriptBridge_Example
+//
+//  Created by 余强 on 2018/9/3.
+//  Copyright © 2018年 289067005@qq.com. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#define CSLog(args...) JSLog(@"CSJSLog", __FILE__,__LINE__,__PRETTY_FUNCTION__,args);
+
+@interface CSJSLog : NSObject
+
+ void JSLog(NSString *prefix, const char *file, int lineNumber, const char *funcName, NSString *format,...);
+
+@end
diff --git a/CSJSBridge/CSJSLog.m b/CSJSBridge/CSJSLog.m
@@ -0,0 +1,35 @@
+//
+//  CSJSLog.m
+//  CSWebViewJavascriptBridge_Example
+//
+//  Created by 余强 on 2018/9/3.
+//  Copyright © 2018年 289067005@qq.com. All rights reserved.
+//
+
+#import "CSJSLog.h"
+#import "CSJSBridgeManager.h"
+
+@implementation CSJSLog
+
+ void JSLog(NSString *prefix, const char *file, int lineNumber, const char *funcName, NSString *format,...) {
+    
+    if ([CSJSBridgeManager customLogger] == nil){
+        return;
+    }
+    
+    va_list ap;
+    va_start (ap, format);
+    format = [format stringByAppendingString:@"\n"];
+    NSString *msg = [[NSString alloc] initWithFormat:[NSString stringWithFormat:@"%@",format] arguments:ap];
+    va_end (ap);
+    if (!msg.length){
+       return;
+    }
+    NSLog(@"%@",msg);
+    [[CSJSBridgeManager customLogger] JSCustomLog:msg];
+    // write to file
+    //fprintf(stderr,"%s%50s:%3d - %s",[prefix UTF8String], funcName, lineNumber, [msg UTF8String]);
+}
+
+
+@end
diff --git a/CSJSBridge/CSJSLoggerProtocol.h b/CSJSBridge/CSJSLoggerProtocol.h
@@ -0,0 +1,19 @@
+//
+//  CSJSLoggerProtocol.h
+//  CSWebViewJavascriptBridge
+//
+//  Created by 余强 on 2018/9/3.
+//  Copyright © 2018年 289067005@qq.com. All rights reserved.
+//
+
+#ifndef CSJSLoggerProtocol_h
+#define CSJSLoggerProtocol_h
+
+@protocol CSJSLoggerProtocol <NSObject>
+
+- (void) JSCustomLog:(nullable NSString *) log;
+
+@end
+
+
+#endif /* CSJSLoggerProtocol_h */
diff --git a/CSJSBridge/CSJSMessage.h b/CSJSBridge/CSJSMessage.h
@@ -10,7 +10,6 @@
 
 @interface CSJSMessage: NSObject
 
-
 /**
   JS主动调native逻辑，分模块定义业务，common,xx,yy等，一个handler代表一个模块
  */
diff --git a/CSJSBridge/CSUIWebViewJavascriptBridge.h b/CSJSBridge/CSUIWebViewJavascriptBridge.h
@@ -9,6 +9,7 @@
 #import <Foundation/Foundation.h>
 #import <JavaScriptCore/JavaScriptCore.h>
 #import "CSWebViewJavascriptBridge.h"
+#import "CSJSLog.h"
 
 /**
  CSUIWebViewJavascriptBridge为CSWebViewJavascriptBridge的subClass，为UIWebView提供桥接能力
diff --git a/CSJSBridge/CSUIWebViewJavascriptBridge.m b/CSJSBridge/CSUIWebViewJavascriptBridge.m
@@ -122,7 +122,7 @@ - (void)callJSWithAction:(NSString *)action script:(NSString *)script JSCompleti
             jsCompletionBlock ? jsCompletionBlock(result) : nil;
         }else{
             if(jsCompletionBlock){
-                NSLog(@"error,js no response,may not register Action,please first register the action");
+                CSLog(@"error,js no response,may not register Action,please first register the action");
             }
         }
     }else{
@@ -133,7 +133,7 @@ - (void)callJSWithAction:(NSString *)action script:(NSString *)script JSCompleti
                  jsCompletionBlock ? jsCompletionBlock(result) : nil;
             }else{
                 if(jsCompletionBlock){
-                    NSLog(@"error,js no response,may not register Action,please first register the action");
+                    CSLog(@"error,js no response,may not register Action,please first register the action");
                 }
             }
         });
diff --git a/CSJSBridge/CSWebBrowViewController.m b/CSJSBridge/CSWebBrowViewController.m
@@ -11,6 +11,8 @@
 #import "CSUIWebViewJavascriptBridge.h"
 #import "CSWKWebViewJavascriptBridge.h"
 #import "CSWebViewJavascriptBridge+Event.h"
+#import "CSJSBridgeManager.h"
+#import "CSJSCustomLogger.h"
 
 @interface CSWebBrowViewController ()
 
@@ -26,6 +28,8 @@ - (void)viewDidLoad {
     [self setUpView];
     [self addViewControllerlifeCycleEvents];
     [(UIWebView *)self.webView loadRequest:[NSURLRequest requestWithURL:_url]];
+    
+    [CSJSBridgeManager registerLogger:[CSJSCustomLogger new]];
 }
 
 - (void)didReceiveMemoryWarning {
@@ -38,7 +42,7 @@ - (void)viewWillAppear:(BOOL)animated
     [super viewWillAppear:animated];
   
     [self addApplicationNotificationEvents];
-     [self.bridge dispatchEvent:CSJSWebViewWillAppearEvent data:nil];
+    [self.bridge dispatchEvent:CSJSWebViewWillAppearEvent data:nil];
 }
 
 - (void)viewDidAppear:(BOOL)animated
diff --git a/CSJSBridge/CSWebViewJavascriptBridge.m b/CSJSBridge/CSWebViewJavascriptBridge.m
@@ -9,6 +9,7 @@
 #import "CSWebViewJavascriptBridge.h"
 #import "CSJSBridgeActionHandlerManager.h"
 #import "CSBridgeConstant.h"
+#import "CSJSLog.h"
 
 @implementation CSWebViewJavascriptBridge
 
@@ -42,13 +43,12 @@ - (void)bridgeForWebView:(id)webView
 
 - (void)callAppNative:(id)message
 {
-    //NSLog(@"callFromJS,data:%@",message);
     if ([message isKindOfClass:[NSDictionary class]])
     {
         CSJSMessage *messageBody = [CSJSMessage messageWithDictionary:message];
         if(![self checkJSMessageParameterValid:messageBody])
         {
-            NSLog(@"<<web call app error data formate,no action/handler:%@>>",message);
+            CSLog(@"web call app error data formate,no action/handler:%@",message);
             return;
         }
         //ios主动调用js，js中对应的对象及方法，如:"jsBridge.nativeCallWeb",动态获取，非写死
@@ -60,7 +60,7 @@ - (void)callAppNative:(id)message
             if (message.callbackID.length) {
                 self.jsCallbackFunction = message.callbackFunction;
                 NSString* script = [NSString stringWithFormat:@"%@('%@');", self.jsCallbackFunction,[message toJavascriptMessage]];
-                NSLog(@"callJSWithScript:%@",script);
+                CSLog(@"callJSWithScript:%@",script);
                 [self callJSWithAction:message.action script:script];
             }
         }];
@@ -87,7 +87,7 @@ - (void)callJS:(NSString *)action
 JSCompletionBlock:(CSJSCompletionBlock)jsCompletionBlock
 {
     NSString* script = [NSString stringWithFormat:@"%@('%@','%@');", self.nativeCallWebFunction,action,[message toJavascriptMessage]];
-    NSLog(@"callJSWithScript:%@",script);
+    CSLog(@"callJSWithScript:%@",script);
     [self callJSWithAction:action script:script JSCompletionBlock:jsCompletionBlock];
 }
 
diff --git a/CSJSHandles/CSJSAction.m b/CSJSHandles/CSJSAction.m
@@ -7,12 +7,13 @@
 //
 
 #import "CSJSAction.h"
+#import "CSJSLog.h"
 
 @implementation CSJSAction
 
 - (void)callAppActionWithMessage:(CSJSMessage *)message jsCallBackBlock:(CSJSCallBackBlock)jsCallBackBlock
 {
-    NSLog(@"completion action:%@",NSStringFromClass([self class]));
+    CSLog(@"completion action:%@",NSStringFromClass([self class]));
     jsCallBackBlock ? jsCallBackBlock(message) : nil;
 }
 
diff --git a/CSJSHandles/CSJSCommonHandler/CSJSShareAction.m b/CSJSHandles/CSJSCommonHandler/CSJSShareAction.m
@@ -15,7 +15,7 @@ - (void)callAppActionWithMessage:(CSJSMessage *)message jsCallBackBlock:(CSJSCal
 {
     CSJSMessage *responceMessage  = message;
     //doSth
-    NSLog(@"completion shareAction");
+
     jsCallBackBlock ? jsCallBackBlock(responceMessage) : nil;
 }
 
diff --git a/CSJSHandles/CSJSCoreHandler/CSJSAPIConfigAction.m b/CSJSHandles/CSJSCoreHandler/CSJSAPIConfigAction.m
@@ -18,7 +18,6 @@ - (void)callAppActionWithMessage:(CSJSMessage *)message jsCallBackBlock:(CSJSCal
 {
     CSJSMessage *responceMessage  = message;
     responceMessage.JSAPIVersion = CSCurrentJSAPIVersion;
-    NSLog(@"**JSLog:%@**",responceMessage.data);
     jsCallBackBlock ? jsCallBackBlock(responceMessage) : nil;
 }
 
diff --git a/CSJSHandles/CSJSCoreHandler/CSJSLogAction.m b/CSJSHandles/CSJSCoreHandler/CSJSLogAction.m
@@ -7,14 +7,17 @@
 //
 
 #import "CSJSLogAction.h"
+#import "CSJSLog.h"
 
 @implementation CSJSLogAction
 
 - (void)callAppActionWithMessage:(CSJSMessage *)message jsCallBackBlock:(CSJSCallBackBlock)jsCallBackBlock
 {
     CSJSMessage *responceMessage  = message;
-    //doSth
-    NSLog(@"**JSLog:%@**",responceMessage.data);
+    NSDictionary *dic = [responceMessage toDictionary];
+    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dic options:NSJSONWritingPrettyPrinted error:nil];
+    NSString *jsonString = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+    CSLog([[@"<<\n fromJslog: " stringByAppendingString:jsonString] stringByAppendingString:@"\n>>"]);
     jsCallBackBlock ? jsCallBackBlock(responceMessage) : nil;
 }
 
diff --git a/CSJSHandles/CSJSHandler.m b/CSJSHandles/CSJSHandler.m
diff --git a/Example/CSWebViewJavascriptBridge.xcodeproj/project.pbxproj b/Example/CSWebViewJavascriptBridge.xcodeproj/project.pbxproj
diff --git a/Example/CSWebViewJavascriptBridge.xcworkspace/xcuserdata/qiang_yu.xcuserdatad/UserInterfaceState.xcuserstate b/Example/CSWebViewJavascriptBridge.xcworkspace/xcuserdata/qiang_yu.xcuserdatad/UserInterfaceState.xcuserstate

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`
`9`	`9`	`#import "CSJSBridgeActionHandlerManager.h"`
`10`	`10`	`#import "CSJSHandler.h"`
	`11`	`+#import "CSJSLog.h"`
`11`	`12`
`12`	`13`	`@interface CSJSBridgeActionHandlerManager()`
`13`	`14`
`@@ -57,7 +58,7 @@ + (instancetype)shareManager`
`57`	`58`	`id handler = [[handlerClass alloc] init];`
`58`	`59`	`if(!handler)`
`59`	`60`	`{`
`60`		`- NSLog(@"<< handlerClass not exist:%@ >>",handlerClassString);`
	`61`	`+ CSLog(@"handlerClass not exist:%@",handlerClassString);`
`61`	`62`	`}`
`62`	`63`	`else{`
`63`	`64`	`if ([handler conformsToProtocol:@protocol(CSJSHandlerProtocol)]) {`
`@@ -66,11 +67,11 @@ + (instancetype)shareManager`
`66`	`67`	`CSJSHandler jsHandler = (CSJSHandler )handler;`
`67`	`68`	`jsHandler.handlerName = handlerName;`
`68`	`69`	`}else{`
`69`		`- NSLog(@"<< handler:%@ not conform to protocol:%@ >>",handler, NSStringFromProtocol(@protocol(CSJSHandlerProtocol)));`
	`70`	`+ CSLog(@"handler:%@ not conform to protocol:%@",handler, NSStringFromProtocol(@protocol(CSJSHandlerProtocol)));`
`70`	`71`	`}`
`71`	`72`	`}`
`72`	`73`	`}];`
`73`		`- NSLog(@"<< supportJsHandlerMap:%@ >>",_supportJSHandlersMap);`
	`74`	`+ CSLog(@"supportJsHandlerMap:%@",_supportJSHandlersMap);`
`74`	`75`	`}`
`75`	`76`	`return _supportJSHandlersMap;`
`76`	`77`	`}`
`@@ -89,7 +90,7 @@ - (void)callHandler:(NSString *)handlerName`
`89`	`90`	`{`
`90`	`91`	`id <CSJSHandlerProtocol>handler = self.supportJSHandlersMap[handlerName];`
`91`	`92`	`if (!handler) {`
`92`		`- NSLog(@"<< error,handler:%@ not register >>",handlerName);`
	`93`	`+ CSLog(@"error,handler:%@ not register",handlerName);`
`93`	`94`	`}`
`94`	`95`	`else`
`95`	`96`	`{`
`@@ -99,7 +100,7 @@ - (void)callHandler:(NSString *)handlerName`
`99`	`100`	`}`
`100`	`101`	`else`
`101`	`102`	`{`
`102`		`- NSLog(@"<< error,handler not respondsToSelector 'callAppActionWithMessage: '>>");`
	`103`	`+ NSLog(@"error,handler not respondsToSelector 'callAppActionWithMessage: '");`
`103`	`104`	`}`
`104`	`105`	`}`
`105`	`106`	`}`