diff --git a/librx/Base.lproj/Main.storyboard b/librx/Base.lproj/Main.storyboard index 5bfe64c..1a39872 100644 --- a/librx/Base.lproj/Main.storyboard +++ b/librx/Base.lproj/Main.storyboard @@ -978,7 +978,7 @@ - + @@ -986,13 +986,13 @@ - + - - + + @@ -1001,13 +1001,13 @@ - + - + @@ -1022,8 +1022,8 @@ - - + + @@ -1775,7 +1775,7 @@ - + diff --git a/librx/ExploreCollectionReusableView.swift b/librx/ExploreCollectionReusableView.swift index 140904b..db89a47 100644 --- a/librx/ExploreCollectionReusableView.swift +++ b/librx/ExploreCollectionReusableView.swift @@ -78,8 +78,6 @@ class ExploreCollectionViewController: UICollectionViewController, UICollectionV cell.frame.size.width = screenWidth / 3 cell.frame.size.height = screenWidth / 3 - // cornerRadius - // mark cell content let explore: Explore = explores[indexPath.row] cell.nameLabel.text = explore.name @@ -90,7 +88,6 @@ class ExploreCollectionViewController: UICollectionViewController, UICollectionV cell.iconImage.layer.cornerRadius = cell.iconImage.frame.width / 2 cell.iconImage.clipsToBounds = true cell.iconImage.layer.borderWidth = 1 - cell.iconImage.sizeToFit() cell.iconImage.layer.borderColor = UIColor.lightGrayColor().CGColor return cell diff --git a/librx/ExploreTableViewController.swift b/librx/ExploreTableViewController.swift index 343afa8..5e5e817 100644 --- a/librx/ExploreTableViewController.swift +++ b/librx/ExploreTableViewController.swift @@ -21,6 +21,7 @@ class ExploreTableViewController: UITableViewController { override func viewDidLoad() { super.viewDidLoad() + } override func viewDidAppear(animated: Bool) { @@ -98,6 +99,7 @@ class ExploreTableViewController: UITableViewController { }else { self.tableView.separatorStyle = UITableViewCellSeparatorStyle.SingleLine; + self.tableView.backgroundView = nil return 1; } return 0; @@ -140,7 +142,7 @@ class ExploreTableViewController: UITableViewController { cell.sourceImg.layer.cornerRadius = cell.sourceImg.frame.size.width / 2 cell.sourceImg.clipsToBounds = true cell.sourceImg.layer.borderWidth = 1 - cell.sourceImg.layer.borderColor = UIColor.blackColor().CGColor + cell.sourceImg.layer.borderColor = UIColor.grayColor().CGColor cell.descriptionLabel.text = source.description diff --git a/librx/StorysTableViewController.swift b/librx/StorysTableViewController.swift index 00d383c..2896a5d 100644 --- a/librx/StorysTableViewController.swift +++ b/librx/StorysTableViewController.swift @@ -39,8 +39,7 @@ class StorysTableViewController: UITableViewController { self.refreshControl?.attributedTitle = NSAttributedString(string: "下拉可以刷新数据") self.refreshControl?.tintColor = UIColor(red: 46/255.0, green: 204/255.0, blue: 113/255.0, alpha: 1.0) self.refreshControl?.addTarget(self, action: "refresh", forControlEvents: .ValueChanged) - self.refreshControl?.backgroundColor = UIColor.clearColor() - + self.refreshControl?.backgroundColor = UIColor.lightGrayColor() self.tableView.addSubview(refreshControl!)