Skip to content

Commit 190e082

Browse files
HDB-LiHDB-Li
authored
Merge pull request #80 from HDB-Li/1.3.7
1.3.7
2 parents 5a5e453 + eb0a600 commit 190e082

245 files changed

Lines changed: 6033 additions & 1753 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## [1.3.7](https://github.com/HDB-Li/LLDebugTool/releases/tag/1.3.7) (11/21/2019)
2+
3+
### `Mock Location` function and split into components.
4+
5+
* Split into components, you can now integrate only a few components by `LLDebugTool/{subspec}`, such as `LLDebugTool/Network`、`LLDebugTool/Log`.
6+
* New `Mock Location` function, now you can mock location to anywhere at anytime. Support `CLLocationManager` and `MKMapView`.
7+
* Support `generate_multiple_pod_projects` in podfile.
8+
19
## [1.3.6](https://github.com/HDB-Li/LLDebugTool/releases/tag/1.3.6) (11/07/2019)
210

311
### Optimize functional experience

‎LLDebugTool.podspec‎

Lines changed: 106 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "LLDebugTool"
3-
s.version = "1.3.6"
3+
s.version = "1.3.7"
44
s.summary = "LLDebugTool is a debugging tool for developers and testers that can help you analyze and manipulate data in non-xcode situations."
55
s.homepage = "https://github.com/HDB-Li/LLDebugTool"
66
s.license = "MIT"
@@ -9,10 +9,110 @@ Pod::Spec.new do |s|
99
s.platform = :ios, "8.0"
1010
s.source = { :git => "https://github.com/HDB-Li/LLDebugTool.git", :tag => s.version }
1111
s.requires_arc = true
12-
s.public_header_files = "LLDebugTool/LLDebug.h", "LLDebugTool/DebugTool/*.h"
13-
s.source_files = "LLDebugTool/**/*.{h,m}"
14-
s.resources = "LLDebugTool/**/*.{xib,storyboard,bundle}"
15-
s.frameworks = "Foundation", "UIKit", "Photos", "SystemConfiguration", "CoreTelephony", "QuickLook", "WebKit"
16-
s.dependency "FMDB", "~> 2.0"
1712

