|
|
@@ -20,6 +20,7 @@
|
|
|
#import "RAPhotoPreviewController.h"
|
|
|
#import "RAPhotoModel.h"
|
|
|
#import "RAMapNavigateHandler.h"
|
|
|
+#import "NSString+RAJavascript.h"
|
|
|
|
|
|
|
|
|
@interface RAWKWebView () <UINavigationControllerDelegate,UIImagePickerControllerDelegate,MFMailComposeViewControllerDelegate>
|
|
|
@@ -378,10 +379,12 @@
|
|
|
}
|
|
|
-(void) webPageCallback:(NSDictionary*)params caller:(NSString*) callerid value:(NSObject*)value
|
|
|
{
|
|
|
- NSString* caller = [NSString stringWithFormat:@"'%@'",callerid];
|
|
|
+// NSString* caller = [NSString stringWithFormat:@"'%@'",callerid];
|
|
|
+ NSString *caller = [callerid ra_stringByEscapingForJavascriptWithDelimiter:'\'' wrapWithDelimiters:YES];
|
|
|
if([value isKindOfClass:NSString.class])
|
|
|
{
|
|
|
- value =[NSString stringWithFormat:@"'%@'",value];
|
|
|
+// value =[NSString stringWithFormat:@"'%@'",value];
|
|
|
+ value = [(NSString *)value ra_stringByEscapingForJavascriptWithDelimiter:'\'' wrapWithDelimiters:YES];
|
|
|
}
|
|
|
NSString *jsStr = [NSString stringWithFormat:params[@"callback"],caller,value];
|
|
|
[self.wkwebView evaluateJavaScript:jsStr completionHandler:^(id _Nullable result, NSError * _Nullable error) {
|