diff --git a/README.md b/README.md index 80216ca..ed39dfd 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,24 @@ -###学习RxJava操作符的APP -全新升级,更漂亮,更耐看 +### 学习RxJava操作符的APP + 全新升级,更漂亮,更耐看，已加入RxJava2.x介绍 自行编译 -###展示: +### 展示: -###下载地址 ->* fir.im
http://fir.im/bpdu ->* Release
https://github.com/jiang111/RxJavaApp/releases/tag/1.6 - -###说明: +### 下载地址 +>* 自行编译 +### 说明: >* Logo来源于网络 ->* app中用到的数据来自:https://github.com/jiang111/RxDocs fork自: https://github.com/mcxiaoke/RxDocs +>* app中用到的数据来自: https://github.com/mcxiaoke/RxDocs >* 介绍的操作符并不是全部操作符,大都是我们常用的,想要看全部操作符,请移步:http://reactivex.io/RxJava/javadoc/overview-summary.html >* 线程调度的一些说明可能不准确,如发现错误,欢迎提issue,我会及时更正过来 -###推荐 ->* 更好的管理线程间跳转的库 https://github.com/jiang111/ObservableScheduler ->* 收集Android你不知道的那些小技巧:https://github.com/jiang111/awesome-android-tips ->* 收集Android studio 常用的插件,请看这里:https://github.com/jiang111/awesome-androidstudio-plugins ->* 收集程序员必备的那些Chrome插件: https://github.com/jiang111/chrome-plugin-recommand ->* 通过RecyclerView实现的联系人: https://github.com/jiang111/IndexRecyclerView ->* 用于学习RxJava操作符的APP: https://github.com/jiang111/RxJavaApp ->* 展示注册进度的view: https://github.com/jiang111/ProgressView ->* 可定制的ViewPagerIndicator: https://github.com/jiang111/ScalableTabIndicator ->* 通过viewpager的滑动来对fragment内的元素进行动画操作: https://github.com/jiang111/ViewPagerTransformer +### 捐赠 +如果您觉得对您有帮助，欢迎请作者一杯咖啡

