From 2df6ea47a833ea73422f7bf263b95b62045fa776 Mon Sep 17 00:00:00 2001 From: huangminlinux <380108184@qq.com> Date: Fri, 7 Jul 2017 11:21:14 +0800 Subject: [PATCH] fix setTags/Alias bug --- src/ios/Plugins/JPushPlugin.m | 71 ++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/src/ios/Plugins/JPushPlugin.m b/src/ios/Plugins/JPushPlugin.m index c07adf4..6ca27e2 100644 --- a/src/ios/Plugins/JPushPlugin.m +++ b/src/ios/Plugins/JPushPlugin.m @@ -99,44 +99,47 @@ -(void)setTagsWithAlias:(CDVInvokedUrlCommand*)command{ NSString *alias = [command argumentAtIndex:0]; NSArray *tags = [command argumentAtIndex:1]; - - [JPUSHService setTags:[NSSet setWithArray:tags] - alias:alias - fetchCompletionHandle:^(int iResCode, NSSet *iTags, NSString *iAlias) { - CDVPluginResult *result; - if (iResCode == 0) { - result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:nil]; - } else { - result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:nil]; - } + + [JPUSHService setTags:[NSSet setWithArray:tags] + alias:alias + fetchCompletionHandle:^(int iResCode, NSSet *iTags, NSString *iAlias) { + CDVPluginResult *result; + if (iResCode == 0) { + result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:nil]; + } else { + result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:nil]; + } + [self.commandDelegate sendPluginResult:result callbackId:command.callbackId]; }]; } -(void)setTags:(CDVInvokedUrlCommand*)command{ - NSArray *tags = command.arguments; - [JPUSHService setTags:[NSSet setWithArray:tags] - alias:nil - fetchCompletionHandle:^(int iResCode, NSSet *iTags, NSString *iAlias) { - CDVPluginResult *result; - if (iResCode == 0) { - result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:nil]; - } else { - result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:nil]; - } + NSArray *tags = command.arguments; + [JPUSHService setTags:[NSSet setWithArray:tags] + alias:nil + fetchCompletionHandle:^(int iResCode, NSSet *iTags, NSString *iAlias) { + CDVPluginResult *result; + if (iResCode == 0) { + result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:nil]; + } else { + result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:nil]; + } + [self.commandDelegate sendPluginResult:result callbackId:command.callbackId]; }]; } -(void)setAlias:(CDVInvokedUrlCommand*)command{ NSString *alias = [command argumentAtIndex:0]; - [JPUSHService setTags:nil - alias:alias - fetchCompletionHandle:^(int iResCode, NSSet *iTags, NSString *iAlias) { - CDVPluginResult *result; - if (iResCode == 0) { - result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:nil]; - } else { - result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:nil]; - } + [JPUSHService setTags:nil + alias:alias + fetchCompletionHandle:^(int iResCode, NSSet *iTags, NSString *iAlias) { + CDVPluginResult *result; + if (iResCode == 0) { + result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:nil]; + } else { + result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:nil]; + } + [self.commandDelegate sendPluginResult:result callbackId:command.callbackId]; }]; } @@ -344,11 +347,11 @@ } #pragma mark 设置标签及别名回调 --(void)tagsWithAliasCallback:(int)resultCode tags:(NSSet *)tags alias:(NSString *)alias { - if (resultCode == 0) { // Success - - } else { - +-(void)tagsWithAliasCallback:(int)resultCode tags:(NSSet *)tags alias:(NSString *)alias { + if (resultCode == 0) { // Success + + } else { + } }