Merge branch 'master' into pr/12

happydog-intj · happydog-intj · commit 95d418f5fc32 · 2016-04-18T21:09:06.000+08:00
# Conflicts:
#	README.md
diff --git a/README.md b/README.md
@@ -31,9 +31,17 @@ RxJava resources
 * [&#27604;&#38050;&#38081;&#20384;&#21453;&#24212;&#26356;&#28789;&#25935;-RxJava](http://www.devtf.cn/?p=770)
 
 ###  &#19968;&#20123;&#19981;&#38169;&#30340;&#20171;&#32461;&#25805;&#20316;&#31526;&#30340;&#25991;&#31456;
+
  * [&#34892;&#20113;&#27969;&#27700;&#30340;&#21338;&#23458;](http://blog.csdn.net/job_hesc/article/details/46242117)
+
  * [Android RxJava&#20351;&#29992;&#20171;&#32461;&#65288;&#20108;&#65289; RxJava&#30340;&#25805;&#20316;&#31526;](http://blog.chinaunix.net/uid/20771867.html)
 
+ * [&#26408;&#27700;&#24029;&#30340;&#21338;&#23458;](http://mushuichuan.com/tags/RxJava/) 
+ 
+ * [RxMarbles](http://rxmarbles.com/)-Interactive diagrams of Rx Observables
+ 
+ * [Android RxJava&#20351;&#29992;&#20171;&#32461;&#65288;&#20108;&#65289; RxJava&#30340;&#25805;&#20316;&#31526;](http://blog.csdn.net/job_hesc/article/details/46242117)
+ 
 ###  &#19968;&#20123;&#19981;&#38169;&#30340;&#32763;&#35793;&#25991;&#31456;
 * [&#12304;&#35793;&#12305;Deferring Observable code until subscription in RxJava](http://www.jianshu.com/p/c83996149f5b)
 
@@ -43,10 +51,20 @@ RxJava resources
 
 * [&#12304;&#35793;&#12305;Don't break the chain: use RxJava's compose() operator](http://www.jianshu.com/p/e9e03194199e)
 
-## Test
+###  &#19968;&#20123;&#21407;&#29702;&#20998;&#26512;&#30340;&#25991;&#31456;
+* [&#24443;&#24213;&#25630;&#25026; RxJava &mdash; &#22522;&#30784;&#31687;](http://diordna.sinaapp.com/?p=896)
+
+* [&#24443;&#24213;&#25630;&#25026; RxJava &mdash; &#20013;&#32423;&#31687;](http://diordna.sinaapp.com/?p=910)
+
+* [&#24443;&#24213;&#25630;&#25026; RxJava &mdash; &#39640;&#32423;&#31687;](http://diordna.sinaapp.com/?p=912)
+ 
+## Test 
+* [&#12304;&#35793;&#12305;RxJava Essentials &#20013;&#25991;&#32763;&#35793;&#29256;](http://rxjava.yuxingxin.com/) -Ivan.Morgillo&#25152;&#20889;&#19968;&#20070;&#30340;&#20013;&#25991;&#32763;&#35793;&#29256;&#26412;
 
 * [Unit Testing RxJava Observables and Subscriptions](http://fedepaol.github.io/blog/2015/09/13/testing-rxjava-observables-subscriptions/)
 
+* [Unit Testing RxJava Observables](https://medium.com/ribot-labs/unit-testing-rxjava-6e9540d4a329)
+
 ## App
 
 * [android-gfycat](https://github.com/dlew/android-gfycat) -Android application that loads gifs via gfycat for efficiency's sake
@@ -55,6 +73,10 @@ RxJava resources
 
 * [Avengers](https://github.com/saulmm/Avengers) - &#19968;&#20010;&#20351;&#29992;Retrofit+RxJava+MVP&#30340;app
 
+* [TranslateApp](https://github.com/maoruibin/TranslateApp) - &#19968;&#20010;&#20351;&#29992; MVP+Dagger2+RxJava+Retrofit&#30340;&#23454;&#29616;&#25163;&#26426;&#31471;&#12302;&#21010;&#35789;&#32763;&#35793;&#12303;&#21151;&#33021;&#30340;App - &#21653;&#21658;&#32763;&#35793;
+
+* [AppPlus](https://github.com/maoruibin/AppPlus) - &#19968;&#20010;&#21487;&#20197;&#29992;&#20110;&#20256;&#36865;Apk&#25991;&#20214;&#65292;&#25552;&#21462;APK&#25991;&#20214;&#31561;&#30340;&#24037;&#20855;&#36719;&#20214;&#12290;
+
 * [rx-android-architecture](https://github.com/tehmou/rx-android-architecture) -Android&#20013;&#20351;&#29992;Rx&#30340;&#19968;&#31181;&#26550;&#26500;
 
 * [android-boilerplate](https://github.com/ribot/android-boilerplate) -&#20351;&#29992;RxJava+Retrofit+MVP&#30340;app&#65292;&#24182;&#20102;&#32467;&#21512;&#35814;&#32454;&#30340;&#27979;&#35797;&#29992;&#20363;
@@ -65,12 +87,21 @@ RxJava resources
 
 * [Intro-To-RxJava](https://github.com/Froussios/Intro-To-RxJava) -RxJava&#23454;&#20363;&#20837;&#38376;
 
+* [MovieGuide]([https://github.com/esoxjem/MovieGuide](https://github.com/esoxjem/MovieGuide))-An Android app that showcases the MVP pattern and RxJava
+
+* [RxWeather]([https://github.com/SmartDengg/RxWeather](https://github.com/SmartDengg/RxWeather))
+-Architecting Android with RxJava
+
+* [RxBlur]([https://github.com/SmartDengg/RxBlur](https://github.com/SmartDengg/RxBlur))-&#29992;RxJava&#22788;&#29702;&#21644;&#25805;&#20316;&#39640;&#26031;&#27169;&#31946;&#25928;&#26524;&#30340;&#31616;&#21333;&#29992;&#20363;&#12290;
+
 ## Library
 
  * [rx-preferences](https://github.com/f2prateek/rx-preferences) -&#20351;SharedPreferences&#25903;&#25345;RxJava
 
  * [RxAndroid](https://github.com/trello/RxLifecycle) -RxJava&#30340;Android&#25299;&#23637;
 
+ * [RxAndroid](https://github.com/ReactiveX/RxAndroid) -RxJava&#30340;Android&#25299;&#23637;
+ 
  * [RxLifecycle](https://github.com/trello/RxLifecycle) -&#24110;&#21161;&#20351;&#29992;&#20102;RxJava&#30340;&#23433;&#21331;&#24212;&#29992;&#25511;&#21046;&#29983;&#21629;&#21608;&#26399;
 
  * [RxBinding](https://github.com/JakeWharton/RxBinding) -&#23433;&#21331;UI&#25511;&#20214;&#30340;RxJava&#32465;&#23450;API
@@ -85,6 +116,11 @@ RxJava resources
 
  * [xBus](https://github.com/mcxiaoke/xBus) -&#31616;&#27905;&#30340;EventBus&#23454;&#29616;
 
+## Video
+
+* [droidconDE 2015: Ivan Morgillo &ndash; Android reactive programming with Rxjava](https://www.youtube.com/watch?v=JCLZ55M2gVo&list=PLAY9OtteiTj04IdJDW7KV1cy843reyjvT)
+* [Common RxJava Mistakes](https://www.youtube.com/watch?v=QdmkXL7XikQ&feature=youtu.be)
+
 ## Stackoverflow
 
  [When should one use RxJava Observable and when simple Callback on Android?](http://stackoverflow.com/questions/21890338/when-should-one-use-rxjava-observable-and-when-simple-callback-on-android)

-Original file line number
+Diff line change
 * [比钢铁侠反应更灵敏-RxJava](http://www.devtf.cn/?p=770)
 ###  一些不错的介绍操作符的文章
++
  * [行云流水的博客](http://blog.csdn.net/job_hesc/article/details/46242117)
++
  * [Android RxJava使用介绍（二） RxJava的操作符](http://blog.chinaunix.net/uid/20771867.html)
 + * [木水川的博客](http://mushuichuan.com/tags/RxJava/)
++
 + * [RxMarbles](http://rxmarbles.com/)-Interactive diagrams of Rx Observables
++
 + * [Android RxJava使用介绍（二） RxJava的操作符](http://blog.csdn.net/job_hesc/article/details/46242117)
++
 ###  一些不错的翻译文章
 * [【译】Deferring Observable code until subscription in RxJava](http://www.jianshu.com/p/c83996149f5b)
 * [【译】Don't break the chain: use RxJava's compose() operator](http://www.jianshu.com/p/e9e03194199e)
 -## Test
 +###  一些原理分析的文章
 +* [彻底搞懂 RxJava — 基础篇](http://diordna.sinaapp.com/?p=896)
++
 +* [彻底搞懂 RxJava — 中级篇](http://diordna.sinaapp.com/?p=910)
++
 +* [彻底搞懂 RxJava — 高级篇](http://diordna.sinaapp.com/?p=912)
++
 +## Test
 +* [【译】RxJava Essentials 中文翻译版](http://rxjava.yuxingxin.com/) -Ivan.Morgillo所写一书的中文翻译版本
 * [Unit Testing RxJava Observables and Subscriptions](http://fedepaol.github.io/blog/2015/09/13/testing-rxjava-observables-subscriptions/)
 +* [Unit Testing RxJava Observables](https://medium.com/ribot-labs/unit-testing-rxjava-6e9540d4a329)
++
 ## App
 * [android-gfycat](https://github.com/dlew/android-gfycat) -Android application that loads gifs via gfycat for efficiency's sake
 * [Avengers](https://github.com/saulmm/Avengers) - 一个使用Retrofit+RxJava+MVP的app
 +* [TranslateApp](https://github.com/maoruibin/TranslateApp) - 一个使用 MVP+Dagger2+RxJava+Retrofit的实现手机端『划词翻译』功能的App - 咕咚翻译
++
 +* [AppPlus](https://github.com/maoruibin/AppPlus) - 一个可以用于传送Apk文件，提取APK文件等的工具软件。
++
 * [rx-android-architecture](https://github.com/tehmou/rx-android-architecture) -Android中使用Rx的一种架构
 * [android-boilerplate](https://github.com/ribot/android-boilerplate) -使用RxJava+Retrofit+MVP的app，并了结合详细的测试用例
 * [Intro-To-RxJava](https://github.com/Froussios/Intro-To-RxJava) -RxJava实例入门
 +* [MovieGuide]([https://github.com/esoxjem/MovieGuide](https://github.com/esoxjem/MovieGuide))-An Android app that showcases the MVP pattern and RxJava
++
 +* [RxWeather]([https://github.com/SmartDengg/RxWeather](https://github.com/SmartDengg/RxWeather))
 +-Architecting Android with RxJava
++
 +* [RxBlur]([https://github.com/SmartDengg/RxBlur](https://github.com/SmartDengg/RxBlur))-用RxJava处理和操作高斯模糊效果的简单用例。
++
 ## Library
  * [rx-preferences](https://github.com/f2prateek/rx-preferences) -使SharedPreferences支持RxJava
  * [RxAndroid](https://github.com/trello/RxLifecycle) -RxJava的Android拓展
 + * [RxAndroid](https://github.com/ReactiveX/RxAndroid) -RxJava的Android拓展
++
  * [RxLifecycle](https://github.com/trello/RxLifecycle) -帮助使用了RxJava的安卓应用控制生命周期
  * [RxBinding](https://github.com/JakeWharton/RxBinding) -安卓UI控件的RxJava绑定API
  * [xBus](https://github.com/mcxiaoke/xBus) -简洁的EventBus实现
 +## Video
++
 +* [droidconDE 2015: Ivan Morgillo – Android reactive programming with Rxjava](https://www.youtube.com/watch?v=JCLZ55M2gVo&list=PLAY9OtteiTj04IdJDW7KV1cy843reyjvT)
 +* [Common RxJava Mistakes](https://www.youtube.com/watch?v=QdmkXL7XikQ&feature=youtu.be)
++
 ## Stackoverflow
  [When should one use RxJava Observable and when simple Callback on Android?](http://stackoverflow.com/questions/21890338/when-should-one-use-rxjava-observable-and-when-simple-callback-on-android)