Browse Source

@liuql6 @toast视图缺失图片、修复date插件日期格式判断问题

秋林 3 years ago
parent
commit
ef4c9eadc8

BIN
IPUFrameworks/IPUMobileFunc.bundle/IPUMobileFunc


BIN
IPUFrameworks/IPUMobileFunc.bundle/Info.plist


BIN
IPUFrameworks/IPUMobileFunc.bundle/images/fail@2x.png


BIN
IPUFrameworks/IPUMobileFunc.bundle/images/success@2x.png


BIN
IPUFrameworks/IPUMobileFunc.framework/IPUMobileFunc


BIN
IPUFrameworks/IPUMobileUI.framework/IPUMobileUI


+ 1 - 1
IPUMobileFunc/IPUMobileFunc.xcodeproj/xcuserdata/benny.xcuserdatad/xcschemes/xcschememanagement.plist

17
		<key>IPUMobileFuncBundle.xcscheme_^#shared#^_</key>
17
		<key>IPUMobileFuncBundle.xcscheme_^#shared#^_</key>
18
		<dict>
18
		<dict>
19
			<key>orderHint</key>
19
			<key>orderHint</key>
20
			<integer>47</integer>
20
			<integer>46</integer>
21
		</dict>
21
		</dict>
22
		<key>IPUMobileFuncResource.xcscheme</key>
22
		<key>IPUMobileFuncResource.xcscheme</key>
23
		<dict>
23
		<dict>

+ 5 - 14
IPUMobileFunc/IPUMobileFunc/IPUMobileUIPlugin.m

694
    }
694
    }
695
    
695
    
696
    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
696
    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
697
    
697
    [dateFormatter setTimeZone:[NSTimeZone timeZoneWithName:@"Asia/Shanghai"]];
698
    [dateFormatter setDateFormat:format];
698
    if ([self isValidate:@"HH.*MM.*" withStr:[format uppercaseString]]) {
699
    if ([self isValidate:@"HH.*MM.*" withStr:[format uppercaseString]]) {
699
        datePickerStyle = IPUDatePickerStyleShowHourMinute;
700
        datePickerStyle = IPUDatePickerStyleShowHourMinute;
700
    } else if ([self isValidate:@"YYYY.*MM.*DD" withStr:[format uppercaseString]]) {
701
    } else if ([self isValidate:@"YYYY.*MM.*DD.*" withStr:[format uppercaseString]]) {
701
        datePickerStyle = IPUDatePickerStyleShowYearMonthDay;
702
        datePickerStyle = IPUDatePickerStyleShowYearMonthDay;
702
        
703
        [dateFormatter setDateFormat:format];
704
        [dateFormatter setTimeZone:[NSTimeZone timeZoneWithName:@"Asia/Shanghai"]];
705
    } else if ([self isValidate:@"YYYY.*MM.*" withStr:[format uppercaseString]]) {
703
    } else if ([self isValidate:@"YYYY.*MM.*" withStr:[format uppercaseString]]) {
706
        datePickerStyle = IPUDatePickerStyleShowYearMonthDayHourMinute;
707
708
        [dateFormatter setDateFormat:format];
704
        datePickerStyle = IPUDatePickerStyleShowYearMonth;
709
    } else if ([format isEqual:@"yyyy"] || [format isEqual:@"yyyy年"]) {
705
    } else if ([format isEqual:@"yyyy"] || [format isEqual:@"yyyy年"]) {
710
        datePickerStyle = IPUDatePickerStyleShowYear;
706
        datePickerStyle = IPUDatePickerStyleShowYear;
711
        
712
        [dateFormatter setDateFormat:format];
713
    } else if ([format isEqual:@"MM"] || [format isEqual:@"MM月"]) {
707
    } else if ([format isEqual:@"MM"] || [format isEqual:@"MM月"]) {
714
        datePickerStyle = IPUDatePickerStyleShowMonth;
708
        datePickerStyle = IPUDatePickerStyleShowMonth;
715
    } else if ([format isEqual:@"dd HH:mm"]) {
709
    } else if ([format isEqual:@"dd HH:mm"]) {
718
        datePickerStyle = IPUDatePickerStyleShowMonthDayHourMinute;
712
        datePickerStyle = IPUDatePickerStyleShowMonthDayHourMinute;
719
    } else if ([format isEqual:@"yyyy-MM"]) {
713
    } else if ([format isEqual:@"yyyy-MM"]) {
720
        datePickerStyle = IPUDatePickerStyleShowYearMonth;
714
        datePickerStyle = IPUDatePickerStyleShowYearMonth;
721
        
722
        [dateFormatter setDateFormat:format];
715
        [dateFormatter setDateFormat:format];
723
    } else if ([format isEqual:@"MM-dd"]) {
716
    } else if ([format isEqual:@"MM-dd"]) {
724
        datePickerStyle = IPUDatePickerStyleShowMonthDay;
717
        datePickerStyle = IPUDatePickerStyleShowMonthDay;
725
    }
718
    }
726
    
727
    [dateFormatter setTimeZone:[NSTimeZone timeZoneWithName:@"Asia/Shanghai"]];
728
    
719
        
729
    NSDate *date = [dateFormatter dateFromString:time];
