From b385a5a712d2ec6cce27430485aa8a1bcd8d6d9f Mon Sep 17 00:00:00 2001
From: ylzheng <yunl.zheng@gmail.com>
Date: Tue, 24 Nov 2015 12:53:09 +0800
Subject: [PATCH] =?UTF-8?q?#49=20=20=E8=B0=83=E6=95=B4api=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 librx/DashViewController.swift                   |  4 ++--
 librx/StorysTableViewController.swift            |  1 +
 libxShareExt/Base.lproj/MainInterface.storyboard | 12 +++++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/librx/DashViewController.swift b/librx/DashViewController.swift
index 79ce4c6..f1aa826 100644
--- a/librx/DashViewController.swift
+++ b/librx/DashViewController.swift
@@ -36,7 +36,7 @@ class DashViewController: UIViewController {
         let storyboard = UIStoryboard(name: "Main", bundle: nil)
         
         let storysViewController1 = storyboard.instantiateViewControllerWithIdentifier("StoriesTableViewController") as! StorysTableViewController
-        storysViewController1.postSection = .HotTimeLine
+        storysViewController1.postSection = .Default
         storysViewController1.title = "信息流"
             
         let storysViewController2  = storyboard.instantiateViewControllerWithIdentifier("StoriesTableViewController") as! StorysTableViewController
@@ -44,7 +44,7 @@ class DashViewController: UIViewController {
         storysViewController2.title = "最新"
 
         let storysViewController3  = storyboard.instantiateViewControllerWithIdentifier("StoriesTableViewController") as! StorysTableViewController
-        storysViewController3.postSection = .Default
+        storysViewController3.postSection = .HotTimeLine
         storysViewController3.title = "热门"
         
         var controllerArray : [UIViewController] = []
diff --git a/librx/StorysTableViewController.swift b/librx/StorysTableViewController.swift
index c49129c..7f61d5a 100644
--- a/librx/StorysTableViewController.swift
+++ b/librx/StorysTableViewController.swift
@@ -267,6 +267,7 @@ class StorysTableViewController: UITableViewController {
         } else{
             if !post.goodFormat {
                 cell.pageMarkLabel.text = "网"
+                cell.pageMarkLabel.textColor = UIColor.whiteColor()
                 cell.pageMarkLabel.backgroundColor = UIColor(hexString: "#FB7F5A")
             } else {
                 cell.pageMarkLabel.text = "文"
diff --git a/libxShareExt/Base.lproj/MainInterface.storyboard b/libxShareExt/Base.lproj/MainInterface.storyboard
index 13790df..a7b15a5 100644
--- a/libxShareExt/Base.lproj/MainInterface.storyboard
+++ b/libxShareExt/Base.lproj/MainInterface.storyboard
@@ -2,6 +2,7 @@
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9052" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="j1y-V4-xli">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9040"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <scenes>
         <!--Share View Controller-->
@@ -15,12 +16,21 @@
                     <view key="view" opaque="NO" contentMode="scaleToFill" id="wbc-yd-nQP">
                         <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="feZ-4s-BQ8">
+                                <rect key="frame" x="14" y="555" width="51" height="31"/>
+                            </switch>
+                        </subviews>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="feZ-4s-BQ8" firstAttribute="leading" secondItem="wbc-yd-nQP" secondAttribute="leadingMargin" constant="-6" id="Tcx-xc-bss"/>
+                            <constraint firstItem="d5i-Ba-RvD" firstAttribute="top" secondItem="feZ-4s-BQ8" secondAttribute="bottom" constant="14" id="cmb-2D-ez9"/>
+                        </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="CEy-Cv-SGf" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="539" y="97"/>
+            <point key="canvasLocation" x="463" y="-91"/>
         </scene>
     </scenes>
 </document>