13+
s.subspec 'Network' do |ss|
14+
ss.public_header_files = "LLDebugTool/Core/Component/Network/**/*.h"
15+
ss.source_files = "LLDebugTool/Core/Component/Network/**/*.{h,m}"
16+
ss.frameworks = "SystemConfiguration", "CoreTelephony"
17+
ss.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'LLDEBUGTOOL_NETWORK=1'}
18+
ss.dependency "LLDebugTool/Storage"
19+
end
20+
21+
s.subspec 'Log' do |ss|
22+
ss.public_header_files = "LLDebugTool/Core/Component/Log/**/*.h"
23+
ss.source_files = "LLDebugTool/Core/Component/Log/**/*.{h,m}"
24+
ss.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'LLDEBUGTOOL_LOG=1'}
25+
ss.dependency "LLDebugTool/Storage"
26+
end
27+
28+
s.subspec 'Crash' do |ss|
29+
ss.public_header_files = "LLDebugTool/Core/Component/Crash/**/*.h"
30+
ss.source_files = "LLDebugTool/Core/Component/Crash/**/*.{h,m}"
31+
ss.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'LLDEBUGTOOL_CRASH=1'}
32+
ss.dependency "LLDebugTool/Storage"
33+
end
34+
35+
s.subspec 'AppInfo' do |ss|
36+
ss.public_header_files = "LLDebugTool/Core/Component/AppInfo/**/*.h"
37+
ss.source_files = "LLDebugTool/Core/Component/AppInfo/**/*.{h,m}"
38+
ss.frameworks = "SystemConfiguration"
39+
ss.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'LLDEBUGTOOL_APP_INFO=1'}
40+
ss.dependency "LLDebugTool/Core"
41+
end
42+
43+
s.subspec 'Sandbox' do |ss|
44+
ss.public_header_files = "LLDebugTool/Core/Component/Sandbox/**/*.h"
45+
ss.source_files = "LLDebugTool/Core/Component/Sandbox/**/*.{h,m}"
46+
ss.frameworks = "QuickLook"
47+
ss.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'LLDEBUGTOOL_SANDBOX=1'}
48+
ss.dependency "LLDebugTool/Core"
49+
end
50+
51+
s.subspec 'Screenshot' do |ss|
52+
ss.public_header_files = "LLDebugTool/Core/Component/Screenshot/**/*.h"
53+
ss.source_files = "LLDebugTool/Core/Component/Screenshot/**/*.{h,m}"
54+
ss.frameworks = "Photos"
55+
ss.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'LLDEBUGTOOL_SCREENSHOT=1'}
56+
ss.dependency "LLDebugTool/Core"
57+
end
58+
59+
s.subspec 'Hierarchy' do |ss|
60+
ss.public_header_files = "LLDebugTool/Core/Component/Hierarchy/**/*.h"
61+
ss.source_files = "LLDebugTool/Core/Component/Hierarchy/**/*.{h,m}"
62+
ss.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'LLDEBUGTOOL_HIERARCHY=1'}
63+
ss.dependency "LLDebugTool/Core"
64+
end
65+
66+
s.subspec 'Magnifier' do |ss|
67+
ss.public_header_files = "LLDebugTool/Core/Component/Magnifier/**/*.h"
68+
ss.source_files = "LLDebugTool/Core/Component/Magnifier/**/*.{h,m}"
69+
ss.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'LLDEBUGTOOL_MAGNIFIER=1'}
70+
ss.dependency "LLDebugTool/Core"
71+
end
72+
73+
s.subspec 'Ruler' do |ss|
74+
ss.public_header_files = "LLDebugTool/Core/Component/Ruler/**/*.h"
75+
ss.source_files = "LLDebugTool/Core/Component/Ruler/**/*.{h,m}"
76+
ss.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'LLDEBUGTOOL_RULER=1'}
77+
ss.dependency "LLDebugTool/Core"
78+
end
79+
80+
s.subspec 'WidgetBorder' do |ss|
81+
ss.public_header_files = "LLDebugTool/Core/Component/WidgetBorder/**/*.h"
82+
ss.source_files = "LLDebugTool/Core/Component/WidgetBorder/**/*.{h,m}"
83+
ss.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'LLDEBUGTOOL_WIDGET_BORDER=1'}
84+
ss.dependency "LLDebugTool/Core"
85+
end
86+
87+
s.subspec 'Html' do |ss|
88+
ss.public_header_files = "LLDebugTool/Core/Component/Html/**/*.h"
89+
ss.source_files = "LLDebugTool/Core/Component/Html/**/*.{h,m}"
90+
ss.frameworks = "WebKit"
91+
ss.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'LLDEBUGTOOL_HTML=1'}
92+
ss.dependency "LLDebugTool/Core"
93+
end
94+
95+
s.subspec 'Location' do |ss|
96+
ss.public_header_files = "LLDebugTool/Core/Component/Location/**/*.h"
97+
ss.source_files = "LLDebugTool/Core/Component/Location/**/*.{h,m}"
98+
ss.frameworks = "CoreLocation", "MapKit"
99+
ss.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'LLDEBUGTOOL_LOCATION=1'}
100+
ss.dependency "LLDebugTool/Core"
101+
end
102+
103+
# Primary
104+
s.subspec 'Storage' do |ss|
105+
ss.public_header_files = "LLDebugTool/Core/Storage/**/*.h"
106+
ss.source_files = "LLDebugTool/Core/Storage/**/*.{h,m}"
107+
ss.dependency "LLDebugTool/Core"
108+
ss.dependency "FMDB", "~> 2.0"
109+
end
110+
111+
# Primary
112+
s.subspec 'Core' do |ss|
113+
ss.public_header_files = "LLDebugTool/LLDebug.h", "LLDebugTool/DebugTool/*.h", "LLDebugTool/Core/Others/**/*.h"
114+
ss.source_files = "LLDebugTool/LLDebug.h", "LLDebugTool/DebugTool/*.{h,m}", "LLDebugTool/Core/Others/**/*.{h,m}"
115+
ss.resources = "LLDebugTool/Core/Others/**/*.{xib,storyboard,bundle}"
116+
end
117+
18118
end

