From 4a788eb4bb47e14cd0b586f11205727575cf823c Mon Sep 17 00:00:00 2001 From: "pengfei.zhou" Date: Sat, 13 Jun 2020 11:53:21 +0800 Subject: [PATCH] adjust code style and add default case --- .../main/java/pub/doric/shader/InputNode.java | 3 + doric-iOS/Pod/Classes/Shader/DoricInputNode.m | 74 ++++++++++--------- doric-js/src/widget/input.ts | 6 +- 3 files changed, 45 insertions(+), 38 deletions(-) diff --git a/doric-android/doric/src/main/java/pub/doric/shader/InputNode.java b/doric-android/doric/src/main/java/pub/doric/shader/InputNode.java index da4e8c06..6eaafaad 100644 --- a/doric-android/doric/src/main/java/pub/doric/shader/InputNode.java +++ b/doric-android/doric/src/main/java/pub/doric/shader/InputNode.java @@ -136,6 +136,9 @@ public class InputNode extends ViewNode implements TextWatcher, View.O case 4: mView.setInputType(InputType.TYPE_CLASS_PHONE); break; + default: + mView.setInputType(InputType.TYPE_CLASS_TEXT); + break; } } break; diff --git a/doric-iOS/Pod/Classes/Shader/DoricInputNode.m b/doric-iOS/Pod/Classes/Shader/DoricInputNode.m index 4b22a529..e3abc523 100644 --- a/doric-iOS/Pod/Classes/Shader/DoricInputNode.m +++ b/doric-iOS/Pod/Classes/Shader/DoricInputNode.m @@ -24,8 +24,9 @@ #import "DoricUtil.h" #import "DoricPromise.h" -typedef void (^onTextChangeBlock)(NSString *text,DoricInputNode *node); -typedef void (^onFocusChangeBlock)(BOOL focused,DoricInputNode *node); +typedef void (^onTextChangeBlock)(NSString *text, DoricInputNode *node); + +typedef void (^onFocusChangeBlock)(BOOL focused, DoricInputNode *node); @implementation DoricInputView @@ -68,7 +69,7 @@ - (CGSize)sizeThatFits:(CGSize)size { @end -@interface DoricInputNode() +@interface DoricInputNode () @property(nonatomic, copy) onTextChangeBlock onTextChange; @property(nonatomic, copy) onFocusChangeBlock onFocusShange; @property(nonatomic, strong) NSNumber *maxLength; @@ -106,57 +107,56 @@ - (void)blendView:(DoricInputView *)view forPropName:(NSString *)name propValue: BOOL mutilin = [(NSNumber *) prop boolValue]; if (!mutilin) { view.textContainer.maximumNumberOfLines = 1; - }else { + } else { view.textContainer.maximumNumberOfLines = 0; } } else if ([name isEqualToString:@"hintText"]) { - view.placeholderLabel.text = (NSString *)prop; + view.placeholderLabel.text = (NSString *) prop; } else if ([name isEqualToString:@"hintTextColor"]) { view.placeholderLabel.textColor = DoricColor(prop); } else if ([name isEqualToString:@"onTextChange"]) { if ([prop isKindOfClass:[NSString class]]) { self.onTextChange = ^(NSString *text, DoricInputNode *node) { - [node callJSResponse:prop,text,nil]; + [node callJSResponse:prop, text, nil]; }; - }else { + } else { self.onTextChange = nil; } } else if ([name isEqualToString:@"onFocusChange"]) { if ([prop isKindOfClass:[NSString class]]) { self.onFocusShange = ^(BOOL focused, DoricInputNode *node) { - [node callJSResponse:prop,@(focused),nil]; + [node callJSResponse:prop, @(focused), nil]; }; - }else { + } else { self.onFocusShange = nil; } } else if ([name isEqualToString:@"maxLength"]) { self.maxLength = prop; - } - else if([name isEqualToString:@"inputType"]){ + } else if ([name isEqualToString:@"inputType"]) { switch ([prop integerValue]) { case 1: { -// [self.view setKeyboardType: UIKeyboardTypeNumberPad ]; + [self.view setKeyboardType:UIKeyboardTypeNumberPad]; break; } case 2: { - [self.view setKeyboardType: UIKeyboardTypeDecimalPad]; + [self.view setKeyboardType:UIKeyboardTypeDecimalPad]; break; } case 3: { - [self.view setKeyboardType: UIKeyboardTypeAlphabet]; + [self.view setKeyboardType:UIKeyboardTypeAlphabet]; break; } case 4: { - [self.view setKeyboardType: UIKeyboardTypePhonePad]; + [self.view setKeyboardType:UIKeyboardTypePhonePad]; break; } default: { + [self.view setKeyboardType:UIKeyboardTypeDefault]; break; } } - } - else { + } else { [super blendView:view forPropName:name propValue:prop]; } } @@ -164,12 +164,13 @@ - (void)blendView:(DoricInputView *)view forPropName:(NSString *)name propValue: - (void)blend:(NSDictionary *)props { [super blend:props]; } + - (void)afterBlended:(NSDictionary *)props { [super afterBlended:props]; if (self.view.doricLayout.paddingTop != self.view.textContainerInset.top - || self.view.doricLayout.paddingLeft != self.view.textContainerInset.left - || self.view.doricLayout.paddingBottom != self.view.textContainerInset.bottom - || self.view.doricLayout.paddingRight != self.view.textContainerInset.right) { + || self.view.doricLayout.paddingLeft != self.view.textContainerInset.left + || self.view.doricLayout.paddingBottom != self.view.textContainerInset.bottom + || self.view.doricLayout.paddingRight != self.view.textContainerInset.right) { self.view.textContainerInset = UIEdgeInsetsMake(self.view.doricLayout.paddingTop, self.view.doricLayout.paddingLeft, self.view.doricLayout.paddingBottom, self.view.doricLayout.paddingRight); } self.view.placeholderLabel.font = self.view.font; @@ -182,6 +183,7 @@ - (void)requestLayout { } #pragma mark - Doric-JS api + - (NSString *)getText { return self.view.text; } @@ -189,12 +191,12 @@ - (NSString *)getText { - (void)setSelection:(NSDictionary *)params withPromise:(DoricPromise *)promise { NSString *start = params[@"start"]; NSString *end = params[@"end"]; - + if (([start isKindOfClass:[NSString class]] || [start isKindOfClass:[NSNumber class]]) && - ([start isKindOfClass:[NSString class]] || [start isKindOfClass:[NSNumber class]])) { + ([start isKindOfClass:[NSString class]] || [start isKindOfClass:[NSNumber class]])) { self.view.selectedRange = NSMakeRange(start.intValue, end.intValue - start.intValue); } - + [promise resolve:nil]; } @@ -207,12 +209,14 @@ - (void)releaseFocus { } #pragma mark - UITextViewDelegate + - (BOOL)textViewShouldBeginEditing:(UITextView *)textView { if (self.onFocusShange) { self.onFocusShange(YES, self); } return YES; } + - (BOOL)textViewShouldEndEditing:(UITextView *)textView { if (self.onFocusShange) { self.onFocusShange(NO, self); @@ -235,24 +239,24 @@ - (void)textViewDidChange:(UITextView *)textView { } -- (NSString *)limitToHansMaxLength:(NSUInteger)maxLen text:(NSString *)text{ +- (NSString *)limitToHansMaxLength:(NSUInteger)maxLen text:(NSString *)text { NSUInteger asciiMaxLen = 2 * maxLen; __block NSUInteger asciiLen = 0; __block NSUInteger subStringRangeLen = 0; [text enumerateSubstringsInRange:NSMakeRange(0, text.length) options:NSStringEnumerationByComposedCharacterSequences usingBlock:^(NSString *substring, NSRange substringRange, NSRange enclosingRange, BOOL *stop) { - if ([substring canBeConvertedToEncoding:NSASCIIStringEncoding]) { - asciiLen += 2; - } else { - asciiLen += [substring lengthOfBytesUsingEncoding:NSUTF16StringEncoding]; - } - if (asciiLen <= asciiMaxLen) { - subStringRangeLen = substringRange.location + substringRange.length; - } else { - *stop = YES; - } - }]; + if ([substring canBeConvertedToEncoding:NSASCIIStringEncoding]) { + asciiLen += 2; + } else { + asciiLen += [substring lengthOfBytesUsingEncoding:NSUTF16StringEncoding]; + } + if (asciiLen <= asciiMaxLen) { + subStringRangeLen = substringRange.location + substringRange.length; + } else { + *stop = YES; + } + }]; return [text substringWithRange:NSMakeRange(0, subStringRangeLen)]; } @end diff --git a/doric-js/src/widget/input.ts b/doric-js/src/widget/input.ts index 09c8e133..4f29f118 100644 --- a/doric-js/src/widget/input.ts +++ b/doric-js/src/widget/input.ts @@ -32,7 +32,7 @@ export class Input extends View { @Property hintText?: string - + @Property inputType?: InputType @@ -74,12 +74,12 @@ export class Input extends View { } } -export enum InputType{ +export enum InputType { Default = 0, Number = 1, - NumberSigned = 2, + Decimal = 2, Alphabet = 3,