Browse Source

@liuql6 @IPUVoice

秋林 3 years ago
parent
commit
be79b9506b

BIN
IPUFrameworks/IPUMobileFunc.framework/Frameworks/IPUFoundation.framework/IPUFoundation


BIN
IPUFrameworks/IPUMobileFunc.framework/Frameworks/IPUFoundation.framework/Info.plist


BIN
IPUFrameworks/IPUMobileFunc.framework/Frameworks/IPUMobile.framework/IPUMobile


BIN
IPUFrameworks/IPUMobileFunc.framework/Frameworks/IPUMobile.framework/Info.plist


BIN
IPUFrameworks/IPUMobileFunc.framework/IPUMobileFunc


+ 0 - 1
IPUFrameworks/IPUMobileUI.framework/Headers/IPUMobileUI.h

@ -35,4 +35,3 @@ FOUNDATION_EXPORT const unsigned char IPUMobileUIVersionString[];
35 35
#import <IPUMobileUI/CoreLockConst.h>
36 36
#import <IPUMobileUI/CoreLockViewController.h>
37 37
#import <IPUMobileUI/IPUVideoRecordViewController.h>
38
#import <IPUMobileUI/IPUFilePreViewController.h>

BIN
IPUFrameworks/IPUMobileUI.framework/IPUMobileUI


BIN
IPUFrameworks/IPUMobileUI.framework/Info.plist


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

@ -12,12 +12,12 @@
12 12
		<key>IPUMobileFunc.xcscheme_^#shared#^_</key>
13 13
		<dict>
14 14
			<key>orderHint</key>
15
			<integer>0</integer>
15
			<integer>2</integer>
16 16
		</dict>
17 17
		<key>IPUMobileFuncBundle.xcscheme_^#shared#^_</key>
18 18
		<dict>
19 19
			<key>orderHint</key>
20
			<integer>1</integer>
20
			<integer>47</integer>
21 21
		</dict>
22 22
		<key>IPUMobileFuncResource.xcscheme</key>
23 23
		<dict>

+ 21 - 15
IPUMobileFunc/IPUMobileFunc/IPUMobileUIPlugin.m