+![](https://raw.githubusercontent.com/jiang111/RxJavaApp/master/qrcode/wechat_alipay.png) + ### License diff --git a/app/art/1.png b/app/art/1.png index d717870..975241d 100644 Binary files a/app/art/1.png and b/app/art/1.png differ diff --git a/app/build.gradle b/app/build.gradle index da535ba..a38e3df 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.jiang.android.rxjavaapp" minSdkVersion 15 targetSdkVersion 23 - versionCode 6 - versionName "1.6" + versionCode 9 + versionName "2.0" } buildTypes { release { @@ -33,6 +33,5 @@ dependencies { compile files('libs/commons-codec-1.6.jar') compile 'io.reactivex:rxjava:1.1.1' compile 'io.reactivex:rxandroid:1.1.0' - compile 'cn.hugeterry.updatefun:updatefun:1.6.8' } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 30d88c0..6357755 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -12,6 +12,6 @@ # If your project uses WebView with JS, uncomment the following # and specify the fully qualified class name to the JavaScript interface # class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} +-keepclassmembers class fqcn.of.javascript.interface.for.webview { + public *; +} diff --git a/app/src/main/java/com/jiang/android/rxjavaapp/activity/MainActivity.java b/app/src/main/java/com/jiang/android/rxjavaapp/activity/MainActivity.java index 865c258..fa51b5c 100644 --- a/app/src/main/java/com/jiang/android/rxjavaapp/activity/MainActivity.java +++ b/app/src/main/java/com/jiang/android/rxjavaapp/activity/MainActivity.java @@ -1,13 +1,9 @@ package com.jiang.android.rxjavaapp.activity; -import android.Manifest; import android.content.Intent; -import android.content.pm.PackageManager; +import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; import android.support.design.widget.NavigationView; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarDrawerToggle; @@ -38,8 +34,6 @@ import java.util.ArrayList; import java.util.List; -import cn.hugeterry.updatefun.UpdateFunGO; -import cn.hugeterry.updatefun.config.UpdateKey; import rx.Observable; import rx.Subscriber; import rx.android.schedulers.AndroidSchedulers; @@ -72,9 +66,7 @@ protected void initViewsAndEvents() { initNavigationView(); initNavRecycerView(); mContentRecyclerView = (RecyclerView) findViewById(R.id.id_content); - UpdateKey.API_TOKEN = "f9036183d93b6f419784ffa248302aef"; - UpdateKey.APP_ID = "com.jiang.android.rxjavaapp"; - localStorage(); + } @@ -299,18 +291,29 @@ public boolean onOptionsItemSelected(MenuItem item) { case R.id.share: shareText(item.getActionView()); break; - case R.id.update: - UpdateFunGO.init(this); + case R.id.mark: + try { + Intent viewIntent = new Intent("android.intent.action.VIEW", + Uri.parse("market://details?id=" + getPackageName())); + startActivity(viewIntent); + } catch (Exception e) { + e.printStackTrace(); + toast("手机未安装应用市场"); + } } return super.onOptionsItemSelected(item); } + private void toast(String str) { + Toast.makeText(this, str, Toast.LENGTH_SHORT).show(); + } + public void shareText(View view) { Intent shareIntent = new Intent(); shareIntent.setAction(Intent.ACTION_SEND); - shareIntent.putExtra(Intent.EXTRA_TEXT, "Hi,我正在学习RxJava,推荐你下载这个app一起学习吧 https://github.com/jiang111/RxJavaApp/releases"); + shareIntent.putExtra(Intent.EXTRA_TEXT, "Hi,我正在学习RxJava,推荐你下载这个app一起学习吧 到应用商店或者https://github.com/jiang111/RxJavaApp/releases即可下载"); shareIntent.setType("text/plain"); startActivity(Intent.createChooser(shareIntent, "分享到")); } @@ -346,36 +349,5 @@ public void showImgFullScreen(int pos) { } - @Override - protected void onResume() { - super.onResume(); - UpdateFunGO.onResume(this); - } - - @Override - protected void onStop() { - super.onStop(); - UpdateFunGO.onStop(this); - } - - @Override - public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { - super.onRequestPermissionsResult(requestCode, permissions, grantResults); - if (requestCode == REQUEST_STORAGE) { - if (grantResults[0] == PackageManager.PERMISSION_GRANTED) { - - } else { - Toast.makeText(this, "权限被禁止,版本更新功能可能没办法使用", Toast.LENGTH_SHORT).show(); - } - } - } - - private void localStorage() { - if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { - ActivityCompat.requestPermissions(this, - new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, - REQUEST_STORAGE); - } - } } diff --git a/app/src/main/java/com/jiang/android/rxjavaapp/common/CommonString.java b/app/src/main/java/com/jiang/android/rxjavaapp/common/CommonString.java index 0a9f9f5..30ef73e 100644 --- a/app/src/main/java/com/jiang/android/rxjavaapp/common/CommonString.java +++ b/app/src/main/java/com/jiang/android/rxjavaapp/common/CommonString.java @@ -32,7 +32,7 @@ * Created by jiang on 16/3/13. */ public class CommonString { - public static final String SPLASH_INDEX_URL = "http://s7.51cto.com/wyfs02/M01/71/AC/wKiom1XWiPSQ-3r1AABXHna6t3c411.jpg"; + public static final String SPLASH_INDEX_URL = "https://raw.githubusercontent.com/jiang111/jiang111.github.io/master/images/rxjava_app_launcher.png"; public static final String GITHUB_URL = "https://github.com/jiang111/RxJavaApp"; public static final String OBSERVABLES = "https://github.com/jiang111/RxDocs/raw/master/images/legend.png"; public static final String SUBJECT = "https://github.com/jiang111/RxDocs/raw/master/images/S.AsyncSubject.png"; diff --git a/app/src/main/java/com/jiang/android/rxjavaapp/common/OperatorsUrl.java b/app/src/main/java/com/jiang/android/rxjavaapp/common/OperatorsUrl.java index 6cbf7af..95d5725 100644 --- a/app/src/main/java/com/jiang/android/rxjavaapp/common/OperatorsUrl.java +++ b/app/src/main/java/com/jiang/android/rxjavaapp/common/OperatorsUrl.java @@ -33,97 +33,98 @@ */ public class OperatorsUrl { - public static final String INTRODUCE = "https://github.com/jiang111/RxDocs/blob/master/Intro.md"; - - - public static final String OBSERVABLES = "https://github.com/jiang111/RxDocs/blob/master/Observables.md"; - public static final String SINGLE = "https://github.com/jiang111/RxDocs/blob/master/Single.md"; - public static final String SUBJECT = "https://github.com/jiang111/RxDocs/blob/master/Subject.md"; - public static final String SCHEDULE = "https://github.com/jiang111/RxDocs/blob/master/Scheduler.md"; - public static final String JUST = "https://github.com/jiang111/RxDocs/blob/master/operators/Just.md"; - public static final String FROM = "https://github.com/jiang111/RxDocs/blob/master/operators/From.md"; - public static final String REPEAT = "https://github.com/jiang111/RxDocs/blob/master/operators/Repeat.md"; - public static final String CREATE = "https://github.com/jiang111/RxDocs/blob/master/operators/Create.md"; - public static final String DEFER = "https://github.com/jiang111/RxDocs/blob/master/operators/Defer.md"; - public static final String INTERVAL = "https://github.com/jiang111/RxDocs/blob/master/operators/Interval.md"; - public static final String TIMER = "https://github.com/jiang111/RxDocs/blob/master/operators/Timer.md"; - public static final String EMPTY = "https://github.com/jiang111/RxDocs/blob/master/operators/Empty.md"; + public static final String INTRODUCE = "https://github.com/mcxiaoke/RxDocs/blob/master/Intro.md"; + + + public static final String OBSERVABLES = "https://github.com/mcxiaoke/RxDocs/blob/master/Observables.md"; + public static final String SINGLE = "https://github.com/mcxiaoke/RxDocs/blob/master/Single.md"; + public static final String SUBJECT = "https://github.com/mcxiaoke/RxDocs/blob/master/Subject.md"; + public static final String SCHEDULE = "https://github.com/mcxiaoke/RxDocs/blob/master/Scheduler.md"; + public static final String JUST = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Just.md"; + public static final String FROM = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/From.md"; + public static final String REPEAT = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Repeat.md"; + public static final String CREATE = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Create.md"; + public static final String DEFER = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Defer.md"; + public static final String RANGE = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Range.md"; + public static final String INTERVAL = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Interval.md"; + public static final String TIMER = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Timer.md"; + public static final String EMPTY = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Empty.md"; // transform - public static final String MAP = "https://github.com/jiang111/RxDocs/blob/master/operators/Map.md"; - public static final String FLATMAP = "https://github.com/jiang111/RxDocs/blob/master/operators/FlatMap.md"; - public static final String CONTACTMAP = "https://github.com/jiang111/RxDocs/blob/master/operators/FlatMap.md"; - public static final String SWITCHMAP = "https://github.com/jiang111/RxDocs/blob/master/operators/FlatMap.md"; - public static final String SCAN = "https://github.com/jiang111/RxDocs/blob/master/operators/Scan.md"; - public static final String GROUPBY = "https://github.com/jiang111/RxDocs/blob/master/operators/GroupBy.md"; - public static final String BUFFER = "https://github.com/jiang111/RxDocs/blob/master/operators/Buffer.md"; - public static final String WINDOW = "https://github.com/jiang111/RxDocs/blob/master/operators/Window.md"; - public static final String CAST = "https://github.com/jiang111/RxDocs/blob/master/operators/Map.md"; + public static final String MAP = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Map.md"; + public static final String FLATMAP = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/FlatMap.md"; + public static final String CONTACTMAP = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/FlatMap.md"; + public static final String SWITCHMAP = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/FlatMap.md"; + public static final String SCAN = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Scan.md"; + public static final String GROUPBY = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/GroupBy.md"; + public static final String BUFFER = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Buffer.md"; + public static final String WINDOW = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Window.md"; + public static final String CAST = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Map.md"; //filter //filter - public static final String FILTER = "https://github.com/jiang111/RxDocs/blob/master/operators/Filter.md"; - public static final String TAKE_LAST = "https://github.com/jiang111/RxDocs/blob/master/operators/TakeLast.md"; - public static final String LAST = "https://github.com/jiang111/RxDocs/blob/master/operators/Last.md"; - public static final String LAST_OR_DEFAULT = "https://github.com/jiang111/RxDocs/blob/master/operators/Last.md"; - public static final String TAKE_LAST_BUFFER = "https://github.com/jiang111/RxDocs/blob/master/operators/TakeLast.md"; - public static final String SKIP = "https://github.com/jiang111/RxDocs/blob/master/operators/Skip.md"; - public static final String SKIP_LAST = "https://github.com/jiang111/RxDocs/blob/master/operators/SkipLast.md"; - public static final String TAKE = "https://github.com/jiang111/RxDocs/blob/master/operators/Take.md"; - public static final String FIRST = "https://github.com/jiang111/RxDocs/blob/master/operators/First.md"; - public static final String FIRST_DEFAULT = "https://github.com/jiang111/RxDocs/blob/master/operators/First.md"; - public static final String ELEMENT_AT = "https://github.com/jiang111/RxDocs/blob/master/operators/ElementAt.md"; - public static final String ELEMENT_DEFAULT = "https://github.com/jiang111/RxDocs/blob/master/operators/ElementAt.md"; - public static final String SAMPLE = "https://github.com/jiang111/RxDocs/blob/master/operators/Sample.md"; - public static final String THROLFIRST = "https://github.com/jiang111/RxDocs/blob/master/operators/Sample.md"; - public static final String DEBOUND = "https://github.com/jiang111/RxDocs/blob/master/operators/Debounce.md"; - public static final String TIMEOUT = "https://github.com/jiang111/RxDocs/blob/master/operators/Timeout.md"; - public static final String DISTINCT = "https://github.com/jiang111/RxDocs/blob/master/operators/Distinct.md"; - public static final String UNTILCHANGED = "https://github.com/jiang111/RxDocs/blob/master/operators/Distinct.md"; - public static final String OF_TYPE = "https://github.com/jiang111/RxDocs/blob/master/operators/Filter.md"; - public static final String IGNORE_ELEMENT = "https://github.com/jiang111/RxDocs/blob/master/operators/IgnoreElements.md"; + public static final String FILTER = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Filter.md"; + public static final String TAKE_LAST = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/TakeLast.md"; + public static final String LAST = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Last.md"; + public static final String LAST_OR_DEFAULT = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Last.md"; + public static final String TAKE_LAST_BUFFER = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/TakeLast.md"; + public static final String SKIP = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Skip.md"; + public static final String SKIP_LAST = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/SkipLast.md"; + public static final String TAKE = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Take.md"; + public static final String FIRST = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/First.md"; + public static final String FIRST_DEFAULT = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/First.md"; + public static final String ELEMENT_AT = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/ElementAt.md"; + public static final String ELEMENT_DEFAULT = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/ElementAt.md"; + public static final String SAMPLE = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Sample.md"; + public static final String THROLFIRST = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Sample.md"; + public static final String DEBOUND = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Debounce.md"; + public static final String TIMEOUT = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Timeout.md"; + public static final String DISTINCT = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Distinct.md"; + public static final String UNTILCHANGED = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Distinct.md"; + public static final String OF_TYPE = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Filter.md"; + public static final String IGNORE_ELEMENT = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/IgnoreElements.md"; //combin - public static final String STARTWITH = "https://github.com/jiang111/RxDocs/blob/master/operators/Merge.md"; - public static final String MERGE = "https://github.com/jiang111/RxDocs/blob/master/operators/Merge.md"; - public static final String MERGEDELAY = "https://github.com/jiang111/RxDocs/blob/master/operators/Merge.md"; - public static final String ZIP = "https://github.com/jiang111/RxDocs/blob/master/operators/Zip.md"; - public static final String AND = "https://github.com/jiang111/RxDocs/blob/master/operators/And.md"; - public static final String COMBINLASTED = "https://github.com/jiang111/RxDocs/blob/master/operators/CombineLatest.md"; - public static final String JOIN = "https://github.com/jiang111/RxDocs/blob/master/operators/Join.md"; - public static final String SWITHONNEXT = "https://github.com/jiang111/RxDocs/blob/master/operators/Switch.md"; + public static final String STARTWITH = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Merge.md"; + public static final String MERGE = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Merge.md"; + public static final String MERGEDELAY = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Merge.md"; + public static final String ZIP = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Zip.md"; + public static final String AND = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/And.md"; + public static final String COMBINLASTED = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/CombineLatest.md"; + public static final String JOIN = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Join.md"; + public static final String SWITHONNEXT = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Switch.md"; //error - public static final String ERROR = "https://github.com/jiang111/RxDocs/blob/master/operators/Catch.md"; - public static final String RETRY = "https://github.com/jiang111/RxDocs/blob/master/operators/Retry.md#retry"; + public static final String ERROR = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Catch.md"; + public static final String RETRY = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Retry.md#retry"; //utity //utility - public static final String Materialize = "https://github.com/jiang111/RxDocs/blob/master/operators/Materialize.md"; - public static final String Dematerialize = "https://github.com/jiang111/RxDocs/blob/master/operators/Materialize.md"; - public static final String Timestamp = "https://github.com/jiang111/RxDocs/blob/master/operators/Timestamp.md"; - public static final String Serialize = "https://github.com/jiang111/RxDocs/blob/master/operators/Serialize.md"; - public static final String ObserveOn = "https://github.com/jiang111/RxDocs/blob/master/operators/ObserveOn.md"; - public static final String SubscribeOn = "https://github.com/jiang111/RxDocs/blob/master/operators/SubscribeOn.md"; - public static final String doOnEach = "https://github.com/jiang111/RxDocs/blob/master/operators/Do.md"; - public static final String doOnSubscribe = "https://github.com/jiang111/RxDocs/blob/master/operators/Do.md"; - public static final String doOnUnsubscribe = "https://github.com/jiang111/RxDocs/blob/master/operators/Do.md"; - public static final String doOnCompleted = "https://github.com/jiang111/RxDocs/blob/master/operators/Do.md"; - public static final String doOnError = "https://github.com/jiang111/RxDocs/blob/master/operators/Do.md"; - public static final String doOnTerminate = "https://github.com/jiang111/RxDocs/blob/master/operators/Do.md"; - - public static final String finallyDo = "https://github.com/jiang111/RxDocs/blob/master/operators/Do.md"; - public static final String Delay = "https://github.com/jiang111/RxDocs/blob/master/operators/Delay.md"; - public static final String delaySubscription = "https://github.com/jiang111/RxDocs/blob/master/operators/Delay.md"; - public static final String TimeInterval = "https://github.com/jiang111/RxDocs/blob/master/operators/TimeInterval.md"; - public static final String Using = "https://github.com/jiang111/RxDocs/blob/master/operators/Using.md"; - public static final String First = "https://github.com/jiang111/RxDocs/blob/master/operators/First.md"; - public static final String To = "https://github.com/jiang111/RxDocs/blob/master/operators/To.md"; + public static final String Materialize = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Materialize.md"; + public static final String Dematerialize = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Materialize.md"; + public static final String Timestamp = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Timestamp.md"; + public static final String Serialize = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Serialize.md"; + public static final String ObserveOn = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/ObserveOn.md"; + public static final String SubscribeOn = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/SubscribeOn.md"; + public static final String doOnEach = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Do.md"; + public static final String doOnSubscribe = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Do.md"; + public static final String doOnUnsubscribe = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Do.md"; + public static final String doOnCompleted = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Do.md"; + public static final String doOnError = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Do.md"; + public static final String doOnTerminate = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Do.md"; + + public static final String finallyDo = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Do.md"; + public static final String Delay = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Delay.md"; + public static final String delaySubscription = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Delay.md"; + public static final String TimeInterval = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/TimeInterval.md"; + public static final String Using = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Using.md"; + public static final String First = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/First.md"; + public static final String To = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/To.md"; //string @@ -131,49 +132,55 @@ public class OperatorsUrl { public static final String decode = FROM; public static final String encode = MAP; public static final String from_String = FROM; - public static final String join = "https://github.com/jiang111/RxDocs/blob/master/operators/Sum.md"; + public static final String join = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Sum.md"; public static final String split = FLATMAP; public static final String stringConcat = join; //conditional - public static final String amb = "https://github.com/jiang111/RxDocs/blob/master/operators/Conditional.md"; + public static final String amb = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Conditional.md"; //boolean - public static final String BOOLEAN_ALL = "https://github.com/jiang111/RxDocs/blob/master/operators/Conditional.md"; - public static final String MATH = "https://github.com/jiang111/RxDocs/blob/master/operators/Mathematical.md#Average"; + public static final String BOOLEAN_ALL = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Conditional.md"; + public static final String MATH = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Mathematical.md#Average"; // math other - public static final String concat = "https://github.com/jiang111/RxDocs/blob/master/operators/Mathematical.md#Concat"; - public static final String count = "https://github.com/jiang111/RxDocs/blob/master/operators/Mathematical.md#Concat"; - public static final String reduce = "https://github.com/jiang111/RxDocs/blob/master/operators/Mathematical.md#Concat"; - public static final String collect = "https://github.com/jiang111/RxDocs/blob/master/operators/Mathematical.md#Concat"; - public static final String toList = "https://github.com/jiang111/RxDocs/blob/master/operators/To.md"; - public static final String toSortedList = "https://github.com/jiang111/RxDocs/blob/master/operators/To.md"; - public static final String toMap = "https://github.com/jiang111/RxDocs/blob/master/operators/To.md"; - public static final String toMultiMap = "https://github.com/jiang111/RxDocs/blob/master/operators/To.md"; - public static final String SAMPLE_FIRST = "https://github.com/jiang111/RxDocs/blob/master/topics/How-To-Use-RxJava.md"; - public static final String GUIDE_OPEN = "https://github.com/jiang111/RxDocs/blob/master/topics/Getting-Started.md"; - public static final String OWN_OPERATE = "https://github.com/jiang111/RxDocs/blob/master/topics/Implementing-Your-Own-Operators.md"; - public static final String OWN_CHAJIAN = "https://github.com/jiang111/RxDocs/blob/master/topics/Plugins.md"; - public static final String ANDROID_MODULE = "https://github.com/jiang111/RxDocs/blob/master/topics/The-RxJava-Android-Module.md"; - - public static final String ERROR_HANDLE = "https://github.com/jiang111/RxDocs/blob/master/topics/Error-Handling.md"; - public static String start = "https://github.com/jiang111/RxDocs/blob/master/operators/Start.md#start"; + public static final String concat = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Mathematical.md#Concat"; + public static final String count = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Mathematical.md#Concat"; + public static final String reduce = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Mathematical.md#Concat"; + public static final String collect = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Mathematical.md#Concat"; + public static final String toList = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/To.md"; + public static final String toSortedList = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/To.md"; + public static final String toMap = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/To.md"; + public static final String toMultiMap = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/To.md"; + public static final String SAMPLE_FIRST = "https://github.com/mcxiaoke/RxDocs/blob/master/topics/How-To-Use-RxJava.md"; + public static final String GUIDE_OPEN = "https://github.com/mcxiaoke/RxDocs/blob/master/topics/Getting-Started.md"; + public static final String OWN_OPERATE = "https://github.com/mcxiaoke/RxDocs/blob/master/topics/Implementing-Your-Own-Operators.md"; + public static final String OWN_CHAJIAN = "https://github.com/mcxiaoke/RxDocs/blob/master/topics/Plugins.md"; + public static final String ANDROID_MODULE = "https://github.com/mcxiaoke/RxDocs/blob/master/topics/The-RxJava-Android-Module.md"; + + public static final String ERROR_HANDLE = "https://github.com/mcxiaoke/RxDocs/blob/master/topics/Error-Handling.md"; + public static String start = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Start.md#start"; //connect - public static String connect = "https://github.com/jiang111/RxDocs/blob/master/operators/Connect.md"; - public static String publish="https://github.com/jiang111/RxDocs/blob/master/operators/Publish.md"; - public static String replay="https://github.com/jiang111/RxDocs/blob/master/operators/Replay.md"; - public static String refCount="https://github.com/jiang111/RxDocs/blob/master/operators/Refcount.md"; + public static String connect = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Connect.md"; + public static String publish = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Publish.md"; + public static String replay = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Replay.md"; + public static String refCount = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Refcount.md"; //block - public static String forEach="https://github.com/jiang111/RxDocs/blob/master/operators/Subscribe.md"; - public static String first="https://github.com/jiang111/RxDocs/blob/master/operators/First.md"; - public static String firstOrDefault="https://github.com/jiang111/RxDocs/blob/master/operators/First.md"; - public static String lastOrDefault="https://github.com/jiang111/RxDocs/blob/master/operators/Last.md"; - public static String mostRecent="https://github.com/jiang111/RxDocs/blob/master/operators/First.md"; - public static String next="https://github.com/jiang111/RxDocs/blob/master/operators/TakeLast.md"; - public static String single="https://github.com/jiang111/RxDocs/blob/master/operators/First.md"; - public static String singleOrDefault="https://github.com/jiang111/RxDocs/blob/master/operators/First.md"; - public static String toFuture="https://github.com/jiang111/RxDocs/blob/master/operators/To.md"; - public static String toIterable="https://github.com/jiang111/RxDocs/blob/master/operators/To.md"; - public static String getIterator="https://github.com/jiang111/RxDocs/blob/master/operators/To.md"; - public static String last="https://github.com/jiang111/RxDocs/blob/master/operators/Last.md"; + public static String forEach = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Subscribe.md"; + public static String first = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/First.md"; + public static String firstOrDefault = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/First.md"; + public static String lastOrDefault = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Last.md"; + public static String mostRecent = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/First.md"; + public static String next = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/TakeLast.md"; + public static String single = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/First.md"; + public static String singleOrDefault = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/First.md"; + public static String toFuture = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/To.md"; + public static String toIterable = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/To.md"; + public static String getIterator = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/To.md"; + public static String last = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Last.md"; + + //RxJava2.x + public static String R_2_INDEX = "https://github.com/mcxiaoke/RxDocs/blob/master/RxJava2/What-different-in-2.md"; + public static String R_2_FLOWABLE = "https://github.com/mcxiaoke/RxDocs/blob/master/RxJava2/Flow.md"; + public static String R_2_OTHER = "https://github.com/mcxiaoke/RxDocs/blob/master/RxJava2/other.md"; + } diff --git a/app/src/main/java/com/jiang/android/rxjavaapp/database/DaoMaster.java b/app/src/main/java/com/jiang/android/rxjavaapp/database/DaoMaster.java index 6759213..af73750 100644 --- a/app/src/main/java/com/jiang/android/rxjavaapp/database/DaoMaster.java +++ b/app/src/main/java/com/jiang/android/rxjavaapp/database/DaoMaster.java @@ -15,7 +15,7 @@ * Master of DAO (schema version 1): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { - public static final int SCHEMA_VERSION = 2; + public static final int SCHEMA_VERSION = 4; /** Creates underlying database table using DAOs. */ public static void createAllTables(SQLiteDatabase db, boolean ifNotExists) { diff --git a/app/src/main/java/com/jiang/android/rxjavaapp/utils/DataUtils.java b/app/src/main/java/com/jiang/android/rxjavaapp/utils/DataUtils.java index a027f98..f977932 100644 --- a/app/src/main/java/com/jiang/android/rxjavaapp/utils/DataUtils.java +++ b/app/src/main/java/com/jiang/android/rxjavaapp/utils/DataUtils.java @@ -48,7 +48,7 @@ public class DataUtils { private static final String IMMEDIATE = "immediate"; static long i = 1l; - static long parentId = 1l; + static long parentId = 0l; static final String COMPUTATION = "computation"; static final String DEFAULT = "默认线程"; @@ -87,6 +87,7 @@ public void onError(Throwable error) { public static List getOperatorsData() { List lists = new ArrayList<>(); + lists.add(new operators(0l, "RxJava 2.x", 0l)); lists.add(new operators(1l, "RxJava 介绍", 1l)); lists.add(new operators(2l, "创建操作", 2l)); lists.add(new operators(3l, "变换操作", 3l)); @@ -106,6 +107,7 @@ public static List getOperatorsData() { public static List getAllOperators() { List alloperatorses = new ArrayList<>(); + getRxJava2List(alloperatorses); getIntroduceList(alloperatorses); getCreatingList(alloperatorses); getTransformList(alloperatorses); @@ -120,9 +122,17 @@ public static List getAllOperators() { getBlockList(alloperatorses); getStringList(alloperatorses); getOthersList(alloperatorses); + return alloperatorses; } + private static void getRxJava2List(List alloperatorses) { + alloperatorses.add(new alloperators(i++, "RxJava2.x有什么不同", " ", "RxJava2.x与RxJava1.x的区别", CommonString.SPLASH_INDEX_URL, OperatorsUrl.R_2_INDEX, parentId)); + alloperatorses.add(new alloperators(i++, "Flowable", " ", "Flowable操作符的使用", CommonString.SPLASH_INDEX_URL, OperatorsUrl.R_2_FLOWABLE, parentId)); + alloperatorses.add(new alloperators(i++, "其他相关类", " ", "Single Completable Subject/Processor", CommonString.SPLASH_INDEX_URL, OperatorsUrl.R_2_OTHER, parentId)); + parentId++; + } + private static void getOthersList(List alloperatorses) { alloperatorses.add(new alloperators(i++, "实现自己的操作符", " ", "实现自己的操作符", CommonString.SPLASH_INDEX_URL, OperatorsUrl.OWN_OPERATE, parentId)); @@ -285,7 +295,7 @@ private static void getCreatingList(List alloperatorses) { alloperatorses.add(new alloperators(i++, "repeatWhen()", TRAMPOLINE, "创建一个重复发射指定数据或数据序列的Observable，它依赖于另一个Observable发射的数据", CommonString.REPEAT_WHEN, OperatorsUrl.REPEAT, parentId)); alloperatorses.add(new alloperators(i++, "create()", DEFAULT, "使用一个函数从头创建一个Observable", CommonString.CREATE, OperatorsUrl.CREATE, parentId)); alloperatorses.add(new alloperators(i++, "defer()", DEFAULT, "只有当订阅者订阅才创建Observable；为每个订阅创建一个新的Observable", CommonString.DEFER, OperatorsUrl.DEFER, parentId)); - alloperatorses.add(new alloperators(i++, "range()", DEFAULT, "创建一个发射指定范围的整数序列的Observable", CommonString.RANGE, OperatorsUrl.DEFER, parentId)); + alloperatorses.add(new alloperators(i++, "range()", DEFAULT, "创建一个发射指定范围的整数序列的Observable", CommonString.RANGE, OperatorsUrl.RANGE, parentId)); alloperatorses.add(new alloperators(i++, "interval()", COMPUTATION, "创建一个按照给定的时间间隔发射整数序列的Observable", CommonString.INTERVAL, OperatorsUrl.INTERVAL, parentId)); alloperatorses.add(new alloperators(i++, "timer()", COMPUTATION, "创建一个按照给定的时间间隔发射整数序列的Observable", CommonString.TIMER, OperatorsUrl.TIMER, parentId)); alloperatorses.add(new alloperators(i++, "empty()", DEFAULT, "创建一个什么都不做直接通知完成的Observable", CommonString.EMPTY, OperatorsUrl.EMPTY, parentId)); diff --git a/app/src/main/res/drawable-xhdpi/splash_large.jpg b/app/src/main/res/drawable-xhdpi/splash_large.jpg deleted file mode 100644 index 86fc37c..0000000 Binary files a/app/src/main/res/drawable-xhdpi/splash_large.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/dialog_topbar_bg.xml b/app/src/main/res/drawable/dialog_topbar_bg.xml new file mode 100644 index 0000000..77c3f62 --- /dev/null +++ b/app/src/main/res/drawable/dialog_topbar_bg.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index a067138..907bb76 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -11,6 +11,7 @@ diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index 912f7f1..ab317a6 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -11,28 +11,21 @@ android:layout_height="@dimen/nav_header_height" android:background="@drawable/side_nav_bar" android:orientation="vertical" + android:gravity="center|left" android:paddingBottom="@dimen/activity_vertical_margin" android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin" - android:theme="@style/ThemeOverlay.AppCompat.Dark"> + android:paddingTop="@dimen/activity_vertical_margin"> + android:src="@mipmap/ic_launcher" /> - - - + diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 41501dc..20b0007 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 5ce9cc5..2b254a5 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 58fd727..f88538b 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5f95e88..8291edf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -13,4 +13,5 @@ 关于 分享 更新 + 评分 diff --git a/build.gradle b/build.gradle index 03bced9..c20bca1 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:2.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/qrcode/a b/qrcode/a new file mode 100644 index 0000000..6a69f92 --- /dev/null +++ b/qrcode/a @@ -0,0 +1 @@ +f diff --git a/release/RxJavaApp_V1.6.apk b/release/RxJavaApp_V1.6.apk deleted file mode 100644 index 55e0c74..0000000 Binary files a/release/RxJavaApp_V1.6.apk and /dev/null differ