From dab0b0cbfb2f65a08ad9cf3f03f3e04f9853d4bc Mon Sep 17 00:00:00 2001 From: seven332 Date: Sat, 6 Sep 2014 16:17:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8B=E8=BD=BD=E9=A1=B9?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=BC=80=E5=A7=8B=E4=B8=8B=E8=BD=BD=E6=88=96?= =?UTF-8?q?=E5=81=9C=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- res/drawable-hdpi/ic_action_start.png | Bin 510 -> 446 bytes res/drawable-hdpi/ic_action_stop.png | Bin 0 -> 236 bytes res/drawable-hdpi/ic_setting_download.png | Bin 567 -> 512 bytes .../ic_setting_download_dark.png | Bin 595 -> 578 bytes res/drawable-mdpi/ic_action_start.png | Bin 340 -> 304 bytes res/drawable-mdpi/ic_action_stop.png | Bin 0 -> 151 bytes res/drawable-mdpi/ic_setting_download.png | Bin 386 -> 341 bytes .../ic_setting_download_dark.png | Bin 446 -> 379 bytes res/drawable-xhdpi/ic_action_start.png | Bin 640 -> 509 bytes res/drawable-xhdpi/ic_action_stop.png | Bin 0 -> 296 bytes res/drawable-xhdpi/ic_setting_download.png | Bin 748 -> 701 bytes .../ic_setting_download_dark.png | Bin 792 -> 767 bytes res/drawable-xxhdpi/ic_action_start.png | Bin 1087 -> 929 bytes res/drawable-xxhdpi/ic_action_stop.png | Bin 0 -> 565 bytes res/drawable-xxhdpi/ic_setting_download.png | Bin 1204 -> 928 bytes .../ic_setting_download_dark.png | Bin 1371 -> 969 bytes res/menu/download.xml | 30 ++++++++++++++ .../ehviewer/service/DownloadService.java | 37 ++++++++++++++++++ .../hippo/ehviewer/ui/DownloadActivity.java | 21 ++++++++++ 19 files changed, 88 insertions(+) create mode 100644 res/drawable-hdpi/ic_action_stop.png create mode 100644 res/drawable-mdpi/ic_action_stop.png create mode 100644 res/drawable-xhdpi/ic_action_stop.png create mode 100644 res/drawable-xxhdpi/ic_action_stop.png create mode 100644 res/menu/download.xml diff --git a/res/drawable-hdpi/ic_action_start.png b/res/drawable-hdpi/ic_action_start.png index b1fc0acac138696ec3d428e10b53ce30b99d0baf..7d7afdbf20979869abd5e4923f7535beea55b42b 100644 GIT binary patch delta 420 zcmV;V0bBn51HJ>0B!7iTL_t(&L+zPMO9L?!g`2;xF1qwViy#&Xb+2oeB7%aVROmwY z6@0(ObD($Q>UJiNIgr4CyGT3d%S~o-lQ0l(LEQhK0+h~R&45G(nx+}T=rDw^C~f%v z^IcO20O$DO3p9cz0Qu?*$T|S#`5M6nAg=lV(FTCNnSm*^2Y-;~k|1pX%<}_+9q1S! zza>Dr0+{DB1e<`k&kYd^fWF_LedqunAGttc0+{F9RW>eiK%@Ym?{8=Z?IIgbDM3;J znCB%Spd)|~Dtb!|V1_xJ`0cohO^^$KzTdgPxzGW^I7-V2V20-iwgACbZ|7D5fTn+- z6KESCk6kEA0e_fhZbP`pr)?K`X#fMcTrKjOb+geI0Q&xf4xur!@#+QX6M%VMAYk!y z>Vc>Lo>6l4;S`!cBgH8syNG39qtYKT*{y{1W=?iHEnCn?mz1(az4Wn)?7^1o(W3O> zuI%wTFF3}mniMZMw6B<)1xb-^u9C8dGv`AqfODXdbsei2NH(<2KmG%5#Og7p%y(P> O0000%dAaM$IAB=7&r%O(H3DhPj+ zaQ#RDlFne7fiwe-Gr(IyhxIXpnGO~UkB;%Ycjo~dH0GdH4SyQj_{!~KdHmD663YPx z0XXl+xP#VZ%El>_(w1?(b+Z95!7ri0H7rcscvE9BkPARJ+&3MCRa#mBW#rW&zH=8> z03+ayKsM3JRpb6Xd;u7c?sD3oY+N``Epq_h0R6D~3_4pzDSyknt?(|<8a02BI&w%Y(N%_CH1+rB~K0O)I04LS^0P@25<2@xYePqwDt2{N5B ziqj81K;i~4nm=gU-9f8Owq&O10+JMf(R>f3*HJ7S+uD+(0Sw3$y{yvtQ6DrL!vgSY zOMn`}Yz0db&s>mU0{F8f8e3%B_c*pB1>mNd(N6Rd5?%Wdi`_=W9%PcOgj_Qx)=o>l z(8#?~ioMi}EvtwwY>6!`iY@L6F0YIKgM(q_lWM}dktL;$5jO>3Oj4vx(hNj8y^O)d aXW$2eNd`dD#RN(K0000Erj% zuWr}mV2j{Zd&L7kohLl`d3)Kk*M)JbT93*{@A-d#G0lGh=bt*JcXjnSpA0s8KRs4e zea130uIqT!>{F9P9x<@C_$**x;o8gaP-uErGncB%gus+7|8?EmCSK%o2C<#^?`Y(0 zSu3?8@J>drERfX5n{qbh7~>k2FedGTRkn{AqB*w-E#5BlO8)Ab9ebEJONYFF&cLUGV?_ literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_setting_download.png b/res/drawable-hdpi/ic_setting_download.png index 457b585c1979ed5aa5ee185ce9870efa4650cb97..d696afec394ac81888cbf2a3c95d485a06e63d5e 100644 GIT binary patch delta 486 zcmVJDh(Z#&0=fuf!K#_z9yvPBM#4PiZ3@04;4U~V#QC?I7{TGr>sU%du zt2p2}F~j_bJ`qs#mGv!@f0QV%>VQXLn)xYx@(*w?JYNU=lLmNI2O>zQgD*nB1*ImY z7|uK=ihwUhz$4+($u*ZY&su5Y#}WMwgaF~hcP#+kIbTqu6(vvvabHj)(1gl$cSJcr zE-wuND7AAPx;K_U(l>hO(%5wfxc?rt%?N}PlB}Bp67`xo8&v~MfyueY2;``ydBz;j cR5K^m7c+IPF`HORP5=M^07*qoM6N<$f*T#$*#H0l delta 542 zcmV+(0^$9D1h)i`B!B)%L_t(&L+zK%D@8#V#_tjN_*3j8EZDGOWyeldWP#LmODR_= zb=?vcVkJ9vR;<{tK(h0v_=p_8skwF1{di~2%(-3W)HJ7apLyTsd7pRY+!N(m{EAwf ze=Z1Uwu8ZeKjAK=T5HLirGNVTlG$rPh^?3x`OX7$G z=sq80-eq)20$XCD!~yk&iy8%-85kp{1?wQAb({O%SwQ5r!nnB8WD=Ts{FMLd9}t` zfEF>qT(opTkuO62(w2N`0b0Z)^E#u=fXFx4Ey!OOtf>l3Qg*F339-pxa4_SgqlNs{D>i@_)_+Xc05a%T+482l-Q1m9NBc zvIl;X;yp3Pv-!mHBgh}SChx_8#GY8>ewJ|p`2!#1y$aCnGywTWU*x?D@JZb39>{|D z{}RBdqCRFay`&#CqGJ>RPnoh;Z^9_*m*flrBvrD(1P5%Y){HfxJz>% diff --git a/res/drawable-hdpi/ic_setting_download_dark.png b/res/drawable-hdpi/ic_setting_download_dark.png index 912af630c5f8da5ffb8c2d829eee8820b4acecc7..7c4400683aec77606d33f9d07a227f127b34d1a7 100644 GIT binary patch delta 553 zcmV+^0@nT01i}Q6B!3A>L_t(&L+w_}O2a@DZAyzZ3m3Z4h3H0Ys5E`9#n12q6nuY+ zZ_p3$GsJbDDV9{-C@yqU7cOF@rS*;wD5Z7Yk;)AW1ZM7;^SG0V5gPNy7<2w16!6yx zVgmmnfowLr-s|-?c*Gcnaa}5vZg^^jtyR)OC_o|xOn{h&Eq{b9B;f$IkfeF|6~Yz@ zqJ>ha)KVl8nHaTKx7)R0ZjF=6Z8#iuM%8pWov&)O`bfiMIs>^}ZWVskHepQC09DMx zkKQMYt75TuN5f+hKtPho-Lv2@3kX64FL}a=O8_ab zZF?Ec!;b1C2!DC#`*X)}9$1|B*KiBaAwrbAPy)Vk_%bcR#(OZPcpMvC3rT*!IE63H zlL(Gb0;)vFl9x)r7m-e<7vO!LHwi)>>P{+^%Cm^`QfFXrLtYW8$SX;}7n9HD=ix@) z1#;8BISNU=!wq~^C=^~~oL8EF4`x}`oN1Z|AYx`1Ie#GE^gQp_b=_ALs13FsF=-dnBKQN3P&Q`I*8I8yfjjZi!u|2YedMx#kvD>|=L zfG8=RIuyX;mX5Vd31l)EOULFk%yPNx($=sFxTFE;mb?; delta 570 zcmV-A0>%Bp1k(hNB!3!7L_t(&L+zI_OT$1E$D5ky*KiRLv}w|!gOigE;-HI@=%9## zA4X8b4vLeD4#hzyCkLfX+A4^+_%&)`NSz;T=d!!V|)Fi{k}_`ZKgjZcb`GC~?4MSm-F2Uzj+2? zUdd1D_4+f9Hh&iY6Si&J!Ft#Rh{=;EDHg^t_F<*jZ2G*K+yF7eEFiW3F~Xa$Hy-A{ zVEzo|pG35T0OE0S@y|LT48hDpqk^&VM9g!qf!-vALSfFbtW6OJW@oCgn#N^Vr=fynwJK^0U_1AQ~&~m zbo0^ym>_oSMf|P(G9FjhVee#&%})*C$7qrfKrG`rd%^4esxW^e+q{wvbWH+c73WJh zZejjfg?Xg_OdR{fB%bqcs>~|~P-(oYtz->kVf=pq#2+(R7B)xys3DCI08TS?k7NMY zq2$y6lrt)c#OMx)RBaIVkk-H;j8SuH0BWUF#pw>Hsw`Fa8+z6HF>GAvaR2}S07*qo IM6N<$f~%PeMgRZ+ diff --git a/res/drawable-mdpi/ic_action_start.png b/res/drawable-mdpi/ic_action_start.png index 01327a70540133caa763b5c6ccce27a6f49f13c1..630e24fef44bf530eaaf1c16086649fb417e81b2 100644 GIT binary patch delta 278 zcmV+x0qOqK0fh_{>WB=n4a&zSTqz9CafcHMd^rX(YYs_h?0vr&0N6kb*GQ{5ks8c{&gw$`$LVJ=?AEn%9dF?%F^g;h? cMjwGM-l>`)=?~ARe*gdg07*qoM6N<$g3e)hE&u=k delta 314 zcmV-A0mc5X0@MPKBYy!KNklDSq9?4i23*nd~pPNiwZanh^+fC zjI&?4@;m~)MN2^IVy?tAQAkYukdP6$bNLvWT}3XnQ7Pg<;D3fa0=$b;xP@}mQX%41 zz-8{hc|&Z=0F3cZMBWu}nR95&L@qviSK?EFD_2B-4PgfwD8;s3MN|m5Opz13jgZwr zCM|MBZm1M+i5oCpLq0i@QSd{+;WA8NYbJ{N@|B2x0uJ>oMEVG7O=R``Bat5#Alw47 zBqTeAq!$s{RWnRhj3~=7T|+|Fk`XthGNnwxH(&fNQ1Ev$OZ+2n0rmKjA(1|4&;S4c M07*qoM6N<$f06IVds9`D) zD-c_#;86DfD4q>;zzdQb08&f^N8q&_WCy`CK!GC&T27P$pnoAD45X(3u^N%laSNy} z2N>*c38^O-0x$!BAwjGoh_;;Q5Fo)3Bw0?f1EA5t52Pmou`XKhUIy~>fx-TfP_QG* z6CDM}nt;)P?g+9hCo2Syq66j#kPyi}hnYiG2p~Cv2kZ+*#xJAP0)hjOB!5XsL_t(oM`L6dV8A%Q_A`t+fTR%k|Np-gFv=zqh_+ltM#f{r zM(wBrMnhmU1O{&i0Q0;bFfU7^06IV%s9_2a zD-m0$;81rDD4qj!z)O-G08$Kegc#Hj%49m?F4Xc@xbzcD1AjnAhypcF1!7Vi0kS+B z==0b398b^z(2x*;hJ-4SA#oe(^EZUl6XgITM@#~;)d?7S6DXet^f^JxLFN$c0H`B` zp&_A$!x6WjK7UKd=P-Ga8~}BMAdm)C$(m@ETnF+&Rq=abEhjkyUlrK zwu+jT0i!7ln|b&uqq9_Yfbr0B05yG&&#b|l2uDl^003}#bRpBEW?=vT002ovPDHLk FV1kIOk-7i? diff --git a/res/drawable-mdpi/ic_setting_download_dark.png b/res/drawable-mdpi/ic_setting_download_dark.png index 1f725d143dc48381a55369903d31eaea898c9c07..9516954933ffdfe6ebb19aaccb0a5a153009549e 100644 GIT binary patch delta 352 zcmV-m0iXW91N#DyB!5ClL_t(oM`L6dV8A%Q_A`t+fTR#GF)`8k_wQdGzG!1&Vw!a3 z%$Y01M(wBrMnhmU1O{&i7#J8>0rRpbT7DJ-=5tegc^p_yoCeCjLR0hl!i5XRu<64Y z0@~WzLL3|%1^@s5mms!K!D;~`GsedCF30MxYgJ2pU*Ac{6 zPLu;cip*5u{p9 zvI9UG^z`(&Sy@^0fYG6d9K1lw@BjY&d(x##m%b7Tb`*W2D2Ay;cLceXlNAE!jsWq= z@j1*Kq7xyukXe$Ek>Lc1KY8-xJ2@dqQ3#N0A-X<_LVy~M!07-ZBcldtSO7EQ+_`gD y&BNz_SyXmF8aDF=uLG#*dwgaM-b6TJLI42&h{7R2l0}>V0000~k@jFly(*21KQS9;jVSkI*Be z?RucVP!T25 zAZo=Csulo)R8`%B+ayg>fn+%-iV7f3w{82qE}jS=gTR9biXT-K1;`m5NF?IK4rGGk z@pw0mV|1br0)OCU48!QAX@1moo_!~FAWINMafj!5Jd%%dA}?VW8ouv;l8QHWAS*0M z(l(4JLY(}*dxlXnJkR@TBHkJR6A^;rxJ!IqE|+(0#8(2qWI+(N@E!!gchk;W?}4^L zWqFM^;hzC0igMGXnBzEw^-3K8fcuUCE{f`HEZvz-MS1L>;SbIy3G|T0Nv&aH30XyLJ`1qu22SW znJd%*n&*lMux1j&ixGP-z;HB=*2)!NJJ8LWD~bTF+iPk7?i;Ks0BKv{)WcB7Yc|G5 zAoYew+AXovo1$sA#nZkRY3|=Whmh!B0hj(=5x}*7S6u^e@84Aby7lku0Nwj{W`L0X zoe?0ke`f;-@84MfhV}0Z0J;Az?|BDCUu#t>Jo-y}e*OgT)Kt9ItN_Kk=J}mx1$b&I aUh5yZeKt^c-)>R>0000$1AqmPBYy%%Nkl*D65-@!$+6$cl;gkL~gUyBb= zEQo?aT@|XJ;vyoVj&2INsJM#wKpYgcx>+9xt&QiF2Is3cy$L6Qz#W>~{D1f4wgzK4`!$i+7?B}yiO&<&uXS?-fX43RaQ znFgUs0Lrq9)PL8hj}r)Q8#SU;6Mz!@Le`L}_=iH+6v6((HxOi`1tH#D8nhAZ!4jG~becm_$$WI)v~J zU4b;408|9aV_F<(^d%00AYdVYvTRDch!vEg)97n@_zwtM0VvHM6hF+O=4%dJ?Qeep zVLJe&`I`K~2$Idae*J?3;M;6|v%vK<||R0000$`{Ln`9l-r6X5*nopIV72Gd zTqEaY=Xh?aO_gSiw`o}L$@6^qy9X(?$}E5GZ#z1F+mC^(e1q)cj_!&G6N?EGj z&v!afbNKnyC~KpA8?Pz9x&QH<!=?1VgnV3*AHv&=j$J}o^*&am*h`nL8S{m9fIcqU+3yF>3owuy^xB!01| zWoTq+J(2O&LCLsFq?4ytV4}!WiJ3BB7_%%-Ve)Tf2X%{HzYPNawwHUFI&Z)4`;eJ2 sfFV~)T+ra^dz~CN77>Tpr=GGu-~Aw9+nsAqfnI0uboFyt=akR{01DK2pa1{> literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_setting_download.png b/res/drawable-xhdpi/ic_setting_download.png index 0cb1f554d4445350ad4c91966974a49da7304676..9f92c8799159bc542f05d03213d5868bd8d45254 100644 GIT binary patch delta 677 zcmV;W0$Tm-1-%83B!7fSL_t(|UhSAYO9Md=hI68zSlIYO1RE_Bth7|=6!BfJ)FjO~ zpJ;a^gBLA<1_+aQFAJ^-B>NJAzZHhcKM5wC0Coq0uzxL34kY_cAHjQ5Kn;?CP;w{- zl6~1%@ZJHC0|zB|&AgXgpjmkU!Z?20#nYFtgg#)mfz010w6``B-vwGgn4ncW0R#%Z zh~V$6qhfRn2EdfV7}~uS5GeROf`4Gd;A9#UfPpZImj1=n-!SucysskoN2iFGor43Y zgHXZW1Ak_|Z)gjlgD2mq05A|n&>k89l=&xS@xX?n{ zYYF&X143pqgfI3Y7-CW(eJFsCw6o|-6_CZOgdUueDj+27Ec*Hd44ULY`yrf600000 LNkvXXu0mjfvcf6= delta 724 zcmV;_0xSK!1?&ZoB!9C>L_t(|UhP*+N*zHEb~Nz>xqyqDAXkvAf(8T;5d=l!&q7_O zC_EPi6m=njKY2d#79pqzf{H8g3ZB4)7sv_X&-fLzkB5v-S9kTy^G!7r^H)_}_4QZP zJyA=+M^y0qTND6gK*15v5-2zUv?4eB{S4?-SC2|WqwQCR;4^k+!_20fZ+sww+-7=L)5;MLY{54s(xQM|5j zi%;X0_AwgfKTF-3nr$LA0{}3BhaU_OxG}lt$1o}bfC|@`4FF955c+YMfwXcb450rA zpPNYjz{R%{0DlIAAzUYNW&*AJE|RahBu_TZ02mO)aHW#SYgCZ@FQ3W105Bj>KN$51 z!qIjg$(J2%Yi1GvP#>6t4Ei$4G8v-%AILTUp!)Y3-T*w$j>bqJP+tf=sz`iCY7#L3 zOgT_f9F__$!Ow3bzbolq8UQMXDae3ikjB?vT(=}>UwpIZrtE}ww2+!!Db zyNC+~Km^8j>_i#BT|8`It6ZC`^s$@JA&WKG3{3z4*Q^;bR0aTFxYH>BT*Q{ z0o;;lbbWRcZ1jY<@hJdY#F|ZC8PIGi%FRa^z(uUt^q&AK_2WUR-LQQC0000&FRCiFDGwV4u;EavFW_k z6i7N-DwWm%!oIDVK(xp6snh9PTLx8s4wz*~48opiIuPyQ{HY7)oiShp4uODu;GID_ z^sxtgcICWt07!u@6I@5$Nf(%u7FeJHIP@Ox7iXnT{Jw|O`H01)n^Im|%z77?WC>bi zNQE&42!A~)c&PSmZLbs#vH?IgVPbrSuY)Nd^zg2R3Ga`B4@RP_0Fb3fho>lvN1*u9 znB_$K51{>xkw=P$*#Q`VfSN!|SdQ(zhx0XV=UKYIl*0Ir3G^PV?sy)~&lP~UCalso za{gA4xz@zzk^hc4wJ$YB(x4gr7@?JVjN24pcRoHhvqIML3c Zt_Q`=Wl*<-rz!vd002ovPDHLkV1n>pT6+Kh delta 768 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 P8Zmgf`njxgN@xNAhvg9D diff --git a/res/drawable-xxhdpi/ic_setting_download_dark.png b/res/drawable-xxhdpi/ic_setting_download_dark.png index 055b777438e69e0fe51ee9f8fc77c05eb41085c6..c0003215a5e4aa118e1ad88b50444e7259db1310 100644 GIT binary patch delta 948 zcmV;l155nd3dskMBYy*sNkl)2&+hk~J!e<8 zQtaWwl|bQI9mV$`!1*G800?j<;9MRn00Nu|IG4u?fB8IPqOuh{Ug9GCl?D(Ws00gkT*))Uz8?NkB2w{JL~qq1oT0XAIOsSvY`C&hA%Km_rXd8B;M(i; z?k^ULnGdcFRX zB(yztHGluAN$`i$>GWtanViKOm-$0@(_~VU;051h1+0XmBEb{BtAG@4N8a$=1$atG z0e%t!JS3z7KN$frC8PvDDFJH|p3oMxW3d$^_ygK%9>?BlZkvnCHgwy7n$705TCEn& z391qT{Ml@FG#-zCTF8}VCMV#0B2{{U{xN<3Kz};1^?oGtBfW%pLcg19{J zOTq{G?yh(ZqL!x@dERLh)D-YWV?eoNkbq|zV}$@AMF|_!fdC;mt!@yYMN*gp0YY$E-5@}Vq%AN90)*hSxU{&&TaSW-5dpoDwTO?5ASgd^N zG?69+4@nVMiG8gBN-Z3VIy#z^l)B^s7X8!I5)%n>X>k-3bQNfHk!Z~KT%_@$QGsJp zMB3Wj-|k9io+^1av-sJ$XM!p27SFAp*X`f={avYha^|n6R~lzreidco%V@EWQ>1~Z z;7!BhPgcw#4aw{>)2~Y|V34tXuw&0T2G$2R7>_?KWz%Sg=L-o7yLR^6Ik|~nRK&VV zzkK^v=5=ku#l9;%0Ssm@Sdv5=8djQ3;yQ3lw=sfMAz@YT5~dA>-U?xi95b?%S2E<> z5$XtKU|M#|LyJLrJ8hIR`s!+HulDr!*XK|OZn>k&`04MGeJ&TO?HfNIRhfM9Vq;@t z`jtQSpCjbYXzA;pKR!9#S7Xxos|iO+j(vC%S6pBJUm`qy4TDec)~#E21_uZCGHmQy zeNyAafgk*qmX^A)v9Xiq{N2E8a5hmhs(I-O!Rf7Y&RSiOI(X@F)6(a{<@`zvK9i3g zJz9D5=1t!n#Z7NG?>ydm?XZvB+ z@TZzP0uwn8&b5Dc_vhkCzMbb9b{_Ng_U1M=GCH$+@zqJqiC5-%s0f{HZf;iYnf2ML zmFYlqU)Kgh^927BQ{_SgYVZ7O(BwR$P1c?p=S(v0qmUnGTq=AHG$!S^YuL)ca|zkL+ff%D1m6clyPB%8EH* z*QymOZgi}S?|-Us{N#h=jha{TUcY`_{dm#7l`lmaG8Zgal2QyzLOVBnXW9Jh_~Vb= z&d$#3V`j>8GA!#{wQAMc2)1*NiYh(QY7T!YU%7nwb61bA|00k5hqp_7z z_WHtRPpuQSC!duUSohf5&WOQhdqY60^=Fl7i+$qnMzb+~;5oCu$vLb)byY;g5{3%t z&t?*(G6F^x?!0GNOx7nJu06L>Iz+pO!G`1Z$10KgFCE!mJXQZ##r(`Z^-}WWP89}Y zt2r}H7g|`go?g?ixcBje>wUs`^$xNVznow)SbQ{bt(1UY0LcA^|E#`|zuWarvOup1 z1HTimg3RW-!e?gnuYWzq-@xF<-{~$-7%SfQl^qE9T;KBN9j7P5>jS&zstYYE%v#36 zz<pzq8593A3H1CdPyFW`#K`Wc$$DTm z=Wm9@_cd_`|NJ)iKaW}dq-ro<1N%b-g*U%yuNeFnJhR`o>`-8m7n6avz_i7O8v@d6 znt#qU_`hst$rI(BIjfj{SSHjQ+jD%+BjY>lDeN-p%S;%K-`hAPoI%IzlB)>AUF&H+ ztOt^mV_g_8>`guyf-c-5${@GJ${}C1)ac{IXR_<^b~461%hEYz#Zb_;+Md;+Ac#@G z=dn*9!<;;!Eg}pDP0oq19(bwd=#3<-#NA*pO?CdED!zzMc|yQKgXOYCun5EQ*(|!O o4hFr(u8ak{JTC+h6kaRe^Gv9|riptsu+U`iboFyt=akR{01i1<`~Uy| diff --git a/res/menu/download.xml b/res/menu/download.xml new file mode 100644 index 000000000..d6aaafebb --- /dev/null +++ b/res/menu/download.xml @@ -0,0 +1,30 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/com/hippo/ehviewer/service/DownloadService.java b/src/com/hippo/ehviewer/service/DownloadService.java index f8551fc8e..193e8e7a7 100644 --- a/src/com/hippo/ehviewer/service/DownloadService.java +++ b/src/com/hippo/ehviewer/service/DownloadService.java @@ -156,6 +156,43 @@ public class DownloadService extends Service } } + public void startAll() { + for (DownloadInfo di : mData.getAllDownloads()) { + if (di.state == DownloadInfo.STATE_NONE || + (di.state == DownloadInfo.STATE_FINISH && di.legacy != 0)) + di.state = DownloadInfo.STATE_WAIT; + } + notifyDownloadInfoChanged(); + notifyUpdate(); + } + + public void stopAll() { + for (DownloadInfo di : mData.getAllDownloads()) { + if (di.state == DownloadInfo.STATE_WAIT || + di.state == DownloadInfo.STATE_DOWNLOAD) { + if (mCurDownloadInfo == di) { + // Cancel download notification + mNotifyManager.cancel(DOWNLOAD_NOTIFY_ID); + + // Target downloadinfo is downloading + mCurDownloadInfo.state = DownloadInfo.STATE_NONE; + mData.addDownload(mCurDownloadInfo); + mCurDownloadInfo = null; + + mCurExDownloader.setListenerDownload(null); + mCurExDownloader.setDownloadMode(false); + mEdManager.freeExDownloader(mCurExDownloader); + mCurExDownloader = null; + } else { + di.state = DownloadInfo.STATE_NONE; + } + } + } + + notifyDownloadInfoChanged(); + notifyUpdate(); + } + public void delete(DownloadInfo di) { stop(di); mData.deleteDownload(di.galleryInfo.gid); diff --git a/src/com/hippo/ehviewer/ui/DownloadActivity.java b/src/com/hippo/ehviewer/ui/DownloadActivity.java index 4bcb0fa21..427dc91f0 100644 --- a/src/com/hippo/ehviewer/ui/DownloadActivity.java +++ b/src/com/hippo/ehviewer/ui/DownloadActivity.java @@ -28,6 +28,7 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.view.LayoutInflater; +import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; @@ -130,13 +131,33 @@ public class DownloadActivity extends AbsActivity implements AbsListView.OnItemC mWindowsAnimate.free(); } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.download, menu); + return true; + } + @Override public boolean onOptionsItemSelected(MenuItem item) { // Handle item selection + Intent it; switch (item.getItemId()) { case android.R.id.home: finish(); return true; + + case R.id.action_start: + it = new Intent(DownloadActivity.this, DownloadService.class); + startService(it); + mServiceConn.getService().startAll(); + return true; + + case R.id.action_stop: + it = new Intent(DownloadActivity.this, DownloadService.class); + startService(it); + mServiceConn.getService().stopAll(); + return true; + default: return super.onOptionsItemSelected(item); }