convert swift 2.0

xiyuxifeng · Aug 12, 2015 · a62ee73 · a62ee73
1 parent fcea7f7
commit a62ee73
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 24 deletions.
diff --git a/Autolayout.xcodeproj/project.pbxproj b/Autolayout.xcodeproj/project.pbxproj
@@ -403,6 +403,8 @@
  7BC03A7B1B63D0B00049DE32 /* Project object */ = {
  isa = PBXProject;
  attributes = {
+ LastSwiftMigration = 0700;
+ LastSwiftUpdateCheck = 0700;
  LastUpgradeCheck = 0640;
  ORGANIZATIONNAME = Wang.Hui;
  TargetAttributes = {

diff --git a/Autolayout/AFHTTPClient.swift b/Autolayout/AFHTTPClient.swift
@@ -21,11 +21,11 @@ class AFHTTPClient: AFHTTPSessionManager {
 
  dispatch_once(&Static.onceToken, { () -> Void in
 
- var baseURL = NSURL(string: BaseURL)
- var sessionConfig = NSURLSessionConfiguration.defaultSessionConfiguration()
+ let baseURL = NSURL(string: BaseURL)
+ let sessionConfig = NSURLSessionConfiguration.defaultSessionConfiguration()
 
  // 设置缓存大小
- var cache = NSURLCache(memoryCapacity: 10 * 1024 * 1024, diskCapacity: 5 * 1024 * 1024, diskPath: nil)
+ let cache = NSURLCache(memoryCapacity: 10 * 1024 * 1024, diskCapacity: 5 * 1024 * 1024, diskPath: nil)
  sessionConfig.URLCache = cache
 
 
@@ -50,11 +50,11 @@ class AFHTTPClient2: AFHTTPSessionManager {
  }
 
  init() {
- var baseURL = NSURL(string: BaseURL)
- var sessionConfig = NSURLSessionConfiguration.defaultSessionConfiguration()
+ let baseURL = NSURL(string: BaseURL)
+ let sessionConfig = NSURLSessionConfiguration.defaultSessionConfiguration()
 
  // 设置缓存大小
- var cache = NSURLCache(memoryCapacity: 10 * 1024 * 1024, diskCapacity: 5 * 1024 * 1024, diskPath: nil)
+ let cache = NSURLCache(memoryCapacity: 10 * 1024 * 1024, diskCapacity: 5 * 1024 * 1024, diskPath: nil)
  sessionConfig.URLCache = cache
 
  super.init(baseURL: baseURL, sessionConfiguration: sessionConfig)
@@ -80,11 +80,11 @@ class AFHTTPClient3: AFHTTPSessionManager {
  }
 
  init() {
- var baseURL = NSURL(string: BaseURL)
- var sessionConfig = NSURLSessionConfiguration.defaultSessionConfiguration()
+ let baseURL = NSURL(string: BaseURL)
+ let sessionConfig = NSURLSessionConfiguration.defaultSessionConfiguration()
 
  // 设置缓存大小
- var cache = NSURLCache(memoryCapacity: 10 * 1024 * 1024, diskCapacity: 5 * 1024 * 1024, diskPath: nil)
+ let cache = NSURLCache(memoryCapacity: 10 * 1024 * 1024, diskCapacity: 5 * 1024 * 1024, diskPath: nil)
  sessionConfig.URLCache = cache
 
  super.init(baseURL: baseURL, sessionConfiguration: sessionConfig)

diff --git a/Autolayout/Extend.swift b/Autolayout/Extend.swift
@@ -23,7 +23,7 @@ let IS_IPHONE_5 = IS_IPHONE && (SCREEN_MAX_LENGTH) == 568.0
 let IS_IPHONE_6 = IS_IPHONE && (SCREEN_MAX_LENGTH) == 667.0
 let IS_IPHONE_6P = IS_IPHONE && (SCREEN_MAX_LENGTH) == 736.0
 
-func getImageURLString(imageUrl: String, #width: Int, #height: Int) -> String {
+func getImageURLString(imageUrl: String, width: Int, height: Int) -> String {
 
  var exactUrl = ""
  var urlArr = imageUrl.componentsSeparatedByString("/")

diff --git a/Autolayout/ViewController.swift b/Autolayout/ViewController.swift
@@ -20,7 +20,7 @@ class ViewController: UIViewController,UITableViewDelegate, UITableViewDataSourc
  super.viewDidLoad()
  // Do any additional setup after loading the view, typically from a nib.
 
- var homeSearchBar: HomeSearchBarView = (UINib(nibName: "HomeSearchBarView", bundle: nil).instantiateWithOwner(self, options: nil).first) as! HomeSearchBarView
+ let homeSearchBar: HomeSearchBarView = (UINib(nibName: "HomeSearchBarView", bundle: nil).instantiateWithOwner(self, options: nil).first) as! HomeSearchBarView
 
  self.navigationItem.titleView = homeSearchBar
 
@@ -41,7 +41,7 @@ class ViewController: UIViewController,UITableViewDelegate, UITableViewDataSourc
  func initHeaderView() {
  self.getBannerDataFromServer { (result, error) -> Void in
  if error == nil {
- var dataArr = result as! NSArray
+ let dataArr = result as! NSArray
  if dataArr.count > 0 {
  self.initCycleScrollView(dataArr)
  }
@@ -51,17 +51,17 @@ class ViewController: UIViewController,UITableViewDelegate, UITableViewDataSourc
 
  func initCycleScrollView(dataArr: NSArray) {
 
- var scale = SCREEN_WIDTH / 320.0
+ let scale = SCREEN_WIDTH / 320.0
  tableHeader.frame = CGRectMake(0, 0, SCREEN_WIDTH, 165.0 * scale)
 
- var headerView = CycleScrollView(frame: CGRectMake(0, 0, SCREEN_WIDTH, 165.0 * scale), animationDuration: 2.0, style: CycleStylePage, andImageCount: dataArr.count)
+ let headerView = CycleScrollView(frame: CGRectMake(0, 0, SCREEN_WIDTH, 165.0 * scale), animationDuration: 2.0, style: CycleStylePage, andImageCount: dataArr.count)
 
  var imageArr = [UIImageView]()
 
  for dict in dataArr {
 
- var imageUrl = (dict as! NSDictionary).valueForKey("images")?.firstObject
- var imageView = UIImageView(frame:CGRectMake(0, 0, SCREEN_WIDTH, 165.0 * scale))
+ let imageUrl = (dict as! NSDictionary).valueForKey("images")?.firstObject
+ let imageView = UIImageView(frame:CGRectMake(0, 0, SCREEN_WIDTH, 165.0 * scale))
 
  if (imageUrl != nil) && !(imageUrl is NSNull){
 
@@ -70,7 +70,7 @@ class ViewController: UIViewController,UITableViewDelegate, UITableViewDataSourc
 
  imageArr.append(imageView)
 
- println(imageView)
+ print(imageView)
  }
 
  headerView.fetchContentViewAtIndex = {(pageIndex: Int) -> UIView in
@@ -80,17 +80,17 @@ class ViewController: UIViewController,UITableViewDelegate, UITableViewDataSourc
  headerView.totalPagesCount = { dataArr.count }
 
  headerView.TapActionBlock = {(pageIndex: Int) in
- var dict = dataArr[pageIndex] as! NSDictionary
- var type = dict.valueForKey("type") as! Int
+ let dict = dataArr[pageIndex] as! NSDictionary
+ let type = dict.valueForKey("type") as! Int
  var toid = dict.valueForKey("toid") as! Int
 
  if type == 1 {
 
- println("type 1 click")
+ print("type 1 click")
 
  } else {
 
- println("other type click")
+ print("other type click")
  }
  }
 
@@ -109,7 +109,7 @@ class ViewController: UIViewController,UITableViewDelegate, UITableViewDataSourc
  callBack(result: responseObject.valueForKey("data"), error: nil)
 
  } else {
- println("get banner error")
+ print("get banner error")
  }
  }
 
@@ -145,10 +145,10 @@ class ViewController: UIViewController,UITableViewDelegate, UITableViewDataSourc
  func tableView(tableView: UITableView, cellForRowAtIndexPath indexPath: NSIndexPath) -> UITableViewCell {
 
  if indexPath.row % 2 == 0 {
- var cell = tableView.dequeueReusableCellWithIdentifier("homeCell", forIndexPath: indexPath) as! UITableViewCell
+ let cell = tableView.dequeueReusableCellWithIdentifier("homeCell", forIndexPath: indexPath) 
  return cell
  } else {
- var cell = tableView.dequeueReusableCellWithIdentifier("homeSecondCell", forIndexPath: indexPath) as! UITableViewCell
+ let cell = tableView.dequeueReusableCellWithIdentifier("homeSecondCell", forIndexPath: indexPath) 
  return cell
  }
 

diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj