From f05d123da74891ffde50c8277ebf068f079369af Mon Sep 17 00:00:00 2001 From: seven332 Date: Wed, 3 Sep 2014 20:23:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20UrlBuilder=EF=BC=8Crelease?= =?UTF-8?q?=20=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=20Log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cproject | 2 +- .project | 2 +- res/drawable-hdpi/ic_setting_advanced.png | Bin 0 -> 861 bytes .../ic_setting_advanced_dark.png | Bin 0 -> 986 bytes res/drawable-mdpi/ic_setting_advanced.png | Bin 0 -> 549 bytes .../ic_setting_advanced_dark.png | Bin 0 -> 656 bytes res/drawable-xhdpi/ic_setting_advanced.png | Bin 0 -> 1127 bytes .../ic_setting_advanced_dark.png | Bin 0 -> 1338 bytes res/drawable-xxhdpi/ic_setting_advanced.png | Bin 0 -> 1825 bytes .../ic_setting_advanced_dark.png | Bin 0 -> 2115 bytes res/values-zh-rCN/strings.xml | 3 + res/xml/advanced_settings.xml | 25 ++++++ res/xml/settings_headers.xml | 6 ++ src/com/hippo/ehviewer/AppContext.java | 2 + src/com/hippo/ehviewer/data/ListUrls.java | 83 ++++++++++-------- .../hippo/ehviewer/network/HttpHelper.java | 6 +- .../hippo/ehviewer/network/UrlBuilder.java | 57 ++++++++++++ .../hippo/ehviewer/ui/SettingsActivity.java | 10 +++ src/com/hippo/ehviewer/util/Log.java | 74 +++++++++------- 19 files changed, 196 insertions(+), 74 deletions(-) create mode 100644 res/drawable-hdpi/ic_setting_advanced.png create mode 100644 res/drawable-hdpi/ic_setting_advanced_dark.png create mode 100644 res/drawable-mdpi/ic_setting_advanced.png create mode 100644 res/drawable-mdpi/ic_setting_advanced_dark.png create mode 100644 res/drawable-xhdpi/ic_setting_advanced.png create mode 100644 res/drawable-xhdpi/ic_setting_advanced_dark.png create mode 100644 res/drawable-xxhdpi/ic_setting_advanced.png create mode 100644 res/drawable-xxhdpi/ic_setting_advanced_dark.png create mode 100644 res/xml/advanced_settings.xml create mode 100644 src/com/hippo/ehviewer/network/UrlBuilder.java diff --git a/.cproject b/.cproject index 46ab49d27..a3b78579c 100644 --- a/.cproject +++ b/.cproject @@ -20,7 +20,7 @@ - + diff --git a/.project b/.project index ec9200712..5e84fc879 100644 --- a/.project +++ b/.project @@ -7,7 +7,7 @@ org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, + full,incremental, diff --git a/res/drawable-hdpi/ic_setting_advanced.png b/res/drawable-hdpi/ic_setting_advanced.png new file mode 100644 index 0000000000000000000000000000000000000000..58715cb1270842cf8a07eb2bfeb8d0d27c0a665c GIT binary patch literal 861 zcmV-j1ETziP)K5@WwMK*C&x;a(mN6l48b8UNnU_HDVqRFD|28p3RF8W0J-s zlNV8HNXqs2eOgERY-{h;xAr-9r`D=}d!Mzx+kbuEy6kI6@!~=$pp<0wCAX#@Q#X zZ@?2|29a6H{RuDuoTBe)Aq2!J!EE8OAN&F@!F(_zC7>_#cY{^nD`+A3`@X@8Uakxn z0+YC&2J@7GNZ`#7_^8yY5YI(`(Vv60b|Cfa(*{tI`P1*CoGSwaKOO@Y!4%_MCbN{t zNH9DlAe+oPWVb`&gAWPs3_zd-hwEZaZxBQq{YUBBm=a8y%x!c?X6 z9{aeLx|Rt#HzkrZnV-mS^C=}?0()_|M?GBG3LOwQtF`G%;0%sdYMnXcyCERUv8wqJ zSc8|zDo<|V_Yk=27ORwS5}@9PVfcGojlL25cIqmFDd9&px4+HiJ83gD2$W|ad=M-F zvc#Rk!7VYsvkoo`l>xfMd$GUU*q7C97nlg1f_9z_*bHP5xPpRgROR-An??*hhroI6 z7rP=-KJUSHBevxzBKG4eTtCm`$nsCiBJkKEe;h+yH72kDzsHik@w==V1X?k4GZ3)X zR=I>i2L6l>Wn!BHp@cG4rcgo^gA+4P)w1{~th0ct5pM}t&xp-YP^#jaEeDlXg!Em&P>g;vCkt139H3f)Ov z3!-ARV?v3bEe=sDMGB><37PyZH1Hae^xc=#7n1Nly)(HKGZj*PBSHm4GTz$uI!r7h9! zkB^W0JswX*Boe8F)KFFi(Y8XFZ%+wFFm&E|_(6!k3qKza@m15;B|-=vjS6f_g4t*tGy+wE5TPrS+H0vH%CTB7PXMjOn}-yi^I00Q$W9*n3#CN>T(*Ohth$`B*XX{bRYaP0u2of zJ1LzW9Gesb#02&N-c8$;fj}miIHlCfdoMNvd*%}Lw=YnJe9Snm4H}v zT(ZvAAmD?*U0Iu&2v9;ElgYGM)>$@rHo65?qqnj))esOXN>pi>wcip7h1BS(#$&Zw z6YR)hb5lNl`A#*M5k!4`{kGE5(hd}=X^U)D&n71)Ukd{exJ*~28l5`9SqR(~qK%D> zZJd#g@w1#Z6Ap(5IfBfkGn0`3Ag?j8oJl2Wo-D`uA@PYx+{J%EEN>6KW|#y0fZt1b zb}3gld<7tPU5Wtf{Jm5KqVjljboAAF5@>C0JxI3Cr26K}bY3T*XCTXrNzMVigpxth zC$Z!LtCvt}!1NOO4@zhN46BYB1>6S`?8FzOc4CeTSCwy8;w;1#-^Y37^Lid7u)T*s zb*H}V;rE6Vfx5c7?KYdO1JE^qU!)C-bC58yo&g4yi@m0o5~tI-!QpW12aydT74(PGpnCzRUt(N^OmKdF{#_st_$?b0 zO$3xqcyFi%XjiIZK=*TopAq9~WMqLS<#hsTqN_$m&w$nlxLmF(?l!wq_4!87=kxhy z#kd+7t^RYK1KeKNxf1DRA}2p)h*f8qYnLAJF+%`TBU3N}D-qtuUFk_SogHj^-?`@; zBKq%@pvc0SGFnLFoB=IP^Qof~$Y(UQ*wQngC2IN9Df$fj0ZOl-Pg&-7D*ylh07*qo IM6N<$f<<=3{{R30 literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_setting_advanced.png b/res/drawable-mdpi/ic_setting_advanced.png new file mode 100644 index 0000000000000000000000000000000000000000..728820ce1f1bdd1ac1498acc888fde2c3906bc4f GIT binary patch literal 549 zcmV+=0^0qFP)lmzBmh~=M zhpkp>zF+iP_$EOgwse^7jUu26!bNZiL_h~zRgc;ClAU>gg z0Rc~C6F{hCW$U0FA)_ABgDh_h9Mhumv_q<;VrxgZh72q2&pf^E}Ee&|mj;3l#FoF~JEWI~EW};Lk^(;@5CO6Nozzm68V}5iNmcNoZWd zY~U7n6AqcN0ow*>0X4vRgd|nJ>UclOCHWJQB7a6HZ5P;` zHz3Hl^o156gAuXg7J!qnAiK%=zZ4(`s8d&VK?LN$N@RTPzY&3cNavL}gMd>N;A=0t nfG~tn$3!}WQOU!Mj|F@J6p_p!a}WS800000NkvXXu0mjfTXg2> literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_setting_advanced_dark.png b/res/drawable-mdpi/ic_setting_advanced_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..43b1eb354a0b76150bd574c615e87fc81b77501b GIT binary patch literal 656 zcmV;B0&o3^P)D*%; zkwf_X$1sdzrlDXkc(>hde=3*DzkDSSi^Zm+(da8cAG!b+o6Y73>MCyA@+E0%Gral+9*?gAgbb z3WkcK%)4;c2+;5Ic)Y-hQ)ws0Df0hr5CZJqkfLS(3S)$bZtsg{)WlB;YE$OD?7l}Jkw~Pd=w$(>qCZzEm9orx q*?lMA1+d>Webqp};9k~`30wf)0ah>^)#~g30000cyP&- zJh(K9CsI@7!KDV7nUL}O*FMv;L`NT6?csYCwsnREftw zzzN`bK#42hhCqpT0QV9!9|FC-z0LHh$)E)sOQll1NqZSS*WzOg7Nh|qLNO${56I2<`1f?!)dID?)^K1*K1Ovfc?COeLfbkGiE6wqUJ|eFNQ@}zn z3rquJ!7$H80(}Cn!4q%~{04i$a?j=lc>@CcENTHnj@DIRyTCe+tXel6Y!v<|3aA;M!zzor5Zyk2zb_9Od|{KfCD-rssYBqV@r_TMO5i3lB5 zBA5w4@Pi=L1m^q5wL^Hbo?&yIOv58v3bSvga5X;ll}MZ{1y~82g8_{665H-QKTSS6 zgmo1A{RnU~ar8K_6yOa076g#eOfcPAn%IQZ8O8o70#p}`0Ca6lel+U~8{Zb3xDo2*cx%jO~neB0yVGcUA&u{MRHU6SMpY1h^fu%s=KP0wg6-$nvoS zpsQA-{H47sQ}NjIH;n67X=nT z8!s7K8GiGe09h1>@(yr4zzu=S3b=QGdkMO)fcp%(d4QV;6?Q7@W`b@i?A8LgT@2}{ zdUU{KP#X>9I;AP_OK>VYv@f8I8-MDApEgM{rYMV{O_bgN{I;z)KOoPA6u_&0ANd+z zlsaEH1;mtJ~y?Ai0bG%{@K<5$KxmpEuBHaP5!cS)vSyN~a2y@^G zu!OuZimjndEdf4A>d#65?Fws{ECcC#KiVZ8nt`CMx%lq{MYY%M5pBwzv^XF&5uksN z-WItYX_r{L$w5iiUHm;JlD$RH{Rx>1kams`yZK#_L4alg(Itw$6xTj!*H4#s0$3^O z_Y=283dHTwaqX=dE|)_ zS>5>DhyWja0>rW}dI3a`ZasrcC(F7#rNzlJpcC6SK>@_Iw-6y`L%@PuK72R<@}Y7u t*Wr3VF}F@WxVavX50#6#j*{;Ie*q~|Enkw(vj+eG002ovPDHLkV1g@+`-}hp literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_setting_advanced_dark.png b/res/drawable-xhdpi/ic_setting_advanced_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..02e8701a9b4c4277970441add90c62902fb21e7d GIT binary patch literal 1338 zcmV-A1;zS_P)_E3aiL=l7- z)Pt);f}-{y2&1Xhva`FhwWu`Y%i2myFfNALMJ!o=H^bNQmKqn=+4g0a5Nfik@|Ex zotc`Ndg!89u(!8&M{{%YHol3hqX2N+*8m{!Dg=HLAv;A-JmJ^b+1V3qZEewDFxbWa zr>SnIL?}xD@MHij&9`aF&0H>*0JvOhYwK%#ixv1>i$o&B@pwGzYXC&JuCA^Yo;@ff zt}BmNx2SA2@{7mJQC7nvx45`?dVGBRN;M5tX^e+JQGkJgfi~U`VbRA`g({^7fIABd z3ttc-^E!OWwXF#N3|iv;5(cXb2|b(5W=~8`PTn!Z?-3j00K{UkZd`UhJ%mjPizh5l zj*pIx{$`Y~NoL*M-BDuyeR!@c@Fb;hrhEO?p5x zasMs~Zg2>fV(L07b%e%y{4C856&^48-{JQu?QR1oI+u>KW1iTK9~CT z_Vxn+wBEx5Jn0FsZzd)tZuklStbY*Yo^cT>FH@P+^F1h$;32ptJ^XGb5{YBJ0YDZ% zEOI{fifFH^a!#NcOkg>%r z`z+UCH2?${`NS8UQ{+*%fX~s2>7^KkEqq%0G#sL#_iHOJ@LhM+*Q(_)0r4M;VDz z^#q`hdCC&o^+7(#O3OZ;9$*2m9$-VjjsX?M5IYFkS-?(%b{$|BLUtus$7IMZh5tK+ zvbjLbk|Fj3j+Hs!%(E%-ft=FRa|~cJWG$N^9|C||VmHq^<)BtJ*wfRqmEE9MoE?yZ zUnkf8)(;yZ80mG4w9%nxo~`pU$z<}9768(i1J8|g@FK5kDfiip`H78?A9!E7tWZx6 zC@2?VV`LkExqoQB`_V za$65Dg{1WW2Lh@ttx9joa5W17rZu_TEXD0P&op@6F%2rw`yPP7!NDiE+;|v4A9Dyh z9}0y&8W|b+yR=@F-uD2AfFx2+kx1?2wRm~z775B(5|q1c3aHYX0HJ0fU_!X%;9&t+ w4wU`ehxGtITW2|BvmUS}!vFvP07*qoM6N<$f|$)@)c^nh literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_setting_advanced.png b/res/drawable-xxhdpi/ic_setting_advanced.png new file mode 100644 index 0000000000000000000000000000000000000000..3e1a3ede051e96d1e629d08ae6431c97dba9ae20 GIT binary patch literal 1825 zcmV++2j2LJP)7+p1YiL?im>4B`X30 zS-rdSF-}0{lfVgZ0x~0z*}b;_Cm=HdncaH}Z~`(TklDSr04E?b0-4==3s_$X7#bRy zL+%G7e;|vIIRgU&t5e~D|KspA3E2dB7~e0a@?G_ltpxzUD+ID*C79RPp8*iRbQ1{t zZixMhkckEOa<>e>7j)C_aJF+2FoU2@Y6SbZ4WxXniAKa}vH1IkN(WF!&Ui1|Tc+1F&~tvp=#AG8Wkx*}foPqXM+Q z*{bDyk9>`Mj(mhH#f|`$9qA1sy6lzZCw6Y9&g(hAm(Of1pa5k9w&Re=$YvD~zF~hp zas+Zf%dt+d`jX1JzkGsBL-wdBFK7Q|z}K;CB`X1C)|{P3v4117Lzj?PgI!(w%c4u& zAmFd;lD}ZHJwbq?g@hB?=)Ry<(arKL#wYdy_)4-T2q?h6ns};DMcpJp_Xyp1)e^Fn ztOOK~gcpOrB}jQgO$CVFKOR7yf{3A1PFwwCBLMJq(;Y;P&y{@PSMMXYLV^fMUUCvJ zoor7}o^gAJiy`2a9I<2}pm^$;U2_l8i&%L^s-^5?1SiyvE;$+vQ=Qsb2mv!KOj~u562RHK zJAuwa)F)F{rgHGZqQZe}t)O&jM}0{bLW16)la$m1sLNq|KxThYM{lnxdV}3KK&M?5 zi=D?IKwafYN-_dC`}LgvB(i6c%sDrQTB_#ps&3pn$=F^Cto``fAT4vPm zNG%x{w16{+OdW3hP;P^O=TZckk^l|=O-PYc1RrxD;Gqb18cn1mK>a-$iRy>)A_P2| zBG6<6q)4V8eK-M`SsO6{++6jHu0ir&>mJ>xr!nA7Gv^!Xes$ddfAL7Im&xC#r*{o= zF%v)#N8}2=chY4TPy^; zgagg7X)4bXjLw+RKtSl=(MobYxe1u+aSH(-U?4)eDn>70PzQz}kHCm;@v zW-CsB8M-)%PCy(S%~qTMGjwqjoq#wvnyokiX6WK5IstKTG+S{3%+SSAbOPewXtv@6 zn4ycK=mf;U(QL&DFhdtd(FuryquGiRV1_P^q7x7YN3#_tzzkg+MJFH*j%F)8O@O{G z4_Qv&9mYp5FCpmjX({)S$Ke5Vt|jN{YAlT^mN8+?o7cBqO=SVW%o->u&b7HYLpQ z738e%AcBj90Ie)_Rf7jj+0%j;pN$d%_9l-<5KY0XD|eH#z5)s^76SCGmloDI8)n6#aY&QXa&Ag7QMzO)y@|{|k}3x;{0r2u8#mjhu#*lXHJyUz2k+v2|(d zDbVi(6nSgqE=@4jSaI&J~MZL6gs1o$UPZNN)OfF`)=yQ^)j zBqq|+I&zb$6N|g)HyHs%6W08C-Ng0DYIT~o_M2{SB@Sx#!!0c{5<9Y~hlY9WzHjIj z2}ubkli+eBztwLG&f&M#kO(PSW#yS+Dvrd?8p}02B;dL_SqNwi2txFXt!M3!G7F#< zw5u4)PDl{3>No+hkTlwH0*t`LQgZ@gA!)SZ1Q>yfrRD_0Legl*2`~Z|OU((0g{0Ar z6JP``mRhe6pssB#uoqHh@*<|L-~Sa}#G=><2_jaVULio=;D#=gHw6Ng3`0N^JF&nG zvC}IAXvLKW5%sgz6^%DsI@}5+#mX%swi5zetU5hGfRX{c-PmY-P!0dJE9$A73iw~u zB_GR9EP$Kr^b7$73EQyMh|{siSn+}^N8Ug*()M#xLNV=x_!?=Qo+4nR$@HVX6OfrT zC%_5Fj6i1h-U6I}%m`$5?=8Ry$c#W{_uc}WfXoPFcJD2~3CN58&HKK7n` P00000NkvXXu0mjf!8Sm5 literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_setting_advanced_dark.png b/res/drawable-xxhdpi/ic_setting_advanced_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..673c54ac86134bc87edd2ed38ec34a544172384f GIT binary patch literal 2115 zcmV-J2)y@+P)9LK%)Zf>qM!v!X$XiO~kKAnM4&P;+Vg)q%XNDPDi=!Jp;>n|~)472|yKXf zw))Xl18Qn&-X)NkmS7rtdwUP{^z?)>41~YBy82gwtmOr^JA!Giqa z;^IxnuRt!AJ2r-?1)nxIH`m`(1PBm|ii$Rn^aBYn;$U71hr=JXwY6Or*UOhLFQ$oD z1W5A&fxsL9o5gt%pECe55C?IDb5V2t=KEgmU*WS8`<=mHa9GHcmX^-S&(GhA++qvR zeaL-6)7PW}{8;R|9LN3os;a6UqB&U4^>j-te*n}EfK$$QCFAZn4jKKcqJN=Qb?4;d zJk9wX31#kGi`TYa9UIJmpl$+UDbXBN^05U_iZYO+Fd5;`Zvp?}z`($P_V)H08S>}Y zY*r8;qNOI(QWKudbgiTo{5dox5&Qf57X!?8 znd~I&42D9Xw>mmHuFCk6(eac3#{27e*jj5BsF)xFJn{4@Cd>SmSxYH=XZ%O7adbeM%-FMnt>l z3oc3OyHfM422lFNn173_==2F6q8U2vg?rBkVC=t+lJ%$;Nu}$9ntFl-n&au(aiZ@T z0W?8kzDKM?W&J@xIZG4twHJYUMt~Q|OhzAu0L`qaARworq9TvE^?_7FH?aoH5nDvh z_G55xFl@8HA0X#^au%BaVr$N_hcp3bJ78vYK5P+xX79c_1Oe{9@!Ji#x|s zwF1fVa7_R}t_Dakp*G>c{eBiXc2g625<-)i080Lyxw*NoLQFxbytyy-7oBudU|bWx zaPn;&&9ZZX%xQu-G!+PNx_Bg}v>Cp>ZikKazH0(#`}bkMR*zuX31;t9AVBP6r9hQB z05(cr@SFp=Q4w1p#~Xuy{SF=cL@@791p>(VCGuF}ByVzdHFa(XNP_D4PS_COr06M> zF$5?CQ^u4bKn691I)(s+V9J;>1jwMKP{$CU5KI|Uh5#AV6zUiP6oM&Z$`BxfnnE2z zfI={3Oc?@XP*bR52v7*7j44Ba3~CB>3;_zklrd!pkU>qMjv+uHm@=je0Wzp5)G-7o z1XIRTwiDoVQNE2u`418ROy+GVEXuzCDP<1G%>1G}!R#cM*>=GobBb*#N2US+6rRoO z@>pe;GcwmHbZ^?pS?{}ElxJ7m8g|7!k;(~ygpk?Y(9m#sDiBaxTRV@PZ(?KCj8u6e z^EtcYzRM^97!Ob)HUe@T=g9~R6X*d-f1@>!$=n2qJcxf8IdA1O*#=`$jt0s3Gw!?k zZJFyD5C_%AUdbxPWRDVXd8hc*fZ>fZQlpfvCDW3r}Oz6-R4cRHQla*OMoFdcx02lS|&|9;{BzU`F+E;7cN}*#S8F- z4^IiOBqjWg{L>AwUv1RceL+RY*$OF$72gr%KHb zpbAMzJB9#B;8dw)1p%xv)G@>Ol#`^GaXrkOd(tOiRd$@jp-Ltz2w)0f2~W7juC~Kc!Dnf}J+aMGQWCa1_lfzuQcsZ+>XHRu>vevK%fr;KwqRNg!h*O)&76PV; zcZxDox}BOZFImW9rjqwh>`(k_lZnz&WydQ9vW5VWFfYZp1rq9L=c^%N4qu6-zH9Uk z&43@|Lx5%k tG`lx7z!0Dr0nP4B4KM^~MnJRs{{e{P0IYVa9oPT>002ovPDHLkV1mei显示时间 显示电量 + 高级 + HTTP + 关于 作者 日志 diff --git a/res/xml/advanced_settings.xml b/res/xml/advanced_settings.xml new file mode 100644 index 000000000..a8e219fa1 --- /dev/null +++ b/res/xml/advanced_settings.xml @@ -0,0 +1,25 @@ + + + + + + + + + \ No newline at end of file diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml index 30c6e7f43..6b01ad436 100644 --- a/res/xml/settings_headers.xml +++ b/res/xml/settings_headers.xml @@ -40,6 +40,12 @@ android:title="@string/read_settings_title" android:icon="@drawable/ic_setting_read_dark" /> +
+
mQueryMap = new HashMap(); + + public UrlBuilder(String rootUrl) { + mRootUrl = rootUrl; + } + + public void addQuery(String key, Object value) { + mQueryMap.put(key, value); + } + + public String build() { + if (mQueryMap.size() == 0) { + return mRootUrl; + } else { + StringBuilder sb = new StringBuilder(mRootUrl); + sb.append("?"); + + Iterator iter = mQueryMap.keySet().iterator(); + if (iter.hasNext()) { + String key = iter.next(); + Object value = mQueryMap.get(key); + sb.append(key).append("=").append(value); + } + while (iter.hasNext()) { + String key = iter.next(); + Object value = mQueryMap.get(key); + sb.append("&").append(key).append("=").append(value); + } + return sb.toString(); + } + } +} diff --git a/src/com/hippo/ehviewer/ui/SettingsActivity.java b/src/com/hippo/ehviewer/ui/SettingsActivity.java index 668a986e6..857bfbd85 100644 --- a/src/com/hippo/ehviewer/ui/SettingsActivity.java +++ b/src/com/hippo/ehviewer/ui/SettingsActivity.java @@ -137,6 +137,7 @@ public class SettingsActivity extends AbsPreferenceActivity { EhFragment.class.getName(), DataFragment.class.getName(), ReadFragment.class.getName(), + AdvancedFragment.class.getName(), AboutFragment.class.getName() }; @@ -145,6 +146,7 @@ public class SettingsActivity extends AbsPreferenceActivity { R.drawable.ic_action_panda, R.drawable.ic_setting_data, R.drawable.ic_setting_read, + R.drawable.ic_setting_advanced, R.drawable.ic_setting_about }; @@ -609,6 +611,14 @@ public class SettingsActivity extends AbsPreferenceActivity { } } + public static class AdvancedFragment extends TranslucentPreferenceFragment { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + addPreferencesFromResource(R.xml.advanced_settings); + } + } + public static class AboutFragment extends TranslucentPreferenceFragment implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener { diff --git a/src/com/hippo/ehviewer/util/Log.java b/src/com/hippo/ehviewer/util/Log.java index 162dfc4ce..6069ecb53 100644 --- a/src/com/hippo/ehviewer/util/Log.java +++ b/src/com/hippo/ehviewer/util/Log.java @@ -22,7 +22,9 @@ import java.io.IOException; import android.content.Context; -public class Log { +import com.hippo.ehviewer.AppContext; + +public final class Log { private static final String NULL = "null"; private static final String LOG_FILENAME = "log.log"; @@ -72,51 +74,59 @@ public class Log { } public static int v(String tag, String msg) { - if (msg == null) - msg = NULL; - return android.util.Log.v(tag, msg); + if (AppContext.DEBUG) + return android.util.Log.v(tag, msg == null ? NULL : msg); + else + return 0; } public static int v(String tag, String msg, Throwable tr) { - if (msg == null) - msg = NULL; - return android.util.Log.v(tag, msg, tr); + if (AppContext.DEBUG) + return android.util.Log.v(tag, msg == null ? NULL : msg, tr); + else + return 0; } public static int d(String tag, String msg) { - if (msg == null) - msg = NULL; - return android.util.Log.d(tag, msg); + if (AppContext.DEBUG) + return android.util.Log.d(tag, msg == null ? NULL : msg); + else + return 0; } public static int d(String tag, String msg, Throwable tr) { - if (msg == null) - msg = NULL; - return android.util.Log.d(tag, msg, tr); + if (AppContext.DEBUG) + return android.util.Log.d(tag, msg == null ? NULL : msg, tr); + else + return 0; } public static int i(String tag, String msg) { - if (msg == null) - msg = NULL; - return android.util.Log.i(tag, msg); + if (AppContext.DEBUG) + return android.util.Log.i(tag, msg == null ? NULL : msg); + else + return 0; } public static int i(String tag, String msg, Throwable tr) { - if (msg == null) - msg = NULL; - return android.util.Log.i(tag, msg, tr); + if (AppContext.DEBUG) + return android.util.Log.i(tag, msg == null ? NULL : msg, tr); + else + return 0; } public static int w(String tag, String msg) { - if (msg == null) - msg = NULL; - return android.util.Log.w(tag, msg); + if (AppContext.DEBUG) + return android.util.Log.w(tag, msg == null ? NULL : msg); + else + return 0; } public static int w(String tag, String msg, Throwable tr) { - if (msg == null) - msg = NULL; - return android.util.Log.w(tag, msg, tr); + if (AppContext.DEBUG) + return android.util.Log.w(tag, msg == null ? NULL : msg, tr); + else + return 0; } public static int w(String tag, Throwable tr) { @@ -124,14 +134,16 @@ public class Log { } public static int e(String tag, String msg) { - if (msg == null) - msg = NULL; - return android.util.Log.e(tag, msg); + if (AppContext.DEBUG) + return android.util.Log.e(tag, msg == null ? NULL : msg); + else + return 0; } public static int e(String tag, String msg, Throwable tr) { - if (msg == null) - msg = NULL; - return android.util.Log.e(tag, msg, tr); + if (AppContext.DEBUG) + return android.util.Log.e(tag, msg == null ? NULL : msg, tr); + else + return 0; } }