Merge pull request #87 from hsnl-dev/tiny-fix

lockys · web-flow · commit 5cbc29092db9 · 2016-07-06T22:52:40.000+08:00
bug fixed.
diff --git a/voiceIn/AppDelegate.swift b/voiceIn/AppDelegate.swift
@@ -3,6 +3,7 @@ import CoreData
 import IQKeyboardManagerSwift
 import Fabric
 import Crashlytics
+import Haneke
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -40,6 +41,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         
         if let window = self.window {
             window.rootViewController = rootController
+            
+            let hnkImageCache = Shared.imageCache
+            hnkImageCache.removeAll()
+            
             window.makeKeyAndVisible()
         }
         
diff --git a/voiceIn/Base.lproj/Main.storyboard b/voiceIn/Base.lproj/Main.storyboard
@@ -689,7 +689,6 @@
                                 <constraints>
                                     <constraint firstAttribute="width" constant="30" id="QlZ-aA-ABC"/>
                                     <constraint firstAttribute="height" constant="30" id="cnD-iR-KS2"/>
-                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="30" id="drX-25-uoa"/>
                                 </constraints>
                                 <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <state key="normal" image="close">
@@ -1404,11 +1403,11 @@
                             </tableViewSection>
                             <tableViewSection headerTitle="設定" id="eki-en-qBd">
                                 <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="detailButton" indentationWidth="10" id="56j-GG-6p8" customClass="MaterialTableViewCell" customModule="Material">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" editingAccessoryType="detailDisclosureButton" id="56j-GG-6p8" customClass="MaterialTableViewCell" customModule="Material">
                                         <rect key="frame" x="0.0" y="300" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="56j-GG-6p8" id="bmT-aY-WQP">
