Merge branch 'master' of https://github.com/didi/DoraemonKit

DoraemonKit.podspec

@@ -7,7 +7,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'DoraemonKit'
-  s.version          = '3.0.0'
+  s.version          = '3.0.1'
   s.summary          = 'iOS各式各样的工具集合'
   s.description      = <<-DESC
                           iOS各式各样的工具集合 Desc
@@ -39,6 +39,14 @@ Pod::Spec.new do |s|
     ss.dependency 'CocoaLumberjack'
   end
 
+  s.subspec 'WithGPS' do |ss| 
+    ss.source_files = 'iOS/DoraemonKit/Src/GPS/**/*{.h,.m}'
+    ss.pod_target_xcconfig = {
+      'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) DoraemonWithGPS'
+    }
+    ss.dependency 'DoraemonKit/Core'
+  end
+
   s.subspec 'WithLoad' do |ss| 
     ss.source_files = 'iOS/DoraemonKit/Src/MethodUseTime/**/*{.h,.m}'
     ss.pod_target_xcconfig = {

iOS/DoraemonKit/Src/Core/Define/DoraemonDefine.h

@@ -18,7 +18,7 @@
 #import "DoraemonAlertUtil.h"
 #import "DoraemonUtil.h"
 
-#define DoKitVersion @"3.0.0"
+#define DoKitVersion @"3.0.1"
 #define kbChange(x) x * 1000
 
 //#define DoKit_OpenLog

iOS/DoraemonKit/Src/Core/Manager/DoraemonManager.m

@@ -26,7 +26,11 @@
 #import "DoraemonNetFlowOscillogramWindow.h"
 #import "DoraemonNetFlowManager.h"
 #import "DoraemonHealthManager.h"
+
+#if DoraemonWithGPS
 #import "DoraemonGPSMocker.h"
+#endif
+
 
 #if DoraemonWithLogger
 #import "DoraemonCocoaLumberjackLogger.h"
@@ -147,13 +151,16 @@ typedef void (^DoraemonPerformanceBlock)(NSDictionary *);
     [[DoraemonCacheManager sharedInstance] saveFpsSwitch:NO];
     [[DoraemonCacheManager sharedInstance] saveCpuSwitch:NO];
     [[DoraemonCacheManager sharedInstance] saveMemorySwitch:NO];
-    
+
+#if DoraemonWithGPS
     //开启mockGPS功能
     if ([[DoraemonCacheManager sharedInstance] mockGPSSwitch]) {
         CLLocationCoordinate2D coordinate = [[DoraemonCacheManager sharedInstance] mockCoordinate];
         CLLocation *loc = [[CLLocation alloc] initWithLatitude:coordinate.latitude longitude:coordinate.longitude];
         [[DoraemonGPSMocker shareInstance] mockPoint:loc];
     }
+#endif
+
     
     //开启NSLog监控功能
     if ([[DoraemonCacheManager sharedInstance] nsLogSwitch]) {
@@ -212,7 +219,10 @@ typedef void (^DoraemonPerformanceBlock)(NSDictionary *);
     [self addPluginWithPluginType:DoraemonManagerPluginType_DoraemonAppSettingPlugin];
     [self addPluginWithPluginType:DoraemonManagerPluginType_DoraemonAppInfoPlugin];
     [self addPluginWithPluginType:DoraemonManagerPluginType_DoraemonSandboxPlugin];
+#if DoraemonWithGPS
     [self addPluginWithPluginType:DoraemonManagerPluginType_DoraemonGPSPlugin];
+#endif
+
     [self addPluginWithPluginType:DoraemonManagerPluginType_DoraemonH5Plugin];
     [self addPluginWithPluginType:DoraemonManagerPluginType_DoraemonDeleteLocalDataPlugin];
     

iOS/DoraemonKitDemo/Podfile

@@ -17,12 +17,11 @@ target :'DoraemonKitDemo' do
   #pod 'WeexSDK', :git => 'git@github.com:apache/incubator-weex.git', :tag => '0.26.0'
   #pod 'DoraemonKit', :subspecs => ['Core','WithLogger','WithGPS','WithLoad','WithWeex', 'WithDatabase', 'WithMLeaksFinder'],  :path => '../../'
   #pod 'DoraemonKit', :subspecs => ['Core'],  :path => '../../'
-  pod 'DoraemonKit', :subspecs => ['Core','WithLogger','WithLoad','WithDatabase', 'WithMLeaksFinder','WithWeex'], :path => '../../'
+  pod 'DoraemonKit', :subspecs => ['Core','WithLogger','WithGPS','WithLoad','WithDatabase', 'WithMLeaksFinder','WithWeex'], :path => '../../'
   pod 'AFNetworking','2.6.3'
   pod 'SDWebImage', '5.0.6'
   pod 'FBRetainCycleDetector', :git => 'https://github.com/facebook/FBRetainCycleDetector.git', :configurations => ['Debug']
   #pod 'fishhook', :git => 'git@github.com:facebook/fishhook.git', :configurations => ['Debug']
   pod 'YYDebugDatabase', :git => 'https://github.com/y500/YYDebugDatabase.git', :configurations => ['Debug']
-  #pod 'YYDebugDatabase', '2.0.8'
-  #pod 'FBRetainCycleDetector'
+  #pod 'YYDebugDatabase', '2.'
 end

iOS/DoraemonKitDemo/Podfile.lock

@@ -27,6 +27,8 @@ PODS:
   - DoraemonKit/WithDatabase (3.0.0):
     - DoraemonKit/Core
     - YYDebugDatabase
+  - DoraemonKit/WithGPS (3.0.0):
+    - DoraemonKit/Core
   - DoraemonKit/WithLoad (3.0.0):
     - DoraemonKit/Core
   - DoraemonKit/WithLogger (3.0.0):
@@ -61,6 +63,7 @@ DEPENDENCIES:
   - AFNetworking (= 2.6.3)
   - DoraemonKit/Core (from `../../`)
   - DoraemonKit/WithDatabase (from `../../`)
+  - DoraemonKit/WithGPS (from `../../`)
   - DoraemonKit/WithLoad (from `../../`)
   - DoraemonKit/WithLogger (from `../../`)
   - DoraemonKit/WithMLeaksFinder (from `../../`)
@@ -99,7 +102,7 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
   AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
   CocoaLumberjack: b17ae15142558d08bbacf69775fa10c4abbebcc9
-  DoraemonKit: a3255b1f1066637cd7fd9ccf45a593db37d4b27c
+  DoraemonKit: 4ad75a74374d836425e947f0f891157cacfdcf46
   FBRetainCycleDetector: 46daef95c2dfa9be34b53087edf6a8f34e4c749c
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
   GCDWebServer: c0ab22c73e1b84f358d1e2f74bf6afd1c60829f2
@@ -109,6 +112,6 @@ SPEC CHECKSUMS:
   WXDevtool: 95b70c73c06fc3299d65bd53ba4b3e0b0087f3cb
   YYDebugDatabase: 037486297a7dd40bc50e2c6df5de7b4ad24c9c17
 
-PODFILE CHECKSUM: 668dc9b43df6b1e4d1d71a99513ac5163b99dd0d
+PODFILE CHECKSUM: 7a8747c43556c3802052b3c7a3dd58be79fc5331
 
 COCOAPODS: 1.8.4