From 374ed3a515e0595d480d043022469377341a3460 Mon Sep 17 00:00:00 2001 From: seven332 Date: Sun, 17 Aug 2014 22:20:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=9A=84=E9=98=85=E8=AF=BB=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidManifest.xml | 21 +- res/drawable/sadpanda.jpg | Bin 9615 -> 0 bytes res/layout/comments.xml | 43 -- res/layout/detail_avg_text.xml | 21 - res/layout/detail_header.xml | 92 --- res/layout/detail_offensive.xml | 64 -- res/layout/detail_pining.xml | 38 -- res/layout/start.xml | 22 - res/layout/viewpager.xml | 30 - res/layout/wait.xml | 37 -- res/xml/data_settings.xml | 30 +- src/com/hippo/ehviewer/AppContext.java | 14 +- src/com/hippo/ehviewer/ImageLoader.java | 17 +- src/com/hippo/ehviewer/StartActivity.java | 79 ++- .../hippo/ehviewer/ehclient/DetailParser.java | 6 +- .../ehviewer/ehclient/DetailUrlParser.java | 4 +- .../ehviewer/ehclient/EdDetailParser.java | 103 ++++ src/com/hippo/ehviewer/ehclient/EhClient.java | 29 +- src/com/hippo/ehviewer/ehclient/EhInfo.java | 15 +- .../ehviewer/ehclient/ExDownloadManager.java | 76 +++ .../hippo/ehviewer/ehclient/ExDownloader.java | 548 ++++++++++++++++++ .../ehviewer/ehclient/ImagePageParser.java | 13 +- .../hippo/ehviewer/ehclient/ListParser.java | 12 +- .../hippo/ehviewer/gallery/data/ImageSet.java | 86 ++- .../hippo/ehviewer/network/Downloader.java | 2 +- .../hippo/ehviewer/network/HttpHelper.java | 72 +-- .../ehviewer/service/DownloadService.java | 9 +- .../hippo/ehviewer/ui/DownloadActivity.java | 397 ------------- .../hippo/ehviewer/ui/GalleryActivity.java | 298 +--------- .../ehviewer/ui/GalleryDetailActivity.java | 1 + .../ehviewer/ui/GalleryDownloadActivity.java | 112 ---- .../ehviewer/ui/GalleryListActivity.java | 8 +- .../hippo/ehviewer/ui/SettingsActivity.java | 73 +-- .../hippo/ehviewer/util/AutoExpandArray.java | 83 +++ src/com/hippo/ehviewer/util/Constants.java | 2 +- src/com/hippo/ehviewer/util/Utils.java | 39 +- 36 files changed, 1076 insertions(+), 1420 deletions(-) delete mode 100644 res/drawable/sadpanda.jpg delete mode 100644 res/layout/comments.xml delete mode 100644 res/layout/detail_avg_text.xml delete mode 100644 res/layout/detail_header.xml delete mode 100644 res/layout/detail_offensive.xml delete mode 100644 res/layout/detail_pining.xml delete mode 100644 res/layout/start.xml delete mode 100644 res/layout/viewpager.xml delete mode 100644 res/layout/wait.xml create mode 100644 src/com/hippo/ehviewer/ehclient/EdDetailParser.java create mode 100644 src/com/hippo/ehviewer/ehclient/ExDownloadManager.java create mode 100644 src/com/hippo/ehviewer/ehclient/ExDownloader.java delete mode 100644 src/com/hippo/ehviewer/ui/DownloadActivity.java delete mode 100644 src/com/hippo/ehviewer/ui/GalleryDownloadActivity.java create mode 100644 src/com/hippo/ehviewer/util/AutoExpandArray.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5b6b44378..f8e51485d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -35,6 +35,7 @@ android:label="@string/app_name" android:largeHeap="false" android:theme="@style/AppTheme.Normal" > + - + - + - - @@ -79,11 +78,14 @@ + + android:screenOrientation="behind" + android:theme="@style/AppTheme.NoActionBar" > + + + - - IGkTf;D(5(goFfw zPewsnOkP-ALhNrNATlyCN(xG5Dk^3%E;yIi|MP+G0IrdOARq`B#0?N#1A(uB@LvH0 z!A@e(zYgF(2Z#s^Atr&6l95vo3N+9HL?AGj2m&T1hCm3V!wB~Q$Tea*E>UF?dgHrL zZZu3RGVKj1Ql++&!DMuwN8HIbij16*iJ676zKNmDRQNjm@ne+dBt`N7&<&)3fu7zqmjE_}{Py zpZ^B-f8e@Cz(oXsfFaPoxIjdY2ygH;2r-u^37xVr^e&p7TP%_krjquiwv!AgZnDqd z`;YKZ$e8uzMv z4fpv4p^ENRcKgwvay+m+wuJ|hjTq%}gr2gR1#O;M5G*Sqm;o=6)pN!62| zmt?oZ10;_Krh}Zv+-k(#;4W0Ee>;BNLm<_t-j8_rB&!nj>pGgi;E1B>L}`t{KN!j+ z-M?j?|7BW3aU6pO+;^Jsz`K7@59$w|WLPh%M*ZOXYfC?Y*6d+l(Ii82)G1xwUsGi6 z?ABYRzGxk0Ev`885GT;!4^IhzvKChnXlB6!XRYAO+%EON%Lk8AUYSm6|4+*SxkS0{ z^;cT@Xf*0YSS{s|L}kVLS9BK78c$w#c24b-u{w-YZ#r3KsGy9}701iuaG|g}Q_;hQ znzMd!6(fuXupwiDa_Pd_+g)r$N6=%F->~ry%`%MY0kv$7spQg z!@&@JT4vy(q=*diu((jhyTiON5j5fy$;*b1Y7YYa8Q#wdL9;0(OXQn*j$zn z?5AZZK^Z~9bD;Gtp$@hh^^%>RC|bZt8P*M z%LcHZ7|xtyfuq6w`NPsXXr*gn(K)fH)S_dRuDKXfD;GSV161%TDeOr1-AxaxwXhZ+ zW?<}Kj!X$A;m$}7vAnx~w%J1%{CDxVk+>GPGk5Fv_ywySJa9sb2j*x;^cv;J`QN?- zd-js@{xLz~qNKtJY))775pA9tqmF4m;DOOY69SvvEge1E7N#;Cu&)Nb#12v4BMhy{ zS>WogZd!~fo|W8iD9XCcj+O`Ih}b%xYF{$>^l?g897=7 z$Lt=xs>#HnloA7G1EPa!UqQ$DBx4T{v7&in*)1LE(cElML5fh=Q6Z@jUT4+$PoBFXeFy!{mgUmRX zqg`kA4}W*S1pS?83=tLJA{#+MqHg&Q9^kDnjsYbU@wnvD=#ZET=yjUrQhR(6=u-KX zmUzg|!Xhn^4b2IH!^eY@`H2{9S$A*^aG&OE6o5}zvwEF~)DKisjyjO}&gyKq>RmJ|l=nKu8ZTCwoIq10*b@-<&kDVq)iKiQ7+fA%Ck1MZztxjWd1V{c^Dm!~LTiRdE*3u70-| zuv#MzU$4=r;&$W^Rq7?(Y;^!7+IWI-ZxMe~ST`3HJPY=@@POu2_)o%DJy*WT%&uGE zAgq@y=V(#(Mqg+TE{ZAd!uWbHiD&#+oW*b4=YO4Y6)4jlbbDZpSAt+O+#L+}DaoDb zB(`!IpGFQdz?^fkbNOkDB1)OpM}{-Bpb|h^ut}^0)}X`B0vSP{p>&Ps`u65^_V>pX zoPY>FC&$}J20dF)g0E`Epx7U?@%rYE^M7_dwT_aG`b))+dCOH-YiMkB(v+*+>$JJZ zpS;l0MJS2)~RcidEXR$VMAAOXrjO^2(H_a9Gzg_imf_AC0B<8$zK99x)>k zRQI){%T0M7*HiZU1Itrek=>kAN_ZguZ{*f)*m8)Wmm1~iaV2*M(HubtOWF~F-h zD?|Kyex&_M_=yK5RE`J}f=l(MmN4Mn-1^@Or++WxyG=i(L7Ng6mu-0&6tsyZl*3Hz zn!AJ)R1DleN`u<0Q63^_Qw*UdbZ1`&vTeFy_ZIbbRaod?lbmxBiM^!)gQjoz#TBtnw;|(M{>K+mNkw-Q zZ_mxPSb(domB6k|{YqUW{w3ra2g%Ks z*C>Qv`Ti-21;D2+m}(M{!siMkLt5A*8k@QUlH8_7F;Tsr=~8xeYHQ`PCrIQDDUvfP z^wIKW(#^h!V@+*F+P8D!kqt8|uf8KG@IaWQ=XJ~{_@s^H_})OG+4ZmFGe^!)d0&!) zK9j)p#E7pW&^OfXm1L!r)hnOsqJGVucFKG5JcyDKV1Yu@I?H|#(S0=YG8I9^YFM`9 zyWBKRGr8^l+6@HiEXzoCj})KEOa2@IpJa2&RoC!SqLuC}weqvDGQ0mAWTD(y?kjBA z<|dYrS7eqY9-T6jIa$sqcih7}Grn}7SzSfCrUc5GBz z9YQ;;u+n>a#}0Av#2yc9>ots6NX2Ph>I&0bsoe_47F*MfR@N?W!N;0((A)+0U>!-V z;~F#)iP|zn#!6l0ePyYRW884lj(oM=8P4hGP_?rMHD78xSQ}q^Tx7ofIVkljdHXJ3 zdQsrHuYqVTRJta>`jt#_gtSAPz(%OT7{eO>hRb!WPDt;fC)4Uyg1;U8AHg2&Hc!o# zBUVc#DMv4IF-~iQ|R5<1hsw}$V+Jmb)bsPVOK~~ zj68$$3fpZ`3(r2l@|B}exhyyJx9+gvWq_nA?zMZ7`@WUcd{JAyP^0vS5A>L4Jw1qL zeKO=nB!pJPQ@i!JQs3a53Tqu|(C(J{Kxlz;CtQplj8e%}psbK^%8VKwIE7SObJ zElwNu)M_=n&z15FKgOZ3xvZ8ft1mtm z(CtR!-h%Of_DUgN?Wi%qnKIwsQDj-u&iM$y3KchespCp;yV&2jOkHgv$=Px~ ziIe-}iIXr+7D+LHrb>m%;5kTSdHgxmmjp+a&NA3Pu|(|eNpdSX2W8W;`8Ok^y-euQ z2fRyDWUM3^xRfh0ti6U^7d1ll<^3 zqIhZ-{ox^)lv%WIy>=1fco--RV1@Y5)!*l14)<1~AhAR%;fd)AEnpnjq9nsJ?^T4% zNwH>W&k5s))>(I2wx?N2x2t7qf1t#VYedf8tjSG`TI%m#eVl)=etS4nW59(@1>Dyk zeH59Z;zmS6AL^JuF`p#&tctmZzGU=uvcYl5+hWAbk5VrArG&QrZz+o zoXCWvY3^c=M9c`WCVX@y<@jRjD!c}l@x|b|BX;%WO0uxzz(d>!;=+)M(^XZSD1l61 zvo2I}C=+!RLztV&ttSWnIkR=uennUjO-I1{)nsga6hOQ`9qDfv~!S-vSzF~xQ-KMSX+Ub@(OMc%FLlNxdi!9X~Dh41q)X|(iMTS26l0bUlg{wsCWaN7qZX``U1F}>;dOvwEby~jl_vK?~=~J@g8A$LKVtK z6L*QcH|Xu${xO#KgK(_Nf`*ES!fo&Q6kCi-&UVep(arDE?)j9%L_0)y;PY)A7t5Rx zHkl_f=Wpf2!pMNzsJY*E>}U>9+R8+zYDwyCO*H%GRMFG%yNGiNR8jyI1gqoWx3@Gi zUQ8D1`*`z!#^L~xg6rhzql!5a>!j2YV?f^gCU!Y16rJcVf5K5zKCiHu;s1cHK<^-r zU(4siMHwFyzJ_5vG6V%Gd;14TzAC~{gggy>aVJ2q@eVofcrTbM*+&a-r7{-wtY8~^ zE#0l-vG+5$cuqqv;j!D`ok;Tx_HugoOZ zUENpiMGr(JDF)tl56no3VV0?LujKrz%Rgd1T-BXx7+!=eL9d#EhfFrqbZpDFf}|4a z`@9Blw!`%d%ql5~M~TZP2wQXigG8>UqPp+i0n$cac#cwilzP{qBZ70*KzwDt_5FF^ zt}LY|b>b(Lzk8Cf^Zo-B;@Hk)vDuT8OCN=ug}w{+5+-L7L4 zI((JfGB*9!a+L%XdMjtJf4*f64fDIoWTcE&`E!s>n06|1;wE!sZb^N0M6;09l0i~w zmUv2c)PXRSVAcfX=aR4U&z|WWFy!Tx*z;^BE3IUtEB+&&9M7_wm@K5D94kKprCFJe zZ#+vWn+yG9-i^tq{Y9>2_W1GL%Zj#zPX$Lch$)`t_@1#r$k^BR*?v~7>>5RPPCC@$ zm7sE1DTQzCj+8qlb;+HFK35~yUlLQ!|KXZI;m=@;vdYfl?VQ*(p}JYMF)8K+m0z5} z2Pxj@Y3Z$p2!?IOImyiIOm5majUj3c>JcmF`RN7!YBuwaxpso9WWt+y52?xf1e}z* zLym?7xZH{pdzkH>fXJc!C8gl)p0PKRKUK>nIkH17iwjF@9}=>Px^WX2_5}pdREzh_BE91cJ%pn+XZeo61FktY}4o6HQJk?MGk#2`rvTRjV!S zJon4k8}gAmxR`W3xcLFYV&u125qIcpGH><|?j*Qr3RC)&wL5}X2{4EAZ;y{(X1@>T6Gn4gWCLhHj-OBkUzv;X zljxK9FydADyNMB7?N!<qod>FJ)zoVX-!!q6x+qh&jT1^`OUqqPvBhqi>u!bIre4)W)bO_6 zbp0Z}Xv_BGm$6l3DyKBx^l#S@e|hI3XTpO38TyODfxmP6gdl!)S*l?4C)GV~8~Gp3 zgPA+FmkJa;h0aCSOTRHL^Z%e}Uzuij6ST5h;mNXK_eOwTghQL1u*vaEND#`-e>cHp z<3c5>t~%}XcKLB(P7%+E@J(@&z+b{Q6YJ#81-B|an2?-Uo@I{Bw&@-Y@%N+kPmuL3 z7R{fO9A~7`OU@#It?0DfjvB$PniJxvYCO>Aa?He}@2=hpXLkdywb z1sZ$OA?E4P7ff7^_xPAu2184V`uPqNF*RICkEiM4!PkA4U5^>|@@PNWN>I^weR%Mx z^=h)!8%!1Th&BY&w|v6>1N^#m8oOIV_g!OJr;fzNr9YMJp7wbP%fe5BuzRmM9)wP_ zmm{6Yry2-k?$)J4pQVS3d5%}AKC^PVK2zusJG0&hu<%W_>}U*aG9atIPIBjHC3IaX zXPSYI=-SBkhUJ6rRa=)uO-Visn-}XK3i^GKlPk#s2r%ub8d*Iae&+jOV0I|PtH*g{ zE3d>voXbN&mkI3b4BeF8yO{Xk`|*3kMb>Xq+DB{yu8n0p=z`s7nTPYB#gfT;ELuzPTqJmNIZlK$ylPILVBGg2tF zN5@BcF9&T8C};+Ygw(7lQGS7+FiZqeu8v!tOrQwCG9-BX+YTBP7;j}Cy|)I&&8S+N zE{x@F*)^Y_su&mzJ%mhEfWR8@gqw#;wRj-!Px}?(day-cja);Y=K{@n_y>ZR-SkvQ z=BL^TOa*H1-U*{>-Zs78W8bdxK*?{!Lc<9HBFMq=LGWW}l|i=9Pj_-Ug;KCWKJ#{t z;d@tPq$MO2TO^dMw5tR^eR6|CA8K?h%H@wlq|)x|;+7;S!5O7cF)ZN~>;PrE;?=Sbd=?Aw>Q5D6UO%-ft}i~-ID5q5snypK zTQz_GX`Q-LGN`w=2RU=hE_+f|-#lUajaTuW5zVf7^)2f?dv}!^HN2bVKNR9ux^B=v zf%V!vfN!=^aa^!1Il^<2bt4M0I#0K)(srsI4rKi}h4`uo+D874KwIQ~u}Ya@hWfF)A;<@| z4A1x=-OJDt;xV_d9a1U#v9ibnA=%iOfuX`2MW!1{{}dsqlr`Zb2h7>yiRxG18_6Ja z`pwzI{qAp8enfdu_MsV?sauFtk)IZhyS2L>2AmWr*?+F*Y%ooI{Bbh>Npz%fi`?_o zcy9wiKT|CH(GNk!9kf!M$Yw@~wU7L=pKkqDZhgdENFupX_U^gaSw{zKi~^3$C)I&t zOJdl9%5JYdUr#iG2)A%98!2->ZV)S`*&USDu#Vueb!Dy^CdLC5Q!;qq#Q`38%T+nd z$-mhk4+rdAZXx&9^8VbVa;N$hx1}e(rw+3yj@8?e{Ng^8AUw2?*R+@%zPqZkcVr*r zerquBql?2LL9bEE#58i-u-4uFb@fh=2+GGY$mz9^F_sH(zvp~VEM35pW-uE8l_)}E z3%Lm5_Pwz{c7+`k%vD(Fmw?M3VA&svI_sI+wkI_!Gm@t8bS6#Z2vZhhHMR2ErD0ih ztCkd9Pn*jAZ4D?)s7l!mPPVUi->m*fkYtD?Sad2BAN7f=%O+o0o;9~7DF{ssHy#W*6CIAjEr z3hL2G`sAI>z;8TWCHZ0#TANQ&+JSq{2rUUVQ4ol6S!>|r;J}c|r{#G#A`ApNf{nmU zREq*y2wb^R44l5})>PyZ&ERy!*I_$i!DFs%qI7bMYkd2X6)WKG_jtg8kXKVvwTd%( z+bGXGzcyu{g$E1~7u>AP-nLS*iLR+=b&*E7QEOHPnhkqb?+xz7YUg)uci07-M%xQGO&m$LwGzGs(4;bIx`GEDM8X|BVONAt|UeBklU>> zn8;WiOiOZOlEwAN9+k=L8d8#W3kr)~b}1NIE1|sgC3-$Y>C5}bnrM+BVU(V{BXXln z(1hm+o{pxV7|ht!63wn2A8PEmNXIaYG|-V)G=4BjUs!W0qj@_42;`|&5Fk4(f@9^4 zEZYgWmyBT@+bzs!G0MIXG&+=x3P##Su$anxMK}hb`k%{Ah*dlnN0N@DH zk>0}=&1B_427wcTcx90`Q4ezzn{oiFeJA**60CCK*L!CF9C!L3T4a#g$L_7fcL zbPl&mNEZ;~{59qp$tMH_^SfWqe04iEl;H2;Szp_$WDHT(?j7*4vMm6Y`SPV$3-kJF zrRFW7^5h6ivOvF97x-2>d33kC>a{@&i;nY@aY;^ZSr;SXOkW>?{uw^$@`GAv$(o5! z+K?O3FmtIxwZMF&eFGU!gJ_)0@{yK|d@{c`i5tRHOC@n@E{_>n0~>tvVsl%QGqi*Q z+kuIIHn2k*G(RK<6+Cuh_LoTNv9?{!9wekAVk0DcNd)q81=U!VO+X~tMUW`>0hL5E z;Vn3;qt;j~JWcNiw44)*yW6)t$iM6>7GgqVyK!(adKw&1dS{06xHPd4n@>R{*gF6_ zq^7crz3esa+lc!Wc3~dSoP144K2jB)n0MFQOZd9*XizA(P)J%6Ga^Nz+ns4QBQjxe zUp~R|PRd!<8U5K8MpRn0hx_dw(H#cyvm=`&NSgejW72Y8V7XX)DwpBWS&FeGRe#*p zJ-?a9^~Q4vBXvnZg-YkAJtY@m)3}si?E5|2kDsU-J)gSRIT$?~&e0BSIP_u3ZUKvC zESySWGDmOPF{46qj6^%DYL|Nv&!_#lW!Hlcmmbg06c-3V&eefN^}*B^yvYz*>+Qj}$#kUC7Ba zY-cF`M3vOSx>TsyL{N3R%bfNr>6SHDsnk2SHg0cyLT$aMR#&uu7m*Ip7-R}x`b*}^ z!=v-|+Ds3l@j#L>9v}@w9Kk11{HU`@c%sZ5b?Vii%WbV5$%lbjt~k}4{7X(klHH7u znN~YQt;>|*f$z5oxo?kT4S40yR_2~|t{Aaf_-9@vJdnCsf(Jt93ERwa)Cx=i)#PvZ zXY>2tUi!aeK8M9BhtJyltg_ci0=pGGR(g3Z(NK& zT5V`wp+jKdlQb(2{(@@Xk1seai#Nkxggpa*|~$-lq!Er_@BY0NA&VB7&RYU0>?J}h2|@=eot31NMd}v z*wX<=J25P~RCcaR=(bdm+Tns~Col7_r3GmzY1uQ#{0q}?_*CD1Fc=ST{f9(T!x(y8 zba2VWUt3Gpoi;?XIbN3|CtRhYKb*OIB%SGd`5^!#H0mU3n5j>liWNy!ro(dVZiFp&8LCLp;FwuLjQV z^wgWSEsP3DWj0avB&I_T_pqnc!yQ{!Ocou>4&i&G?ggEqi1Q?mmluEWR5+`Rz8zW4 zWv=!XmOuYE9dz=G&!c9)l=*Y=q_Mtem(`@qUP^a@7lS&3CU^4Qo;m|J@rLqmW%*Hc zfNR-=+LvZ3K_HUzH?|0Jqz(fPzL~5g{xMb;O;QLaS03M0hs8jSv{SMY_yPG__E;pn zIt;{*66NSl`s(_F|7~`UiObe*4u3vT;_|%&eh_GH4%6W^2s47{_g$imz2yl_anZ<| hY;C+v01OH@F$Gw{58tuq;SF_Iw;T^a4+7z5{}-V7=sf@c diff --git a/res/layout/comments.xml b/res/layout/comments.xml deleted file mode 100644 index 6ec808e3f..000000000 --- a/res/layout/comments.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - -