small fix

daimajia · Aug 13, 2014 · c889be5 · c889be5
1 parent 36a9201
commit c889be5
Show file tree

Hide file tree

Showing 5 changed files with 148 additions and 109 deletions.
diff --git a/README-cn.md b/README-cn.md
diff --git a/README-en.md b/README-en.md
@@ -0,0 +1,60 @@
+#AnimeTaste (Global Animation)[![Build Status](https://travis-ci.org/daimajia/AnimeTaste.png?branch=master)](https://travis-ci.org/daimajia/AnimeTaste)
+
+[中文](./README-cn.md)
+
+------------
+
+AnimeTaste is the first app that focuses on global original animation in China.
+
+AnimeTaste for Android is developed for all the animation fans.
+
+======
+
+![AnimeTaste](http://ww2.sinaimg.cn/mw690/610dc034jw1e885o9kjgzj208c0b40ty.jpg)　![AnimeTaste](http://ww3.sinaimg.cn/mw690/610dc034jw1e885obnjy6j208c0b43zo.jpg)
+
+### About AnimeTaste:
+
+* [Offical Site](http://www.animetaste.net)
+* [Creator of AnimeTaste](http://www.plidezus.net/)
+
+### Thanks for the open source:
+
+*	[ShareSDK for Android](http://sharesdk.cn/)
+*	[Picasso](https://github.com/square/picasso)
+*	[Baidu-T5Player-SDK-Android](http://developer.baidu.com/wiki/index.php?title=docs/cplat/media/sdk)
+*	[Android-Switch-Backport](https://github.com/BoD/android-switch-backport)
+*	[Gif-Movie-View](https://github.com/sbakhtiarov/gif-movie-view)
+*	[ViewPagerIndicator](https://github.com/JakeWharton/Android-ViewPagerIndicator)
+*	[SuperToasts](https://github.com/JohnPersano/SuperToasts)
+*	[SwipeBackLayout](https://github.com/Issacw0ng/SwipeBackLayout)
+*	[sdk-manager-plugin](https://github.com/JakeWharton/sdk-manager-plugin)
+
+### How to compile:
+
+Only one step:
+
+`./gradlew assemble` (Mac/Linux)
+
+or
+
+`./gradlew.bat assemble` (Windows)
+
+### Download
+
+
+[Google Play](https://play.google.com/store/apps/details?id=com.zhan_dui.animetaste)  
+
+[App Store](https://itunes.apple.com/en/app/animetaste-pin-wei-dong-hua/id444912104?mt=8)
+
+
+### About me:
+
+A sutdent in Beijing, I like Android, like open source. I'm good at Android/ php / node , if there is an intership opportunity, please [email me](mailto:daimajia@gmail.com).
+
+You can also view my other project:
+
+*	[EverMemo](https://github.com/daimajia/EverMemo) A fast record memo app.
+*	[MooDroid](http://moodroid.com) A site to share graceful Android library.
+*	[Blog](http://daimajia.com) My own blog.
+
+
diff --git a/README.md b/README.md
@@ -1,60 +1,68 @@
-#AnimeTaste (Global Animation)[![Build Status](https://travis-ci.org/daimajia/AnimeTaste.png?branch=master)](https://travis-ci.org/daimajia/AnimeTaste)
+#AnimeTaste(全球动画精选)[![Build Status](https://travis-ci.org/daimajia/AnimeTaste.png?branch=master)](https://travis-ci.org/daimajia/AnimeTaste)
+[English](./README.md)
 
-[中文](./README-cn.md)
+---------------------
 
-------------
+AnimeTaste（品赏艾尼莫）是国内首个关注独立动画的网站。
+移动版聚焦更新的全球独立动画的传播，让您随时随地能观看动画，分享快乐给更多好友。品味动画，重拾幻想。
 
-AnimeTaste is the first app that focuses on global original animation in China.
+---------------------
 
-AnimeTaste for Android is developed for all the animation fans.
+AnimeTaste For Android，为全球动画爱好者所开发。
 
-======
+### 体验地址: [豌豆荚](http://www.wandoujia.com/apps/com.zhan_dui.animetaste) [Google Play](https://play.google.com/store/apps/details?id=com.zhan_dui.animetaste) ###
 
-![AnimeTaste](http://ww2.sinaimg.cn/mw690/610dc034jw1e885o9kjgzj208c0b40ty.jpg)　![AnimeTaste](http://ww3.sinaimg.cn/mw690/610dc034jw1e885obnjy6j208c0b43zo.jpg)
+### [豌豆荚110期设计奖](http://www.wandoujia.com/award/blog/com.zhan_dui.animetaste)
 
-### About AnimeTaste:
+![AnimeTaste](http://ww2.sinaimg.cn/mw690/610dc034jw1e885o9kjgzj208c0b40ty.jpg)　
+![AnimeTaste](http://ww3.sinaimg.cn/mw690/610dc034jw1e885obnjy6j208c0b43zo.jpg)
 
-* [Offical Site](http://www.animetaste.net)
-* [Creator of AnimeTaste](http://www.plidezus.net/)
+### 关于AnimeTaste: ###
 
-### Thanks for the open source:
+*	[AnimeTaste官网](http://www.animetaste.net)
+*	[AnimeTaste创始人Plidezus](http://www.plidezus.net/)
+*	[开发AnimeTaste的故事](http://blog.daimajia.com/?p=549)
 
-*	[ShareSDK for Android](http://sharesdk.cn/)
-*	[Picasso](https://github.com/square/picasso)
-*	[Baidu-T5Player-SDK-Android](http://developer.baidu.com/wiki/index.php?title=docs/cplat/media/sdk)
-*	[Android-Switch-Backport](https://github.com/BoD/android-switch-backport)
-*	[Gif-Movie-View](https://github.com/sbakhtiarov/gif-movie-view)
-*	[ViewPagerIndicator](https://github.com/JakeWharton/Android-ViewPagerIndicator)
-*	[SuperToasts](https://github.com/JohnPersano/SuperToasts)
-*	[SwipeBackLayout](https://github.com/Issacw0ng/SwipeBackLayout)
-*	[sdk-manager-plugin](https://github.com/JakeWharton/sdk-manager-plugin)
+欢迎任何方式的与AnimeTaste的合作。
 
-### How to compile:
+### 感谢以下库作者和组织
 
-Only one step:
+*	[ShareSDK for Android](http://sharesdk.cn/) 社交关注。
+*	[Picasso](https://github.com/square/picasso) 图片缓存
+*	[Baidu-T5Player-SDK-Android](http://developer.baidu.com/wiki/index.php?title=docs/cplat/media/sdk) 百度T5 Player SDK
+*	[Android-Switch-Backport](https://github.com/BoD/android-switch-backport) Switch的兼容库
+*	[Gif-Movie-View](https://github.com/sbakhtiarov/gif-movie-view) Gif动画播放
+*	[ViewPagerIndicator](https://github.com/JakeWharton/Android-ViewPagerIndicator) 滑动画廊
+*	[SuperToasts](https://github.com/JohnPersano/SuperToasts) 扩展的Toasts弹出框
+*	[SwipeBackLayout](https://github.com/Issacw0ng/SwipeBackLayout) 滑动退出
+*	Android-Support-v7-appcompat Android ActionBar 兼容库
+*	[sdk-manager-plugin](https://github.com/JakeWharton/sdk-manager-plugin) SDK管理工具
 
-`./gradlew assemble` (Mac/Linux)
+-------------------
 
-or
+### 如何编译 ###
 
-`./gradlew.bat assemble` (Windows)
+Step-All: 
 
-### Download
+**Mac和Linux用户在根目录运行`./gradlew assemble`, Windows用户运行`gradlew.bat assemble` 稍等片刻即可(会自动下载确实的SDK版本以及依赖包，可能会比较慢)。**
 
 
-[Google Play](https://play.google.com/store/apps/details?id=com.zhan_dui.animetaste)  
+-------
 
-[App Store](https://itunes.apple.com/en/app/animetaste-pin-wei-dong-hua/id444912104?mt=8)
 
+如果出现错误或者有任何问题，请放轻松[联系我](mailto:daimajia@gmail.com)。
 
-### About me:
 
-A sutdent in Beijing, I like Android, like open source. I'm good at Android/ php / node , if there is an intership opportunity, please [email me](mailto:daimajia@gmail.com).
+###关于我：
+我是个学生，酷爱开发，擅长Android、php、python、nodejs、web，如果您手头有适合我的实习或者工作机会，欢迎邮件联系我:  [daimajia#gmail.com](mailto:daimajia@gmail.com)
 
-You can also view my other project:
+*	[西北大学](http://zh.wikipedia.org/wiki/%E8%A5%BF%E5%8C%97%E5%A4%A7%E5%AD%A6_\(%E4%B8%AD%E5%9B%BD\))
+*	[北京师范大学](http://www.bnu.edu.cn)
+*	我的站点: [代码家](http://www.daimajia.com)
+*	我的微博:[代码家](http://weibo.com/daimajia)
+*	Twitter:[daimajia](http://twitter.com/daimajia)
+*	Instagram:[daimajia](http://instagram.com/daimajia)
 
-*	[EverMemo](https://github.com/daimajia/EverMemo) A fast record memo app.
-*	[MooDroid](http://moodroid.com) A site to share graceful Android library.
-*	[Blog](http://daimajia.com) My own blog.
+欢迎Follow我，我会关注和开源一些Android、Node、Python、Java相关项目。
 
 
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.9.+'
+        classpath 'com.android.tools.build:gradle:0.12.+'
         classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.9.+'
     }
 }
@@ -24,8 +24,8 @@ repositories {
 
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
-    compile 'com.android.support:support-v4:+'
-    compile 'com.android.support:appcompat-v7:+'
+    compile 'com.android.support:support-v4:19.+'
+    compile 'com.android.support:appcompat-v7:19.+'
     compile 'com.github.johnpersano:supertoasts:1.3.4@aar'
     compile 'im.dino:dbinspector:1.0.5@aar'
     compile project(':libraries:ViewPagerIndicator')
@@ -37,11 +37,11 @@ dependencies {
 
 
 ext.compileSdkVersion=19
-ext.buildToolsVersion="19.0.3"
+ext.buildToolsVersion="19.1.0"
 
 android {
     compileSdkVersion 19
-    buildToolsVersion "19.0.3"
+    buildToolsVersion "19.1.0"
 
     lintOptions {  
           abortOnError false
@@ -61,4 +61,43 @@ android {
         exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/NOTICE.txt'
     }
+
+    signingConfigs {
+        release {
+            storeFile file('AnimeTasteKey')
+            storePassword '410831497'
+            keyAlias 'AnimeTaste'
+            keyPassword '410831497'
+        }
+    }
+
+    buildTypes {
+        release {
+            signingConfig signingConfigs.release
+            zipAlign true
+        }
+    }
+
+    productFlavors {
+        GitHub{}
+
+    }
+
+    android.applicationVariants.all{ variant -> 
+        println "${variant.productFlavors[0].name}"
+        variant.processManifest.doLast{
+            copy{
+                from("${buildDir}/manifests"){
+                    include "${variant.dirName}/AndroidManifest.xml"
+                }
+                into("${buildDir}/manifests/$variant.name")
+
+                filter{
+                    String line -> line.replaceAll("UMENG_CHANNEL_VALUE", "${variant.productFlavors[0].name}")
+                }
+
+                variant.processResources.manifestFile = file("${buildDir}/manifests/${variant.name}/${variant.dirName}/AndroidManifest.xml")
+            }    
+       }
+    }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 25 13:51:42 CST 2014
+#Sat Jun 28 18:45:33 CST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip