From 16bcaa0f1356a0c871749cd442d763ac4c3f775f Mon Sep 17 00:00:00 2001
From: wu736139669 <wu736139669@736139669@qq.com>
Date: Thu, 2 Apr 2015 10:34:04 +0800
Subject: [PATCH] new

---
 .../xcdebugger/Breakpoints_v2.xcbkptlist      |  6 +-
 Ash_AWord/Views/Note/NoteTableViewCell.h      |  1 +
 Ash_AWord/Views/Note/NoteTableViewCell.m      |  6 ++
 Ash_AWord/Views/Note/NoteTableViewCell.xib    | 17 +++++-
 .../Pods-DACircularProgress.xcscheme          | 59 +++++++++++++++++++
 .../xcschemes/Pods-MWPhotoBrowser.xcscheme    | 59 +++++++++++++++++++
 .../xcschemes/Pods-PSTCollectionView.xcscheme | 59 +++++++++++++++++++
 7 files changed, 202 insertions(+), 5 deletions(-)
 create mode 100644 Pods/Pods.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Pods-DACircularProgress.xcscheme
 create mode 100644 Pods/Pods.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Pods-MWPhotoBrowser.xcscheme
 create mode 100644 Pods/Pods.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Pods-PSTCollectionView.xcscheme

diff --git a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index ac62c33..630f82e 100644
--- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -266,11 +266,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "Ash_AWord/Views/Note/NoteTableViewCell.m"
-            timestampString = "449596299.705646"
+            timestampString = "449634594.612603"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "67"
-            endingLineNumber = "67"
+            startingLineNumber = "73"
+            endingLineNumber = "73"
             landmarkName = "+heightWith:"
             landmarkType = "5">
          </BreakpointContent>
diff --git a/Ash_AWord/Views/Note/NoteTableViewCell.h b/Ash_AWord/Views/Note/NoteTableViewCell.h
index 1cfc674..3b4fe49 100644
--- a/Ash_AWord/Views/Note/NoteTableViewCell.h
+++ b/Ash_AWord/Views/Note/NoteTableViewCell.h
@@ -9,6 +9,7 @@
 #import <UIKit/UIKit.h>
 @class Text_Image;
 @interface NoteTableViewCell : UITableViewCell
+@property (weak, nonatomic) IBOutlet UILabel *timeLabel;
 @property (weak, nonatomic) IBOutlet UILabel *contentLabel;
 @property (weak, nonatomic) IBOutlet UIImageView *avatar;
 @property (weak, nonatomic) IBOutlet UILabel *userName;
