Skip to content

Commit ae81561

Browse files
DevDragonLiDevDragonLi
committed
【1.1.3】OC版本单利函数名调整兼容Swift引入调用问题
1 parent 813d02f commit ae81561

5 files changed

Lines changed: 14 additions & 14 deletions

File tree

‎Podfile.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
PODS:
2-
- iPadSplitScreenKit (1.1.1):
3-
- iPadSplitScreenKit/Swift (= 1.1.1)
4-
- iPadSplitScreenKit/ObjC (1.1.1)
5-
- iPadSplitScreenKit/Swift (1.1.1)
2+
- iPadSplitScreenKit (1.1.3):
3+
- iPadSplitScreenKit/Swift (= 1.1.3)
4+
- iPadSplitScreenKit/ObjC (1.1.3)
5+
- iPadSplitScreenKit/Swift (1.1.3)
66

77
DEPENDENCIES:
88
- iPadSplitScreenKit (from `./`)
@@ -13,7 +13,7 @@ EXTERNAL SOURCES:
1313
:path: "./"
1414

1515
SPEC CHECKSUMS:
16-
iPadSplitScreenKit: 6f2107c175f8ba4171110617556ee4051bcfcf99
16+
iPadSplitScreenKit: b4f148671878191a352e6954ab93ad0662c3d6bc
1717

1818
PODFILE CHECKSUM: 4299f035224cff562b9a12578265e8bc4dbaad9a
1919

‎iPadSplitScreenKit.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "iPadSplitScreenKit"
3-
s.version = "1.1.2"
3+
s.version = "1.1.3"
44
s.summary = "iPadSplitScreenKit"
55

66
s.description = <<-DESC

‎iPadSplitScreenKit/Objc/iPadSplitScreenStatusTool.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#import <iPadSplitScreenKit/iPadSplitScreenDefineHeader.h>
1010

1111
/// BOOL 类型
12-
#define SPLITISFULLSCREEN (iPadSplitScreenStatusTool.tool.fullScreen)
12+
#define SPLITISFULLSCREEN (iPadSplitScreenStatusTool.defaultool.fullScreen)
1313

1414
NS_ASSUME_NONNULL_BEGIN
1515

@@ -42,7 +42,7 @@ NS_ASSUME_NONNULL_BEGIN
4242

4343
- (void)updateScreenInterfaceAttributes;
4444

45-
+ (instancetype)tool;
45+
+ (instancetype)defaultool;
4646

4747

4848
@end

‎iPadSplitScreenKit/Objc/iPadSplitScreenStatusTool.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ @interface iPadSplitScreenStatusTool ()
2424

2525
@implementation iPadSplitScreenStatusTool
2626

27-
+ (instancetype)tool {
27+
+ (instancetype)defaultool {
2828
static iPadSplitScreenStatusTool *tool;
2929
static dispatch_once_t onceToken;
3030
dispatch_once(&onceToken, ^{
3131
tool = [[self alloc] init];
32+
[tool updateCurrentInterfaceOrientation];
3233
});
3334
return tool;
3435
}

‎iPadSplitScreenKit/Objc/iPadSplitScreenVC.m‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ @implementation iPadSplitScreenVC
2222

2323
- (instancetype)init {
2424
if (self = [super init]) {
25-
[iPadSplitScreenStatusTool.tool updateCurrentInterfaceOrientation];
2625
self.lastScreenInterfaceType = SplitUnknown;
2726
}
2827
return self;
@@ -70,9 +69,9 @@ - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIVi
7069

7170
- (void)split_updateViewLayoutDependenciesWithCurrentSize:(CGSize)currentSize {
7271

73-
[iPadSplitScreenStatusTool.tool updateCurrentInterfaceOrientation];
74-
[iPadSplitScreenStatusTool.tool updateCurrentInterfaceSize:currentSize];
75-
[iPadSplitScreenStatusTool.tool updateScreenInterfaceAttributes];
72+
[iPadSplitScreenStatusTool.defaultool updateCurrentInterfaceOrientation];
73+
[iPadSplitScreenStatusTool.defaultool updateCurrentInterfaceSize:currentSize];
74+
[iPadSplitScreenStatusTool.defaultool updateScreenInterfaceAttributes];
7675

7776
[self ipadInterfaceOrientationChanged:ZDInterfaceChanging currentSize:currentSize];
7877

@@ -122,7 +121,7 @@ - (void)split_configScreenWithIsFull:(BOOL)isFullScreen {
122121
}
123122

124123
- (void)split_configLastScreenType {
125-
self.lastScreenInterfaceType = iPadSplitScreenStatusTool.tool.currentScreenInterfaceType;
124+
self.lastScreenInterfaceType = iPadSplitScreenStatusTool.defaultool.currentScreenInterfaceType;
126125
}
127126

128127
@end

0 commit comments

Comments
 (0)