Skip to content

Commit 7388b5b

Browse files
committed
add rule into gitignore
refactor swift xlog demo
1 parent c9a1b4e commit 7388b5b

File tree

3 files changed

+13
-30
lines changed

3 files changed

+13
-30
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ xcshareddata
1818
!/mars/boost/libs/
1919
/samples/iOS/iOSDemo/Kernel/MarsLib/
2020
/samples/iOS/iOSDemoXlog/Kernel/MarsLib/
21+
/samples/iOS/XloggerSwiftDemo/Kernel/MarsLib/
2122
/samples/Mac/Kernel/MarsLib/
2223
/samples/android/xlogSample/app/src/main/jni/export_include/*.so
2324

samples/iOS/XloggerSwiftDemo/XloggerSwiftDemo/Appender2SwiftBridge/appender-swift-bridge.h

+8-6
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
#import <Foundation/Foundation.h>
2020
#import "LogUtil.h"
2121

22-
2322
typedef NS_ENUM(NSUInteger, XloggerType) {
24-
25-
debug,
26-
info,
27-
warning,
28-
error,
23+
all = kLevelAll,
24+
verbose = kLevelVerbose,
25+
debug = kLevelDebug,
26+
info = kLevelInfo,
27+
warning = kLevelWarn,
28+
error = kLevelError,
29+
fatal = kLevelFatal,
30+
none = kLevelNone
2931

3032
};
3133

samples/iOS/XloggerSwiftDemo/XloggerSwiftDemo/Appender2SwiftBridge/appender-swift-bridge.mm

+4-24
Original file line numberDiff line numberDiff line change
@@ -35,32 +35,12 @@ -(void)initXlogger: (XloggerType)debugLevel releaseLevel: (XloggerType)releaseLe
3535

3636
// init xlog
3737
#if DEBUG
38-
switch (debugLevel) {
39-
case debug:
40-
xlogger_SetLevel(kLevelDebug);
41-
case info:
42-
xlogger_SetLevel(kLevelInfo);
43-
case warning:
44-
xlogger_SetLevel(kLevelWarn);
45-
case error:
46-
xlogger_SetLevel(kLevelError);
47-
default:
48-
break;
49-
}
38+
39+
xlogger_SetLevel((TLogLevel)debugLevel);
5040
appender_set_console_log(true);
5141
#else
52-
switch (releaseLevel) {
53-
case debug:
54-
xlogger_SetLevel(kLevelDebug);
55-
case info:
56-
xlogger_SetLevel(kLevelInfo);
57-
case warning:
58-
xlogger_SetLevel(kLevelWarn);
59-
case error:
60-
xlogger_SetLevel(kLevelError);
61-
default:
62-
break;
63-
}
42+
43+
xlogger_SetLevel((TLogLevel)releaseLevel);
6444
appender_set_console_log(false);
6545
#endif
6646
appender_open(kAppednerAsync, [logPath UTF8String], prefix);

0 commit comments

Comments
 (0)