1.优化QuickWebQRCodePlugin插件手势。2.修复QuickWebQRCodePlugin本地化错误。

pcjbird · Jan 9, 2018 · 9745afa · 9745afa
1 parent 6e57a98
commit 9745afa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/QuickWebKit.podspec b/QuickWebKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = "QuickWebKit"
-    s.version          = "1.0.7"
+    s.version          = "1.0.8"
     s.summary          = "A great & strong plugin based WebViewController. 一款基于插件的 WebView 视图控制器，您可以基于它设计您的浏览器插件，然后像积木一样来组装它们。"
     s.description      = <<-DESC
     A great & strong plugin based WebViewController. 一款基于插件的 WebView 视图控制器，您可以基于它设计您的浏览器插件，然后像积木一样来组装它们。

diff --git a/QuickWebKit/QuickWebKit.h b/QuickWebKit/QuickWebKit.h
@@ -8,7 +8,11 @@
 //  框架名称:QuickWebKit
 //  框架功能:A great & strong plugin based WebViewController. 一款基于插件的 WebView 视图控制器，您可以基于它设计您的浏览器插件，然后像积木一样来组装它们。
 //  修改记录:
-//     pcjbird    2018-01-07  Version:1.0.7 Build:201801090001
+//     pcjbird    2018-01-09  Version:1.0.8 Build:201801090002
+//                            1.优化QuickWebQRCodePlugin插件手势。
+//                            2.修复QuickWebQRCodePlugin本地化错误。
+//
+//     pcjbird    2018-01-09  Version:1.0.7 Build:201801090001
 //                            1.优化当作为navigationController的根视图时的显示问题。
 //
 //     pcjbird    2018-01-06  Version:1.0.6 Build:201801060001

diff --git a/QuickWebKit/QuickWebPlugins/QuickWebQRCodePlugin/QuickWebQRCodePlugin.m b/QuickWebKit/QuickWebPlugins/QuickWebQRCodePlugin/QuickWebQRCodePlugin.m
@@ -76,6 +76,11 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecogni
     return YES;
 }
 
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldBeRequiredToFailByGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
+{
+    return YES;
+}
+
 -(void)longtap:(UILongPressGestureRecognizer * )longtapGes
 {
 
@@ -235,7 +240,7 @@ - (void)openContextMenuAt:(CGPoint)pt
             }
 
             //取消
-            UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) style:UIAlertActionStyleCancel handler:nil];
+            UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedStringFromTableInBundle(@"Cancel", @"Localizable", SDK_BUNDLE, nil) style:UIAlertActionStyleCancel handler:nil];
             [alertController addAction:cancelAction];
 
             alertController.view.tintColor =  [weakSelf alertTintColor];

diff --git a/QuickWebKit/Supporting Files/Info.plist b/QuickWebKit/Supporting Files/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.7</string>
+	<string>1.0.8</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>