Skip to content

Commit

Permalink
Merge pull request #2 from shajz/fix.ios.cordova.v7
Browse files Browse the repository at this point in the history
shajz authored Jan 5, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents a72fb9e + 2d91637 commit 36bd759
Showing 5 changed files with 24 additions and 47 deletions.
2 changes: 1 addition & 1 deletion src/ios/GoogleMaps/PluginMap.m
Original file line number Diff line number Diff line change
@@ -667,7 +667,7 @@ - (void)setActiveMarkerId:(CDVInvokedUrlCommand*)command {
}

CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}

44 changes: 22 additions & 22 deletions src/ios/GoogleMaps/PluginMarker.m
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ -(void)create:(CDVInvokedUrlCommand *)command
[createResult setObject:markerId forKey:@"__pgmId"];

[[NSOperationQueue mainQueue] addOperationWithBlock:^{
CDVCommandDelegateImpl *cmdDelegate = (CDVCommandDelegateImpl *)self.commandDelegate;
__weak __auto_type weakSelf = self;
[self _create:markerId markerOptions:json callbackBlock:^(BOOL successed, id result) {
CDVPluginResult* pluginResult;

@@ -93,7 +93,7 @@ -(void)create:(CDVInvokedUrlCommand *)command

pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:createResult ];
}
[cmdDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];

}];
@@ -255,7 +255,7 @@ -(void)showInfoWindow:(CDVInvokedUrlCommand *)command
}

CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}];
}
@@ -270,7 +270,7 @@ -(void)hideInfoWindow:(CDVInvokedUrlCommand *)command
self.mapCtrl.map.selectedMarker = nil;
self.mapCtrl.activeMarker = nil;
CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}];
}
@@ -295,7 +295,7 @@ -(void)getPosition:(CDVInvokedUrlCommand *)command
[json setObject:longitude forKey:@"lng"];

CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:json];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}

@@ -319,7 +319,7 @@ -(void)setTitle:(CDVInvokedUrlCommand *)command


CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}];
}
@@ -338,7 +338,7 @@ -(void)setSnippet:(CDVInvokedUrlCommand *)command
marker.snippet = [command.arguments objectAtIndex:1];

CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}];
}
@@ -358,7 +358,7 @@ -(void)remove:(CDVInvokedUrlCommand *)command
marker = nil;

CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}];
}
@@ -424,7 +424,7 @@ -(void)setIconAnchor:(CDVInvokedUrlCommand *)command
}

CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}

@@ -450,7 +450,7 @@ -(void)setInfoWindowAnchor:(CDVInvokedUrlCommand *)command
} else {
pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR];
}
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];

}];
@@ -470,7 +470,7 @@ -(void)setOpacity:(CDVInvokedUrlCommand *)command
marker.opacity = [[command.arguments objectAtIndex:1] floatValue];

CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}];
}
@@ -488,7 +488,7 @@ -(void)setZIndex:(CDVInvokedUrlCommand *)command
marker.zIndex = [[command.arguments objectAtIndex:1] intValue];

CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}];
}
@@ -507,7 +507,7 @@ -(void)setDraggable:(CDVInvokedUrlCommand *)command
[marker setDraggable:isEnabled];

CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}];
}
@@ -530,7 +530,7 @@ -(void)setDisableAutoPan:(CDVInvokedUrlCommand *)command
NSLog(@"--->propertyId = %@", propertyId);

CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}

@@ -560,7 +560,7 @@ -(void)setVisible:(CDVInvokedUrlCommand *)command
[self.mapCtrl.objects setObject:properties forKey:propertyId];

CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}];
}
@@ -582,7 +582,7 @@ -(void)setPosition:(CDVInvokedUrlCommand *)command
[marker setPosition:position];

CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}];
}
@@ -601,7 +601,7 @@ -(void)setFlat:(CDVInvokedUrlCommand *)command
[marker setFlat: isFlat];

CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}];
}
@@ -645,15 +645,15 @@ -(void)setIcon:(CDVInvokedUrlCommand *)command
[iconProperty setObject:[rgbColor parsePluginColor] forKey:@"iconColor"];
}

CDVCommandDelegateImpl *cmdDelegate = (CDVCommandDelegateImpl *)self.commandDelegate;
__weak __auto_type weakSelf = self;
[self setIcon_:marker iconProperty:iconProperty callbackBlock:^(BOOL successed, id resultObj) {
CDVPluginResult* pluginResult;
if (successed == NO) {
pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:resultObj];
} else {
pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
}
[cmdDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}];
}
@@ -671,7 +671,7 @@ -(void)setRotation:(CDVInvokedUrlCommand *)command
[marker setRotation:degrees];

CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}];
}
@@ -686,11 +686,11 @@ -(void)setAnimation:(CDVInvokedUrlCommand *)command
GMSMarker *marker = [self.mapCtrl.objects objectForKey:markerId];

NSString *animation = [command.arguments objectAtIndex:1];
CDVCommandDelegateImpl *cmdDelegate = (CDVCommandDelegateImpl *)self.commandDelegate;
__weak __auto_type weakSelf = self;

[self setMarkerAnimation_:animation marker:marker callbackBlock:^(void) {
CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
[cmdDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}];
}];
}];
2 changes: 1 addition & 1 deletion src/ios/GoogleMaps/PluginMarkerCluster.m
Original file line number Diff line number Diff line change
@@ -453,7 +453,7 @@ - (void)redrawClusters:(CDVInvokedUrlCommand*)command {
- (void) endRedraw:(CDVInvokedUrlCommand*)command {
NSLog(@"--->allResults = %@", self.allResults);
CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:self.allResults];
[(CDVCommandDelegateImpl *)self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
[self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
}

- (void) deleteProcess:(NSDictionary *) params clusterId:(NSString *)clusterId{
5 changes: 0 additions & 5 deletions src/ios/GoogleMaps/PluginUtil.h
Original file line number Diff line number Diff line change
@@ -20,7 +20,6 @@
#import "IPluginProtocol.h"
#import "PluginViewController.h"
#import <Cordova/CDVCommandDelegate.h>
#import <Cordova/CDVCommandDelegateImpl.h>

typedef void (^MYCompletionHandler)(NSError *error);

@@ -49,10 +48,6 @@ typedef void (^MYCompletionHandler)(NSError *error);
- (UIImage *)resize:(CGFloat)width height:(CGFloat)height;
@end

@interface CDVCommandDelegateImpl (GoogleMapsPlugin)
- (void)hookSendPluginResult:(CDVPluginResult*)result callbackId:(NSString*)callbackId;
@end

//
// animationDidStop for group animation
// http://stackoverflow.com/a/28051909/697856
18 changes: 0 additions & 18 deletions src/ios/GoogleMaps/PluginUtil.m
Original file line number Diff line number Diff line change
@@ -108,24 +108,6 @@ -(UIImage *)resize:(CGFloat)width height:(CGFloat)height {
@end


/*
@implementation CDVCommandDelegateImpl (GoogleMapsPlugin)

- (void)hookSendPluginResult:(CDVPluginResult*)result callbackId:(NSString*)callbackId {

NSRange pos = [callbackId rangeOfString:@"://"];
if (pos.location == NSNotFound) {
[self sendPluginResult:result callbackId:callbackId];
} else {
NSArray *tmp = [callbackId componentsSeparatedByString:@"://"];
NSString *pluginName = [tmp objectAtIndex:0];
CDVPlugin<IPluginProtocol> *plugin = [self getCommandInstance:pluginName];
[plugin onHookedPluginResult:result callbackId:callbackId];
}

}
@end
*/

static char CAAnimationGroupBlockKey;
@implementation CAAnimationGroup (Blocks)

0 comments on commit 36bd759

Please sign in to comment.