From 4145dc7a50b22020092cc2e9fa8754edd23fa584 Mon Sep 17 00:00:00 2001 From: wu736139669 Date: Tue, 2 Jun 2015 10:29:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87cell?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ash_AWord.xcodeproj/project.pbxproj | 48 +++++++ .../xcdebugger/Breakpoints_v2.xcbkptlist | 130 ++++++++++++++++-- Ash_AWord/Resource/accessory@2x.png | Bin 0 -> 3833 bytes Ash_AWord/Resource/accessoryN@2x.png | Bin 0 -> 1285 bytes .../Resource/mainCellCommentClickN@2x.png | Bin 0 -> 2884 bytes Ash_AWord/Resource/mainCellCommentN@2x.png | Bin 0 -> 2940 bytes Ash_AWord/Resource/praise-wall-white@2x.png | Bin 0 -> 3637 bytes Ash_AWord/Utility/Network/RequireEngine.m | 6 +- Ash_AWord/Utility/Tool/CommonUtil.m | 66 ++++----- .../ViewControllers/Main/NoteViewController.m | 3 +- .../Note/NoteCommentViewController.h | 13 ++ .../Note/NoteCommentViewController.m | 37 +++++ .../Note/NoteCommentViewController.xib | 19 +++ .../Common/CommentGoodListCellTableViewCell.h | 14 ++ .../Common/CommentGoodListCellTableViewCell.m | 23 ++++ .../CommentGoodListCellTableViewCell.xib | 52 +++++++ Ash_AWord/Views/Note/NoteTableViewCell.h | 1 + Ash_AWord/Views/Note/NoteTableViewCell.m | 12 +- Ash_AWord/Views/Note/NoteTableViewCell.xib | 103 +++++++++----- 19 files changed, 444 insertions(+), 83 deletions(-) create mode 100644 Ash_AWord/Resource/accessory@2x.png create mode 100644 Ash_AWord/Resource/accessoryN@2x.png create mode 100644 Ash_AWord/Resource/mainCellCommentClickN@2x.png create mode 100644 Ash_AWord/Resource/mainCellCommentN@2x.png create mode 100644 Ash_AWord/Resource/praise-wall-white@2x.png create mode 100644 Ash_AWord/ViewControllers/Note/NoteCommentViewController.h create mode 100644 Ash_AWord/ViewControllers/Note/NoteCommentViewController.m create mode 100644 Ash_AWord/ViewControllers/Note/NoteCommentViewController.xib create mode 100644 Ash_AWord/Views/Common/CommentGoodListCellTableViewCell.h create mode 100644 Ash_AWord/Views/Common/CommentGoodListCellTableViewCell.m create mode 100644 Ash_AWord/Views/Common/CommentGoodListCellTableViewCell.xib diff --git a/Ash_AWord.xcodeproj/project.pbxproj b/Ash_AWord.xcodeproj/project.pbxproj index d025f81..3a04cfe 100644 --- a/Ash_AWord.xcodeproj/project.pbxproj +++ b/Ash_AWord.xcodeproj/project.pbxproj @@ -188,6 +188,13 @@ A9B4A9551AEDC3620017C655 /* FeedbackViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9B4A9531AEDC3620017C655 /* FeedbackViewController.xib */; }; A9B4E39F1AC9908E00A1DBDF /* libMobClickLibrary.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9B4E39C1AC9908E00A1DBDF /* libMobClickLibrary.a */; }; A9BE23BF1ACD8CA20032171A /* libSocialSina.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9BE23BD1ACD8CA20032171A /* libSocialSina.a */; }; + A9CF211C1B1C36D0007490EF /* mainCellCommentClickN@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9CF211A1B1C36D0007490EF /* mainCellCommentClickN@2x.png */; }; + A9CF211D1B1C36D0007490EF /* mainCellCommentN@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9CF211B1B1C36D0007490EF /* mainCellCommentN@2x.png */; }; + A9CF21211B1C4C70007490EF /* NoteCommentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9CF211F1B1C4C70007490EF /* NoteCommentViewController.m */; }; + A9CF21221B1C4C70007490EF /* NoteCommentViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9CF21201B1C4C70007490EF /* NoteCommentViewController.xib */; }; + A9CF21271B1C53E3007490EF /* CommentGoodListCellTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = A9CF21251B1C53E3007490EF /* CommentGoodListCellTableViewCell.m */; }; + A9CF21281B1C53E3007490EF /* CommentGoodListCellTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9CF21261B1C53E3007490EF /* CommentGoodListCellTableViewCell.xib */; }; + A9CF212A1B1C65A2007490EF /* praise-wall-white@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9CF21291B1C65A2007490EF /* praise-wall-white@2x.png */; }; A9E2711B1ADB97ED000B1542 /* Default-568h.png in Resources */ = {isa = PBXBuildFile; fileRef = A9E271191ADB97ED000B1542 /* Default-568h.png */; }; A9E2711C1ADB97ED000B1542 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = A9E2711A1ADB97ED000B1542 /* Default.png */; }; A9E2711E1ADBB25C000B1542 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9E2711D1ADBB25C000B1542 /* AVFoundation.framework */; }; @@ -201,6 +208,8 @@ A9FAD4311AC923FC007ADC10 /* MyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9FAD42F1AC923FC007ADC10 /* MyViewController.m */; }; A9FAD4321AC923FC007ADC10 /* MyViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9FAD4301AC923FC007ADC10 /* MyViewController.xib */; }; A9FAD4351AC925AC007ADC10 /* LoginViewModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A9FAD4341AC925AC007ADC10 /* LoginViewModel.m */; }; + A9FD82B71B1D433800AC4DC9 /* accessory@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9FD82B51B1D433800AC4DC9 /* accessory@2x.png */; }; + A9FD82B81B1D433800AC4DC9 /* accessoryN@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A9FD82B61B1D433800AC4DC9 /* accessoryN@2x.png */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -480,6 +489,15 @@ A9B4E39E1AC9908E00A1DBDF /* MobClickSocialAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobClickSocialAnalytics.h; sourceTree = ""; }; A9BE23BD1ACD8CA20032171A /* libSocialSina.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libSocialSina.a; sourceTree = ""; }; A9BE23BE1ACD8CA20032171A /* UMSocialSinaHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UMSocialSinaHandler.h; sourceTree = ""; }; + A9CF211A1B1C36D0007490EF /* mainCellCommentClickN@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mainCellCommentClickN@2x.png"; sourceTree = ""; }; + A9CF211B1B1C36D0007490EF /* mainCellCommentN@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mainCellCommentN@2x.png"; sourceTree = ""; }; + A9CF211E1B1C4C70007490EF /* NoteCommentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoteCommentViewController.h; sourceTree = ""; }; + A9CF211F1B1C4C70007490EF /* NoteCommentViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NoteCommentViewController.m; sourceTree = ""; }; + A9CF21201B1C4C70007490EF /* NoteCommentViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NoteCommentViewController.xib; sourceTree = ""; }; + A9CF21241B1C53E3007490EF /* CommentGoodListCellTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommentGoodListCellTableViewCell.h; sourceTree = ""; }; + A9CF21251B1C53E3007490EF /* CommentGoodListCellTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CommentGoodListCellTableViewCell.m; sourceTree = ""; }; + A9CF21261B1C53E3007490EF /* CommentGoodListCellTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CommentGoodListCellTableViewCell.xib; sourceTree = ""; }; + A9CF21291B1C65A2007490EF /* praise-wall-white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "praise-wall-white@2x.png"; sourceTree = ""; }; A9E271191ADB97ED000B1542 /* Default-568h.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h.png"; sourceTree = ""; }; A9E2711A1ADB97ED000B1542 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; A9E2711D1ADBB25C000B1542 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; @@ -498,6 +516,8 @@ A9FAD4301AC923FC007ADC10 /* MyViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MyViewController.xib; sourceTree = ""; }; A9FAD4331AC925AC007ADC10 /* LoginViewModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewModel.h; sourceTree = ""; }; A9FAD4341AC925AC007ADC10 /* LoginViewModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewModel.m; sourceTree = ""; }; + A9FD82B51B1D433800AC4DC9 /* accessory@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "accessory@2x.png"; sourceTree = ""; }; + A9FD82B61B1D433800AC4DC9 /* accessoryN@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "accessoryN@2x.png"; sourceTree = ""; }; AD3C5DED2445FC2F0892A525 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = ""; }; E7B8559E65B4108EA2C3F343 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -748,6 +768,9 @@ A97559AF1ACBC683004ADA42 /* NotePublishViewController.h */, A97559B01ACBC683004ADA42 /* NotePublishViewController.m */, A97559B11ACBC683004ADA42 /* NotePublishViewController.xib */, + A9CF211E1B1C4C70007490EF /* NoteCommentViewController.h */, + A9CF211F1B1C4C70007490EF /* NoteCommentViewController.m */, + A9CF21201B1C4C70007490EF /* NoteCommentViewController.xib */, ); path = Note; sourceTree = ""; @@ -810,6 +833,7 @@ A97C54B91AC8F0370038818A /* Views */ = { isa = PBXGroup; children = ( + A9CF21231B1C4EA2007490EF /* Common */, A98D65991AD37EFD008668EE /* Message */, A97559C01ACBEE71004ADA42 /* Note */, ); @@ -905,6 +929,11 @@ A97C54E21AC91FD70038818A /* Resource */ = { isa = PBXGroup; children = ( + A9FD82B51B1D433800AC4DC9 /* accessory@2x.png */, + A9FD82B61B1D433800AC4DC9 /* accessoryN@2x.png */, + A9CF21291B1C65A2007490EF /* praise-wall-white@2x.png */, + A9CF211A1B1C36D0007490EF /* mainCellCommentClickN@2x.png */, + A9CF211B1B1C36D0007490EF /* mainCellCommentN@2x.png */, A966FB951AD62C5D00542068 /* icon_error@2x.png */, A966FB971AD62CAE00542068 /* checkmark@2x.png */, A966FB981AD62CAE00542068 /* errormark@2x.png */, @@ -1135,6 +1164,16 @@ path = Sina; sourceTree = ""; }; + A9CF21231B1C4EA2007490EF /* Common */ = { + isa = PBXGroup; + children = ( + A9CF21241B1C53E3007490EF /* CommentGoodListCellTableViewCell.h */, + A9CF21251B1C53E3007490EF /* CommentGoodListCellTableViewCell.m */, + A9CF21261B1C53E3007490EF /* CommentGoodListCellTableViewCell.xib */, + ); + path = Common; + sourceTree = ""; + }; A9FAD41E1AC92293007ADC10 /* Main */ = { isa = PBXGroup; children = ( @@ -1251,9 +1290,11 @@ A90BA0011AD6031E00728393 /* MessagePublishViewController.xib in Resources */, A93442031ACA981D00A6B233 /* Default-568h@2x.png in Resources */, A9FAD4321AC923FC007ADC10 /* MyViewController.xib in Resources */, + A9FD82B81B1D433800AC4DC9 /* accessoryN@2x.png in Resources */, A93441FF1ACA919F00A6B233 /* tabbarVoice@2x.png in Resources */, A968627E1ACCF46E00DDAA6B /* cellmorebtnclickN@2x.png in Resources */, A9EA14C31B02E88300357529 /* LaunchScreen.xib in Resources */, + A9CF211D1B1C36D0007490EF /* mainCellCommentN@2x.png in Resources */, A93441FA1ACA919500A6B233 /* tabbarQuotation-dark@2x.png in Resources */, A97559D01ACBF0BC004ADA42 /* btn_share_clicked@2x.png in Resources */, A90BA01F1AD606AE00728393 /* voice-record-icon@2x.png in Resources */, @@ -1272,6 +1313,7 @@ A97DBE461ACAE7B500705682 /* iconWeixin@2x.png in Resources */, A96862421ACCF0B400DDAA6B /* LICENCE.txt in Resources */, A985367D1AEB8F89000312BF /* RegistInfoViewController.xib in Resources */, + A9CF21281B1C53E3007490EF /* CommentGoodListCellTableViewCell.xib in Resources */, A99AA12F1ADD028400574B12 /* Icon120.png in Resources */, A98536821AEBC7BB000312BF /* SetUserInfoViewController.xib in Resources */, A97C55071AC933AD0038818A /* UMSShareListController.xib in Resources */, @@ -1284,6 +1326,7 @@ A97C55041AC933AD0038818A /* UMShareEditViewControlleriPad.xib in Resources */, A978838A1AD36A0500D46477 /* mainCellDing@2x.png in Resources */, A98F98541ACA29B5007C4594 /* TencentOpenApi_IOS_Bundle.bundle in Resources */, + A9CF211C1B1C36D0007490EF /* mainCellCommentClickN@2x.png in Resources */, A9617A591ACC2EBC0024AE4A /* mine-setting-icon@2x.png in Resources */, A968627C1ACCF3D200DDAA6B /* cellmorebtnnormalN@2x.png in Resources */, A93442041ACA981D00A6B233 /* Default@2x.png in Resources */, @@ -1300,6 +1343,7 @@ A93441E61ACA8AC400A6B233 /* Profile_filter_contentIconClick@2x.png in Resources */, A97559C51ACBEE99004ADA42 /* NoteTableViewCell.xib in Resources */, A90BA0151AD6066000728393 /* voice-bottom-sure@2x.png in Resources */, + A9CF212A1B1C65A2007490EF /* praise-wall-white@2x.png in Resources */, A9617A551ACC27860024AE4A /* SetUpViewController.xib in Resources */, A97559D11ACBF0BC004ADA42 /* btn_share@2x.png in Resources */, A98D659E1AD37F18008668EE /* MessageTableViewCell.xib in Resources */, @@ -1319,6 +1363,7 @@ A90BA0121AD6066000728393 /* voice-bottom-close-click@2x.png in Resources */, A97C55061AC933AD0038818A /* UMSnsAccountViewController.xib in Resources */, A966FB9A1AD62CAE00542068 /* errormark@2x.png in Resources */, + A9CF21221B1C4C70007490EF /* NoteCommentViewController.xib in Resources */, A97559CD1ACBF0BC004ADA42 /* btn_bad@2x.png in Resources */, A93441F71ACA918100A6B233 /* tabbarSetup@2x.png in Resources */, A90BA0091AD6060600728393 /* playButtonClick@2x.png in Resources */, @@ -1342,6 +1387,7 @@ A97DBE421ACAE4E300705682 /* first-login-icon.png in Resources */, A97C55051AC933AD0038818A /* UMSLoginViewController.xib in Resources */, A97C55081AC933AD0038818A /* UMSocialSDKResourcesNew.bundle in Resources */, + A9FD82B71B1D433800AC4DC9 /* accessory@2x.png in Resources */, A90BA01B1AD6069A00728393 /* voice-play-start@2x.png in Resources */, A97DBE341ACAE10800705682 /* LoginViewController.xib in Resources */, A93441EA1ACA8AD200A6B233 /* Profile_filter_ImageIconClick@2x.png in Resources */, @@ -1394,6 +1440,7 @@ A9FAD4271AC922BE007ADC10 /* NoteViewController.m in Sources */, A97559A01ACB88FE004ADA42 /* AWordDefault.m in Sources */, A97C54D31AC8F10F0038818A /* XiaoYuAPIClient.m in Sources */, + A9CF21211B1C4C70007490EF /* NoteCommentViewController.m in Sources */, A97559C41ACBEE99004ADA42 /* NoteTableViewCell.m in Sources */, A96862481ACCF0B400DDAA6B /* MWTapDetectingImageView.m in Sources */, A9FAD4311AC923FC007ADC10 /* MyViewController.m in Sources */, @@ -1418,6 +1465,7 @@ A968626E1ACCF13300DDAA6B /* NSIndexPath+PSTCollectionViewAdditions.m in Sources */, A9FAD42C1AC923E2007ADC10 /* MessageViewController.m in Sources */, A985367C1AEB8F89000312BF /* RegistInfoViewController.m in Sources */, + A9CF21271B1C53E3007490EF /* CommentGoodListCellTableViewCell.m in Sources */, A98536811AEBC7BB000312BF /* SetUserInfoViewController.m in Sources */, A968627A1ACCF13300DDAA6B /* PSTGridLayoutSection.m in Sources */, A96862771ACCF13300DDAA6B /* PSTGridLayoutInfo.m in Sources */, 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 3934387..219e524 100644 --- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -665,11 +665,11 @@ ignoreCount = "0" continueAfterRunningActions = "No" filePath = "Ash_AWord/Views/Note/NoteTableViewCell.m" - timestampString = "451710683.81762" + timestampString = "454903615.072925" startingColumnNumber = "9223372036854775807" endingColumnNumber = "9223372036854775807" - startingLineNumber = "148" - endingLineNumber = "148" + startingLineNumber = "154" + endingLineNumber = "154" landmarkName = "-setText_Image:" landmarkType = "5"> @@ -965,7 +965,7 @@ @@ -1666,5 +1666,117 @@ landmarkType = "5"> + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ash_AWord/Resource/accessory@2x.png b/Ash_AWord/Resource/accessory@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..43b88023a4a12e44f1475a25ce711a43b19f86c6 GIT binary patch literal 3833 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 literal 0 HcmV?d00001 diff --git a/Ash_AWord/Resource/mainCellCommentClickN@2x.png b/Ash_AWord/Resource/mainCellCommentClickN@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..15722e29dba93facf98f506c2a8b0dfea47cb052 GIT binary patch literal 2884 zcmbVOc|4T)AD_*cRF-noFUIIv%sqn{=P={Qk{x6!VUA}qm>Fg!Gf8CHO-h$S$&oA@ zRwY*m`H9pJ5_TO?k|k%3a{nG}_V@c^U;D@JdA*+F`#hiX{k-3w=ZSH1b=at~O$7ph z$lD#Yb#jA1*BP}HM1t#$PL5hc+f;Nm+y&8J{Lh}@fiR@ z!VLzWLm(E`l3+SB5D-Bbz)=p*5;k651%q-}mM|~83(6(f4)EtVh6w=oFjo&|SRj+Y zf>~QZEhI!R02dI^p%QKoPe_zl!oI{Mg4e6Jkuc~N6H%ZgjI^2%N^^08+VKSd6pz5e znJ6?4YDz$$@o1bG+8ByKp|MC57Kz5f(HJ6%Kt$uAUpE+-O~7Iksbu@Fxxker%wHr5 zCL)nyu^1u7BKU%%NHl>!K%y{63d*Rrp+ka2Ay;|wKfGDH1(I>~@-G#Di@$UP@IdhhK$YkyZG8zUOh-ha ziQM^Yk(e$3Ab*O%iAz5UGJ?)J9`X#ZfIyTEI*~~pqX$m}xqE8+j*s>iSDdWs>gwR~ zdp~uT7f&BMy;mR0w#rgW*(R-1&~!j4#`i%FqBcB)o}uZ-lhw%@;rcN(S`W;UV|SJL z;qF{j#RX7H2zA7|_SyNT)a(&W#h{>=g}4QWCdu<;~0(I3&mV2p~l0L)C`wv(E3AUf7sa>8aDQ?#{0io zzwC&9GgNq}Dy&F*WAt431@^pl-T|pSEMQ4vzu#TU6YH*EkNTeh}Rh#Rn#*w(rG4v#r)ojXP1_@FQw8{PSutQ_vq+tTNiWX+l;(S1?iKw2Nf91cP|w5u#CQP$BPkTkKC#Bgym~ zwGiUqFqy)TLhE0+8sZ7rB^E1-E>Xp0zL6>W2BwIu^D~~F7O%S<)Z~ZqFKp*zx!vz8 z5AA7A)=qVG&vs6HH(Wkm*%q7m%4%9I{`sKGEVt`!;H|pmW*cnn?R}r>4W=k10ZYSe zxS9vpIw(2W^>V{N!^K3Oq;c=4H$ynb*jVKsHD!2n^OMn==4z~$>raz!&na#qsXIZ# zW`FGw_C3ZwEGkQ4(+;F(=N{fmwaq*+{X^1sTgYd-j?DRcmx~u_td~U2?vwb^3r(Bt zBbVAne#_5bB=*JiMw)gO^C~)HuJ7P-4}5xEv8}(esQbpnr|$m4!>Eq29u;;|5q|vUD^O+Ejq>i`UrC7Dm@q235%v`a?=M59!{bBd;d50Z9;E>_- zIFhdQrZ^_Ea(KLIaD%8!@Md75a%xlKmh-wfzdV&IE9YdoI-FsYS+uPM4 z`qKXDU6G4)gW2&FaY$XAy>3`QY4TIn-HU7$g`$YI9GU#Y@fqz$FA5_p9b+#h zM3hU@B8De)EhGaHi-{Ho*WPryU1^zA4Gpg`#Afvvo45Z~$ji^a;{2giRc2UZ+*90BTdlo?f;BcG8GJit zJUg6=b2lc2k5_=&6M<|p*3tVHd1sVODS75)MFkX%VHmuY)C@mo*m5wCAIfTXy*CvEvJ)rJVqBX|%*6fMI)y+ie!O{Rv2S5d7OE77HUI z-=^5ya_beRnTtlW!9fYK<_ClxJFjzh|LN0e##eh9#6K!u%q^UmSp~$+_-0C({=x{> zBjo9hf{0iQ;L_NZb5%BZ%i~ZovT7uEdCXk8IBW#cO1MpiTwa?f$`aIsgt3B^--(cEl7Qz8*{2@IotT5}? z2R|Aj&5M-L+#Oj3&KJ>KuU=*}IDwZZnykAl`IXt|yGLZ1wSz-t8%R&6ke@$hIs?zQ v8eL0L(j#w`C7y2yrkyoQ+3;o`uSIiog|!07aSxTQ{_HwYT*-HB{iOc^$gcZv literal 0 HcmV?d00001 diff --git a/Ash_AWord/Resource/mainCellCommentN@2x.png b/Ash_AWord/Resource/mainCellCommentN@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..4002507e3548681cbfc555c03d3fb969c7a4658a GIT binary patch literal 2940 zcmbVOdpMN&9-ksjN_mn}D`tm~jJX;UZ68*w! z7#d88(_D!{RM*Sg}~u*H>!=ybJno8GmW5@Qjf`*jZ2#+33R#E=ALGwEpX#*#1MQ~8h$UO*<1FcdDy z2E!$gtS}T3g^%HrxjZu2n!@E<^A_U#mA^fiL81_d6f%QFz~fm&8xq6Hk;Jkg5Lje; z9G$uicw!7ri%U|J)X$NLjpb#!zU317(9u@$8fF5T#Pk|VvQ#d zhyonX8vV_m|NlaV1w~<1Joz8qEIa~aRNelm0&w_KN00=FM-EhS?ehCnP$V>20^qkj8#>~34HoKicOcrOeWz53Iep=QZbW|}qyf400bS0!zr|kLmJ>=qj5t&(IFRc9U zl!`86-rXqfx^6yNC|>P+ounl?gLo5|Wx+KyPW<6U+|#+aEzjO5@=CiMBN3PfhLZ?Xz?`o$2nLrq9ss^iVsSmX=oHX|9$~ zKktF$JRhFg`*H|gJ~cJvusHET)+2$UZJNDvXKPDqYelF~c+J2zZf3Xbc_k0Yfdzv8 zWc&QnP*ulSjM~}s^z`yw#qVX5xGma9i{cj{1T40qC%n0L;?s+}ckg1=58fN5q;`9n zXD%|y$hld3!P(h)>s-S86-w&%YB+kr52t;-nbVOopZ4$Gb?K?aNw8J z8>%ye8#iuzhWOz{U0vNe!v|Mfuk2Rg;_dAna*oVn8>d&euc?0e?3n{?S94*Z$yP*A zSz+P*8++j0fq{1F-yfIgsU2z9Y=Y$am3eQwxz&3RzOzKXSt@{_WdsM%m)+Q2jc6=Ne88H=9eVSC$TC$j-bqHs^Hf1()ySclE2Tuc0+W+?LDHE%AO67i0 zZ0u+3POCL`wCbRlxi9sh)&8eXed!+3XtFFzYvYi@4-{Fv}W6BqiWPo52$W|eto#M#zUbGiYL>jVNpxpCNA`Rz^GKNq=~ zg*iXB%zp41U{G9Kd@{hYZJ#>hm2JZBGloP0LEfu_O=2LGeX9oudI}#HUmBts^ z4Le3Z*6t5Wpt+BoC+Us8uB|b&*K=v?PD)BTF}(G8Y5*gd?EO+|o`e$_`B4Wn-q+XXb^l6HMn*=q zOut@4+7S3+cq&DmVR7=riMgzML6`5(YJ%)>w%y$~{4qED%k03ctTt$6{u0GzwU`M5(0+iyV1$G_r6na*`t;bzV6)`CgG%MR08D~`KI37wCL#O5)VT+J)V7X} zAs!)TMBTy!tcVn|KL5#F+i$kopl|k5Rx|ZrePCk2CYX-cb@xw`fyE%&gG&ar&Lb6S4~&^ zm&yu8dl)$wh9@o9>488@ZQkCWkp~`kc6QQ?*>5WS%cPrnzHF;AQZ23Ii{2U<8g;c^ zB{V#KeAdZWUUTUZFZS75Ga!Ri&EvVFqod8%p z=K$TH)$o;MS~?Or+eOYDJ>KwJ^g!b=o&B1C@~A`Z$rs0NzaE>&%gd|7@JjVC9bq?# zEx&Heebf&}L_Ff?MNU00_L#SU2Oqah#m-%9;>I-a33tl@j;jo4dSO7z>vVNn&d*%x zazY?MF)B*!^6;p7>9wU;S64Trsw3_USj72mgNL^l{QT_c)9W>uhfjy#Li_yp8OAY7 zSx=VJ3@U!SaN)vUbei6s+FJaPhH>WusI2b~JsBS#Pm$k#m3QXM=S;DSu#sCS2?=?3 zX{Ot-5-bSaindvwjFw4p&W?VkQz_CEoZfLy+w*~Y0s>yC1YcBMZX4k5-?>>E8DgXF hI_`QaeV<9|+j;hvrOi#HMyfx_Y?dpt+&<{Qe*jd^^fUkf literal 0 HcmV?d00001 diff --git a/Ash_AWord/Resource/praise-wall-white@2x.png b/Ash_AWord/Resource/praise-wall-white@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..c2263492310521fb94e730a4be8a5e7b15897c99 GIT binary patch literal 3637 zcmds4`9Bn17rrz0UAD1gk8g!Sl*pcpvW`7FAkV67};X%I}IT*$yV8FEK!z_ zok>Gu$(E&edOzQP;(hPubIx{;49|_9 zFE~x`)P5X)Gr`hc<)`RW`KyR<%G%n&*g*>^hjciA9^}BB;F3;RF7gJK5wTZP$3>G( z;GG{@F;HIkEUg&lGVz@!T^9iBH0ZF%pjypC$O}IJ1^y%FPI2|j{fTKdm9_?ADPUHD zi^KxKB0%psi(Vek%MWVJU*2K{X#gP6_jDvc6&qOnWuQR^#w$~&U|_uHWF;d=gn+Em z`lp~;Z-BF96hao-@eUN=wIt5bcGN&HwvCGVP)sWw2uZTRa%edNOqPyp9}rW40$maA zei|`DngaRZ_Ss4&|5ySX0y>E4{h2q0FYpl3KM96zuFuYk&%Z;~>A1koaC$H;O5|kX zB)Q=v8p8or00j4k-X5!HVoA%3bITqiB;{9E(Xr3EpM-|^#>{cc6DTdjN(L0#ytYO$W`xWcJJzlb@>T*#lHEnv~1I!^nlmPWAPMD`qK!&?OvHqtDY zeH7UrM(@m@_m02iArq~3FC({$xN7_f*Q9ZY0Y+F>60L*_Tk3i9$K3^iLqSR$4w#H0 zpCQ2p5p_&sQTfn~@4-PJ;&GB2W=MhESPsEne|uZ zePOJMSIxg^fGP+vJ#QXY$*mNeE!B_X(7bcYahuao^lvw|`iHUC3Le6XE!>*A1ro*ix)t3wY;;BgtZ2xxKF^F??dtbe z4MXS-ghI~WH8j@^tn$EnqC$#cjP0>-OE}nHOPb{lQ$t3F7VMl+N45Lk7kF z5Tt*`c`hi2!8APZekWb=O4IIBK37~^y%Z-)I!n41+s^c-`DA-E4>f!a>g(&3ox+df zKddHQ9?9{^b7}k9GI^L7TdJ4Sbv@x?LQlp-#yuikhEc{Y{+X4A720asY7B2MYEPCW zqeiWfrb5;@R-7u1*jQ1GtL_ZJp=NmId6LfzpV>C|olsakTxDL(UZr2VyyLPXwS(Fj z6z)68B|NGYq;@YLD7Y^K>EA*wnNxaS*;)C1#oANIvoJ7sOBq&n154z}49SFh8Y>R%kT3HK6(7`EhM!Z4xu; zZIY3rky()phj|BTzllf5d+l@RO}-6dI%mjR$P%PAN-*jrjSr0|Z5C}QgECzr-5dJz ztQx#JtW0dSq5-LX9k5NIeYXo!p0e3PydN2Jd2b5+mhY1`6d65{^l*@IhBMNyY~OID zuaPl+Rv#Hp5cLwsg6&7}oH?slb?%2*gL%-Mpk3Kf{G#oFXKT_%a^;iPYLniL0U@4v zZzKZgwu&QQ2vvlru(&ou2R#B@y0^P4P{`x*&zZ$7}qn&`C^B^H_0H4&~~dAgiy zmA<3$O)WzA_w9!!*Mhq*Fqt4^&?y2>UrTNoSzR5S#t(kI^HuJ0T25L{F@nu2qd{g& zzUg$6iHD3#D%&D@8TC;pHSXi?qU3(y)+8@7)^Mn}0a0Vh&S!YOLMF_P-!6;*Z-w9d za$&~f_{Y8^OEllTR&1>)q4woCA@;$38;zQnn7-chag7Womymt&ySD8wuD5z?k9>N#&Q>k7k+>w}gt|T* zR2c5Poz&mZ|FNG&*+qHHuCEb4xmkFzcqcsfz5~(fsQP(R+gIs{(e`hlcemJMgn8Ab zDQT-MuVlikeOmP*wta_xMt@5dbQNlDUyl4n&<{1~%1gdmdY55Gk3#ki@%4;8)9M@hi_xhI<+sZ7a*Z|B zzhq6JcMT7-d>qUiT0M0K^E6>WKMk9lc0X)Qlad|QTl{}X?7B`$HQlIIuTj^J^go(| zzp(QoyYCX$tgqAr{W2n}4N*Sd|Lxr|5;(RucFrLm-Ad_R6>9R8{&tce)x5nIva<#Y zW&UY6`ZZa$7z2)$IT7v_vw#F zUXx5r&J`6EViRoLyfu(IS6*MvJ@_%w>JOS6_?$FzG=Feo(B^P_on=2^u)PLdxfMWp zUim_`N3ut>WdNnZXbS<#uUWPP0Ql70arYOJ*Uuj z_$^M@Ymr(EW*~H~@Wz`4qbOYdIf~4j;Y`r<^j;xqawqJHh#Um0b5vDTO>0_OTH4Zr z*;pOMx$ss;l8Hh$zYb#t1cas3kel~$HDpyHRnllVj0Imm6TwlRhNvPpH*$gwZeBez z*7x##m#B_M&&-Ay%o-S%fA(_p*T^5tfP%2-GOui}?6OiZT$z`5c3B-i=%88KJvdTH zT4)(oNpiEzC|v?Tq=a%1IbA_Hm<|Ad<5MF_&2w{}1NfJ}xO6-vw)HoRtv({o8r~WMo@6NPn-_4rl+%;KN5O3@&wv zf>{oC+YGzuy+HH^10aZ#5;ez`0$$sk1mj40Fzdvm2!J*{5bFhilR79wQx)s~LW-di zr8dW(KekAgp8!Av|8~XNr~(84)_3xUIC=rK4EXmE9)K}V0iXj50sPcDSp@(_oaX;O hm8X8>-+FcF|6A{#_x!<9AN9F_fu8Zz8Xf28{{X_GKEeP1 literal 0 HcmV?d00001 diff --git a/Ash_AWord/Utility/Network/RequireEngine.m b/Ash_AWord/Utility/Network/RequireEngine.m index 38f6c45..ec3c200 100644 --- a/Ash_AWord/Utility/Network/RequireEngine.m +++ b/Ash_AWord/Utility/Network/RequireEngine.m @@ -118,9 +118,9 @@ for (int i = 0; i < proper.pFile.img.count; i++) { UIImage *uploadImage = proper.pFile.img[i]; NSString *proName = [proper.pFile.name stringByAppendingFormat:@"%d", i]; - // NSData* data = UIImageJPEGRepresentation(uploadImage, 0.5); - // DLog(@"%ld kB",data.length/(8*1024)); - [formData appendPartWithFileData:UIImageJPEGRepresentation(uploadImage, 0.5) name:proper.pFile.img.count == 1 ? proper.pFile.name : proName fileName:[proName stringByAppendingString:@".jpg" ] mimeType:@"image/jpg"]; + NSData* data = UIImageJPEGRepresentation(uploadImage, 0.1); + DLog(@"%ld kB",data.length/(8*1024)); + [formData appendPartWithFileData:UIImageJPEGRepresentation(uploadImage, 0.1) name:proper.pFile.img.count == 1 ? proper.pFile.name : proName fileName:[proName stringByAppendingString:@".jpg" ] mimeType:@"image/jpg"]; } }else{ NSData* uploadFile = proper.pFile.img[0]; diff --git a/Ash_AWord/Utility/Tool/CommonUtil.m b/Ash_AWord/Utility/Tool/CommonUtil.m index c25f339..cd27c67 100644 --- a/Ash_AWord/Utility/Tool/CommonUtil.m +++ b/Ash_AWord/Utility/Tool/CommonUtil.m @@ -184,7 +184,7 @@ NSDateFormatter* formatter = [[NSDateFormatter alloc] init]; // [formatter setDateStyle:NSDateFormatterMediumStyle]; // [formatter setTimeStyle:NSDateFormatterShortStyle]; - [formatter setDateFormat:@"yyyy-MM-dd HH:MM::ss"]; + [formatter setDateFormat:@"yyyy-MM-dd"]; NSDate * d = [NSDate dateWithTimeIntervalSince1970:[timeSp floatValue]/1000]; NSTimeInterval late = [d timeIntervalSince1970]; @@ -230,38 +230,38 @@ { - timeString = [NSString stringWithFormat:@"%f", cha/86400]; - - timeString = [timeString substringToIndex:timeString.length-7]; - - int num = [timeString intValue]; - - if (num < 2) { - - timeString = [NSString stringWithFormat:@"昨天"]; - - }else if(num == 2){ - - timeString = [NSString stringWithFormat:@"前天"]; - - }else if (num > 2 && num <7){ - - timeString = [NSString stringWithFormat:@"%@天前", timeString]; - - }else if (num >= 7 && num <= 10) { - - timeString = [NSString stringWithFormat:@"1周前"]; - - }else if(num > 10 && num <= 31){ - - timeString = [NSString stringWithFormat:@"%d天前",num]; - - }else if (num >31 && num < 365){ - timeString = [NSString stringWithFormat:@"%d月前",num/31]; - }else{ - timeString = [NSString stringWithFormat:@"%d年前",num/365]; - - } +// timeString = [NSString stringWithFormat:@"%f", cha/86400]; +// +// timeString = [timeString substringToIndex:timeString.length-7]; +// +// int num = [timeString intValue]; +// +// if (num < 2) { +// +// timeString = [NSString stringWithFormat:@"昨天"]; +// +// }else if(num == 2){ +// +// timeString = [NSString stringWithFormat:@"前天"]; +// +// }else if (num > 2 && num <7){ +// +// timeString = [NSString stringWithFormat:@"%@天前", timeString]; +// +// }else if (num >= 7 && num <= 10) { +// +// timeString = [NSString stringWithFormat:@"1周前"]; +// +// }else if(num > 10 && num <= 31){ +// +// timeString = [NSString stringWithFormat:@"%d天前",num]; +// +// }else if (num >31 && num < 365){ +// timeString = [NSString stringWithFormat:@"%d月前",num/31]; +// }else{ +// timeString = [NSString stringWithFormat:@"%d年前",num/365]; +// +// } } diff --git a/Ash_AWord/ViewControllers/Main/NoteViewController.m b/Ash_AWord/ViewControllers/Main/NoteViewController.m index 1220c1c..1c21c02 100644 --- a/Ash_AWord/ViewControllers/Main/NoteViewController.m +++ b/Ash_AWord/ViewControllers/Main/NoteViewController.m @@ -258,7 +258,8 @@ picker.sourceType = UIImagePickerControllerSourceTypeCamera; } if (buttonIndex == 1) { - picker.sourceType = UIImagePickerControllerSourceTypePhotoLibrary; + picker.sourceType = UIImagePickerControllerSourceTypeSavedPhotosAlbum; + } if(buttonIndex == 2) { diff --git a/Ash_AWord/ViewControllers/Note/NoteCommentViewController.h b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.h new file mode 100644 index 0000000..bef6fe3 --- /dev/null +++ b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.h @@ -0,0 +1,13 @@ +// +// NoteCommentViewController.h +// Ash_AWord +// +// Created by xmfish on 15/6/1. +// Copyright (c) 2015年 ash. All rights reserved. +// + +#import + +@interface NoteCommentViewController : UIViewController + +@end diff --git a/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m new file mode 100644 index 0000000..7e9412e --- /dev/null +++ b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.m @@ -0,0 +1,37 @@ +// +// NoteCommentViewController.m +// Ash_AWord +// +// Created by xmfish on 15/6/1. +// Copyright (c) 2015年 ash. All rights reserved. +// + +#import "NoteCommentViewController.h" + +@interface NoteCommentViewController () + +@end + +@implementation NoteCommentViewController + +- (void)viewDidLoad { + [super viewDidLoad]; + // Do any additional setup after loading the view from its nib. +} + +- (void)didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +/* +#pragma mark - Navigation + +// In a storyboard-based application, you will often want to do a little preparation before navigation +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { + // Get the new view controller using [segue destinationViewController]. + // Pass the selected object to the new view controller. +} +*/ + +@end diff --git a/Ash_AWord/ViewControllers/Note/NoteCommentViewController.xib b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.xib new file mode 100644 index 0000000..8106516 --- /dev/null +++ b/Ash_AWord/ViewControllers/Note/NoteCommentViewController.xib @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/Ash_AWord/Views/Common/CommentGoodListCellTableViewCell.h b/Ash_AWord/Views/Common/CommentGoodListCellTableViewCell.h new file mode 100644 index 0000000..2686e5b --- /dev/null +++ b/Ash_AWord/Views/Common/CommentGoodListCellTableViewCell.h @@ -0,0 +1,14 @@ +// +// CommentGoodListCellTableViewCell.h +// Ash_AWord +// +// Created by xmfish on 15/6/1. +// Copyright (c) 2015年 ash. All rights reserved. +// + +#import + +@interface CommentGoodListCellTableViewCell : UITableViewCell +@property (weak, nonatomic) IBOutlet UIImageView *barBtImageView; + +@end diff --git a/Ash_AWord/Views/Common/CommentGoodListCellTableViewCell.m b/Ash_AWord/Views/Common/CommentGoodListCellTableViewCell.m new file mode 100644 index 0000000..8bce838 --- /dev/null +++ b/Ash_AWord/Views/Common/CommentGoodListCellTableViewCell.m @@ -0,0 +1,23 @@ +// +// CommentGoodListCellTableViewCell.m +// Ash_AWord +// +// Created by xmfish on 15/6/1. +// Copyright (c) 2015年 ash. All rights reserved. +// + +#import "CommentGoodListCellTableViewCell.h" + +@implementation CommentGoodListCellTableViewCell + +- (void)awakeFromNib { + // Initialization code +} + +- (void)setSelected:(BOOL)selected animated:(BOOL)animated { + [super setSelected:selected animated:animated]; + + // Configure the view for the selected state +} + +@end diff --git a/Ash_AWord/Views/Common/CommentGoodListCellTableViewCell.xib b/Ash_AWord/Views/Common/CommentGoodListCellTableViewCell.xib new file mode 100644 index 0000000..6004a5b --- /dev/null +++ b/Ash_AWord/Views/Common/CommentGoodListCellTableViewCell.xib @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Ash_AWord/Views/Note/NoteTableViewCell.h b/Ash_AWord/Views/Note/NoteTableViewCell.h index 50869b0..8fd834d 100644 --- a/Ash_AWord/Views/Note/NoteTableViewCell.h +++ b/Ash_AWord/Views/Note/NoteTableViewCell.h @@ -19,6 +19,7 @@ @property (weak, nonatomic) IBOutlet UIImageView *avatar; @property (weak, nonatomic) IBOutlet UILabel *userName; @property (weak, nonatomic) IBOutlet UIImageView *contentImgView; +@property (weak, nonatomic) IBOutlet NSLayoutConstraint *imageWidth; @property (weak, nonatomic) IBOutlet UIButton *goodBtn; @property (weak, nonatomic) IBOutlet UIButton *badBtn; @property (weak, nonatomic)iddelegate; diff --git a/Ash_AWord/Views/Note/NoteTableViewCell.m b/Ash_AWord/Views/Note/NoteTableViewCell.m index da91c1a..7f06913 100644 --- a/Ash_AWord/Views/Note/NoteTableViewCell.m +++ b/Ash_AWord/Views/Note/NoteTableViewCell.m @@ -23,7 +23,7 @@ _contentLabel.font = [UIFont appFontOfSize:14.0]; _contentTextView.font = [UIFont appFontOfSize:14.0]; _contentTextView.scrollEnabled = NO; - _timeLabel.font = [UIFont appFontOfSize:14.0]; +// _timeLabel.font = [UIFont appFontOfSize:14.0]; _avatar.layer.cornerRadius = _avatar.frame.size.width/2; _avatar.layer.masksToBounds = YES; @@ -37,6 +37,12 @@ _shareBtn.layer.masksToBounds = YES; _goodBtn.backgroundColor = [UIColor lineColor]; _shareBtn.backgroundColor = [UIColor lineColor]; + + _badBtn.layer.cornerRadius = 3; + _badBtn.layer.masksToBounds = YES; + _badBtn.backgroundColor = [UIColor lineColor]; + + _imageWidth.constant = kScreenWidth-16.0; } @@ -134,7 +140,7 @@ _timeLabel.text = [CommonUtil timeFromtimeSp:text_image.createTime.stringValue]; _timeLabel.hidden = NO; UIFont *font = [UIFont appFontOfSize:14.0]; - CGSize size = CGSizeMake(300*[Ash_UIUtil currentScreenSizeRate],MAXFLOAT); + CGSize size = CGSizeMake(kScreenWidth-16.0,MAXFLOAT); CGRect labelRect = [text_image.content boundingRectWithSize:size options:NSStringDrawingUsesLineFragmentOrigin|NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:font} context:nil]; _contentHeight.constant = labelRect.size.height+25; @@ -161,7 +167,7 @@ +(CGFloat)heightWith:(Text_Image *)text_image { UIFont *font = [UIFont appFontOfSize:14.0]; - CGSize size = CGSizeMake(300*[Ash_UIUtil currentScreenSizeRate],MAXFLOAT); + CGSize size = CGSizeMake(kScreenWidth-16.0,MAXFLOAT); CGRect labelRect = [text_image.content boundingRectWithSize:size options:NSStringDrawingUsesLineFragmentOrigin|NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName:font} context:nil]; diff --git a/Ash_AWord/Views/Note/NoteTableViewCell.xib b/Ash_AWord/Views/Note/NoteTableViewCell.xib index 6afddb5..f462806 100644 --- a/Ash_AWord/Views/Note/NoteTableViewCell.xib +++ b/Ash_AWord/Views/Note/NoteTableViewCell.xib @@ -1,38 +1,38 @@ - + - + - - + + - - - - + - + - - + + - - + + @@ -148,41 +141,82 @@ + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + @@ -194,20 +228,21 @@ + - + - +