diff --git a/Ash_AWord/Views/Note/NoteTableViewCell.m b/Ash_AWord/Views/Note/NoteTableViewCell.m
index cc99977..fe6f9a3 100644
--- a/Ash_AWord/Views/Note/NoteTableViewCell.m
+++ b/Ash_AWord/Views/Note/NoteTableViewCell.m
@@ -13,6 +13,11 @@
 - (void)awakeFromNib {
     // Initialization code
     _contentLabel.font = [UIFont appFontOfSize:14.0];
+    _timeLabel.font = [UIFont appFontOfSize:14.0];
+    
+    _avatar.layer.cornerRadius = _avatar.frame.size.width/2;
+    _avatar.layer.masksToBounds = YES;
+    
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
@@ -43,6 +48,7 @@
 
     
     
+    _timeLabel.text = text_image.createTime;
     UIFont *font = [UIFont appFontOfSize:14.0];
     CGSize size = CGSizeMake(300*[Ash_UIUtil currentScreenSizeRate],MAXFLOAT);
     
diff --git a/Ash_AWord/Views/Note/NoteTableViewCell.xib b/Ash_AWord/Views/Note/NoteTableViewCell.xib
index dec6f9a..72197ae 100644
--- a/Ash_AWord/Views/Note/NoteTableViewCell.xib
+++ b/Ash_AWord/Views/Note/NoteTableViewCell.xib
@@ -27,7 +27,7 @@
                         <constraints>
                             <constraint firstAttribute="height" constant="21" id="lZB-v4-5by"/>
                         </constraints>
-                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
                         <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -100,6 +100,16 @@
                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="p9l-PS-2tC">
                         <rect key="frame" x="8" y="69" width="304" height="112"/>
                     </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="       " textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kO5-Uc-AhU">
+                        <rect key="frame" x="112" y="12" width="200" height="21"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="21" id="So4-KJ-qSw"/>
+                            <constraint firstAttribute="width" constant="200" id="b2k-Td-bM3"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                 </subviews>
                 <constraints>
                     <constraint firstItem="p9l-PS-2tC" firstAttribute="top" secondItem="Uly-Ql-At6" secondAttribute="bottom" constant="8" id="1xJ-Ua-AUU"/>
@@ -107,6 +117,7 @@
                     <constraint firstItem="p9l-PS-2tC" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" id="8ZE-ff-hMV"/>
                     <constraint firstAttribute="trailingMargin" secondItem="Zq3-YP-dwB" secondAttribute="trailing" constant="-8" id="AWp-lE-bwq"/>
                     <constraint firstAttribute="bottomMargin" secondItem="xeW-Yw-x4V" secondAttribute="bottom" constant="-3" id="CHt-YD-DRF"/>
+                    <constraint firstItem="kO5-Uc-AhU" firstAttribute="trailing" secondItem="H2p-sc-9uM" secondAttribute="trailingMargin" id="Dxu-6O-Q88"/>
                     <constraint firstAttribute="bottomMargin" secondItem="A54-Sv-7Vo" secondAttribute="bottom" constant="-3" id="GQb-si-pt6"/>
                     <constraint firstItem="Zq3-YP-dwB" firstAttribute="leading" secondItem="j8x-8X-1uX" secondAttribute="trailing" constant="8" id="Jr5-MH-iSW"/>
                     <constraint firstItem="Uly-Ql-At6" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" constant="2" id="JsO-9m-lHD"/>
@@ -118,6 +129,7 @@
                     <constraint firstItem="Zq3-YP-dwB" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" constant="2" id="Yz4-qJ-JUc"/>
                     <constraint firstItem="xeW-Yw-x4V" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leadingMargin" id="YzT-Tf-o6a"/>
                     <constraint firstItem="Uly-Ql-At6" firstAttribute="trailing" secondItem="H2p-sc-9uM" secondAttribute="trailingMargin" constant="-2" id="ZhZ-qC-Tj6"/>
+                    <constraint firstItem="kO5-Uc-AhU" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" constant="4" id="fRB-tZ-fsb"/>
                     <constraint firstItem="p9l-PS-2tC" firstAttribute="trailing" secondItem="H2p-sc-9uM" secondAttribute="trailingMargin" id="hsb-xb-XRe"/>
                     <constraint firstAttribute="bottomMargin" secondItem="p9l-PS-2tC" secondAttribute="bottom" constant="30" id="hwb-4s-rTG"/>
                     <constraint firstItem="j8x-8X-1uX" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="topMargin" id="kHO-Ea-fBs"/>
@@ -138,9 +150,10 @@
                 <outlet property="contentLabel" destination="Uly-Ql-At6" id="g1W-5b-sC7"/>
                 <outlet property="goodBtn" destination="xeW-Yw-x4V" id="0LE-Gu-6C1"/>
                 <outlet property="shareBtn" destination="DAR-mT-RbS" id="fGW-sh-aV3"/>
+                <outlet property="timeLabel" destination="kO5-Uc-AhU" id="jky-Wu-oYB"/>
                 <outlet property="userName" destination="Zq3-YP-dwB" id="Ggo-yh-zdb"/>
             </connections>
-            <point key="canvasLocation" x="193" y="147"/>
+            <point key="canvasLocation" x="193" y="146"/>
         </tableViewCell>
     </objects>
     <resources>
diff --git a/Pods/Pods.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Pods-DACircularProgress.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Pods-DACircularProgress.xcscheme
new file mode 100644
index 0000000..730b4c3
--- /dev/null
+++ b/Pods/Pods.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Pods-DACircularProgress.xcscheme
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0510"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C37FD853CB072143A5870EDB"
+               BuildableName = "libPods-DACircularProgress.a"
+               BlueprintName = "Pods-DACircularProgress"
+               ReferencedContainer = "container:Pods.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Pods/Pods.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Pods-MWPhotoBrowser.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Pods-MWPhotoBrowser.xcscheme
new file mode 100644
index 0000000..ae27356
--- /dev/null
+++ b/Pods/Pods.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Pods-MWPhotoBrowser.xcscheme
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0510"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0965509D6FC49C811309F372"
+               BuildableName = "libPods-MWPhotoBrowser.a"
+               BlueprintName = "Pods-MWPhotoBrowser"
+               ReferencedContainer = "container:Pods.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Pods/Pods.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Pods-PSTCollectionView.xcscheme b/Pods/Pods.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Pods-PSTCollectionView.xcscheme
new file mode 100644
index 0000000..cbf5301
--- /dev/null
+++ b/Pods/Pods.xcodeproj/xcuserdata/xmfish.xcuserdatad/xcschemes/Pods-PSTCollectionView.xcscheme
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0510"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4BD013E38F08B8A236F2377D"
+               BuildableName = "libPods-PSTCollectionView.a"
+               BlueprintName = "Pods-PSTCollectionView"
+               ReferencedContainer = "container:Pods.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>