From 3194ffdc7b9633d8e59aa3fbdfd5eeba35fdf15b Mon Sep 17 00:00:00 2001 From: PeratX <1215714524@qq.com> Date: Fri, 7 Apr 2017 22:48:54 +0800 Subject: [PATCH] Updated AboutActivity & improved test domain input --- app/build.gradle | 4 +- app/src/main/assets/cutedns_logo.png | Bin 0 -> 14062 bytes app/src/main/assets/ic_launcher.png | Bin 0 -> 6258 bytes app/src/main/assets/index.html | 42 ++++++++ app/src/main/assets/itxtech_logo.png | Bin 0 -> 6731 bytes .../org/itxtech/daedalus/AboutActivity.java | 93 +++++++++++++++++- .../org/itxtech/daedalus/MainActivity.java | 5 - .../itxtech/daedalus/ServerTestActivity.java | 3 + app/src/main/res/layout-land/content_main.xml | 31 ------ app/src/main/res/layout/activity_about.xml | 17 ++-- .../main/res/layout/activity_server_test.xml | 5 +- app/src/main/res/layout/content_main.xml | 32 +++--- app/src/main/res/menu/menu_about.xml | 21 ++++ app/src/main/res/menu/menu_main.xml | 4 - app/src/main/res/values-zh/strings.xml | 6 +- app/src/main/res/values/array.xml | 3 +- app/src/main/res/values/strings.xml | 6 +- 17 files changed, 200 insertions(+), 72 deletions(-) create mode 100644 app/src/main/assets/cutedns_logo.png create mode 100644 app/src/main/assets/ic_launcher.png create mode 100644 app/src/main/assets/index.html create mode 100644 app/src/main/assets/itxtech_logo.png delete mode 100644 app/src/main/res/layout-land/content_main.xml create mode 100644 app/src/main/res/menu/menu_about.xml diff --git a/app/build.gradle b/app/build.gradle index 88a5518..496d26a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,7 @@ apply plugin: 'com.android.application' +def gitSha = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.trim() + android { compileSdkVersion 25 buildToolsVersion "25.0.2" @@ -26,7 +28,7 @@ android { variant.outputs.each { output -> def outputFile = output.outputFile if (outputFile != null && outputFile.name.endsWith('.apk')) { - def fileName = outputFile.name.replace("app", "${defaultConfig.applicationId}_${defaultConfig.versionName}_${System.currentTimeMillis()}") + def fileName = outputFile.name.replace("app", "${defaultConfig.applicationId}_${defaultConfig.versionName}_${gitSha}") output.outputFile = new File(outputFile.parent, fileName) } } diff --git a/app/src/main/assets/cutedns_logo.png b/app/src/main/assets/cutedns_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..418400606d0ed87b0f9c5148a65c92533dde9c9d GIT binary patch literal 14062 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 literal 0 HcmV?d00001 diff --git a/app/src/main/assets/ic_launcher.png b/app/src/main/assets/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..bf7a9bfe50438444fabc73ec86480180e755655f GIT binary patch literal 6258 zcmc&(cQjmUyWgXP5MoFKkr<;z7(Jr5j1ohF=-udDv=O~$5M?3=iE;=Dg6L7AMohv{ z;^@64dJCftcRSzt&i(FMcip?z{o}j)kG*zz*YlSBKELwp7_A4YG*m29007Y3S3~Lm z07L}5UZ%VNp5Ll9WP%S+j=F~4hMF2u*6ywXRyOWvTLC{;5AZzz$jJM7SXn#Udc)AR z_Kt3{@Xdy1ILy&T7H)7yQ%KX}o~?tUn!l&*BmW1w*8a}ck~VO8IVu@HDKLPmt+y4- z&(+1vOUh3c{%2e%@cR6*ARP8*6K`i(xZ-(-Fhfl(*gbboTi6`|afG$7s08e;q=4`p zNeK}#ewc`mu(+U*q@b`ELP%IjNK#5j81~lzm!pEoc-q)W=^$19>I}S-g*$kAdq@ci zVlWs1jHrOSr@f%Cq@<*vkcgm&2m)+@@Ot9rZRLk>^Wr!U@sAitTQ6%*M-OjDcQ@F1 zOe?gzkGCuwE_mLF;9tFf(-ZuAe&EgDD`e{iE{i8Pf7ty}DF9%cyN^`V^?SWOx$1sp zc#>jkGktP&&vsbcobbyijc(s#-?D{KJ+?aaMz^gxs z-l?6CmcV2Ai#2ue15%c8bi>geCf1})WUK+34Oy9)nLj(mddAikpJ8h3UTmrwOJ<1% z{IFLJyyNwwo0&aQ0a8925uS}inso3V7#%=>j|Rb|7t%;ts%Lqi{arAMmXWOiGE2q_ z>CV&T17~`}GsjU{FBpJE6P?@8{(ahQ z@%|PAohthKZ_(OI%rpg#sq5+3C3$5^$l$!@o8;}Ytok5lRt1(&+7_)3p5prFv2laM ze!*)={i)1o#RnaKk*+b5d_C{r z=a!FoIDLP?MRt!hJUgqL9}pie*WL5GmB*61pOmP{a&d9x?JKZshpRth_Q)a*wl7ad zjA!uc4Xtn93A`+!$RF;yd9d{70c8=F}NziN|rR~}I>%Nhd{lXP4TMIr&Z zjMqpBdfqYp+g|E8stUe{dra9ME8R@QSlXlF(sEXfP!ybS62Po?uB`)wRk2>JNqjib zn$pUS3cAQ1NtM&&J`?EuIJjV~r)<|duQKmOxgjfNQ$Dod@f0&uuXA-T7qjo|;Iw0H z=S!PdP{0?=BPPDX9jXjy1IyRkl~cDJoQzjsNMwbWX8XtiQZLAmN~G8{IA_C$Jc|~R z4;7+mp?uX>pusOM^efIoZE0ge$$fL<`TD(kZ0dVnE4vrpDHq^?mi9i5$ea2%H;Z+< zRN2f@>L&yYx^{ONCO!o;quFj`u8-`0nJRK#-jt6%I;zig6|MAo$<+L)>UVX-a4C^` z*}EPsubOZZnLKTwhmgi>w3xUDRTfms1k{9@)P5-{we>r=fG+pz2&Ua#SIzM;(W|bi zal2a`_iNhVxLHpIi~heHqK zFEL$=XL7ZrEjVraxfJFX)?JK`r%@hn zo1Kd&*LT*wQkTD;adP^ch#$%=a{Ar*KIh^_kzP^9qUZg+`TgUf(vFh)uAw>o#km|) z1hZM%3OEcSiT+Ad3&xOlyrGzRE8A1i&q*5s4ayw3Y12j{M)>Npx@YA*uU|k6J zIcdjIM-}8N`+%fn3q$IBQz{{J%037DcE>5~)mi*mo~7WOH8-zatkaAP*Bq zw%&8)Xr|)@wltn$*R%(oe$gcDQ{t|oyBCLbdg`?jgWqPdK`!`R5`lZlTwsPu-i&yL zWldC6K_+ymcBohwyaN7rk~x|i)BiQ~H=TGXX{oJ^mfF72{scdG z*u&C9^uZC$@?$1=ZhR!2gy#~BmQ4z1?tPj*DtU>PctfhVt-+HG z*D%08Tybrpjx^+Orebd;1`E7C+rVt~#MBN4yHk^WsKs0kCN{`hu54Q`2fq9Y8*9v{p!?)T4>2E>eA&tBBg|51)sSSsWUBxr zdu&b0x7Rvv!uj>=%#+t9Zo+ew3af(tTO8XGx}wC%g7_znHPg~soe(m8#&gS=1WX&r z%sj<~pxW#pj3tKDM>_D=xE&v?OMeuRuqhN|kMtmQSh_CJ{6Ru~p11ZFpX}tw;Aog3 ze?sr(lLutpfQY zCCuE+NAe0C(5syn(I4#WwX8h-u3WI1)e>ne> zisLUwGW4VFQ9|_gI2p?E`&kp$&n}VM+Z3n8mmaB{^~S&7NDQtEeOA*=$B~;B>zIMJ zsZtr7C-UwXJab!k+VR;biC0PcK>=F(Wx<3<3n(5GZ+&A2d;l3k=5`Bd4$_%^(bqHT zNI}`l;;(Tfv;;nd!!*6Mm9>@z(rFdd0O{vn$>i#UV?$^yesbM{x@ORkbSAL2%|=l4 zjV!gVO|V{gdK&#!^y)QzZ}w~xs-%Ziv5)w`t$K3sbhCBc+|022YHO*$+DOxlkRNTa z$g2C(@)+OA3>()l{k8SU2n!-%KZQ}>lv?<`sj){tkV`2!nNl^j`LL0jn$Mh>we8?@bkxy{a_2Tw-G?q$TQV%sVIZ zvTL6jEbcu@W&@c@$N6UT7nLbwuvN#c(5hW(f5`bD2;k6J+NNsFn`czMOfhQKaiLts=+Z1*=^`L_?ULyc`%E&?)_WR;ez7Pp(! zs{?oY^$NSzJ*zby%C}B7?DG-&`$rRk+}BF#Q%_H=-<6f|jfsm&KaJUzRvv%YWg2|heXWXkA&;Y_FJ`N-Wn z=zv&1De@Qohs00Qba$i#IdjXX$2mTKnjG6XRU$Y2J&+54x@Hm6Qad`!x~{c87J(Oq zuPdgSOnt_DHywBeGAaQ!(ENc>z3z(T=i8gAphzPsio3UA@lQv0%$hhtu|?KrL?s5b zORt2uvbctug>X%sUFz_n2b$b+Hfb84<+|C^_&+6zyTXI-@DN|pL$!JD1R!~j^JDO~ zq**u1XN^z_uS9TWGwDpw(Y%7o@vkoAL}@s%M>9ePX@CB~@c+b#|2q+Tx%)sws%&X+ z9&c8H;kaA6m~DBX<|w9^;`~cB+)u>$_~UPRk!^(q??&wB6dg{ElR$RKB1Y=GC{A};ZC3{wpb&|($<3Ke z2KO@J6eFdj`{vD)BTPukAM>5xiE3uXS<(S^h|g4?20~a}!$Nmku~_|c6dDaViCQlz znwuCEO+9)J67z;-|GE;TH$?;gjU+530MaL&(iK;}6v=!wa-*W|M()u%StK$_$MM)x z`8Hm~J=oYgK!RS;!Snlf2uR&CR<|P6#Eh#-bbq`6-9g9=5Vh8&S8J55g-t*DU94Yl zu>?7{KC6T6%===$q01y;dmQ6o>w(v?P@XLHVCO z-EdiR;Qi18WL3iOYR77TZ(iZo#J8fAeqwjbmihc0Tx{fbM33hIo#I-!mt^~aA?4%x ziN+7Aj|N02*x}C$99iU!_do8Qs_3(kTLSo!z#Kpb!qngKbF=v7=8(+xeI#eQSaN@q zeKRBnf`_v?6rdJ1LvF|YdYBeCPGUfgOr*=b5$eph$_2ljBwTT%c5ry|u&vilo+61X z=|T>v&}a2?-vn<2(hB~m0STYAH9k9?d86&dKC1+w zs4RcaULfuG)=sMmvT9F5GZ-s9zR+rW17TYj*A(DJ&MeItV=8z`EO);IYO?>{o44eP4jFM-?AnO%R0^O`Shq^{**0r4nL`8D*KohQn{Cc9vsNX0e5xE@$a->S#d7G?K`^U3$T*$oZ zjQX!fCfZ_ehaNSB{p#;HOs|k`{yq@jli>Rq{dnTjSt!WU+JlYeg8rE1=mKteJG-B6 zhGZ_q$2Z2Dw8d%zj?33}NzMnc_STW*%NL%am3EyZqs1LkpEABJZ^~Qop^kvcNTj$e z`Y^1nqQ=^Ga?)&RebTHV$YJSTVeo@YIY>2Lj2`e~@{jCm|27|#;&ix_SFDpZzUY*m z6&&7x*)&+o%d5O`JT(H!aw4%)%fiB-$`v%d4D*=S8l%F+vFZ?ZvmYgr#R;skSnlTL zB4gi;iLlzKBRfs!Cj=Krty{dFS=ZJU&1dv>ERl6-JW*k_rpU?BbuzlCiO4mss^W%r zkDzaCo?)!sp2T{4t=OQ*fu zVdoe{;4q0RD!K#W=!=G8{X)hxlp9f}dD_4S;WlVi!-&D9d6<-N<*n)jjc9J1y;III zBWY?^ADuG$J@o7ab?(~g11$D-r7S-3y2D!X>d+zu3t^BG6|?00`CqN3lef7V(&Ac; zDmI{@dXX4K^)cg69e|I?919}i5-rjM!{=>~y5!>#{I!iSn{Vn0n89tau2>Lag?Qn~ z+k(}bO2odqavb3@6$!;%u3T&gR0TjcdwLwjox~(=r7nXi4Y7g;C8nhybu%+G0`UUr z*r1p91dROIT*r_nP7jWRx!}1vP6VtD0mXppx*#KqZm&!Y6}N>qw1^7BD^xYvSnkp& zP^b4PT|&T%ZuAuL{D0cX|B*U>POXsGICQbVXVnIYNVxX9jkyp{|0koV#u@|fn^JX+ zOH(zzq#C39nRYb_985$~D)LiJ1$YclGUgSUHH>D%&K4-RBMK31rMAbA$TOooSmg9| zWwhd)ItQyk_j#_6BI*7!3lY5GSbS{X2>uno2th*LJaN4Lm*Gyn$+5b&bS~YMKxsP{ z14?(f*xA*)Z#u28SaEu#8T@Y%5`jy=i5wf4t3ndHnC|W#;}un~ngvSsC5lZ&y}{Tg7Ir4)ALHt)WH5wo zW9(J`w`UTd$6StpLQBq3sN(E^dR$Mhqps4Pe~$|!=E>IF@hCd5PG%$pgF*q2K4Fo! z{%IX`)1PQocm-gwRQcZti?O;%@lz*NO9T(j@V&A|h28J0^QApie);4?B zaX){ZRqnbF#6vkl#ef^3?E2x|>(Mc=A)7kC-W#Oup(2nr{CFLf&cl)Zn4=5=uTk}!KNgJm-V#yiGy^PJXl%Lmd#BS r?vgUHrP%rqo?C)uJmEh9fK#?k22mZ1F + + + + About iTXTech Daedalus + + + + + + + +
+
iTX Technologies
+
+
+ +
+
Daedalus
+
null
+
+
+ +
CuteDNS!
+
+
+
+
+ 使用者必须遵守当地法律法规。
+ 欢迎加入 CuteDNS! QQ群:625385297 。
+ 打开菜单探索更多功能。 +
+ + \ No newline at end of file diff --git a/app/src/main/assets/itxtech_logo.png b/app/src/main/assets/itxtech_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..beddd56b8d36506590c8687bd9969e4470e31846 GIT binary patch literal 6731 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 NUaRS + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. + */ public class AboutActivity extends AppCompatActivity { + @SuppressLint({"JavascriptInterface", "SetJavaScriptEnabled"}) @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_about); + + WebView view = (WebView) findViewById(R.id.webView_about); + + view.getSettings().setJavaScriptEnabled(true); + view.addJavascriptInterface(this, "JavascriptInterface"); + + if (Locale.getDefault().getLanguage().equals("zh")) {//TODO: multi language + view.loadUrl("file:///android_asset/index.html"); + } else { + view.loadUrl("file:///android_asset/index.html"); + } + + view.setWebViewClient(new WebViewClient() { + @Override + public void onPageFinished(WebView view, String url) { + super.onPageFinished(view, url); + try { + view.loadUrl("javascript:changeVersion('" + getPackageManager().getPackageInfo(getPackageName(), 0).versionName + "')"); + } catch (Exception e) { + Log.e("Dvpn", e.toString()); + } + } + }); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.menu_about, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + //noinspection SimplifiableIfStatement + if (id == R.id.action_visit_itxtech) { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://itxtech.org"))); + } + + if (id == R.id.action_visit_github) { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/iTXTech/Daedalus"))); + } + + if (id == R.id.action_visit_cutedns) { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.cutedns.cn"))); + } + + if (id == R.id.action_join_qqgroup) { + joinQQGroup("gg"); + } + + return super.onOptionsItemSelected(item); + } + + private boolean joinQQGroup(String key) { + Intent intent = new Intent(); + intent.setData(Uri.parse("mqqopensdkapi://bizAgent/qm/qr?url=http%3A%2F%2Fqm.qq.com%2Fcgi-bin%2Fqm%2Fqr%3Ffrom%3Dapp%26p%3Dandroid%26k%3D" + key)); + // 此Flag可根据具体产品需要自定义,如设置,则在加群界面按返回,返回手Q主界面,不设置,按返回会返回到呼起产品界面 //intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) + try { + startActivity(intent); + return true; + } catch (Exception e) { + // 未安装手Q或安装的版本不支持 + return false; + } } } diff --git a/app/src/main/java/org/itxtech/daedalus/MainActivity.java b/app/src/main/java/org/itxtech/daedalus/MainActivity.java index 0ddf93d..85ff9fa 100644 --- a/app/src/main/java/org/itxtech/daedalus/MainActivity.java +++ b/app/src/main/java/org/itxtech/daedalus/MainActivity.java @@ -5,7 +5,6 @@ import android.app.NotificationManager; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.net.Uri; import android.net.VpnService; import android.os.Bundle; import android.preference.PreferenceManager; @@ -155,10 +154,6 @@ public class MainActivity extends AppCompatActivity { return true; } - if (id == R.id.action_project_home) { - startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/iTXTech/Daedalus"))); - } - return super.onOptionsItemSelected(item); } } diff --git a/app/src/main/java/org/itxtech/daedalus/ServerTestActivity.java b/app/src/main/java/org/itxtech/daedalus/ServerTestActivity.java index 0ca23a5..c993420 100644 --- a/app/src/main/java/org/itxtech/daedalus/ServerTestActivity.java +++ b/app/src/main/java/org/itxtech/daedalus/ServerTestActivity.java @@ -61,6 +61,9 @@ public class ServerTestActivity extends AppCompatActivity { public void run() { try { String testUrl = textViewTestUrl.getText().toString(); + if (testUrl.equals("")) { + testUrl = getResources().getStringArray(R.array.default_test_urls)[0]; + } String testText = ""; String[] dnsServers = {DnsServers.getDnsServerAddress(String.valueOf(spinnerServerChoice.getSelectedItemId())), "114.114.114.114", "8.8.8.8"}; DNSClient client = new DNSClient(null); diff --git a/app/src/main/res/layout-land/content_main.xml b/app/src/main/res/layout-land/content_main.xml deleted file mode 100644 index c03aaf5..0000000 --- a/app/src/main/res/layout-land/content_main.xml +++ /dev/null @@ -1,31 +0,0 @@ - - -