修复QuickWebProviderPlugin字体颜色的问题

pcjbird · Jan 2, 2018 · 42b28e0 · 42b28e0
1 parent 7511974
commit 42b28e0
Show file tree

Hide file tree

Showing 5 changed files with 6 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.1"
+    s.version          = "1.0.2"
     s.summary          = "A great & strong plugin based WebViewController. 一款基于插件的 WebView 视图控制器，您可以基于它设计您的浏览器插件，然后像积木一样来组装它们。"
     s.description      = <<-DESC
     A great & strong plugin based WebViewController. 一款基于插件的 WebView 视图控制器，您可以基于它设计您的浏览器插件，然后像积木一样来组装它们。

diff --git a/QuickWebKit/QuickWebCore/QuickWebViewController.m b/QuickWebKit/QuickWebCore/QuickWebViewController.m
@@ -150,7 +150,7 @@ -(instancetype)initWithUrlString:(NSString *)url
     if(self = [super init])
     {
         _initUrl = url;
-
+        [self initVariables];
     }
     return self;
 }

diff --git a/QuickWebKit/QuickWebKit.h b/QuickWebKit/QuickWebKit.h
@@ -8,6 +8,8 @@
 //  框架名称:QuickWebKit
 //  框架功能:A great & strong plugin based WebViewController. 一款基于插件的 WebView 视图控制器，您可以基于它设计您的浏览器插件，然后像积木一样来组装它们。
 //  修改记录:
+//     pcjbird    2018-01-02  Version:1.0.2 Build:201801020002
+//                            1.修复QuickWebProviderPlugin字体颜色的问题
 //     pcjbird    2018-01-02  Version:1.0.1 Build:201801020001
 //                            1.修复dealloc中使用了weak导致的crash问题
 //     pcjbird    2017-12-24  Version:1.0.0 Build:201712240001

diff --git a/QuickWebKit/QuickWebPlugins/QuickWebProviderPlugin/QuickWebProviderPlugin.m b/QuickWebKit/QuickWebPlugins/QuickWebProviderPlugin/QuickWebProviderPlugin.m
@@ -35,7 +35,7 @@ -(void)webViewControllerDidWebViewCreated:(QuickWebViewController *)webViewContr
     QuickWebProvider *provider = [QuickWebProvider new];
     provider.backgroundColor = [UIColor clearColor];
     provider.font = [UIFont systemFontOfSize:11.0f];
-    provider.textColor = [[scrollBackColor quickweb_inversecolor] colorWithAlphaComponent:0.70f];
+    provider.textColor = [scrollBackColor isKindOfClass:[UIColor class]] ? [[scrollBackColor quickweb_inversecolor] colorWithAlphaComponent:0.7f] : [UIColor colorWithRed:99/255.0 green:98/255.0 blue:98/255.0 alpha:0.7f];
     webViewController.webView.scrollView.quickweb_provider = provider;
 }
 

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.1</string>
+	<string>1.0.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>