@ -672,26 +672,31 @@
672 672
//调用原生的时间选择器供用户选择,返回用户选择的时间。
673 673
- (void)date:(NSArray *)param {
674 674
    IPUDatePickerStyle datePickerStyle = IPUDatePickerStyleShowYearMonthDay;
675
    NSString *format = param[1];
676
    NSString *time = param[0];
675
676
    NSString *format = @"yyyy-MM-dd";
677
    if (param.count > 1 &&
678
        [param[1] isKindOfClass:[NSString class]] &&
679
        [param[1] length] > 0) {
680
        format = param[1];
681
    }
682
    
683
    NSString *time = @"";
684
    if (param.count &&
685
        [param[0] isKindOfClass:[NSString class]] &&
686
        [param[0] length] > 0) {
687
        time = param[0];
688
    } else {
689
        NSDate *date = [NSDate date];
690
        NSDateFormatter *dateFormatter1 = [[NSDateFormatter alloc] init];
691
        [dateFormatter1 setDateFormat:format];
692
        [dateFormatter1 setTimeZone:[NSTimeZone timeZoneWithName:@"Asia/Shanghai"]];
693
        time = [dateFormatter1 stringFromDate:date];
694
    }
677 695
    
678 696
    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
679 697
    
680 698
    if ([self isValidate:@"HH.*MM.*" withStr:[format uppercaseString]]) {
681 699
        datePickerStyle = IPUDatePickerStyleShowHourMinute;
682
        
683
        // 构造完成的初始化时间
684
        NSDate *now = [NSDate date];
685
        NSDateFormatter *dateFormatter1 = [[NSDateFormatter alloc] init];
686
        [dateFormatter1 setDateFormat:@"yyyy-MM-dd"];
687
        [dateFormatter1 setTimeZone:[NSTimeZone timeZoneWithName:@"Asia/Shanghai"]];
688
        NSString *nowString = [dateFormatter1 stringFromDate:now];
689
        time = [nowString stringByAppendingFormat:@" %@", time];
690
        
691
        NSString *format = @"yyyy-MM-dd HH:mm:ss";
692
        
693
        [dateFormatter setDateFormat:format];
694
        [dateFormatter setTimeZone:[NSTimeZone timeZoneWithName:@"Asia/Shanghai"]];
695 700
    } else if ([self isValidate:@"YYYY.*MM.*DD" withStr:[format uppercaseString]]) {
696 701
        datePickerStyle = IPUDatePickerStyleShowYearMonthDay;
697 702
        
@ -722,6 +727,7 @@
722 727
    [dateFormatter setTimeZone:[NSTimeZone timeZoneWithName:@"Asia/Shanghai"]];
723 728
    
724 729
    NSDate *date = [dateFormatter dateFromString:time];
730
    [IPUDatePicker setDateLabelColor:[UIColor colorWithRed:(247/255.0) green:(133/255.0) blue:(51/255.0) alpha:1.0]];
725 731
    IPUDatePicker *datePicker = [[IPUDatePicker alloc] initWithDateStyle:datePickerStyle
726 732
                                                            scrollToDate:date
727 733
                                                           completeBlock:^(NSDate * _Nonnull selectedDate) {

+ 1 - 1
IPUMobileFunc/IPUMobileFunc/Utils/IPUNFCManager.m

@ -102,7 +102,7 @@
102 102
}
103 103
104 104
// 读取成功回调iOS13
105
- (void)readerSession:(NFCNDEFReaderSession *)session didDetectTags:(NSArray<__kindof id<NFCNDEFTag>> *)tags API_AVAILABLE(ios(13.0)) API_UNAVAILABLE(watchos, macos, tvos){
105
- (void)readerSession:(NFCNDEFReaderSession *)session didDetectTags:(NSArray<__kindof id<NFCNDEFTag>> *)tags API_AVAILABLE(ios(13.0)) API_UNAVAILABLE(macos, tvos) {
106 106
    dispatch_async(dispatch_get_main_queue(), ^{
107 107
        if (tags.count > 1) {
108 108
            session.alertMessage = @"存在多个标签";

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

@ -2,6 +2,12 @@
2 2
<Workspace
3 3
   version = "1.0">
4 4
   <FileRef
5
      location = "group:../../iOS/IPUMobileUI/IPUMobileUI.xcodeproj">
6
   </FileRef>
7
   <FileRef
8
      location = "group:../IPUMobileFunc/IPUMobileFunc.xcodeproj">
9
   </FileRef>
10
   <FileRef
5 11
      location = "group:../../iOS/IPUMobile/IPUMobile.xcodeproj">
6 12
   </FileRef>
7 13
   <FileRef

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


+ 6 - 38
display-center/display-center.xcworkspace/xcuserdata/benny.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@ -34,49 +34,17 @@
34 34
      <BreakpointProxy
35 35
         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
36 36
         <BreakpointContent
37
            uuid = "8BBA2465-BE05-4C5E-B9F1-6F0F04A973A1"
37
            uuid = "254C637C-4AD8-4FA2-843A-AB2DA9A908EE"
38 38
            shouldBeEnabled = "Yes"
39 39
            ignoreCount = "0"
40 40
            continueAfterRunningActions = "No"
41
            filePath = "../../iOS/IPUFoundation/IPUFoundation/IPUUtility.m"
41
            filePath = "../IPUMobileFunc/IPUMobileFunc/IPUMobileUIPlugin.m"
42 42
            startingColumnNumber = "9223372036854775807"
43 43
            endingColumnNumber = "9223372036854775807"
44
            startingLineNumber = "25"
45
            endingLineNumber = "25"
46
            landmarkName = "CheckAppSignatureInformation(sign)"
47
            landmarkType = "9">
48
            <Locations>
49
               <Location
50
                  uuid = "8BBA2465-BE05-4C5E-B9F1-6F0F04A973A1 - b42cc360c185592f"
51
                  shouldBeEnabled = "Yes"
52
                  ignoreCount = "0"
53
                  continueAfterRunningActions = "No"
54
                  symbolName = "CheckAppSignatureInfomation"
55
                  moduleName = "IPUFoundation"
56
                  usesParentBreakpointCondition = "Yes"
57
                  urlString = "file:///Users/benny/iOS/IPUFoundation/IPUFoundation/IPUUtility.m"
58
                  startingColumnNumber = "9223372036854775807"
59
                  endingColumnNumber = "9223372036854775807"
60
                  startingLineNumber = "25"
61
                  endingLineNumber = "25"
62
                  offsetFromSymbolStart = "24">
63
               </Location>
64
               <Location
65
                  uuid = "8BBA2465-BE05-4C5E-B9F1-6F0F04A973A1 - 9f5a5ff7e0173e9c"
66
                  shouldBeEnabled = "Yes"
67
                  ignoreCount = "0"
68
                  continueAfterRunningActions = "No"
69
                  symbolName = "CheckAppSignatureInformation"
70
                  moduleName = "IPUFoundation"
71
                  usesParentBreakpointCondition = "Yes"
72
                  urlString = "file:///Users/benny/iOS/IPUFoundation/IPUFoundation/IPUUtility.m"
73
                  startingColumnNumber = "9223372036854775807"
74
                  endingColumnNumber = "9223372036854775807"
75
                  startingLineNumber = "25"
76
                  endingLineNumber = "25"
77
                  offsetFromSymbolStart = "24">
78
               </Location>
79
            </Locations>
44
            startingLineNumber = "674"
45
            endingLineNumber = "674"
46
            landmarkName = "-date:"
47
            landmarkType = "7">
80 48
         </BreakpointContent>
81 49
      </BreakpointProxy>
82 50
   </Breakpoints>