Skip to content

Commit 4063a2a

Browse files
HotBitmapGGHotBitmapGG
committed
Update
1 parent f221205 commit 4063a2a

20 files changed

+507
-1070
lines changed

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@
2828
projectFilesBackup/.idea/workspace.xml
2929

3030
.idea/dictionaries/hcc.xml
31+
32+
.idea/inspectionProfiles/profiles_settings.xml
33+
34+
.idea/inspectionProfiles/Project_Default.xml

‎app/build.gradle

+24-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
1+
buildscript {
2+
repositories {
3+
mavenCentral()
4+
maven { url "https://jitpack.io" }
5+
}
6+
dependencies {
7+
classpath 'me.tatarka:gradle-retrolambda:3.2.5'
8+
}
9+
}
10+
11+
112
apply plugin: 'com.android.application'
13+
apply plugin: 'me.tatarka.retrolambda'
214

315
android {
4-
compileSdkVersion 23
5-
buildToolsVersion "23.0.3"
16+
compileSdkVersion 25
17+
buildToolsVersion "25.0.2"
618

719
defaultConfig {
820
applicationId "com.hotbitmapgg.moequest"
921
minSdkVersion 17
10-
targetSdkVersion 23
22+
targetSdkVersion 25
1123
versionCode 3
1224
versionName "2.1.1"
1325

@@ -23,6 +35,11 @@ android {
2335
}
2436
}
2537

38+
compileOptions {
39+
sourceCompatibility JavaVersion.VERSION_1_8
40+
targetCompatibility JavaVersion.VERSION_1_8
41+
}
42+
2643
packagingOptions {
2744
exclude 'META-INF/services/javax.annotation.processing.Processor'
2845
}
@@ -32,9 +49,9 @@ dependencies {
3249
compile fileTree(dir: 'libs', include: ['*.jar'])
3350
testCompile 'junit:junit:4.12'
3451
//AndroidLib
35-
compile 'com.android.support:appcompat-v7:23.4.0'
36-
compile 'com.android.support:cardview-v7:23.4.0'
37-
compile 'com.android.support:design:23.4.0'
52+
compile 'com.android.support:appcompat-v7:25.1.0'
53+
compile 'com.android.support:cardview-v7:25.1.0'
54+
compile 'com.android.support:design:25.1.0'
3855
//Retrofit2
3956
compile 'com.squareup.retrofit2:retrofit:2.0.0-beta4'
4057
compile 'com.squareup.retrofit2:adapter-rxjava:2.0.0-beta4'
@@ -64,7 +81,7 @@ dependencies {
6481
compile 'org.jsoup:jsoup:1.8.3'
6582
//TabLayout
6683
compile 'com.flyco.tablayout:FlycoTabLayout_Lib:2.0.6@aar'
67-
compile 'com.android.support:support-v13:23.4.0'
84+
compile 'com.android.support:support-v13:25.1.0'
6885
//Realm数据
6986
compile 'io.realm:realm-android:0.87.0'
7087
//腾讯bugly

‎app/src/main/java/com/hotbitmapgg/moequest/MoeQuestApp.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
public class MoeQuestApp extends Application {
2020

21-
public static Context mAppContext;
21+
private static Context mAppContext;
2222

2323

2424
@Override

‎app/src/main/java/com/hotbitmapgg/moequest/module/commonality/AppSplashActivity.java

+10-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
package com.hotbitmapgg.moequest.module.commonality;
22

3+
import butterknife.Bind;
4+
import butterknife.ButterKnife;
5+
import com.hotbitmapgg.moequest.R;
6+
import java.util.concurrent.TimeUnit;
7+
import rx.Observable;
8+
import rx.Subscription;
9+
import rx.android.schedulers.AndroidSchedulers;
10+
311
import android.animation.Animator;
412
import android.animation.AnimatorListenerAdapter;
513
import android.animation.AnimatorSet;
@@ -9,17 +17,6 @@
917
import android.os.Bundle;
1018
import android.widget.ImageView;
1119

12-
import com.hotbitmapgg.moequest.R;
13-
14-
import java.util.concurrent.TimeUnit;
15-
16-
import butterknife.Bind;
17-
import butterknife.ButterKnife;
18-
import rx.Observable;
19-
import rx.Subscription;
20-
import rx.android.schedulers.AndroidSchedulers;
21-
import rx.functions.Action1;
22-
2320
/**
2421
* Created by hcc on 16/6/30 21:57
2522
* [email protected]
@@ -46,13 +43,8 @@ protected void onCreate(Bundle savedInstanceState) {
4643
ButterKnife.bind(this);
4744
subscribe = Observable.timer(1000, TimeUnit.MILLISECONDS)
4845
.observeOn(AndroidSchedulers.mainThread())
49-
.subscribe(new Action1<Long>() {
50-
51-
@Override
52-
public void call(Long aLong) {
53-
54-
startAnim();
55-
}
46+
.subscribe(aLong -> {
47+
startAnim();
5648
});
5749
}
5850

‎app/src/main/java/com/hotbitmapgg/moequest/module/commonality/MainActivity.java

+12-15
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
package com.hotbitmapgg.moequest.module.commonality;
22

3-
import android.content.Intent;
4-
import android.os.Bundle;
5-
import android.support.design.widget.NavigationView;
6-
import android.support.v4.app.Fragment;
7-
import android.support.v4.app.FragmentTransaction;
8-
import android.support.v4.widget.DrawerLayout;
9-
import android.support.v7.app.ActionBarDrawerToggle;
10-
import android.support.v7.widget.Toolbar;
11-
import android.view.KeyEvent;
12-
import android.view.MenuItem;
13-
import android.view.View;
14-
3+
import butterknife.Bind;
154
import com.hotbitmapgg.moequest.R;
165
import com.hotbitmapgg.moequest.base.RxBaseActivity;
176
import com.hotbitmapgg.moequest.module.douban.DoubanMeiziFragment;
@@ -24,10 +13,19 @@
2413
import com.hotbitmapgg.moequest.utils.ShareUtil;
2514
import com.hotbitmapgg.moequest.utils.SnackbarUtil;
2615
import com.hotbitmapgg.moequest.widget.CircleImageView;
27-
2816
import java.util.Random;
2917

30-
import butterknife.Bind;
18+
import android.content.Intent;
19+
import android.os.Bundle;
20+
import android.support.design.widget.NavigationView;
21+
import android.support.v4.app.Fragment;
22+
import android.support.v4.app.FragmentTransaction;
23+
import android.support.v4.widget.DrawerLayout;
24+
import android.support.v7.app.ActionBarDrawerToggle;
25+
import android.support.v7.widget.Toolbar;
26+
import android.view.KeyEvent;
27+
import android.view.MenuItem;
28+
import android.view.View;
3129

3230
/**
3331
* Created by hcc on 16/7/30 12:57
@@ -90,7 +88,6 @@ public void initViews(Bundle savedInstanceState) {
9088

9189
private void initFragment() {
9290

93-
// 初始化Fragment
9491
GankMeiziFragment gankMeiziFragment = GankMeiziFragment.newInstance();
9592
MeiziTuFragment meiziTuFragment = MeiziTuFragment.newInstance();
9693
DoubanMeiziFragment doubanMeiziFragment = DoubanMeiziFragment.newInstance();

‎app/src/main/java/com/hotbitmapgg/moequest/module/commonality/MeiziDetailsFragment.java

+35-82
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
package com.hotbitmapgg.moequest.module.commonality;
22

3-
import android.Manifest;
4-
import android.content.DialogInterface;
5-
import android.net.Uri;
6-
import android.os.Bundle;
7-
import android.os.Environment;
8-
import android.support.v7.app.AlertDialog;
9-
import android.view.View;
10-
import android.widget.ImageView;
11-
import android.widget.TextView;
12-
import android.widget.Toast;
13-
3+
import butterknife.Bind;
144
import com.bumptech.glide.Glide;
155
import com.bumptech.glide.load.engine.DiskCacheStrategy;
166
import com.bumptech.glide.load.resource.drawable.GlideDrawable;
@@ -22,17 +12,23 @@
2212
import com.hotbitmapgg.moequest.utils.ConstantUtil;
2313
import com.hotbitmapgg.moequest.utils.GlideDownloadImageUtil;
2414
import com.tbruyelle.rxpermissions.RxPermissions;
25-
2615
import java.io.File;
27-
28-
import butterknife.Bind;
2916
import rx.Observable;
3017
import rx.android.schedulers.AndroidSchedulers;
31-
import rx.functions.Action1;
3218
import rx.functions.Func1;
3319
import rx.schedulers.Schedulers;
3420
import uk.co.senab.photoview.PhotoViewAttacher;
3521

22+
import android.Manifest;
23+
import android.net.Uri;
24+
import android.os.Bundle;
25+
import android.os.Environment;
26+
import android.support.v7.app.AlertDialog;
27+
import android.view.View;
28+
import android.widget.ImageView;
29+
import android.widget.TextView;
30+
import android.widget.Toast;
31+
3632
/**
3733
* Created by hcc on 16/7/5 21:14
3834
* [email protected]
@@ -89,18 +85,11 @@ public void initViews() {
8985
private void saveImageToGallery() {
9086

9187
Observable.just(R.string.app_name)
92-
.compose(this.<Integer>bindToLifecycle())
88+
.compose(this.bindToLifecycle())
9389
.compose(RxPermissions.getInstance(getActivity())
9490
.ensure(Manifest.permission.WRITE_EXTERNAL_STORAGE))
9591
.observeOn(Schedulers.io())
96-
.filter(new Func1<Boolean, Boolean>() {
97-
98-
@Override
99-
public Boolean call(Boolean aBoolean) {
100-
101-
return aBoolean;
102-
}
103-
})
92+
.filter(aBoolean -> aBoolean)
10493
.flatMap(new Func1<Boolean, Observable<Uri>>() {
10594

10695
@Override
@@ -110,23 +99,15 @@ public Observable<Uri> call(Boolean aBoolean) {
11099
}
111100
})
112101
.observeOn(AndroidSchedulers.mainThread())
113-
.subscribe(new Action1<Uri>() {
114-
115-
@Override
116-
public void call(Uri uri) {
117-
118-
File appDir = new File(Environment.getExternalStorageDirectory(),
119-
ConstantUtil.FILE_DIR);
120-
String msg = String.format("图片已保存至 %s 文件夹", appDir.getAbsolutePath());
121-
Toast.makeText(getActivity(), msg, Toast.LENGTH_SHORT).show();
122-
}
123-
}, new Action1<Throwable>() {
102+
.subscribe(uri -> {
124103

125-
@Override
126-
public void call(Throwable throwable) {
104+
File appDir = new File(Environment.getExternalStorageDirectory(),
105+
ConstantUtil.FILE_DIR);
106+
String msg = String.format("图片已保存至 %s 文件夹", appDir.getAbsolutePath());
107+
Toast.makeText(getActivity(), msg, Toast.LENGTH_SHORT).show();
108+
}, throwable -> {
127109

128-
Toast.makeText(getActivity(), "保存失败,请重试", Toast.LENGTH_SHORT).show();
129-
}
110+
Toast.makeText(getActivity(), "保存失败,请重试", Toast.LENGTH_SHORT).show();
130111
});
131112
}
132113

@@ -154,51 +135,23 @@ public boolean onResourceReady(GlideDrawable resource, String model,
154135

155136

156137
private void setPhotoViewAttacher() {
157-
mPhotoViewAttacher.setOnLongClickListener(new View.OnLongClickListener() {
158-
159-
@Override
160-
public boolean onLongClick(View v) {
161-
162-
new AlertDialog.Builder(getActivity())
163-
.setMessage("是否保存到本地?")
164-
.setNegativeButton("取消", new DialogInterface.OnClickListener() {
165-
166-
@Override
167-
public void onClick(DialogInterface dialog, int which) {
168-
169-
dialog.cancel();
170-
}
171-
})
172-
.setPositiveButton("确定", new DialogInterface.OnClickListener() {
173-
174-
@Override
175-
public void onClick(DialogInterface dialog, int which) {
176-
177-
saveImageToGallery();
178-
dialog.dismiss();
179-
}
180-
})
181-
.show();
182-
183-
return true;
184-
}
138+
mPhotoViewAttacher.setOnLongClickListener(v -> {
139+
140+
new AlertDialog.Builder(getActivity())
141+
.setMessage("是否保存到本地?")
142+
.setNegativeButton("取消", (dialog, which) -> dialog.cancel())
143+
.setPositiveButton("确定", (dialog, which) -> {
144+
saveImageToGallery();
145+
dialog.dismiss();
146+
})
147+
.show();
148+
149+
return true;
185150
});
186151

187-
mPhotoViewAttacher.setOnViewTapListener(new PhotoViewAttacher.OnViewTapListener() {
188-
189-
@Override
190-
public void onViewTap(View view, float v, float v1) {
191-
RxBus.getInstance().post("hideAppBar");
192-
}
193-
});
194-
195-
mImageError.setOnClickListener(new View.OnClickListener() {
196-
197-
@Override
198-
public void onClick(View v) {
199-
RxBus.getInstance().post("hideAppBar");
200-
}
201-
});
152+
mPhotoViewAttacher.setOnViewTapListener(
153+
(view, v, v1) -> RxBus.getInstance().post("hideAppBar"));
154+
mImageError.setOnClickListener(v -> RxBus.getInstance().post("hideAppBar"));
202155
}
203156

204157

0 commit comments

Comments
 (0)