-                                            <rect key="frame" x="0.0" y="0.0" width="553" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="個人資料設定" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="biE-wW-k6O">
@@ -1424,7 +1423,7 @@
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>
-                                            <segue destination="2V3-kn-mV4" kind="presentation" id="a4g-o3-ZwN"/>
+                                            <segue destination="2V3-kn-mV4" kind="presentation" modalTransitionStyle="crossDissolve" id="a4g-o3-ZwN"/>
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="1Sd-gS-0DG" customClass="MaterialTableViewCell" customModule="Material">
diff --git a/voiceIn/Controllers/Contact/ContactTableViewController.swift b/voiceIn/Controllers/Contact/ContactTableViewController.swift
@@ -48,7 +48,6 @@ class ContactTableViewController: UITableViewController, NSFetchedResultsControl
         self.refreshControl?.addTarget(self, action: #selector(ContactTableViewController.refresh(_:)), forControlEvents: UIControlEvents.ValueChanged)
         
         super.viewDidLoad()
-        
         //MAKR - Init search view contrller
         self.resultSearchController = ({
             let controller = UISearchController(searchResultsController: nil)
diff --git a/voiceIn/Controllers/Setting/EditProfileViewController.swift b/voiceIn/Controllers/Setting/EditProfileViewController.swift
@@ -245,6 +245,7 @@ class EditProfileViewController: FormViewController {
         let updateInformationApiRoute = API_END_POINT + "/accounts/" + userUuid
         let uploadAvatarApiRoute = API_END_POINT + "/accounts/" + userUuid + "/avatar"
         let dateFormatter = NSDateFormatter()
+        var isUploadSuccess = false
         
         var avatarImageFile = UIImageJPEGRepresentation(UIImage(named: "user")!, 0.6)
         
@@ -286,7 +287,7 @@ class EditProfileViewController: FormViewController {
         Alamofire
             .request(.PUT, updateInformationApiRoute, parameters: parameters, encoding: .JSON, headers: headers)
             .response { request, response, data, error in
-                if error == nil && !self.isUserSelectPhoto {
+                if error == nil {
                     //MARK: error is nil, nothing happened! All is well :)
                     
                     UserPref.setUserPref("userName", value: parameters["userName"])
@@ -300,18 +301,27 @@ class EditProfileViewController: FormViewController {
                         if let superview = self.view.superview {
                             SwiftOverlays.removeAllOverlaysFromView(superview)
                         }
+                        
+                        isUploadSuccess = true
                         self.dismissViewControllerAnimated(true, completion: nil)
                     }
                 } else {
                     if let superview = self.view.superview {
                         SwiftOverlays.removeAllOverlaysFromView(superview)
                     }
+                    
+                    isUploadSuccess = false
                     AlertBox.createAlertView(self, title: "失敗", body: "出現網路或伺服器錯誤", buttonValue: "確認")
                 }
+                
                 debugPrint(error)
                 self.isSaveClicked = false
         }
         
+        if isUploadSuccess == true {
+            return
+        }
+        
         /**
          POST: Upload avatar image.
          **/
diff --git a/voiceIn/Controllers/Setting/SettingViewController.swift b/voiceIn/Controllers/Setting/SettingViewController.swift
@@ -1,6 +1,7 @@
 import UIKit
 import Alamofire
 import SwiftyJSON
+import SwiftOverlays
 import Haneke
 
 class SettingViewController: UITableViewController {
@@ -20,6 +21,12 @@ class SettingViewController: UITableViewController {
     @IBAction func refreshCredit(sender: UIButton) {
         self.credit?.text = "讀取中"
         
+        let text = "重新整理中..."
+        
+        if let superview = self.view.superview {
+            SwiftOverlays.showCenteredWaitOverlayWithText(superview, text: text)
+        }
+        
         let getInformationApiRoute = API_END_POINT + "/accounts/" + UserPref.getUserPrefByKey("userUuid")
         let headers = Network.generateHeader(isTokenNeeded: true)
         let parameters = [
@@ -29,6 +36,8 @@ class SettingViewController: UITableViewController {
             .request(.GET, getInformationApiRoute, headers: headers, parameters: parameters, encoding: .URLEncodedInURL)
             .responseJSON {
                 response in
+                sender.setTitle("重新整理", forState: .Normal)
+                
                 switch response.result {
                 case .Success(let JSON_RESPONSE):
                     let jsonResponse = JSON(JSON_RESPONSE)
@@ -46,6 +55,10 @@ class SettingViewController: UITableViewController {
                     self.credit?.text = "讀取失敗"
                     debugPrint(error)
                 }
+                
+                if let superview = self.view.superview {
+                    SwiftOverlays.removeAllOverlaysFromView(superview)
+                }
         }
     }
     
diff --git a/voiceIn/Controllers/Validation/UserInformationViewController.swift b/voiceIn/Controllers/Validation/UserInformationViewController.swift
@@ -348,25 +348,26 @@ class UserInformationViewController: FormViewController {
                             return
                         }
                 })
-        } else {
-            // MARK - POST: Generate QRCode
-            Alamofire
-                .request(.POST, generateQrcodeApiRoute, headers: headers)
-                .response {
-                    request, response, data, error in
-                    
-                    if let superview = self.view {
-                        SwiftOverlays.removeAllOverlaysFromView(superview)
-                    }
-                    
-                    if error == nil {
-                        print("Generate QR Code Successfully!")
-                        self.presentViewController(contactTableView, animated: true, completion: nil)
-                    } else {
-                        AlertBox.createAlertView(self ,title: "抱歉!", body: "網路或伺服器錯誤，請稍候再嘗試", buttonValue: "確認")
-                    }
+        }
+        
+        // MARK - POST: Generate QRCode
+        Alamofire
+            .request(.POST, generateQrcodeApiRoute, headers: headers)
+            .response {
+                request, response, data, error in
+                
+                if let superview = self.view {
+                    SwiftOverlays.removeAllOverlaysFromView(superview)
+                }
+                
+                if error == nil {
+                    print("Generate QR Code Successfully!")
+                    self.presentViewController(contactTableView, animated: true, completion: nil)
+                } else {
+                    AlertBox.createAlertView(self ,title: "抱歉!", body: "網路或伺服器錯誤，請稍候再嘗試", buttonValue: "確認")
                 }
         }
+
     }
     
     /**
diff --git a/voiceIn/Info.plist b/voiceIn/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.1</string>
+	<string>1.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>44</string>
+	<string>1</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>
