微调了主页面文章的切换动画效果，使其更自然修复了Xcode7.1下运行有时候会导致主体日报scrollView contentOffSe…

…t.y 不正确的问题
woshichuangqilang · Nov 1, 2015 · eb36e9d · eb36e9d
1 parent c812ec8
commit eb36e9d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/Bridging-Header.h b/Bridging-Header.h
@@ -18,5 +18,6 @@
 #import "SWRevealViewController.h"
 #import "UIImage+ImageEffects.h"
 #import "ZFModalTransitionAnimator.h"
+#import <SDWebImage/UIImageView+WebCache.h>
 
 #endif /* Bridging_Header_h */
diff --git a/zhihuDaily 2.0/Base.lproj/Main.storyboard b/zhihuDaily 2.0/Base.lproj/Main.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15B30a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="4ba-nh-i6M">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="4ba-nh-i6M">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>

diff --git a/zhihuDaily 2.0/LaunchViewController.swift b/zhihuDaily 2.0/LaunchViewController.swift
@@ -22,9 +22,7 @@ class LaunchViewController: UIViewController, JSAnimatedImagesViewDataSource {
         super.viewDidLoad()
 
         //如果已有下载好的文字则使用
-        if NSUserDefaults.standardUserDefaults().objectForKey(launchTextKey) != nil {
-            text.text = NSUserDefaults.standardUserDefaults().objectForKey(launchTextKey) as! String
-        }
+        text.text = NSUserDefaults.standardUserDefaults().objectForKey(launchTextKey) as? String
 
         //下载下一次所需的启动页数据
         Alamofire.request(.GET, "http://news-at.zhihu.com/api/4/start-image/1080*1776").responseJSON { (_, _, dataResult) -> Void in

diff --git a/zhihuDaily 2.0/MainTableViewController.swift b/zhihuDaily 2.0/MainTableViewController.swift
@@ -204,7 +204,7 @@ class MainTableViewController: UITableViewController, SDCycleScrollViewDelegate,
         self.animator.dragable = true
         self.animator.bounces = false
         self.animator.behindViewAlpha = 0.7
-        self.animator.behindViewScale = 0.7
+        self.animator.behindViewScale = 0.9
         self.animator.transitionDuration = 0.7
         self.animator.direction = ZFModalTransitonDirection.Right
 
@@ -228,7 +228,7 @@ class MainTableViewController: UITableViewController, SDCycleScrollViewDelegate,
         self.animator.dragable = true
         self.animator.bounces = false
         self.animator.behindViewAlpha = 0.7
-        self.animator.behindViewScale = 0.7
+        self.animator.behindViewScale = 0.9
         self.animator.transitionDuration = 0.7
         self.animator.direction = ZFModalTransitonDirection.Right
 

diff --git a/zhihuDaily 2.0/ThemeViewController.swift b/zhihuDaily 2.0/ThemeViewController.swift
@@ -25,6 +25,8 @@ class ThemeViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        self.automaticallyAdjustsScrollViewInsets = false
+
         //清空原数据
         self.appCloud().themeContent = nil