diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.mm b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.mm index d304aa8dfa..a796b49ee3 100644 --- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.mm +++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.mm @@ -246,17 +246,17 @@ - (void)dealloc - (void)fillCSSStyles:(NSDictionary *)styles { - WX_STYLE_FILL_TEXT(fontFamily, fontFamily, NSString, YES) - WX_STYLE_FILL_TEXT_PIXEL(fontSize, fontSize, YES) - WX_STYLE_FILL_TEXT(fontWeight, fontWeight, WXTextWeight, YES) - WX_STYLE_FILL_TEXT(fontStyle, fontStyle, WXTextStyle, YES) - WX_STYLE_FILL_TEXT(lines, lines, NSUInteger, YES) - WX_STYLE_FILL_TEXT(textAlign, textAlign, NSTextAlignment, NO) - WX_STYLE_FILL_TEXT(textDecoration, textDecoration, WXTextDecoration, YES) - WX_STYLE_FILL_TEXT(textOverflow, textOverflow, NSString, NO) - WX_STYLE_FILL_TEXT_PIXEL(lineHeight, lineHeight, YES) - WX_STYLE_FILL_TEXT_PIXEL(letterSpacing, letterSpacing, YES) - WX_STYLE_FILL_TEXT(wordWrap, wordWrap, NSString, YES); + WX_STYLE_FILL_TEXT(fontFamily, fontFamily, NSString, YES) //!OCLint + WX_STYLE_FILL_TEXT_PIXEL(fontSize, fontSize, YES) //!OCLint + WX_STYLE_FILL_TEXT(fontWeight, fontWeight, WXTextWeight, YES) //!OCLint + WX_STYLE_FILL_TEXT(fontStyle, fontStyle, WXTextStyle, YES) //!OCLint + WX_STYLE_FILL_TEXT(lines, lines, NSUInteger, YES) //!OCLint + WX_STYLE_FILL_TEXT(textAlign, textAlign, NSTextAlignment, NO) //!OCLint + WX_STYLE_FILL_TEXT(textDecoration, textDecoration, WXTextDecoration, YES) //!OCLint + WX_STYLE_FILL_TEXT(textOverflow, textOverflow, NSString, NO) //!OCLint + WX_STYLE_FILL_TEXT_PIXEL(lineHeight, lineHeight, YES) //!OCLint + WX_STYLE_FILL_TEXT_PIXEL(letterSpacing, letterSpacing, YES) //!OCLint + WX_STYLE_FILL_TEXT(wordWrap, wordWrap, NSString, YES); //!OCLint UIColor* color = nil; id value = styles[@"color"]; diff --git a/ios/sdk/WeexSDK/Sources/Display/UIBezierPath+Weex.m b/ios/sdk/WeexSDK/Sources/Display/UIBezierPath+Weex.m index 7a74c3fd28..300facd8f2 100644 --- a/ios/sdk/WeexSDK/Sources/Display/UIBezierPath+Weex.m +++ b/ios/sdk/WeexSDK/Sources/Display/UIBezierPath+Weex.m @@ -33,10 +33,10 @@ + (instancetype)wx_bezierPathWithRoundedRect:(CGRect)rect bottomRight:(CGFloat)bottomRightRadius { UIBezierPath *path = [UIBezierPath bezierPath]; - if(isnan(topLeftRadius) || isnan(topRightRadius) || isnan(bottomLeftRadius) || isnan(bottomRightRadius)) { + if(isnan(topLeftRadius) || isnan(topRightRadius) || isnan(bottomLeftRadius) || isnan(bottomRightRadius)) { //!OCLint return path; } - if (![WXUtility isValidPoint:rect.origin] || isnan(rect.size.height) || isnan(rect.size.width)) { + if (![WXUtility isValidPoint:rect.origin] || isnan(rect.size.height) || isnan(rect.size.width)) { //!OCLint return path; } CGPoint topLeftPoint = CGPointMake(rect.origin.x + topLeftRadius, rect.origin.y); diff --git a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m index a992b28e87..f4bd6618e3 100644 --- a/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m +++ b/ios/sdk/WeexSDK/Sources/Utility/WXUtility.m @@ -391,7 +391,7 @@ + (BOOL)isBlankString:(NSString *)string { + (BOOL)isValidPoint:(CGPoint)point { - return !(isnan(point.x)) && !(isnan(point.y)); + return !(isnan(point.x)) && !(isnan(point.y)); //!OCLint } + (NSError *)errorWithCode:(NSInteger)code message:(NSString *)message diff --git a/weex_core/Source/core/render/manager/render_manager.cpp b/weex_core/Source/core/render/manager/render_manager.cpp index a09395ea44..35ad5f8aa4 100644 --- a/weex_core/Source/core/render/manager/render_manager.cpp +++ b/weex_core/Source/core/render/manager/render_manager.cpp @@ -454,7 +454,7 @@ void RenderManager::CallMetaModule(const char *page_id, const char *method, cons else if (key == "deviceWidth") { setPageArgument(page_id, "devicewidth", value); } - else if (key == "deviceHeight") { + else if (key == "deviceHeight") { //!OCLint // unsupported now } else if (key == "reserveCssStyles") { diff --git a/weex_core/Source/wson/wson_parser.cpp b/weex_core/Source/wson/wson_parser.cpp index 21060aa437..ee677332c5 100644 --- a/weex_core/Source/wson/wson_parser.cpp +++ b/weex_core/Source/wson/wson_parser.cpp @@ -151,7 +151,7 @@ void wson_parser::toJSONtring(std::string &builder){ std::string wson_parser::nextStringUTF8(uint8_t type) { std::string str; - switch (type) { + switch (type) {//!OCLint case WSON_UINT8_STRING_TYPE: { int size = wson_next_uint(wsonBuffer); uint8_t *utf8 = wson_next_bts(wsonBuffer, size);