720
    NSDate *date = [dateFormatter dateFromString:time];
730
    [IPUDatePicker setDateLabelColor:[UIColor colorWithRed:(247/255.0) green:(133/255.0) blue:(51/255.0) alpha:1.0]];
721
    [IPUDatePicker setDateLabelColor:[UIColor colorWithRed:(247/255.0) green:(133/255.0) blue:(51/255.0) alpha:1.0]];
731
    IPUDatePicker *datePicker = [[IPUDatePicker alloc] initWithDateStyle:datePickerStyle
722
    IPUDatePicker *datePicker = [[IPUDatePicker alloc] initWithDateStyle:datePickerStyle

+ 6 - 4
IPUMobileFunc/IPUMobileFunc/IPUTipsHUDPlugin.m

367
    NSBundle *bundle = [NSBundle bundleWithPath:bundlestring];
367
    NSBundle *bundle = [NSBundle bundleWithPath:bundlestring];
368
    UIImage *successImg = [UIImage imageNamed:@"images/success" inBundle:bundle compatibleWithTraitCollection:nil];
368
    UIImage *successImg = [UIImage imageNamed:@"images/success" inBundle:bundle compatibleWithTraitCollection:nil];
369
    
369
    
370
    UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 95)];
370
    UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 60, 60)];
371
    view.layer.cornerRadius = 5;
371
    view.layer.cornerRadius = 5;
372
    UIImageView *imgView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, view.width, view.height)];
372
    UIImageView *imgView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 30, 30)];
373
    imgView.center = view.center;
373
    imgView.image = successImg;
374
    imgView.image = successImg;
374
    [view addSubview:imgView];
375
    [view addSubview:imgView];
375
    
376
    
391
    NSBundle *bundle = [NSBundle bundleWithPath:bundlestring];
392
    NSBundle *bundle = [NSBundle bundleWithPath:bundlestring];
392
    UIImage *successImg = [UIImage imageNamed:@"images/fail" inBundle:bundle compatibleWithTraitCollection:nil];
393
    UIImage *successImg = [UIImage imageNamed:@"images/fail" inBundle:bundle compatibleWithTraitCollection:nil];
393
    
394
    
394
    UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 95)];
395
    UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 60, 60)];
395
    view.layer.cornerRadius = 5;
396
    view.layer.cornerRadius = 5;
396
    UIImageView *imgView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, view.width, view.height)];
397
    UIImageView *imgView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 30, 30)];
398
    imgView.center = view.center;
397
    imgView.layer.cornerRadius = 5;
399
    imgView.layer.cornerRadius = 5;
398
    imgView.image = successImg;
400
    imgView.image = successImg;
399
    [view addSubview:imgView];
401
    [view addSubview:imgView];

BIN
IPUMobileFunc/IPUMobileFuncResource/images/fail@2x.png


BIN
IPUMobileFunc/IPUMobileFuncResource/images/success@2x.png


+ 0 - 12
display-center/display-center.xcworkspace/contents.xcworkspacedata

2
<Workspace
2
<Workspace
3
   version = "1.0">
3
   version = "1.0">
4
   <FileRef
4
   <FileRef
5
      location = "group:../../iOS/IPUMobileUI/IPUMobileUI.xcodeproj">
6
   </FileRef>
7
   <FileRef
8
      location = "group:../IPUMobileFunc/IPUMobileFunc.xcodeproj">
9
   </FileRef>
10
   <FileRef
11
      location = "group:../../iOS/IPUMobile/IPUMobile.xcodeproj">
12
   </FileRef>
13
   <FileRef
14
      location = "group:../../iOS/IPUFoundation/IPUFoundation.xcodeproj">
15
   </FileRef>
16
   <FileRef
17
      location = "group:display-center.xcodeproj">
5
      location = "group:display-center.xcodeproj">
18
   </FileRef>
6
   </FileRef>
19
</Workspace>
7
</Workspace>

BIN
display-center/display-center.xcworkspace/xcuserdata/benny.xcuserdatad/UserInterfaceState.xcuserstate


+ 16 - 0
display-center/display-center.xcworkspace/xcuserdata/benny.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

47
            landmarkType = "7">
47
            landmarkType = "7">
48
         </BreakpointContent>
48
         </BreakpointContent>
49
      </BreakpointProxy>
49
      </BreakpointProxy>
50
      <BreakpointProxy
51
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
52
         <BreakpointContent
53
            uuid = "68D8A129-51FA-46E1-B49F-C0BA7B494706"
54
            shouldBeEnabled = "Yes"
55
            ignoreCount = "0"
56
            continueAfterRunningActions = "No"
57
            filePath = "../../iOS/IPUMobileUI/IPUMobileUI/Comp/DatePickerView/IPUDatePicker.m"
58
            startingColumnNumber = "9223372036854775807"
59
            endingColumnNumber = "9223372036854775807"
60
            startingLineNumber = "271"
61
            endingLineNumber = "271"
62
            landmarkName = "-setupUI"
63
            landmarkType = "7">
64
         </BreakpointContent>
65
      </BreakpointProxy>
50
   </Breakpoints>
66
   </Breakpoints>
51
</Bucket>
67
</Bucket>