From dc3519e8ce6bbb8959b5e0200ad3ae331439a4a5 Mon Sep 17 00:00:00 2001 From: Jay <673592063@qq.com> Date: Mon, 22 Jun 2015 22:15:56 +0800 Subject: [PATCH 1/5] add the server php code --- server/blog/list.json | 123 ++++++++++++++++++++++++++++++++++ server/digest/add.php | 59 ++++++++++++++++ server/digest/detail.php | 26 +++++++ server/digest/list.php | 39 +++++++++++ server/digest/post.php | 30 +++++++++ server/digest/review_post.php | 40 +++++++++++ server/digest/search.php | 35 ++++++++++ server/latest.json | 6 ++ server/tool/add.php | 58 ++++++++++++++++ server/tool/list.php | 39 +++++++++++ server/tool/post.php | 30 +++++++++ server/tool/search.php | 35 ++++++++++ 12 files changed, 520 insertions(+) create mode 100644 server/blog/list.json create mode 100644 server/digest/add.php create mode 100644 server/digest/detail.php create mode 100644 server/digest/list.php create mode 100644 server/digest/post.php create mode 100644 server/digest/review_post.php create mode 100644 server/digest/search.php create mode 100644 server/latest.json create mode 100644 server/tool/add.php create mode 100644 server/tool/list.php create mode 100644 server/tool/post.php create mode 100644 server/tool/search.php diff --git a/server/blog/list.json b/server/blog/list.json new file mode 100644 index 0000000..e353894 --- /dev/null +++ b/server/blog/list.json @@ -0,0 +1,123 @@ +[{ + "title" : "开发社区(每日更新)", + "type" : "header" +},{ + "title" : "Android开发 - 博客园", + "description":"代码改变世界", + "type" : "html", + "url" : "http://www.cnblogs.com/cate/android/" +},{ + "title" : "Android热门博客列表 - ITeye博客频道", + "type" : "html", + "url" : "http://www.iteye.com/blogs/tag/Android" +},{ + "title" : "Android开发专区 - 开源中国", + "type" : "html", + "url" : "http://www.oschina.net/android/1/android?type=3&sort=time" +},{ + "title" : "AndroidCN：Android专业中文社区", + "type" : "html", + "url" : "http://www.androidcn.org" +},{ + "title" : "android周报(每周更新)", + "type" : "header" +},{ + "title" : "Android开发技术周报", + "type" : "html", + "url" : "http://www.androidweekly.cn" +},{ + "title" : "Android周报", + "description":"Coding, thoughts. @Android笔记", + "type" : "html", + "url" : "http://www.race604.com" +},{ + "title" : "Android开发技术前线", + "type" : "html", + "url" : "https://github.com/bboyfeiyu/android-tech-frontier" +},{ + "title" : "App开发日报", + "type" : "html", + "url" : "http://app.memect.com" +},{ + "title" : "电子书", + "type" : "header" +},{ + "title" : "皮皮书屋 - 备份", + "type" : "html", + "url" : "http://bt8.nl/ebook.php?book=android" +},{ + "title" : "知名博客(不定时更新)", + "type" : "header" +},{ + "title" : "codeKK 开源项目源码分析", + "type" : "html", + "url" : "http://www.codekk.com" +},{ + "title" : "代码家", + "description":"我想写个好的App…", + "type" : "html", + "url" : "http://blog.daimajia.com" +},{ + "title" : "Android 科学院 - 知乎专栏", + "type" : "html", + "url" : "http://zhuanlan.zhihu.com/andlib" +},{ + "title" : "Android开源项目分类汇总", + "type" : "html", + "url" : "https://github.com/Trinea/android-open-project" +},{ + "title" : "郭霖的专栏", + "description":"每当你在感叹，如果有这样一个东西就好了的时候，请注意，其实这是你的机会", + "type" : "html", + "url" : "http://blog.csdn.net/guolin_blog" +},{ + "title" : "Drakeet的个人博客", + "description":"平平凡凡的，追求优雅的代码", + "type" : "html", + "url" : "http://drakeet.me" +},{ + "title" : "老罗的Android之旅", + "description":"爱生活，爱Android", + "type" : "html", + "url" : "http://blog.csdn.net/luoshengyang" +},{ + "title" : "Android Performance", + "description":"Android,Performance", + "type" : "html", + "url" : "http://androidperformance.com" +},{ + "title" : "云在千峰", + "description":"About Java Android Web Dart etc …", + "type" : "html", + "url" : "http://blog.chengyunfeng.com/" +},{ + "title" : "宋宝华的blog", + "type" : "html", + "url" : "http://blog.csdn.net/21cnbao" +},{ + "title" : "谦虚的天下", + "type" : "html", + "url" : "http://www.cnblogs.com/qianxudetianxia/" +},{ + "title" : "设计交互", + "type" : "header" +},{ + "title" : "materialup", + "type" : "html", + "url" : "http://www.materialup.com" +},{ + "title" : "国外网站", + "type" : "header" +},{ + "title" : "Stack Overflow", + "description":"Newest 'android' Questions - Stack Overflow", + "type" : "html", + "url" : "http://stackoverflow.com/questions/tagged/android" +},{ + "title" : "Android Weekly", + "description":"Android Weekly is a free newsletter that helps you to stay cutting-edge with your Android Development.", + "type" : "html", + "url" : "http://androidweekly.net" +} + +] diff --git a/server/digest/add.php b/server/digest/add.php new file mode 100644 index 0000000..b0ff897 --- /dev/null +++ b/server/digest/add.php @@ -0,0 +1,59 @@ + + + +New a android digest + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
标题:
摘要:
内容:
图片:
网址:
类型: + +
是否显示更多: + +
+ +
+
+ + diff --git a/server/digest/detail.php b/server/digest/detail.php new file mode 100644 index 0000000..68e91a7 --- /dev/null +++ b/server/digest/detail.php @@ -0,0 +1,26 @@ +getData($sql); + +if (count($data) > 0) { + echo json_encode($data[0]); +} else { + echo "{}"; +} + +$mysql->closeDb(); + +function decodeUnicode($str) { + return preg_replace_callback('/\\\\u([0-9a-f]{4})/i', + create_function( '$matches', 'return mb_convert_encoding(pack("H*", $matches[1]), "UTF-8", "UCS-2BE");' ), + $str); +} + +?> diff --git a/server/digest/list.php b/server/digest/list.php new file mode 100644 index 0000000..f350d12 --- /dev/null +++ b/server/digest/list.php @@ -0,0 +1,39 @@ +getData($sql); + +echo json_encode($data); + +$mysql->closeDb(); + +function decodeUnicode($str) { + return preg_replace_callback('/\\\\u([0-9a-f]{4})/i', + create_function( '$matches', 'return mb_convert_encoding(pack("H*", $matches[1]), "UTF-8", "UCS-2BE");' ), + $str); +} + +?> diff --git a/server/digest/post.php b/server/digest/post.php new file mode 100644 index 0000000..a9a5166 --- /dev/null +++ b/server/digest/post.php @@ -0,0 +1,30 @@ +runSql($sql); +if ($mysql->errno() != 0) +{ + die("Error:" . $mysql->errmsg()); +} else { + echo "插入成功"; +} + +$mysql->closeDb(); +?> diff --git a/server/digest/review_post.php b/server/digest/review_post.php new file mode 100644 index 0000000..4ea69a7 --- /dev/null +++ b/server/digest/review_post.php @@ -0,0 +1,40 @@ +runSql($sql); +if ($mysql->errno() != 0) { + die("{\"s_status\": \"ERROR\",\"s_message\": \"" . $mysql->errmsg() . "\",\"s_code\": 1}"); +} else { + die("{\"s_status\": \"OK\",\"s_message\": \"\",\"s_code\": 200}"); +} + +$mysql->closeDb(); +?> diff --git a/server/digest/search.php b/server/digest/search.php new file mode 100644 index 0000000..7e20d31 --- /dev/null +++ b/server/digest/search.php @@ -0,0 +1,35 @@ +getData($sql); + +echo json_encode($data); + +$mysql->closeDb(); + +function decodeUnicode($str) { + return preg_replace_callback('/\\\\u([0-9a-f]{4})/i', + create_function( '$matches', 'return mb_convert_encoding(pack("H*", $matches[1]), "UTF-8", "UCS-2BE");' ), + $str); +} + +?> diff --git a/server/latest.json b/server/latest.json new file mode 100644 index 0000000..088c815 --- /dev/null +++ b/server/latest.json @@ -0,0 +1,6 @@ +{ + "vercode":4, + "vername":"0.5", + "download":"http://jayfeng-files.stor.sinaapp.com/androiddigest/android_digest_release_v0.5.apk", + "log":"1. [增加]设置模块\n2. [增加]搜索功能\n3. [增加]集成了友盟统计\n4. [修复]重构了网络请求的代码，极大的精简优化了SpiceRequest的使用方式\n5. [修复]改善了工具箱的UI\n6. [修复]优化了列表中图片的展示效果\n7. [修复]修复了大量的其他bug" +} diff --git a/server/tool/add.php b/server/tool/add.php new file mode 100644 index 0000000..b32b2d2 --- /dev/null +++ b/server/tool/add.php @@ -0,0 +1,58 @@ + + + +Import a android tool + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
标题:
简介:
图片:
官网:
Apk下载地址:
网址:
分类: + +
+ +
+
+ + diff --git a/server/tool/list.php b/server/tool/list.php new file mode 100644 index 0000000..fc67a7f --- /dev/null +++ b/server/tool/list.php @@ -0,0 +1,39 @@ +getData($sql); + +echo json_encode($data); + +$mysql->closeDb(); + +function decodeUnicode($str) { + return preg_replace_callback('/\\\\u([0-9a-f]{4})/i', + create_function( '$matches', 'return mb_convert_encoding(pack("H*", $matches[1]), "UTF-8", "UCS-2BE");' ), + $str); +} + +?> diff --git a/server/tool/post.php b/server/tool/post.php new file mode 100644 index 0000000..16e5497 --- /dev/null +++ b/server/tool/post.php @@ -0,0 +1,30 @@ +runSql($sql); +if ($mysql->errno() != 0) +{ + die("Error:" . $mysql->errmsg()); +} else { + echo "插入成功"; +} + +$mysql->closeDb(); +?> diff --git a/server/tool/search.php b/server/tool/search.php new file mode 100644 index 0000000..120a4bb --- /dev/null +++ b/server/tool/search.php @@ -0,0 +1,35 @@ +getData($sql); + +echo json_encode($data); + +$mysql->closeDb(); + +function decodeUnicode($str) { + return preg_replace_callback('/\\\\u([0-9a-f]{4})/i', + create_function( '$matches', 'return mb_convert_encoding(pack("H*", $matches[1]), "UTF-8", "UCS-2BE");' ), + $str); +} + +?> From 93501aecc5665a4f2a8876aa3c400e95c2203bcf Mon Sep 17 00:00:00 2001 From: Jay <673592063@qq.com> Date: Wed, 24 Jun 2015 23:29:23 +0800 Subject: [PATCH 2/5] update the latest libs for perparing the material design --- app/build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3ff7fb8..b7953fc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,7 +45,8 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:22.1.1' + compile 'com.android.support:appcompat-v7:22.2.0' + compile 'com.android.support:design:22.2.0' compile 'com.jayfeng:lesscode-core:0.4.4' compile 'in.srain.cube:ultra-ptr:1.0.10' compile('com.octo.android.robospice:robospice-google-http-client:1.4.14') { @@ -57,7 +58,7 @@ dependencies { exclude(group: 'junit', module: 'junit') //by both name and group exclude(group: 'com.google.android', module: 'android') //by both name and group } - compile 'com.facebook.fresco:fresco:0.5.1+' + compile 'com.facebook.fresco:fresco:0.5.2+' compile 'com.umeng:fb:5.1.0' compile 'com.umeng.analytics:analytics:latest.integration' debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1' From cbf7fb9772e2c5498e9f66fba3c97ea5f37cdba1 Mon Sep 17 00:00:00 2001 From: Jay <673592063@qq.com> Date: Sat, 27 Jun 2015 20:59:43 +0800 Subject: [PATCH 3/5] update the app icon --- app/src/main/AndroidManifest.xml | 2 +- .../androiddigest/activity/MainActivity.java | 4 +--- app/src/main/res/layout/activity_main.xml | 6 ++---- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3418 -> 4021 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2206 -> 2368 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4842 -> 5564 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 7718 -> 8814 bytes 7 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d6318c6..a67a504 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,7 +25,7 @@ diff --git a/app/src/main/java/com/jayfeng/androiddigest/activity/MainActivity.java b/app/src/main/java/com/jayfeng/androiddigest/activity/MainActivity.java index 0e35a27..02486dc 100644 --- a/app/src/main/java/com/jayfeng/androiddigest/activity/MainActivity.java +++ b/app/src/main/java/com/jayfeng/androiddigest/activity/MainActivity.java @@ -59,9 +59,7 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_main); showToolbar(); - toolbar.setNavigationIcon(R.mipmap.ic_launcher); - toolbar.setSubtitle(R.string.app_description); - toolbar.setSubtitleTextColor(getResources().getColor(android.R.color.white)); + toolbar.setTitle(R.string.app_description); //set navigationBar color for Android 5.0 or above if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b21a620..d98a522 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -9,10 +9,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="left" - android:paddingTop="8dp" - android:paddingBottom="8dp" - android:background="#008AC4" - android:minHeight="?attr/actionBarSize" /> + android:background="#45b39c" + android:minHeight="@dimen/abc_action_bar_default_height_material" /> i5LI? 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 KMNUMnLSTY;CcqQ` literal 3418 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 IM6N<$f}N#wcmMzZ delta 2194 zcmV;D2yOSk5}px|B!2{FK}|sb0I`n?{9y$E001CkNK#Dz0D2|>0Dy!50Qvv`0D$NK z0Cg|`0P0`>06Lfe02gqax=}m;000JJOGiWi000000Qp0^e*gdg32;bRa{vGf6951U z69E94oEQKA2cStrK~!ko?O9!H6xS90&YhX{u6Ng96W7=#IDZ5i(i+oXS)r6PF*2ag z5}^b{(w3%DP#+ovDG80B5=tvU5Rs}@sc5UTN~9KoNYW~8qm(9MS-S8v^6vi zCUNk(br)=}e|C26>BG$I&hPFl0n`T$T6T8sx%YnG`MKxbYv6|5kn1Ai;k^&X0nl}r zi+1kZngAdo0e_34^MgM=w4=Lk=F+#H+R}85Nzenk*Lo_T5=IGNOF6#e7|Ab=# zvPg+1p80xx>*IZusDyUuUg;(%FCI%8vBr1IvaC$*~_j z^v%uA7*DzmcPc+efq3H9#Heg%)1OR}Ui|uSEqvILgH8Elg zwRY26V;@bO-21?>O#m_g3Q;W^RR}<$yLahb+kX#q9|H&s=|omF0sDWl^nUu-$-cAi z4)p_=iV8}phQRXWO|h*{uHGH5!{M`+?Mqu`E)Qnk92uF6Wc_Lg(7pGrN^Smr z&zrS3$&Epl4U#B2PD#|Gr}ORwt1~09S2BZ{NF<^Vpp6?>rPe*U=+9b0_V`go2k8x; zKz~3QZdumTus$;ydolAtWfB$ZKu1SMY|W!>zgKH`xoy>=WjQElsvzWjvc}U==y~w* z#jhYj(X2#3*?ypBPkb)*x`2m*cY?dJJh1yF>UhKVUf#456{4hEBkg*2YgglE#StGw z2A0&{jXRpZissbk@bBqC=yC?-tnUq%? z#|Ov4#x3U}ZGM+Hgn)2akiH#XXxRn;XvAWqWApI(;Qp$tzjomcG$h&p08Pmy$mwGk zo;dCE#o{}YzXGrtKt5=kun-d8Ik>r3OK=yMeTmwXYDRC;AajIo-WWY|~VSnHQ%U+q# z@m71KMx>W6ZAnxjK&_qisftKLz=v76+RzD92T-@7p%$Ly)aR0TN{!{Rg<(UI5M;QN zB`e`sS^Q~)E3kQfAY$`$20((?-d=8VOO0S1Km ziU9~BfVgB9OBZB65=aoh41Xd4B0$=ho&6XfsGe{tJqv}vv6#<(J_3p&xVDaz zzuZQ;0R{lIhM>hoF@JPGr2$8;$SwM9!PeL(kf|RAuAv;N_6#FElv!a!a z_aN|W5AG3P2mR;W7hYx^hFsDHvR|J;=Kf-grPYWwvhaYOzu z<$og|U;;R}vW)-$03~!qSaf7zbY(hYa%Ew3WdJfTF*GeOIV~_XR536*H8(mnI4v+Y zIxsN2$3gA@001R)MObuXVRU6WZEs|0W_bWIFflYOFgYzSHB>P$IyE;sH8?FWH##sd U&6@dA01E&B07*qoM6N<$f>rYg^#A|> diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index bfa42f0e7b91d006d22352c9ff2f134e504e3c1d..190e49c5d6ffb498c4a623c5bc0f9a61a73e5b02 100644 GIT binary patch delta 5559 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 FV1n-#$_@Yk literal 4842 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 diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 324e72cdd7480cb983fa1bcc7ce686e51ef87fe7..2a8bd61256e4ffb5c122fa6f6cf6e95c344a6f43 100644 GIT binary patch literal 8814 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 From f00989d9f40bc249e5dbabfe3c59c460c0986f57 Mon Sep 17 00:00:00 2001 From: Jay <673592063@qq.com> Date: Mon, 29 Jun 2015 00:17:24 +0800 Subject: [PATCH 4/5] update the toolbar color --- app/src/main/AndroidManifest.xml | 2 +- .../com/jayfeng/androiddigest/activity/BaseActivity.java | 8 ++++++++ .../com/jayfeng/androiddigest/activity/MainActivity.java | 3 +-- app/src/main/res/layout/activity_about_us.xml | 4 ++-- app/src/main/res/layout/activity_joke_detail.xml | 4 ++-- app/src/main/res/layout/activity_main.xml | 3 ++- app/src/main/res/layout/activity_offline.xml | 4 ++-- app/src/main/res/layout/activity_review_digest_add.xml | 4 ++-- app/src/main/res/layout/activity_search.xml | 4 ++-- app/src/main/res/layout/activity_settings.xml | 4 ++-- app/src/main/res/layout/activity_tool_list.xml | 4 ++-- app/src/main/res/layout/activity_web_view.xml | 4 ++-- .../main/res/layout/fragment_blog_list_item_header.xml | 1 + app/src/main/res/values/colors.xml | 6 +++--- 14 files changed, 32 insertions(+), 23 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a67a504..d6318c6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,7 +25,7 @@ diff --git a/app/src/main/java/com/jayfeng/androiddigest/activity/BaseActivity.java b/app/src/main/java/com/jayfeng/androiddigest/activity/BaseActivity.java index d5aa5b8..52c393f 100644 --- a/app/src/main/java/com/jayfeng/androiddigest/activity/BaseActivity.java +++ b/app/src/main/java/com/jayfeng/androiddigest/activity/BaseActivity.java @@ -2,6 +2,7 @@ import android.support.v7.app.ActionBarActivity; import android.support.v7.widget.Toolbar; +import android.text.TextUtils; import android.view.View; import com.jayfeng.androiddigest.R; @@ -12,7 +13,14 @@ public class BaseActivity extends ActionBarActivity { protected Toolbar toolbar; protected void showToolbar() { + showToolbar(null); + } + + protected void showToolbar(String title) { toolbar = (Toolbar) findViewById(R.id.toolbar); + if (!TextUtils.isEmpty(title)) { + toolbar.setTitle(title); + } toolbar.setTitleTextColor(getResources().getColor(android.R.color.white)); toolbar.showOverflowMenu(); setSupportActionBar(toolbar); diff --git a/app/src/main/java/com/jayfeng/androiddigest/activity/MainActivity.java b/app/src/main/java/com/jayfeng/androiddigest/activity/MainActivity.java index 02486dc..ceb8362 100644 --- a/app/src/main/java/com/jayfeng/androiddigest/activity/MainActivity.java +++ b/app/src/main/java/com/jayfeng/androiddigest/activity/MainActivity.java @@ -58,8 +58,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - showToolbar(); - toolbar.setTitle(R.string.app_description); + showToolbar(getString(R.string.app_description)); //set navigationBar color for Android 5.0 or above if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { diff --git a/app/src/main/res/layout/activity_about_us.xml b/app/src/main/res/layout/activity_about_us.xml index 67eddb9..5f118ac 100644 --- a/app/src/main/res/layout/activity_about_us.xml +++ b/app/src/main/res/layout/activity_about_us.xml @@ -8,8 +8,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="left" - android:background="#008AC4" - android:minHeight="?attr/actionBarSize" /> + android:background="@color/primary" + android:minHeight="@dimen/abc_action_bar_default_height_material" /> + android:background="@color/primary" + android:minHeight="@dimen/abc_action_bar_default_height_material" /> + android:background="@color/primary" + android:minHeight="@dimen/abc_action_bar_default_height_material" /> + android:background="@color/primary" + android:minHeight="@dimen/abc_action_bar_default_height_material" /> + android:background="@color/primary" + android:minHeight="@dimen/abc_action_bar_default_height_material"> + android:background="@color/primary" + android:minHeight="@dimen/abc_action_bar_default_height_material" /> + android:background="@color/primary" + android:minHeight="@dimen/abc_action_bar_default_height_material" /> + android:background="@color/primary" + android:minHeight="@dimen/abc_action_bar_default_height_material" /> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c6ff4d4..8427139 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,9 +3,9 @@ #FF939393 #FF257DB8 - #2196F3 - #1976D2 - #BBDEFB + #009588 + #00796b + #da793e #03A9F4 #212121 #727272 From baf2a9c83e2f6421a4e767976fdbd2c1c20784d7 Mon Sep 17 00:00:00 2001 From: JianwuGao Date: Sat, 10 Oct 2015 00:05:59 +0800 Subject: [PATCH 5/5] add developer info --- app/src/main/AndroidManifest.xml | 32 ++--- .../activity/DeveloperActivity.java | 16 +++ .../androiddigest/activity/MainActivity.java | 10 +- .../main/res/layout/activity_developer.xml | 116 ++++++++++++++++++ app/src/main/res/menu/more_popup_menu.xml | 3 + app/src/main/res/values-w820dp/dimens.xml | 6 + app/src/main/res/values/strings.xml | 13 ++ 7 files changed, 178 insertions(+), 18 deletions(-) create mode 100644 app/src/main/java/com/jayfeng/androiddigest/activity/DeveloperActivity.java create mode 100644 app/src/main/res/layout/activity_developer.xml create mode 100644 app/src/main/res/values-w820dp/dimens.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d6318c6..fcc395a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,9 +2,9 @@ - - - + + + @@ -17,11 +17,11 @@ + android:name="UMENG_APPKEY" + android:value="5527fcbbfd98c5d7d2000383" /> + android:name="UMENG_CHANNEL" + android:value="official" /> - - - - - - + android:name=".activity.SettingsActivity" + android:label="@string/settings_title" /> + + + + + diff --git a/app/src/main/java/com/jayfeng/androiddigest/activity/DeveloperActivity.java b/app/src/main/java/com/jayfeng/androiddigest/activity/DeveloperActivity.java new file mode 100644 index 0000000..eadd3c2 --- /dev/null +++ b/app/src/main/java/com/jayfeng/androiddigest/activity/DeveloperActivity.java @@ -0,0 +1,16 @@ +package com.jayfeng.androiddigest.activity; + +import android.os.Bundle; + +import com.jayfeng.androiddigest.R; + +public class DeveloperActivity extends BaseActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_developer); + + showToolbar(); + } +} diff --git a/app/src/main/java/com/jayfeng/androiddigest/activity/MainActivity.java b/app/src/main/java/com/jayfeng/androiddigest/activity/MainActivity.java index ceb8362..17258bd 100644 --- a/app/src/main/java/com/jayfeng/androiddigest/activity/MainActivity.java +++ b/app/src/main/java/com/jayfeng/androiddigest/activity/MainActivity.java @@ -158,8 +158,14 @@ public boolean onMenuItemClick(MenuItem item) { agent.startFeedbackActivity(); break; case R.id.more_menu_setting: - Intent intent = new Intent(MainActivity.this, SettingsActivity.class); - startActivity(intent); + Intent settingsIntent = new Intent(MainActivity.this, SettingsActivity.class); + startActivity(settingsIntent); + break; + case R.id.more_menu_developers: + Intent developerIntent = new Intent(MainActivity.this, DeveloperActivity.class); + startActivity(developerIntent); + break; + default: break; } return true; diff --git a/app/src/main/res/layout/activity_developer.xml b/app/src/main/res/layout/activity_developer.xml new file mode 100644 index 0000000..dc81d9c --- /dev/null +++ b/app/src/main/res/layout/activity_developer.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/more_popup_menu.xml b/app/src/main/res/menu/more_popup_menu.xml index 1e22a50..83688e9 100644 --- a/app/src/main/res/menu/more_popup_menu.xml +++ b/app/src/main/res/menu/more_popup_menu.xml @@ -12,4 +12,7 @@ android:id="@+id/more_menu_setting" android:title="@string/tab_more_menu_setting"/> + \ No newline at end of file diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml new file mode 100644 index 0000000..63fc816 --- /dev/null +++ b/app/src/main/res/values-w820dp/dimens.xml @@ -0,0 +1,6 @@ + + + 64dp + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e4a276c..827a3b0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -14,6 +14,7 @@ 工具箱 更多 设置 + 开发小组 正文 正文 离线列表 @@ -50,5 +51,17 @@ 关于 关于干柴 + 冯建 + 昵称：谦虚的天下 + 博客地址：http://cnblogs.com/qianxudetianxia + QQ：673592063 + 微博地址：http://weibo.com/xiaofengjian?from=profile&wvr=6 + + 高建武 + 昵称：Gracker + 博客地址：http://androidperformance.com + QQ：553000664 + 微博地址：http://www.weibo.com/u/1315612820?from=feed&loc=nickname + 关于