Merge pull request didi#36 from EFRenovation/master

Add removePluginWithPluginName

Author: yixiangboy

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

@@ -15,12 +15,16 @@ typedef void (^DoraemonH5DoorBlock)(NSString *);
 
 - (void)install;
 
+- (void)installWithCustomBlock:(void(^)())customBlock;
+
 @property (nonatomic,strong) NSMutableArray *dataArray;
 
 @property (nonatomic, copy) DoraemonH5DoorBlock h5DoorBlock;
 
 - (void)addPluginWithTitle:(NSString *)title icon:(NSString *)iconName desc:(NSString *)desc pluginName:(NSString *)entryName atModule:(NSString *)moduleName;
 
+- (void)removePluginWithPluginName:(NSString *)pluginName atModule:(NSString *)moduleName;
+
 - (void)addStartPlugin:(NSString *)pluginName;
 
 - (void)addH5DoorBlock:(void(^)(NSString *h5Url))block;

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

@@ -55,6 +55,12 @@ + (DoraemonManager *)shareInstance{
 }
 
 - (void)install{
+    [self installWithCustomBlock:^{
+        //什么也没发生
+    }];
+}
+
+- (void)installWithCustomBlock:(void(^)())customBlock{
     for (int i=0; i<_startPlugins.count; i++) {
         NSString *pluginName = _startPlugins[i];
         Class pluginClass = NSClassFromString(pluginName);
@@ -63,8 +69,10 @@ - (void)install{
             [plugin pluginDidLoad];
         }
     }
-    
+
     [self initData];
+    customBlock();
+
     [self initEntry];
 
     //根据开关判断是否收集Crash日志
@@ -190,6 +198,10 @@ - (void)addPluginWithTitle:(NSString *)title icon:(NSString *)iconName desc:(NSS
     }
 }
 
+- (void)removePluginWithPluginName:(NSString *)pluginName atModule:(NSString *)moduleName{
+    [self unregisterPlugin:pluginName withModule:moduleName];
+}
+
 - (void)registerPluginArray:(NSMutableArray*)array withModule:(NSString*)moduleName{
     if (!_dataArray){
         _dataArray = [[NSMutableArray alloc]init];
@@ -200,6 +212,27 @@ - (void)registerPluginArray:(NSMutableArray*)array withModule:(NSString*)moduleN
     [_dataArray addObject:dic];
 }
 
+- (void)unregisterPlugin:(NSString*)pluginName withModule:(NSString*)moduleName{
+    if (!_dataArray){
+        return;
+    }
+    id object;
+    for (object in _dataArray) {
+        NSString *tempModuleName = [((NSMutableDictionary *)object) valueForKey:@"moduleName"];
+        if ([tempModuleName isEqualToString:moduleName]) {
+            NSMutableArray *tempPluginArray = [((NSMutableDictionary *)object) valueForKey:@"pluginArray"];
+            id pluginObject;
+            for (pluginObject in tempPluginArray) {
+                NSString *tempPluginName = [((NSMutableDictionary *)pluginObject) valueForKey:@"pluginName"];
+                if ([tempPluginName isEqualToString:pluginName]) {
+                    [tempPluginArray removeObject:pluginObject];
+                    return;
+                }
+            }
+        }
+    }
+}
+
 - (void)hiddenDoraemon{
     _entryView.hidden = YES;
 }

iOS/DoraemonKitDemo/DoraemonKitDemo.xcodeproj/project.pbxproj

@@ -562,7 +562,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = RSV7DQ57L7;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "DoraemonKitDemo/DoraemonKitDemo-PrefixHeader.pch";
@@ -580,7 +580,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = RSV7DQ57L7;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_BITCODE = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "DoraemonKitDemo/DoraemonKitDemo-PrefixHeader.pch";

iOS/DoraemonKitDemo/DoraemonKitDemo/AppDelegate.m

@@ -30,8 +30,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 //    [[DoraemonManager shareInstance] addH5DoorBlock:^(NSString *h5Url) {
 //        NSLog(@"使用自带容器打开H5链接: %@",h5Url);
 //    }];
-    [[DoraemonManager shareInstance] install];
-    
+    // 例子：移除 GPS Mock
+//    [[DoraemonManager shareInstance] installWithCustomBlock:^{
+//        [[DoraemonManager shareInstance] removePluginWithPluginName:@"DoraemonGPSPlugin" atModule:@"常用工具"];
+//    }];
+
     for (int i=0; i<10; i++) {
        // DDLogInfo(@"点击添加埋点22222");
     }