‎LLDebugTool/Core/Component/AppInfo/Function/LLAppInfoHelper.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
#import <mach-o/arch.h>
2929
#import <mach/mach.h>
3030

31-
#import "LLNetworkHelper.h"
32-
#import "LLMacros.h"
31+
#import "LLInternalMacros.h"
3332

34-
#import "UIDevice+LL_Utils.h"
33+
#import "UIDevice+LL_AppInfo.h"
3534
#import "NSObject+LL_Utils.h"
35+
#import "LLRouter+Network.h"
3636

3737
static LLAppInfoHelper *_instance = nil;
3838

@@ -461,7 +461,7 @@ - (NSString *)currentWifiSSID
461461

462462
- (NSString *)currentNetworkStatusDescription {
463463
NSString *returnValue = @"Unknown";
464-
switch ([[LLNetworkHelper shared] currentNetworkStatus]) {
464+
switch ([LLRouter networkStateFromStatebar]) {
465465
case LLNetworkStatusNotReachable:{
466466
returnValue = @"Unknown";
467467
}

LLDebugTool/Core/Others/Category/UIDevice/UIDevice+LL_Utils.h renamed to LLDebugTool/Core/Component/AppInfo/Function/UIDevice/UIDevice+LL_AppInfo.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// UIDevice+LL_Utils.h
2+
// UIDevice+LL_AppInfo.h
33
//
44
// Copyright (c) 2018 LLDebugTool Software Foundation (https://github.com/HDB-Li/LLDebugTool)
55
//
@@ -26,7 +26,7 @@
2626
NS_ASSUME_NONNULL_BEGIN
2727

2828
/// UIDevice utils.
29-
@interface UIDevice (LL_Utils)
29+
@interface UIDevice (LL_AppInfo)
3030
/**
3131
* Change platform name to model name, such as change "iPhone10,6" to "iPhone X".
3232
*/

LLDebugTool/Core/Others/Category/UIDevice/UIDevice+LL_Utils.m renamed to LLDebugTool/Core/Component/AppInfo/Function/UIDevice/UIDevice+LL_AppInfo.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// UIDevice+LL_Utils.m
2+
// UIDevice+LL_AppInfo.m
33
//
44
// Copyright (c) 2018 LLDebugTool Software Foundation (https://github.com/HDB-Li/LLDebugTool)
55
//
@@ -21,15 +21,15 @@
2121
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2222
// SOFTWARE.
2323

24-
#import "UIDevice+LL_Utils.h"
24+
#import "UIDevice+LL_AppInfo.h"
2525

2626
#import <sys/sysctl.h>
2727

2828
#import "NSObject+LL_Runtime.h"
2929

3030
static const char kLLModelNameKey;
3131

32-
@implementation UIDevice (LL_Utils)
32+
@implementation UIDevice (LL_AppInfo)
3333

3434
- (NSString *)LL_modelName {
3535
NSString *name = [self LL_getStringProperty:&kLLModelNameKey];

‎LLDebugTool/Core/Component/AppInfo/LLAppInfo.h‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
//
2+
// LLAppInfo.h
3+
//
4+
// Copyright (c) 2018 LLDebugTool Software Foundation (https://github.com/HDB-Li/LLDebugTool)
5+
//
6+
// Permission is hereby granted, free of charge, to any person obtaining a copy
7+
// of this software and associated documentation files (the "Software"), to deal
8+
// in the Software without restriction, including without limitation the rights
9+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
// copies of the Software, and to permit persons to whom the Software is
11+
// furnished to do so, subject to the following conditions:
12+
//
13+
// The above copyright notice and this permission notice shall be included in all
14+
// copies or substantial portions of the Software.
15+
//
16+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
// SOFTWARE.
23+
24+
#ifndef LLAppInfo_h
25+
#define LLAppInfo_h
26+
27+
#import "LLAppInfoComponent.h"
28+
29+
#import "LLAppInfoHelper.h"
30+
31+
#import "UIDevice+LL_AppInfo.h"
32+
33+
#import "LLAppInfoViewController.h"
34+
#import "LLAppInfoWindow.h"
35+
36+
#import "LLWindowManager+AppInfo.h"
37+
38+
#endif /* LLAppInfo_h */

‎LLDebugTool/Core/Component/AppInfo/LLAppInfoComponent.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525

2626
#import "LLAppInfoViewController.h"
2727
#import "LLNavigationController.h"
28-
#import "LLWindowManager.h"
28+
29+
#import "LLWindowManager+AppInfo.h"
2930

3031
@implementation LLAppInfoComponent
3132

‎LLDebugTool/Core/Component/AppInfo/UserInterface/LLAppInfoViewController.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525

2626
#import "LLTitleCellCategoryModel.h"
2727
#import "LLBaseTableViewCell.h"
28+
#import "LLInternalMacros.h"
2829
#import "LLTitleCellModel.h"
2930
#import "LLAppInfoHelper.h"
3031
#import "LLThemeManager.h"
3132
#import "LLFactory.h"
32-
#import "LLMacros.h"
3333
#import "LLConfig.h"
3434

3535
@interface LLAppInfoViewController ()

‎LLDebugTool/Core/Component/AppInfo/UserInterface/LLWindowManager+AppInfo.h‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
//
2+
// LLWindowManager+AppInfo.h
3+
//
4+
// Copyright (c) 2018 LLDebugTool Software Foundation (https://github.com/HDB-Li/LLDebugTool)
5+
//
6+
// Permission is hereby granted, free of charge, to any person obtaining a copy
7+
// of this software and associated documentation files (the "Software"), to deal
8+
// in the Software without restriction, including without limitation the rights
9+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
// copies of the Software, and to permit persons to whom the Software is
11+
// furnished to do so, subject to the following conditions:
12+
//
13+
// The above copyright notice and this permission notice shall be included in all
14+
// copies or substantial portions of the Software.
15+
//
16+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
// SOFTWARE.
23+
24+
#import "LLWindowManager.h"
25+
26+
#import "LLAppInfoWindow.h"
27+
28+
NS_ASSUME_NONNULL_BEGIN
29+
30+
@interface LLWindowManager (AppInfo)
31+
32+
/**
33+
AppInfo window
34+
35+
@return LLAppInfoWindow.
36+
*/
37+
+ (LLAppInfoWindow *)appInfoWindow;
38+
39+
@end
40+
41+
NS_ASSUME_NONNULL_END

‎LLDebugTool/Core/Component/AppInfo/UserInterface/LLWindowManager+AppInfo.m‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
//
2+
// LLWindowManager+AppInfo.m
3+
//
4+
// Copyright (c) 2018 LLDebugTool Software Foundation (https://github.com/HDB-Li/LLDebugTool)
5+
//
6+
// Permission is hereby granted, free of charge, to any person obtaining a copy
7+
// of this software and associated documentation files (the "Software"), to deal
8+
// in the Software without restriction, including without limitation the rights
9+
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
// copies of the Software, and to permit persons to whom the Software is
11+
// furnished to do so, subject to the following conditions:
12+
//
13+
// The above copyright notice and this permission notice shall be included in all
14+
// copies or substantial portions of the Software.
15+
//
16+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
22+
// SOFTWARE.
23+
24+
#import "LLWindowManager+AppInfo.h"
25+
26+
@implementation LLWindowManager (AppInfo)
27+
28+
+ (LLAppInfoWindow *)appInfoWindow {
29+
return (LLAppInfoWindow *)[self createWindowWithClassName:NSStringFromClass([LLAppInfoWindow class])];
30+
}
31+
32+
@end

0 commit comments

Comments
 (0)