修改一致性体验

librx/Base.lproj/Main.storyboard

@@ -819,7 +819,7 @@
                     </navigationItem>
                     <connections>
                         <segue destination="rvR-19-yLR" kind="show" identifier="showUserProfile" id="fgr-G1-uqB"/>
-                        <segue destination="331-bv-LXb" kind="show" identifier="showWebView" id="a1A-OB-cPM"/>
+                        <segue destination="331-bv-LXb" kind="modal" identifier="showWebView" id="a1A-OB-cPM"/>
                     </connections>
                 </tableViewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="wQd-t8-Eyc" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1691,7 +1691,7 @@
         <image name="default" width="62" height="62"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="a1A-OB-cPM"/>
         <segue reference="fgr-G1-uqB"/>
+        <segue reference="a1A-OB-cPM"/>
     </inferredMetricsTieBreakers>
 </document>

librx/ExploreCollectionReusableView.swift

@@ -27,9 +27,7 @@ class ExploreCollectionViewController: UICollectionViewController, UICollectionV
     override func viewDidLoad() {
         
         super.viewDidLoad()
-        
         self.navigationController?.navigationBar.tintColor = UIColor.whiteColor()
-        
         self.navigationController?.navigationBar.titleTextAttributes = [NSForegroundColorAttributeName: UIColor.whiteColor()]
         
         screenSize = UIScreen.mainScreen().bounds
@@ -41,14 +39,21 @@ class ExploreCollectionViewController: UICollectionViewController, UICollectionV
     override func viewDidAppear(animated: Bool) {
         
         super.viewDidAppear(animated)
+        
+        self.navigationController?.navigationBarHidden = false
+        self.navigationController?.setNavigationBarHidden(false, animated: false)
+        
         LibrxService.loadExplore { (explores) -> () in
             self.explores = explores
             self.collectionView?.reloadData()
         }
-
         
     }
     
+    override func prefersStatusBarHidden() -> Bool {
+        return false
+    }
+    
     override func numberOfSectionsInCollectionView(collectionView: UICollectionView) -> Int {
         return 1
     }

librx/ExploreTableViewController.swift

@@ -26,11 +26,18 @@ class ExploreTableViewController: UITableViewController {
     
     override func viewDidAppear(animated: Bool) {
         super.viewDidAppear(animated)
+        
         self.navigationController?.navigationBarHidden = false
+        self.navigationController?.setNavigationBarHidden(false, animated: true)
+        
         refreshContent()
         self.tableView.reloadData()
     }
     
+    override func prefersStatusBarHidden() -> Bool {
+        return false
+    }
+    
     func refreshContent() {
         loadPostsFromUrl(self.dataUrl!)
         self.tableView.reloadData()

librx/LibrxService.swift

@@ -15,7 +15,7 @@ import JWT
 
 struct LibrxService {
 
-    private static let baseURL = "http://123.57.95.237"
+    private static let baseURL = "http://uat.librme.com"
     private static let defaultThumail = "http://7pn5d3.com1.z0.glb.clouddn.com/9050353.png"
 
     
@@ -179,6 +179,8 @@ struct LibrxService {
         Alamofire.request(.GET, urlString, headers: headers)
             .response{ (request, res, data, error) in
                 
+                print(urlString)
+                
                 var posts:[Post] = []
                 if let _ = error{
                     return response(posts, error: "Libr失联了，请稍候再试...")
@@ -186,10 +188,13 @@ struct LibrxService {
                 
                     LocalStore.setLocalCachePosts(data!)
                     let json = JSON(data: data!)
-                    for index in 0..<json.count {
-                        let postData = json[index]
-                        let post: Post = JsonPaser.parsePost(postData)
-                        posts.append(post)
+                    if !json.isEmpty {
+                        for index in 0..<json.count {
+                            let postData = json[index]
+                            print(postData)
+                            let post: Post = JsonPaser.parsePost(postData)
+                            posts.append(post)
+                        }
                     }
                 }
 
@@ -444,7 +449,6 @@ struct LibrxService {
         
         let urlString = baseURL + ResourcePath.UnFollow(userId: userId).description
         let headers:[String: String] = buildHttpRequestHeader()
-        print(urlString)
         Alamofire.request(.POST, urlString, headers: headers).response { (req, res, data, error) -> Void in}
     }
     

librx/ProfileViewController.swift

@@ -55,10 +55,12 @@ class ProfileViewController: UIViewController{
         self.followButton.layer.borderColor = UIColor.whiteColor().CGColor
         self.followButton.hidden = true
         
-        navigationController?.navigationBar.backgroundColor = UIColor.whiteColor()
-        navigationController?.navigationBar.tintColor = UIColor.whiteColor()
+        self.navigationController?.navigationBar.backgroundColor = UIColor.whiteColor()
+        self.navigationController?.navigationBar.tintColor = UIColor.whiteColor()
+        
+        self.navigationController?.navigationBarHidden = false
+        self.navigationController?.setNavigationBarHidden(false, animated: true)
         
-        navigationController?.navigationBar.backItem?.hidesBackButton = false
         self.settingButton.hidden = true
         self.backButton.hidden = true
         
@@ -80,6 +82,10 @@ class ProfileViewController: UIViewController{
         
     }
     
+    override func prefersStatusBarHidden() -> Bool {
+        return false
+    }
+    
     func loadUserProfile(userId: Int){
         
         LibrxService.profile(userId) { [weak self](profile) -> () in

librx/StorysTableViewController.swift

@@ -156,10 +156,12 @@ class StorysTableViewController: UITableViewController {
    
     func refresh() {
         print("refreshing...")
-        postsLoader.load(completion: { [unowned self] (posts, error) in
-            self.posts = posts
-            self.tableView.reloadData()
-            self.refreshControl?.endRefreshing()
+        postsLoader.load(completion: { [weak self] (posts, error) in
+            if let selfView = self {
+                selfView.posts = posts
+                selfView.tableView.reloadData()
+                selfView.refreshControl?.endRefreshing()
+            }
         })
         timer = NSTimer.scheduledTimerWithTimeInterval(3.0, target: self, selector: "endOfWork", userInfo: nil, repeats: true)
     }
@@ -178,13 +180,17 @@ class StorysTableViewController: UITableViewController {
     
     func loadMore() {
         print("load more data")
-        postsLoader.load(currentPage+1, completion: { [unowned self] (posts, error) in
-            if posts.count == 0 {
-                print("没有数据了")
-            } else{
-                self.posts += posts
-                self.currentPage += 1
-                self.tableView.reloadData()
+        postsLoader.load(currentPage+1, completion: { [weak self] (posts, error) in
+            
+            if let selfView = self {
+            
+                if posts.count == 0 {
+                    print("没有数据了")
+                } else{
+                    selfView.posts += posts
+                    selfView.currentPage += 1
+                    selfView.tableView.reloadData()
+                }
             }
         })
     }

librx/WebViewController.swift

@@ -104,7 +104,10 @@ class WebViewController: UIViewController {
     }
     @IBAction func dismiss(sender: AnyObject) {
         
-        self.navigationController?.popViewControllerAnimated(true)
+        if let _ = self.navigationController {
+            self.navigationController?.popViewControllerAnimated(true)
+            return
+        }
         self.dismissViewControllerAnimated(true, completion: nil)
         
     }