From 4d0bcc91505430a10d2845646525b56b98d4fc7a Mon Sep 17 00:00:00 2001 From: Wicky Date: Wed, 17 Jan 2018 11:07:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UserInterfaceState.xcuserstate | Bin 0 -> 19348 bytes .../xcschemes/xcschememanagement.plist | 14 +++++++ DWCoreTextLabel/DWWebImage.h | 22 ++++++++++- DWCoreTextLabel/DWWebImage.m | 37 +++++++++++++++--- 4 files changed, 66 insertions(+), 7 deletions(-) create mode 100644 DEMO/DWCoreTextLabel.xcodeproj/project.xcworkspace/xcuserdata/zhangdingwen.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 DEMO/DWCoreTextLabel.xcodeproj/xcuserdata/zhangdingwen.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/DEMO/DWCoreTextLabel.xcodeproj/project.xcworkspace/xcuserdata/zhangdingwen.xcuserdatad/UserInterfaceState.xcuserstate b/DEMO/DWCoreTextLabel.xcodeproj/project.xcworkspace/xcuserdata/zhangdingwen.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..468930031d60baf64cd13a5ddbb5988e938359b5 GIT binary patch literal 19348 zcmeHvd3;kv^zY2QNxG+LY0C~Nr46)Ao1{szbxG2+r7Q)yQ1%kqv<+>OlBDd*1QBFW z5fxEHXhC+t1pyHeLB$1;9a%&W6;MPF5CxQXCb#JV>d*K2y!Y384W)BuJ#*&FnKS2n zZ^qWu*j#Rz>=?p`K`i1SJ`(T-@&*mI z>cSD8vvNxqHX}dekJ_OK6p0d0B9fvcl#FCZjua>bDUk}LqYRXZa?t>kkBZPxGz?Xv z8dQty$bst6c;rMbG!;!l(-A?Bq1k9IdIHTu^U;%N1zL$3P$OD}R-;$Z8nhN|L9e4X z(3|Kjv=zOLwxL~U5BdP@N1vbr=ma{8&ZF~7V|J43$P#d#{uXl4#L4W z1PgH}?ua|#&bSNiiIZ?LmSH(o;1ryWGjJw0;J&yY?vIDy5>ag-&5N zo`k33X?P|k*n=O(3-Hr;FWDg_&ZrCOin^ihgii#-kNA@S5=eqb zFbP?YqEQbNgLI)86rJbQ%$sux;oKzCTno2z#yu$Dm`j%HtHl;i*(15=R}#Wx}~ z(hv~|YeYJvC*dTWGD14E%u#Mlf>r8gb0@X!BWaMe(&DOj6*}sjW!5aHS1OYHTmAly zO5gatp$#aD4sApx(vCzmA~VV+9Y`WcIEwm!Oy!}zs2}Q2rD`lNX9WCpT5Eur6RZT0 zND@&hDz32ASar$C$;B>UXY!OPU`n~oUOCZfPX^vsgW^msv6WR%PBxchIh@ua>m+x7 z%UEm8-#nLC$L7^qDy>OXN6n1YlPy$q4|Xay~?^Z zy(M1S+W%jot=7l8;b<(1UyDYdk!TbejY`oNWFZ|%C(@a8Azeu~(tRx|L*>YdDo`b) zDv6jxlU}4ZiHB4?UEZE8Ysal^lFKVTAgoC)x5epBDs$A7in=^fjY>t1qlPlNR21__ zv8&AKsHyR8kR(S%h06+p9R07gYHW58pTFs;nI5aXJc+B-D3UG}HZBJ>PejGjf$q34N|B#~qyBXXi3DQnRSXeoLT zy@Zybm(g;fBr2jITB0L*lJ@_Xoi01i$IW$UBe(1uVA)gYvcCq)t|pR)7CbC(Z;V02 ztyvfz8;0veNnzOK>t;K82gNs_9VDXx?Ieb_`s;nKKFBN;DJDrL(VZi$aa4lJ(rVP^ zRJk%osxWJ0Qf0QnBsCgM3TdiFlarI3lAW4jl=}wQi$0_S>?6ho^bs-9RqW_f^**KA z-%;j0XIz|geu`!`pwCDai9HUo`UN_OzC?%6VNj_@(fjE5Ft@E1&L&H3U8zW9om6MB zmlwf_0$bNs=N{n`cTjZ0;NY=N8f0--ksN~jNhUELMJLf$(CI038l5Q>h2;>=YG8tI%&$}I?1ur+G-}3iXvNgFaU(GhC8tz8ZpaZFLQ!%0{pYpRXOZdm#wxQ zPF#mmE>BYUmx?mVC%DVKuYO4$#UyhXsx8?5wNerBTWX@QGEM*7UO8#gN!ESq>5CNIx@LQB5*A3P3eup65NZFk}<@x3R!UiPK1+oEGeV(#yv7Z z8}bG@Z4M_`e5Imnu*X9HpY(|6ZFL!@Kp$kT{k>VropbwSjz-P-4x) zlfYW6!+K&R6{M0R#27f$hX#v_P4%{#a$id$&VINhdJ*U1K5*jL$T*Tvp!=6`2jIaE zx5fpy5EqdeQcLVGZsv7v;HD`Y!NX7x9*##)ld#<4whRo5nmg8arN#`);|n~q{^M0z z6z%69D(cj^OPnM@m8#Z6YtyrHa{J^BEF3a?RHfZHVaoKTD^5UQP;iJ4jJ+nNa+V+* z>qa*yjIs4_4}hzUn6SeN>&wcl)^cn4(XjBqc2OPw=0emM5lMK2-`Ktb+)p}@$RYWK zIS#uUYGyfV9M0oiyLA@_M)!#684D$awkcK^w<4#;Qt6_0gq2g!4kr{+jTK{v<2V%d zgb40Bex&2*q{5v1LTcwqO<=kl3GCH79&QcXC@t+P;wJx%2m>&WbU@KO0GyD zA>Qi|Sh5{}xFSkrabB?tEac|KUXz6uP(oYfihT`otQM-33axIq235LRRSD&Kq%?Z_ zJQ5zLOKZ@>9VCiUlVR-Gm}wwkB)rj-1-F9;5?Lzh3~hWJ(tD1>nO6=w+*V<;!j5R) zTv{}_&e~EULL$MDzWw?S_&aO9t#Q^rzuBaR7J~+lZZ^ogrroMR1^GTR56X**|G{J{ z>YoqAB}2XEAZ1Sr-y4VJ|4lB`9x<{>5*kP3A0J&h#u7NTtlU}w!#tCBU|9?9HZZ7yaDy4n3F8L2>emMv`)Y}8UlgnLYwFu!fg#0d- z)j8b=1@wgcn2GK>n(hPXi0Yz(EJ%+;$UnHLEo7taxmLT?X)6=wf^ja+wZI7>RwOCJ zgPaa}d8AeT&;Hcb)Kj|YPj~nYc2yVlgTF~Y|Lk&$nWi<6ezVMyUD%ZVae{3~KBNr@ zF+J+srUFR!h4k3^>S80L6Cu5+!kJSH=?qAJRaM`Irj-b>QB$glN+8`0(tYh?^9Mp& z2kELZSJrSy_kwg|l{Js96Yz}v%;wH3f;5cBUUNDMX#IGEcxmNUb2gXHtEhJLqcrq@ z{H?ADg*4ww^OUMAN+*oPJ2B4EcMzmO0r75GYjSCQ=!f5_&OM0s3D119y(XWIYk>3; ztIIoIc;=sQR~6AUQy?Vh;dU0$wm_SpsKS<$2k9J0PpWeEq4_Xh!S1>mubcr-1oxfw z1$6E(N534ay_oWl$_24FvvVO0yz<+HhF}X^eI0N~w!-DtjxHcExIJxXf;Ux(EZ`8e zK%N5XE5KQ5g*sN`gc>ezmx|%a>;%`Qube*97PL(rlsMp0Z3CxjZgZ~Kd)4OJ(LNmT zOP^@Jm%aU#HI0`9<7IVw74Dj1R0Xb6JNz#OXYF}!&Lp6(7M`;pw;swWA>Dcu1;~*C zoD-B*js{vzN4e58iUV4dd&lD1(OFVA0PWKT^`<}>rOi8YUVEO5mjb_fUVmOXPX_t9 z(2oU8MpAEnnm5lkYRk;&+^#f_Iv!}HBT%l<+0&GdUp^jw0Q_=8ZVk+kx}s?<7f^E_ z+Eh2SZrujvxu{cpue!P=PYuo+y#{J?RETFeOKoLeK7GAu-ha1hkB%;Fvu*=h%Y|1` z${&#n7@vQHe~5pMe+-G??|1y;{L7F!!#@k3Q_b`Y0{VUOKzYycpc44NJ+(+ynKy^7 zMGbuDx;#o}%bIch&^oPpz^r#%Dzip!FSN84e(B0uy*%aCuO8BFSd|KIYbi)f3zZK` z6!f-#+O7^rd}86APmy?&=$%iRXD2?++cENJ@cwBP_C=lQ>PD}bcF$VZQcBmsIye8f zd^9Uj_PXq6%YN%UPWk2I7On4Fsc~MeJ-QODC5Eopf1{{% zKisbK?Fnvmyt_^qBa{pMgz-X^&?v;hX!t0E21vySdkFgr+e2v|p+smFc5dcJu6G?N z9o!DJdH>S=(xSzNL8(s?==`dn%;~LRX_{~A{Y7O+4B?{|eMU8!t@WY*TD1Shw5&PBfM+)H#>pXjVI^jfo2+r#5^NU z#WOUeskTak57kwi_LlN8p)>;m6B??=TF(G_Z_#LfPkrm1VHM~E5<#{=;_cfzJAqly zN05WW0y)hWBn$dNT1#uW!N!L324y+wCOd7FRc^5ntQ@O2&t8_4C|1biaJo^OiPk~r z=3uWagrg3W)jKC}c|7`u56;9;2B_`0$&7|EGX0n$W)xG&jAy1WvzezL5Z1_Sg5cK&%;(H;<~)SCZnFr2 zT2X8?D`hoo7CVp~&Q`Eab_P2i0#%LdX3zoq*`w@v_A2`aPXIwDF@&1*ygs~QUKwvZ zZw7B6?s$ijDxnPT6kKnN2qTsflpI=A61iy5@fqoW0x8EGU7yUN*z3+F# z?|Z-B{e%3w`z!o&{D=G7{b%_v@!#OT+y99FCI5Q?qJY={UBJMA@_@+!PY0|H*ctF; z!1n?70>c6&f$4!of#U)_flC872YwWIHt=RpP*9H`ZP4H#TM!9a8uWV5CqWm2{s;~a zjt|ZX9vNI8{8aGT;61^of^UX|gv5myLWYO9L!Js*AF?mxT*&XjcETiKp0HdvQ@BjH zO?X6jEi@oBHq;n8I&@0tlF+w8zYM)93J}GKvP2fq4AC;tJED`K+hOg(~gqYcwBgPczO8j@Kxda!Y{UC+r_lYYFF0ov39H5ebnyz2tkA-A}?ZG#Da*| zA`V7ej|`7gMh=Ob6uB(&y~y)XY*buSUQ|ug(@}3mort>IzH579du#i7?KihS(*90| z&K(RLtR3ce*wW#6hr1oc9kV-DcYLPf_Ksh7;&qDeG`Q2mPOo(OsMFQX5uNp&%R0~R z{ATCVU6?NMT?)EP?Xs%NfiAbZcI%qkwXW-nUH5gp+AXS^q1(7_&vo0~?MnA{-7~t| zxjd-c}L-F!TZ@4@TeXA?Z=vV^)tXJ-&_!jM2nY#5@HW{_r~<`XSn zYtqit?$Z9DOVzn`Z|Z*0OZCa>gLJ<=`d4e94I#2I5UR%V>fjLx)V zHfDZnh%uBK))+1sdmG0YHyN*)WG1KSZPT4BUDouhJ!aONYo2dDm>r&7oc&Vvxttz3 zl{p)8uIH+9r{?bI!|&6t&og~a=5@_0%Uhp!y|23O^u8bV3+`9g@1=g<_K)xH?7wpW zGobH)X9t|kkIlE|Zy$&T<_&yy;MapBgT@bfcd%gapux)q|4<+=m{zdAuw7wk;fBKB zicCdM7o92YRa{@ZcSz`vkwexGxl>{;SzK~{X!6kMLq8wZX_#%;j^Td8hYVjc{Pu|K z5zmkKexz#ToRKF+Nk&Z?_37wNqiaULR~lMsDSc}Ue@w}k4P)+G23i^|x5wsGOLzUUA1M|Ub5X7*Js>{ad)Z* zRpgt|F(=f~^DKR^Duv!8Q~3%f?ScDN(p zf_b36SN-Gl7bav(ST^DJi9;s7H7RV8ebRx+@ssCGzBDCg%Bxd(Q_H6AofbXKGws53 z21#d&|tFQ5O}0@;Ek3+^v0Tlm?N@+X%*`QWLFrw%@y`t&P{ z1dHs8PCS$O%(}&4i>EBU`0RjZw>>9*ZvJz(o-cj=(XFEcIM@^Y7#=e>MqdHM1quNYq0yrS!h1uO2Zw5|NAA-7>$V_f5sRf1I$ zR{gMg$m;#CYF=Hxrqh}QYyMnoUweLC!MYFEtJkmJ&}GBZ8<~yu8?S5{x#`er=GS&? zmTqp?618Q)>*)3R*MEFt%o``(?Dyv0w={2U-Wt30<+t0tJ%1bCHhJ6i?N!^)?-;h@ z@H>6q*}GG}^X+$&-d(#Zde^e|BHw#@ci`^XyC1wi<^9`x>h@gypz?!@drSA8**A3G zu@47-c<`fsAARz1&d2-q8~4BeN%|+dKGl8t&S#p>wtt@b`L+Y918;w!`r_?_sRy@x zss3`uA?=}^htm%4K9YIlgQMo7A0Nv*_WAMrcKYi!=?*8|)e+c z)?Zd!-gPDC%Ap@e{P_J(bwAy^I_KxGpI^S#>)O^|48I(>KJ@zcH=H*f{JQXF$D3=Cf3a6v4bPti+Dfc!-yjhCnCO%_%`B~h+iWfMDikoBSRx2B6~+B zMj9gv;anWSS!@jE{=)p*{6vl-4sX~BrZW1W)ugjSg-r|U^PF376^dU2frBz!j(gz> zTnXWW@x)0i#6{d|Ac!yySK}J^e;kAo>d6E$3I4CA0fip_?)j(A&;PL!$QD$R{CiKd zQlWb?jZFOyHH#pa=&gAK*Mo|yLax=(@!{wCb7ZyP9)#0R} zelJdf?sYCs#nmXXj5S%Dd9EQg7Z)1rNPF>OfQlTBnz60QMmLw_I3XfXD(dcARcrIG z&>e*K+!U5UJ>?m#Nore`qB5td6bg-0ZO)cUl^U5*YSbtd(j2u(k(H%VnpLTCE)25; zj~E!n+xk%W#c2Ak;g|M){#;)5mPC162%&sZ2A!zHTt_C2W+O+gEaPxYYuZz z8hiEb=8g3P!I-J?Z1|`Fi;$8nlbSVVqtu*}k|j0CRA!k>sgj!%>XB0^^AlmmYGl)o zCMAc#RTlsW5UKDAC^tzi?GwqiWvz+v)}Y8U5)OS#ohntR6U7ido}MV43IYJbXcda- z(_vAjPK5`VH{UyDwOT!$&N)>L^J_hHV`?0wN~=@Quo3OI3-n8+33`^x)vdaaD{0qV zX|Z=oRJ6RsO%qgcLu4A@%x%HsG-k#_ql4ukT<7cn&^gKWD#S53+~Y!{9|Y4sg~}>>2K8 zZa%A<&Tij<&7LCwmHbzc@TvW`@OuC*#aqEF*@m~{9pDn#iQmP$$O5vEJV~A+Pm@LD z8M2r>yB_a`17Ht$O!ne^_(Mp4OrC>d;4cs6dvJ;er+Tmvp4X8CiZBs{ynCZCMC`Z}$+Jbt2bAb91iOb_1-n4(DVDdev2V z5u%k;^C$je#}J~lRodJ1JCb(Z($+^OM}o~t(Gx}&#jsj@08qfCR(w_xyn2dJ4>$Xi~9ts`g1 zEpi*u3Bzl=3bY7xDF@x)_(&s}rEreg%Pr1w%3jJ&t_ZL*LpWeP_gq*%wiap+Z`DxL z4q7x}d%d&e7$|PaYQgCODA#FqK>(J+S-}qWF{kxX(6N2_w5MbE2Kdfyf?0G6^~Jy8 zJD~Kbam}%cP9>j`FKS z(iZXtS$Q0sfIJk$@EHMYV1Fin3B(_R1p3ZPA3AAtO8}mN$GkOaL6@~;gSz)(zy?~fnGQ_H;Vt78dnqBS$*W{d8$&`A;x$RZ=LzR{7Z8*dUU5gb zx8Wd*&DqFwr--zFtM8$P#8xUFzBG8)<)HE;h@{We0%=ulq} z($nDKK22T+*?NPL52#uu6L5?8H<0RBj;Jig%w0d47rKo;Y`cpZnQTfEy{-J0>f8vq zOdr4=|A!`xOdjq1zf^6~fN-!4fJ+F|pKNVl^2yuuJ`l@oV~+6Bf6^|#4hone+Cd@N z*1!~#?IfXy8U()5VazBLzKR*nj9^BR9poLda}_fhq-G3x7o_GCeaE7Ao8i2djY2qR z?3LWT!v{?Es`JRUb-l1^`sPF1{9LP}*6Mb0cP6F+){ChmyPEGx%s9pg5M{WR*D$q= z9d74!%y{x1*-hRjd&mc5FWI-2aWQVDo|ypqa1wz3KO`TKFUd*ReqX`GD`8{~;4O|P`T+XvDzsmuG?gKr&XGYe7pTIO+P4l|c|f|=2DGb_EAY-R;uvJd_~KK`FI^C&621d(I2+gw%Fa^3&# zi#6O-KBF7$b8?!*f=$zM7g8%ViDFd>T#@ahLIZDowugN*`&1wk9 zoxtOmugH1w12~d?B?&|OTPvCjNP6RKHe$^5g(7OY4Cj;-HLr#h& zY+~EeCaqIg=AeEoahpPKb9gbT1y2XuD1uyv zfo=eVym>)l46eF1Z9B4^VU}zsaS%N|7a@1Hsv%0NLx}d&+#B4N*U%8UL zv*3M`kL}6E(blo#w+2>1?)(dn*aYAao5)JZ@8n)HkKn4Ne1vorkgg_w0O@yubPzU9 ztH&5TPqZODjWs;d)(CC0$bD%0Cq2+Yp|w{+;X*@&G{!J;Pn$mauzh`t%=RM>njC*@ zJ|%V_JII5P2e8&fw z_v%M;5$uzHXwz&J`<53j&nSK)JBgjlPGP6A)7a?{i=W97*2B*7;6M)!^59?(4)I`^ zd#DGCJUGmQ!#%j22S;pVXS0u^yX;)x&pb%a2Dj&3cD4scdH|wd?QyhI7MLRq!fujC!Ts}W3-xjRo7^a7!h8cQ8iq;>}7XX`v#ttqdm zA-u*(J=yfSV$SAXr+kz;>TYcAH`nQ?ujBLx`!c(Hr3XiOO-*(MyAt5HfQD{lS5Q;3 zl^$29<)Fv4GH_`ju!GrEUcYp^2Teb|b-wV)f#$8he( z9o@_TpMCTwBdCX=SuWcQVzO4i8<@>4xGw2+sW58*HSg+O&1FrC?wj;`?ECP-4!hff zdo-|nJUGUu2e>1|=%Ri3Du2j+O!e1C9^A8m-S5G%bjJVi>H|2B4#6SD9-uxX+}?xZ zJXqp^S2?EAJo-82&4X$>)N{@E$6vc4pQaX=JTAr$bR24`yV_wkw|>KUSWS~nd?;#mbR$zU)UQ^1iNx- z1N*B7C$*H^X74nY{O-ZYEhYEZKWTUOJy_P@B@b-zR$le0reS#ukJn5QkMF^XW{P(M{+d<>OdJoQMKA(6!cySNw zZk_~1^Ll%*mZ~oul`iV+Y8GSem>KUq0pRsH?>Wg!;wc{KCIz}td2kx-CY^h)j63MK z9_Ef|eTeXMyo^VB$b=q@9-K*gF!%^*_PBA~)EU}zlf%oS9M0wS@nDk&XEmZ|Fu#QG z0SSG>BpQvL);|IQi^s9iYG5@RbFV;QX1!J`G=7@GN|3 z!3*$(1dj3SI+m4WPj`@HX+z@&){M z{0{t1fCh`^$M9qM626k3#_z-L%kR(62SnHw{!acr{-^wd{F8v*{egd(|D(Vp7$_Jm z7$X=fC>K-+ssJBW0|>F{f|&x3;4#7Dg1Lfuf(3#%0V{ULud|=gufp#szeRq_{TlsN z`>pZY==Yl67QZ+Aw)=hT_od$?{7t3fZqas54anc9GDiE z8E6bN2j&F!2`mq+4Xg`v2D$_11wI?NCh*O`U4gp;_XK_rxDSwNM*@Ec{3GyQ;GcmH zg8YLbf;tAp1|8(7vE!K_`N~3OXHhHt1Z? z`Jiuuz6-h?bSLPKpnE}o20aMI!E7);*e^INxJ$4qxPP!Ec!C$#_FnMr;0GZBK(=)V zi492%NeYpLC_=O$`jGUH%n&0W-JT9v7xG5Pu8`d!dqVbxd>Ha^$R{DkL(T&B?R?0$ zAy-0v3i&zYmyjF6PJn`S3#SU76uu;E5UvuwDqJhvEPP$~rf@6Z;@%g2AlxrJCOjkj zTKJ9dg7C8NN8wfBHQ{yP%}{=5cxcDa&Y@jHyNAYw_6m&;O$<#6RflGT=7tW8Jso>C z_WRhIv3KKeoG`9)T-UhnanW%xaj}3FQ^uvnY2tKoX>l2GhB#APW!%EJZE@%0uEgDl zyBl|3!j}X~!X#ozZ;3{dDKSb4B_k!J5{slvQYUdq>Lrr^V>V6lxa0}Re91z|^O7Z! zrIH58I>`pfCdp>W>yq~*pGgi#4oVJ5j!2G4PDn0FzL#8*T#@`F`C0Od0#+n>2c{v=_%<|={4zf>95k;(%+@` zq<j+dGg*-ApB$JRoGeThC5IKlT(sa$?9ZnvOYOIIWxI$a#`~DoaRlujvKQesnjrNpNsrl?X%Q_54GN_ipW zy_CHvms4)1{GM_*<N+Ld+6 zmz7(U2b9N^Unx&3&nmAde^=gB-dFymLMleZQwda&s`jdms?Mses_v?2Rg5ZDrBG$4 zhN)^*^Hgh9Z>hdiomKs$`dRgh>W1p3>bB~R>W@_a)WFo>RAH(pH9R#UH7d13YG&%_ z)Y+-)QV*uyRCiYQQcKmzYPlL-JXGt{Y3hD}0vxL@S68U3)Z^4H^)&SiHBrw}&sNV- zKdXLT{et>M^&0g$^#=7O^*ic!)$gg_S07LxR3B0wQGchtp}wiUt-hn-YgC#HjZu@O z$<~b2*fdU!TQfm3Ni#+BnC5ZKT+KYq0?m_}C7R8ecQpGnhcu@&XEa}HzR_IJ{HVFA zxu&_U`BigE8?H^(7HF%rZf(7GqIR}+u6CYwq4p{5BJFDJYuY!pTeaJ?JG38Z4`>f+ z4{48RPifC+zt(=Ey`cR?dtVo->!6F)CFxW;wN9(k>r6VcE=Si#*H>4h8>JhktJOJl zPCzzJ(9PGqpj)bYQMXLDPPb9_n(lQ#J8so|qC2cRq5DdAT6b1=MR#5ItL~QWH{GAQ z2YRe$^?ZG(zJoqipQumL%k&DpRofI6eW8A&-lnh7+x6r1E`7azhW;`A9Q{1~ z0{v3`3VnlqmHt)zCjA!u8~UyKZTju{J^C;7$Mh%kU+GWlFX+G1|DeC3|4Dx<4X631 z1*Hko!qPgVbx!M+7M&K8mX%hLHYIIt+AC=dfWTavwju4cwAa(#O52w9PTH=t_tQ?K zok}~Kb}sEg+QqaV(ypXkO}mzMJ?&=N?ex&}Zt2?e!RdABGt-|9^B= zOaCK-$?(qz$>^CO%}C0SWoR>UG72+>WDLs~nNgZCHp80X%&5G>Ug8uIMF!8 zIL$cExX8HJ_?&Txak+7&vC;UdajkKuai8&!@ucyT@r?0n<9EhO#w*6F#%sp=CcY`$ z)X~)0)Ya786ldyfN-!k>&Na)_-!#lL+GH`6n{1|PQ?1EideXGT^nvMP(*dusgct}n P&>tRsU#!)S>EQnY^jx|< literal 0 HcmV?d00001 diff --git a/DEMO/DWCoreTextLabel.xcodeproj/xcuserdata/zhangdingwen.xcuserdatad/xcschemes/xcschememanagement.plist b/DEMO/DWCoreTextLabel.xcodeproj/xcuserdata/zhangdingwen.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..abb1938 --- /dev/null +++ b/DEMO/DWCoreTextLabel.xcodeproj/xcuserdata/zhangdingwen.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + DWCoreTextLabel.xcscheme + + orderHint + 0 + + + + diff --git a/DWCoreTextLabel/DWWebImage.h b/DWCoreTextLabel/DWWebImage.h index 1d32162..4b8544f 100644 --- a/DWCoreTextLabel/DWWebImage.h +++ b/DWCoreTextLabel/DWWebImage.h @@ -11,9 +11,16 @@ 轻量级图片异步下载缓存类 version 1.0.0 - 提供异步下载功能,提供图片缓存功能,线程安全。 + 提供异步下载功能,提供图片缓存功能。 + + version 1.0.1 + 添加断言 + + version 1.0.2 + 下载完成后修改operation为finish状态 */ + #import #ifndef DWWebImageMarco @@ -124,8 +131,18 @@ typedef NS_ENUM(NSUInteger, DWWebImageCacheType) {///缓存数据类型 ///现在完成标志 @property (nonatomic ,assign) BOOL downloadFinish; +///初始化方法 +-(instancetype)initWithSession:(NSURLSession *)session; + ///以url下载图片 -(void)downloadImageWithUrlString:(NSString *)url; + +///开启下载 +-(void)resume; + +///取消下载 +-(void)cancel; + @end @@ -136,6 +153,9 @@ typedef NS_ENUM(NSUInteger, DWWebImageCacheType) {///缓存数据类型 ///图片下载器 @property (nonatomic ,strong) DWWebImageDownloader * donwloader; +///下载任务是否完成 +@property (nonatomic , assign, getter=isFinished) BOOL finished; + ///以url及session下载图片 -(instancetype)initWithUrl:(NSString *)url session:(NSURLSession *)session; diff --git a/DWCoreTextLabel/DWWebImage.m b/DWCoreTextLabel/DWWebImage.m index 53ba112..8fe5f2a 100644 --- a/DWCoreTextLabel/DWWebImage.m +++ b/DWCoreTextLabel/DWWebImage.m @@ -148,6 +148,10 @@ -(void)downloadFinishNotice:(NSNotification *)sender if (error) {///移除任务 [self removeOperationByUrl:sender.userInfo[@"url"]]; [self removeCacheByUrl:sender.userInfo[@"url"]]; + } else { + NSString * url = sender.userInfo[@"url"]; + DWWebImageOperation * operation = self.operations[url];///取出下载任务 + operation.finished = YES; } } @@ -242,17 +246,24 @@ @interface DWWebImageDownloader () @implementation DWWebImageDownloader #pragma mark --- 接口方法 --- --(instancetype)initWithUrl:(NSString *)url session:(NSURLSession *)session -{ +-(instancetype)initWithSession:(NSURLSession *)session { self = [super init]; if (self) { - _url = url; _session = session; _downloadFinish = NO; } return self; } +-(instancetype)initWithUrl:(NSString *)url session:(NSURLSession *)session +{ + self = [self initWithSession:session]; + if (self) { + _url = url; + } + return self; +} + -(void)downloadImageWithUrlString:(NSString *)url { if (!url.length) { @@ -264,6 +275,14 @@ -(void)downloadImageWithUrlString:(NSString *)url [self downloadImageWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:url]]]; } +-(void)resume { + [self.task resume]; +} + +-(void)cancel { + [self.task cancel]; +} + #pragma mark --- Tool Method --- -(void)downloadImageWithRequest:(NSURLRequest *)request { @@ -326,7 +345,7 @@ -(void)downloadImageWithRequest:(NSURLRequest *)request #pragma mark --- DWWebImageOperation --- @implementation DWWebImageOperation - +@synthesize finished = _finished; -(instancetype)initWithUrl:(NSString *)url session:(NSURLSession *)session { self = [super init]; @@ -340,13 +359,19 @@ -(instancetype)initWithUrl:(NSString *)url session:(NSURLSession *)session -(void)start { [super start]; - [self.donwloader.task resume]; + [self.donwloader resume]; } -(void)cancel { [super cancel]; - [self.donwloader.task cancel]; + [self.donwloader cancel]; +} + +-(void)setFinished:(BOOL)finished { + [self willChangeValueForKey:@"isFinished"]; + _finished = finished; + [self didChangeValueForKey:@"isFinished"]; } @end From 682d52755c2df3c9c987ab53145f27b684b112a4 Mon Sep 17 00:00:00 2001 From: Wicky Date: Wed, 17 Jan 2018 11:10:59 +0800 Subject: [PATCH 2/5] Tag --- DWCoreTextLabel.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DWCoreTextLabel.podspec b/DWCoreTextLabel.podspec index bf597de..a5ba5eb 100755 --- a/DWCoreTextLabel.podspec +++ b/DWCoreTextLabel.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'DWCoreTextLabel' -s.version = '1.2.3' +s.version = '0.0.0.0.1' s.license = { :type => 'MIT', :file => 'LICENSE' } s.summary = 'It is a Label based on coreText,help you to layout of the collocation of illustration and character.基于coreText的Label控件,帮助你做图文混排。' s.homepage = 'https://github.com/CodeWicky/DWCoreTextLabel' From e1939e42e12a6a5b07d8db91ff3d0ba73ca26925 Mon Sep 17 00:00:00 2001 From: Wicky Date: Wed, 17 Jan 2018 11:45:10 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UserInterfaceState.xcuserstate | Bin 19348 -> 24654 bytes DWCoreTextLabel/DWCoreTextLabel.h | 6 ++++++ 2 files changed, 6 insertions(+) diff --git a/DEMO/DWCoreTextLabel.xcodeproj/project.xcworkspace/xcuserdata/zhangdingwen.xcuserdatad/UserInterfaceState.xcuserstate b/DEMO/DWCoreTextLabel.xcodeproj/project.xcworkspace/xcuserdata/zhangdingwen.xcuserdatad/UserInterfaceState.xcuserstate index 468930031d60baf64cd13a5ddbb5988e938359b5..9d3e992e9ac4fc139a706fcdf84747a603385047 100644 GIT binary patch delta 10806 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 delta 8205 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 From 0cdedfe803682c3be0eeaf552a46e9a843d949e4 Mon Sep 17 00:00:00 2001 From: Wicky Date: Wed, 17 Jan 2018 12:45:57 +0800 Subject: [PATCH 4/5] Spec --- .../UserInterfaceState.xcuserstate | Bin 24654 -> 24643 bytes DWCoreTextLabel.podspec | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/DEMO/DWCoreTextLabel.xcodeproj/project.xcworkspace/xcuserdata/zhangdingwen.xcuserdatad/UserInterfaceState.xcuserstate b/DEMO/DWCoreTextLabel.xcodeproj/project.xcworkspace/xcuserdata/zhangdingwen.xcuserdatad/UserInterfaceState.xcuserstate index 9d3e992e9ac4fc139a706fcdf84747a603385047..21e99a17e59901f6e106b1e3f9b5709c3fdd5163 100644 GIT binary patch delta 1817 zcmYMoX;c;00RZ5r5k(CYL2+Z|xkPJaQ55DrkvDhd-gjqzbMMTHXeGu4a-hKlEY@SH z@8K4WagC`_V_ZUNEOB3=qN1X8si0_Us*M^@3^Lc06^;s5hp&aNhik$&!qp!ROgKnJ=gj?mPVU_N>A6XGd@!Hp&6=4@3#Lxb&6`z_ zlUtOOKl}ePYtGo&zvLTJi)N&cp}$pfXXX~=PtUjALqoX2j8GTuH7<(l%MIm{xD;*_ zH<}yEjpKYA55JE;z#rpJ@F)4x{2Bfne~JGG{|$eS|CX=g|IIh?Pxz;N3;$z? zf9Z+#4Dby0yzUw18SWYBN%f5Jqh+aM1V zgLz;+SO7vGR07@ytH2tt4r~Tnz*g{QP!3Lk3UC%wf(zgxxD5UVs=zf+1MYz)@B};s zE#L>x3fjC8-bil`Z#S1=a# zhJ9gwm;wRJgb*U=hYp+wv*BBC8q9|Ua3(B-b6^Qv4R^quunZo974RIq058F7@CN)l z{2Jbdb?_-{g>CR>*e*p#kx~yST8fdzNU9XdlZvH9(o$);v{G6vt&=uLJET%+m$X|d zllDpnq(jmbsZH)9kCP4gP5F2740*OZN1iLsli!y&%A4h_@^<+%`E&Uz`Mg{uUzcyn zx8&P$om?+B$W3yy{7h~^-OxZZ8bRboDl!m7E*g&}pj?!P-U*?Zs1VITVN`+^p(SVw z`T~`qz32csjE3AZ38!y0NycjRTEAR(+4PK8w!XM);_)~lYe}zxrlehw(#pm%wd<9>{p=w-%Z{lYB z(m%jI#*h42{sMp4zrnxXf5l(xZ}d0$pZHt-|MCAwI*~{cMfwvD8BB(f5hRJEkWoY< z?~r-qU9ymrkR@apSwsFrHjz)rHnM~4B}d3HQcg~j3*-{HLaN9$Qb(G|3(~H1R5~kN zmFSStQ;AdJmA=X_Wu%g+U`0`M#ZrPwmNHSvRwgTj%6#QLJ!Y*Mx;Ta^ms zuF|NyR9{g$sS#?V+Cz<2d#b(EKI#ZHNgb)Cs$a}LAMSHHb>YenSdM~|?-e2eRf%*`An4YeC^>MnW%er4zbzL|0iF&Rc);H+;^=kc& z{#b7_x*FY$C?m#*GvbYYMuL%OB!`Sq#%LqW5Dc%8VPqOP#$sc)QDyvK_A#MpnT{DW zv&?LBvN^?^W)_;u%uVJOX1V#bdB?nKerrB3>#capV-2?wtrRQOO0xtDTekIvHNl!> zO}3_3`POo4mGz}{+&XEUw$57BR*iMjx@A4E9$5`msL6U6=oaV^hz`UA`UOS?(gH>x z7zhQH1oj2)2O0uRf#$$7yNexXC)gf)uszfsZl~I5Hn7LqnYL)Fwqw6(7u$>MmG)|T zoxQ={Xm7W7+NJg`d$(O?U$!67NIHm)pouh@W>6oMD5iv}G@Itrf)JfWi)bZ?S1ChZVAU>|M5ym9XV(C0oVTvi0l}_BlJqj97( z%j_zvW;N_4t7pxu-HCIO9nCSFfWw@iGsBtdEO1shUpmK}6V55;j8p0S)A^TkTD zI***E&I{)!=f7?T_fa5vFSc1O8BS8|a{T-P1%PH-o=Gu-*^AKj2! z;%;`g4t2M=JKa)ukGtPJV0_RMBtaus7+f3N8Qc}z^I`H7zQex%0q$6` A>i_@% delta 1854 zcmXxbX?PXY0mg9yL1~mFtW6qbE@8C+Bq3(b1ajxhoO93YGv~~?M5!XpLLgcS6bh)3 zdzA+T5;lX#`d}#_Wf2M#*_0rAgn%q1Akt!?0tN`u1Oid|Sf0Kg{=ZM}{;GtUs)Wt$ zx^;M>d;EC3ZM-IaB7QRdRs2-EZDsdvTbNutX=3rnNu@<2`eCMP?;l>Yo0_87Te*47kZ z{NPv{p`(y0^b|4$Amj=|gs>11biovC!4=}dQem6$nQ%m?7LExu!b#zja7MT+ToY~x zb;2#7LAWP02@i!I#ol66jEghHdE!cOlek^nA?_0Qi2KEZ;$iWq_@#JUJT3lH{7$?s zelOk>|06bv_r(WdbEs7;)H;+J>Ju6e8W_q7Wrqfb@=EqztLQ^qiC_4U(RhBneAIG9*iKBu}DJAWfE*Nr$9*sR<;2B=8LA4AMY%Fc8SV z06t)#2>cF=1>?a45C_x1bT9+V02cQ}JBqzv;a?kcCqX|f=PkmH@q)g z6TTe2685WcWHPgHvGzTnsnBjc_~M z53AvEcoLq57vMMWAMjgv1>S@Y)C4tAeM(JIlhsaYS2a~lQx%n~u?cEiovqGOE7gVS zVs)9iLfxQlQn#qv)a~j{b&vYFdR9x+dT6?quZ`CJs7=w{)TU~0Ytyt3w3XUwZLPLm z`$XHUeW9JuYPGMmOWI}aigr`0*Y0YKT9furYet<>KNLnbqKKn>^b&dn6`&$C4oyIl zV(4{LhNhx&RDourxo8dAingPjXb;+p_MsZ|6*_~?p$q6Dx{m75ZS(_bK=*JWehMey zHn=_RfJK~+d*Qw~1NX-&F2>{W3|x-q;Q4p~{tz$0%kf9}&v*^~3$DUn;Dh)uuExjk z3498l#piJBJidr8;igFINS}xj@gjwh$&vENipcKB*+^ZaA<`JRPZCHA(u%Ytok$Al zO)|&;l1Xw1Ah~1+iIPcV8hMw@Bo$;XnNOCGKao}BW3rBHAUjDF*-s9UqvRwxP0o^9 za)I0=je1KxNpGXK*E{N|F}<5E>gjq~8@jIt`cVBveS}`97we<+QoT%{uD`E; zs4vl%>nrtD`Wk($Uaeo#8;sV*(?(k(+2~|+HByakM#$)4 z1*_N^XO&wktlidm>#B9nPP9APUF;M)%@*x+yO-V9mTWm@53$2Gv^5*s#5U})_8fbg zU2Fg3^l)tFMQ6A(!YOn{Ii=2P&KRf6neVJ}wmOHLZ=I{oHRpThmQ(MhyBTh_E4jID zo(o;g_1)jNzjce;61UWS&7J60x{KUT-2?7n_o#c!J?~z0FS(c9TkakAt{ZFgT6>+n zu3oB_=JoOhd(g}GMtHNlx!x}ChIiL%^qRbfeg|Ll`}!IF06){u_Vaw`BR}FBzU6a& zxIfyD`?LLp{$hWbzrtVXulG0loBS>QHh;T+#=k>5(f%}tN>rwVn$)2_Wt7uVbRwM` zqi@i+Xq>)7%jrB?Nf**ZbT!>TH_pAGY!O?^ma~u9 zX7(97z+#74H9OAEuygD@yT~rFde#&q1!5ov(cpz(SnzT%BA61q9n1(81fK@`gM-15 z;LD&U_*d}n;CfIO+z##p4|q%dB>x3}hPUI%T;Sb#Pu_=TbBW7*2sgRIJ 'MIT', :file => 'LICENSE' } s.summary = 'It is a Label based on coreText,help you to layout of the collocation of illustration and character.基于coreText的Label控件,帮助你做图文混排。' s.homepage = 'https://github.com/CodeWicky/DWCoreTextLabel' From ee68b17907c7095d4cb0294294aad2cc6d8b186e Mon Sep 17 00:00:00 2001 From: Wicky Date: Mon, 11 May 2020 23:56:57 +0800 Subject: [PATCH 5/5] plist --- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 DEMO/DWCoreTextLabel.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/DEMO/DWCoreTextLabel.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/DEMO/DWCoreTextLabel.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/DEMO/DWCoreTextLabel.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + +