Skip to content

Commit d068be9

Browse files
committed
支持gradle 4.1
1 parent 0829cc0 commit d068be9

File tree

9 files changed

+29
-40
lines changed

9 files changed

+29
-40
lines changed

ImageLibrary/build.gradle

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
apply plugin: 'com.android.library'
2-
apply plugin: 'com.jakewharton.butterknife'
3-
apply plugin: 'android-apt'
42
apply plugin: 'com.github.dcendents.android-maven'
53

64
group='com.github.renyu'
75

86
android {
9-
compileSdkVersion 25
10-
buildToolsVersion "26.0.1"
7+
compileSdkVersion 26
118

129
defaultConfig {
1310
minSdkVersion 19
14-
targetSdkVersion 25
11+
targetSdkVersion 26
1512
versionCode 1
1613
versionName "1.0"
1714

@@ -35,13 +32,13 @@ dependencies {
3532
exclude group: 'com.android.support', module: 'support-annotations'
3633
})
3734
testCompile 'junit:junit:4.12'
38-
compile 'com.github.r17171709:AndroidCommonLibrary:v1.6.7'
35+
compile 'com.github.r17171709:AndroidCommonLibrary:v1.7.0'
3936
// CircleIndicator A lightweight viewpager indicator like in nexus 5 launcher
4037
compile 'me.relex:circleindicator:1.2.2@aar'
4138
// PhotoDraweeView PhotoView For Fresco
4239
compile 'me.relex:photodraweeview:1.1.3'
4340
// butterknife
44-
apt 'com.jakewharton:butterknife-compiler:8.8.1'
41+
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
4542
// uCrop Image Cropping Library for Android
4643
compile 'com.github.yalantis:ucrop:2.2.1'
4744
// subsampling-scale-image-view Highly configurable, easily extendable view with pan and zoom gestures for displaying huge images without loss of detail. Perfect for photo galleries, maps, building plans etc.

ImageLibrary/src/main/java/com/renyu/imagelibrary/crop/CropUActivity.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import com.renyu.commonlibrary.baseact.BaseActivity;
1717
import com.renyu.imagelibrary.R;
18-
import com.renyu.imagelibrary.R2;
1918
import com.yalantis.ucrop.UCrop;
2019
import com.yalantis.ucrop.UCropActivity;
2120
import com.yalantis.ucrop.callback.BitmapCropCallback;
@@ -28,21 +27,15 @@
2827

2928
import java.util.ArrayList;
3029

31-
import butterknife.BindView;
32-
3330
/**
3431
* Created by renyu on 2017/3/7.
3532
*/
3633

3734
public class CropUActivity extends BaseActivity {
3835

39-
@BindView(R2.id.nav_layout)
4036
RelativeLayout nav_layout;
41-
@BindView(R2.id.ib_nav_left)
4237
ImageButton ib_nav_left;
43-
@BindView(R2.id.tv_nav_right)
4438
TextView tv_nav_right;
45-
@BindView(R2.id.cv_crop)
4639
UCropView cv_crop;
4740
private GestureCropImageView mGestureCropImageView;
4841
private OverlayView mOverlayView;
@@ -59,6 +52,11 @@ public int initViews() {
5952

6053
@Override
6154
public void initParams() {
55+
nav_layout = findViewById(R.id.nav_layout);
56+
ib_nav_left = findViewById(R.id.ib_nav_left);
57+
tv_nav_right = findViewById(R.id.tv_nav_right);
58+
cv_crop = findViewById(R.id.cv_crop);
59+
6260
nav_layout.setBackgroundColor(Color.parseColor("#80000000"));
6361
ib_nav_left.setOnClickListener(new View.OnClickListener() {
6462
@Override

ImageLibrary/src/main/java/com/renyu/imagelibrary/photopicker/PhotoPickerActivity.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,11 @@
2222
import com.renyu.commonlibrary.baseact.BaseActivity;
2323
import com.renyu.commonlibrary.commonutils.BarUtils;
2424
import com.renyu.imagelibrary.R;
25-
import com.renyu.imagelibrary.R2;
25+
import com.renyu.imagelibrary.bean.Photo;
26+
import com.renyu.imagelibrary.bean.PhotoDirectory;
2627
import com.renyu.imagelibrary.camera.CameraActivity;
2728
import com.renyu.imagelibrary.commonutils.PhotoDirectoryLoader;
2829
import com.renyu.imagelibrary.commonutils.Utils;
29-
import com.renyu.imagelibrary.bean.Photo;
30-
import com.renyu.imagelibrary.bean.PhotoDirectory;
3130
import com.renyu.imagelibrary.params.CommonParams;
3231
import com.renyu.imagelibrary.preview.ImagePreviewActivity;
3332

@@ -38,7 +37,6 @@
3837
import java.util.List;
3938
import java.util.Map;
4039

41-
import butterknife.BindView;
4240
import io.reactivex.Observable;
4341
import io.reactivex.ObservableEmitter;
4442
import io.reactivex.ObservableOnSubscribe;
@@ -56,18 +54,12 @@
5654
*/
5755
public class PhotoPickerActivity extends BaseActivity {
5856

59-
@BindView(R2.id.ib_nav_left)
6057
ImageView ib_nav_left;
61-
@BindView(R2.id.tv_nav_title)
6258
TextView tv_nav_title;
63-
@BindView(R2.id.tv_nav_right)
6459
TextView tv_nav_right;
65-
@BindView(R2.id.photopicker_rv)
6660
RecyclerView photopicker_rv;
6761
PhotoPickerAdapter adapter;
68-
@BindView(R2.id.photopicker_dict)
6962
TextView photopicker_dict;
70-
@BindView(R2.id.photopicker_preview)
7163
TextView photopicker_preview;
7264
ListPopupWindow popupWindow;
7365
DictAdapter dictAdapter;
@@ -107,6 +99,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
10799

108100
@Override
109101
public void initParams() {
102+
ib_nav_left = findViewById(R.id.ib_nav_left);
103+
tv_nav_title = findViewById(R.id.tv_nav_title);
104+
tv_nav_right = findViewById(R.id.tv_nav_right);
105+
photopicker_rv = findViewById(R.id.photopicker_rv);
106+
photopicker_dict = findViewById(R.id.photopicker_dict);
107+
photopicker_preview = findViewById(R.id.photopicker_preview);
108+
110109
allHashMap=new LinkedHashMap<>();
111110
models=new ArrayList<>();
112111
dictModels=new ArrayList<>();

ImageLibrary/src/main/java/com/renyu/imagelibrary/preview/ImagePreviewFragment.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717
import com.facebook.imagepipeline.request.ImageRequestBuilder;
1818
import com.renyu.commonlibrary.basefrag.BaseFragment;
1919
import com.renyu.imagelibrary.R;
20-
import com.renyu.imagelibrary.R2;
2120

22-
import butterknife.BindView;
2321
import me.relex.photodraweeview.OnPhotoTapListener;
2422
import me.relex.photodraweeview.PhotoDraweeView;
2523

@@ -29,7 +27,6 @@
2927

3028
public class ImagePreviewFragment extends BaseFragment {
3129

32-
@BindView(R2.id.photo_view)
3330
PhotoDraweeView photoDraweeView;
3431

3532
OnPicChangedListener onPicChangedListener;
@@ -53,6 +50,8 @@ public static ImagePreviewFragment newInstance(String url, int position) {
5350

5451
@Override
5552
public void initParams() {
53+
photoDraweeView = view.findViewById(R.id.photo_view);
54+
5655
String url=getArguments().getString("url");
5756
PipelineDraweeControllerBuilder controller = Fresco.newDraweeControllerBuilder();
5857
ImageRequest request = ImageRequestBuilder.newBuilderWithSource(Uri.parse(url.indexOf("http")!=-1?url:"file://"+url))

ImageLibrary/src/main/java/com/renyu/imagelibrary/preview/SubsamplingActivity.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,15 @@
2525
import com.renyu.commonlibrary.baseact.BaseActivity;
2626
import com.renyu.commonlibrary.network.OKHttpHelper;
2727
import com.renyu.imagelibrary.R;
28-
import com.renyu.imagelibrary.R2;
2928

3029
import java.io.File;
3130

32-
import butterknife.BindView;
33-
3431
/**
3532
* Created by renyu on 2017/8/10.
3633
*/
3734

3835
public class SubsamplingActivity extends BaseActivity {
3936

40-
@BindView(R2.id.iv_sub)
4137
SubsamplingScaleImageView iv_sub;
4238

4339
OKHttpHelper httpHelper;
@@ -46,6 +42,8 @@ public class SubsamplingActivity extends BaseActivity {
4642

4743
@Override
4844
public void initParams() {
45+
iv_sub = findViewById(R.id.iv_sub);
46+
4947
httpHelper=new OKHttpHelper();
5048
progressDialog=ProgressDialog.show(SubsamplingActivity.this, "", "正在加载文件");
5149
}

app/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion "26.0.1"
4+
compileSdkVersion 26
65
defaultConfig {
76
applicationId "com.renyu.androidimagelibrary"
87
minSdkVersion 19
9-
targetSdkVersion 25
8+
targetSdkVersion 26
109
versionCode 1
1110
versionName "1.0"
1211
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

app/src/main/java/com/renyu/androidimagelibrary/MainActivity.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.os.Environment;
65
import android.support.v7.app.AppCompatActivity;
76

87
import com.facebook.drawee.backends.pipeline.Fresco;
9-
import com.renyu.imagelibrary.commonutils.Utils;
108
import com.renyu.imagelibrary.preview.ImagePreviewActivity;
119

1210
import java.util.ArrayList;
@@ -18,7 +16,7 @@ protected void onCreate(Bundle savedInstanceState) {
1816
super.onCreate(savedInstanceState);
1917
setContentView(R.layout.activity_main);
2018

21-
com.blankj.utilcode.util.Utils.init(this);
19+
com.blankj.utilcode.util.Utils.init(getApplication());
2220
Fresco.initialize(this);
2321

2422
ArrayList<String> strings=new ArrayList<>();

build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,23 @@
22

33
buildscript {
44
repositories {
5+
google()
56
jcenter()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.3.3'
9+
classpath 'com.android.tools.build:gradle:3.0.0'
910

1011
// NOTE: Do not place your application dependencies here; they belong
1112
// in the individual module build.gradle files
1213
classpath 'me.tatarka:gradle-retrolambda:3.7.0'
13-
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
1414
classpath 'com.jakewharton:butterknife-gradle-plugin:8.8.1'
1515
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1616
}
1717
}
1818

1919
allprojects {
2020
repositories {
21+
google()
2122
jcenter()
2223
maven { url 'https://jitpack.io' }
2324
}

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

0 commit comments

Comments
 (0)