Skip to content

Commit 81b9d68

Browse files
jiang111jiang111
committed
finish
1 parent 4cdfbb3 commit 81b9d68

File tree

16 files changed

+255
-57
lines changed

16 files changed

+255
-57
lines changed

‎app/art/1.png

22.5 KB
Loading

‎app/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "com.jiang.android.rxjavaapp"
99
minSdkVersion 15
1010
targetSdkVersion 23
11-
versionCode 2
12-
versionName "1.1"
11+
versionCode 3
12+
versionName "1.3"
1313
}
1414
buildTypes {
1515
release {
@@ -34,7 +34,6 @@ dependencies {
3434
compile files('libs/commons-codec-1.6.jar')
3535
compile 'io.reactivex:rxjava:1.1.1'
3636
compile 'io.reactivex:rxandroid:1.1.0'
37-
compile 'de.greenrobot:eventbus:2.4.+'
3837

3938

4039
}

‎app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@
1616
android:supportsRtl="true"
1717
android:theme="@style/AppTheme">
1818
<activity android:name=".actiity.MainActivity" />
19-
2019
<activity android:name=".base.BaseWebActivity" />
2120
<activity android:name=".actiity.PhotoPagerActivity" />
22-
23-
2421
<activity android:name=".actiity.LauncherActivity">
2522
<intent-filter>
2623
<action android:name="android.intent.action.MAIN" />

‎app/src/main/java/com/jiang/android/rxjavaapp/actiity/MainActivity.java

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.jiang.android.rxjavaapp.actiity;
22

3+
import android.content.Intent;
34
import android.os.Bundle;
45
import android.support.design.widget.NavigationView;
56
import android.support.v4.view.GravityCompat;
@@ -9,6 +10,7 @@
910
import android.support.v7.widget.RecyclerView;
1011
import android.support.v7.widget.Toolbar;
1112
import android.view.Menu;
13+
import android.view.MenuItem;
1214
import android.view.View;
1315
import android.widget.ImageView;
1416
import android.widget.LinearLayout;
@@ -29,7 +31,6 @@
2931
import java.util.ArrayList;
3032
import java.util.List;
3133

32-
import de.greenrobot.event.EventBus;
3334
import rx.Observable;
3435
import rx.Subscriber;
3536
import rx.android.schedulers.AndroidSchedulers;
@@ -53,18 +54,9 @@ public class MainActivity extends BaseActivity implements View.OnClickListener {
5354
private NavigationView navigationView;
5455
private ActionBarDrawerToggle toggle;
5556

56-
public void onEventMainThread(int center) {
57-
if (center == 1) {
58-
initToolBar();
59-
initNavigationView();
60-
initNavRecycerView();
61-
mContentRecyclerView = (RecyclerView) findViewById(R.id.id_content);
62-
}
63-
}
6457

6558
@Override
6659
protected void initViewsAndEvents() {
67-
EventBus.getDefault().register(this);
6860
initToolBar();
6961
initNavigationView();
7062
initNavRecycerView();
@@ -257,17 +249,39 @@ public void onBackPressed() {
257249
@Override
258250
protected void onDestroy() {
259251
super.onDestroy();
260-
EventBus.getDefault().unregister(this);
261252
}
262253

263254
@Override
264255
public boolean onCreateOptionsMenu(Menu menu) {
265-
// Inflate the menu; this adds items to the action bar if it is present.
266256
getMenuInflater().inflate(R.menu.main, menu);
267257
return true;
268258
}
269259

260+
@Override
261+
public boolean onOptionsItemSelected(MenuItem item) {
262+
switch (item.getItemId()) {
263+
case R.id.about:
264+
Bundle bundle = new Bundle();
265+
bundle.putString(BaseWebActivity.BUNDLE_KEY_URL, "https://github.com/jiang111?tab=repositories");
266+
bundle.putString(BaseWebActivity.BUNDLE_KEY_TITLE, "关于");
267+
bundle.putBoolean(BaseWebActivity.BUNDLE_KEY_SHOW_BOTTOM_BAR, true);
268+
readyGo(BaseWebActivity.class, bundle);
269+
break;
270+
case R.id.share:
271+
shareText(item.getActionView());
272+
break;
273+
}
274+
270275

276+
return super.onOptionsItemSelected(item);
277+
}
278+
public void shareText(View view) {
279+
Intent shareIntent = new Intent();
280+
shareIntent.setAction(Intent.ACTION_SEND);
281+
shareIntent.putExtra(Intent.EXTRA_TEXT, "Hi,我正在学习RxJava,推荐你下载这个app一起学习吧 https://github.com/jiang111/RxJavaApp/releases");
282+
shareIntent.setType("text/plain");
283+
startActivity(Intent.createChooser(shareIntent, "分享到"));
284+
}
271285
@Override
272286
public void onClick(View v) {
273287
switch (v.getId()) {

‎app/src/main/java/com/jiang/android/rxjavaapp/actiity/SplashActivity.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎app/src/main/java/com/jiang/android/rxjavaapp/common/CommonString.java

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,4 +127,65 @@ public class CommonString {
127127
public static final String split = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/St.split.png";
128128
public static final String stringConcat = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/sum.f.png";
129129

130+
131+
//conditional
132+
public static final String amb = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/amb.c.png";
133+
public static final String defaultIfEmpty = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/defaultIfEmpty.c.png";
134+
public static final String doWhile = amb;
135+
public static final String ifThen = amb;
136+
public static final String skipUntil = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/skipUntil.c.png";
137+
public static final String skipWhile = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/skipWhile.c.png";
138+
public static final String switchCase = amb;
139+
public static final String takeUntil = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/takeUntil.png";
140+
public static final String takeWhile = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/takeWhile.c.png";
141+
public static final String whileDo = amb;
142+
143+
//bool
144+
public static final String all = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/all.png";
145+
public static final String contains = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/contains.png";
146+
public static final String exists = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/exists.png";
147+
public static final String sequenceEqual = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/sequenceEqual.png";
148+
149+
public static final String MATH = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/collect.png";
150+
151+
152+
// math other
153+
public static final String concat = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/concat.c.png";
154+
public static final String count = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/count.c.png";
155+
public static final String reduce = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/reduce.c.png";
156+
public static final String collect = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/collect.png";
157+
public static final String toList = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/toList.png";
158+
public static final String toSortedList = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/toSortedList.png";
159+
public static final String toMap = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/toMap.png";
160+
public static final String toMultiMap = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/toMultiMap.png";
161+
162+
public static String start = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/start.png";
163+
public static String toAsync = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/toAsync.png";
164+
public static String startFuture = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/startFuture.png";
165+
public static String deferFuture = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/deferFuture.png";
166+
public static String forEachFuture = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/forEachFuture.png";
167+
public static String fromAction = start;
168+
public static String runAsync = start;
169+
public static String fromRunnable = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/fromRunnable.png";
170+
public static String fromCallable = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/fromCallable.png";
171+
172+
//connect
173+
public static String connect = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/publishConnect.c.png";
174+
public static String publish = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/publishConnect.c.png";
175+
public static String replay = "https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/replay.c.png";
176+
public static String refCount = replay;
177+
178+
//block
179+
public static String forEach=EMPTY;
180+
public static String first="https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/first.c.png";
181+
public static String firstOrDefault="https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/firstOrDefault.png";
182+
public static String last="https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/last.png";
183+
public static String lastOrDefault="https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/lastOrDefault.png";
184+
public static String mostRecent="https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/first.png";
185+
public static String next="https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/takeLast.c.png";
186+
public static String single="https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/single.p.png";
187+
public static String singleOrDefault="https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/singleOrDefault.p.png";
188+
public static String toFuture="https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/B.toFuture.png";
189+
public static String toIterable="https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/B.getIterator.png";
190+
public static String getIterator="https://github.com/mcxiaoke/RxDocs/raw/master/images/operators/B.getIterator.png";
130191
}

‎app/src/main/java/com/jiang/android/rxjavaapp/common/OperatorsUrl.java

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,5 +134,46 @@ public class OperatorsUrl {
134134
public static final String join = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Sum.md";
135135
public static final String split = FLATMAP;
136136
public static final String stringConcat = join;
137-
137+
//conditional
138+
public static final String amb = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Conditional.md";
139+
140+
//boolean
141+
public static final String BOOLEAN_ALL = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Conditional.md";
142+
public static final String MATH = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Mathematical.md#Average";
143+
144+
// math other
145+
public static final String concat = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Mathematical.md#Concat";
146+
public static final String count = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Mathematical.md#Concat";
147+
public static final String reduce = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Mathematical.md#Concat";
148+
public static final String collect = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Mathematical.md#Concat";
149+
public static final String toList = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/To.md";
150+
public static final String toSortedList = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/To.md";
151+
public static final String toMap = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/To.md";
152+
public static final String toMultiMap = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/To.md";
153+
public static final String SAMPLE_FIRST = "https://github.com/mcxiaoke/RxDocs/blob/master/topics/How-To-Use-RxJava.md";
154+
public static final String GUIDE_OPEN = "https://github.com/mcxiaoke/RxDocs/blob/master/topics/Getting-Started.md";
155+
public static final String OWN_OPERATE = "https://github.com/mcxiaoke/RxDocs/blob/master/topics/Implementing-Your-Own-Operators.md";
156+
public static final String OWN_CHAJIAN = "https://github.com/mcxiaoke/RxDocs/blob/master/topics/Plugins.md";
157+
public static final String ANDROID_MODULE = "https://github.com/mcxiaoke/RxDocs/blob/master/topics/The-RxJava-Android-Module.md";
158+
159+
public static final String ERROR_HANDLE = "https://github.com/mcxiaoke/RxDocs/blob/master/topics/Error-Handling.md";
160+
public static String start = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Start.md#start";
161+
//connect
162+
public static String connect = "https://github.com/mcxiaoke/RxDocs/blob/master/operators/Connect.md";
163+
public static String publish="https://github.com/mcxiaoke/RxDocs/blob/master/operators/Publish.md";
164+
public static String replay="https://github.com/mcxiaoke/RxDocs/blob/master/operators/Replay.md";
165+
public static String refCount="https://github.com/mcxiaoke/RxDocs/blob/master/operators/Refcount.md";
166+
//block
167+
public static String forEach="https://github.com/mcxiaoke/RxDocs/blob/master/operators/Subscribe.md";
168+
public static String first="https://github.com/mcxiaoke/RxDocs/blob/master/operators/First.md";
169+
public static String firstOrDefault="https://github.com/mcxiaoke/RxDocs/blob/master/operators/First.md";
170+
public static String lastOrDefault="https://github.com/mcxiaoke/RxDocs/blob/master/operators/Last.md";
171+
public static String mostRecent="https://github.com/mcxiaoke/RxDocs/blob/master/operators/First.md";
172+
public static String next="https://github.com/mcxiaoke/RxDocs/blob/master/operators/TakeLast.md";
173+
public static String single="https://github.com/mcxiaoke/RxDocs/blob/master/operators/First.md";
174+
public static String singleOrDefault="https://github.com/mcxiaoke/RxDocs/blob/master/operators/First.md";
175+
public static String toFuture="https://github.com/mcxiaoke/RxDocs/blob/master/operators/To.md";
176+
public static String toIterable="https://github.com/mcxiaoke/RxDocs/blob/master/operators/To.md";
177+
public static String getIterator="https://github.com/mcxiaoke/RxDocs/blob/master/operators/To.md";
178+
public static String last="https://github.com/mcxiaoke/RxDocs/blob/master/operators/Last.md";
138179
}

0 commit comments

Comments
 (0)