Merge branch 'master' into release

* master: 修复 KVO cntext 被移除的问题
li6185377 · Nov 23, 2017 · 2c1bcb7 · 2c1bcb7
2 parents bee9f81 + 56f92b3
commit 2c1bcb7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Classes/TableUtils/IMYAOPTableViewUtils.m b/Classes/TableUtils/IMYAOPTableViewUtils.m
@@ -118,17 +118,19 @@ - (void)bindingTableView:(UITableView *)tableView aopClass:(Class)aopClass
     for (id observance in observanceArray) {
         NSString *keyPath = [observance valueForKeyPath:@"_property._keyPath"];
         id observer = [observance valueForKey:@"_observer"];
+        id context = nil;
         if (observer && keyPath) {
             NSKeyValueObservingOptions options = 0;
             @try {
+                context = [observance valueForKey:@"_context"];
                 options = [[observance valueForKey:@"_options"] unsignedIntegerValue];
             } @catch (NSException *exception) {
                 IMYLog(@"%@", exception.debugDescription);
             }
             if (options == 0) {
                 options = (NSKeyValueObservingOptionOld | NSKeyValueObservingOptionNew);
             }
-            [tableView addObserver:observer forKeyPath:keyPath options:options context:nil];
+            [tableView addObserver:observer forKeyPath:keyPath options:options context:(void *)context];
         }
     }
 }