Merge pull request #19 from fengyongge/feature/dev-v1.4.2

fix r
fengyongge · Sep 4, 2020 · 63949d0 · 63949d0
2 parents 17b569d + 10ec2d8
commit 63949d0
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 24 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/src/main/java/com/zzti/fengyongge/imagepickersample/AddPicActivity.java b/app/src/main/java/com/zzti/fengyongge/imagepickersample/AddPicActivity.java
@@ -15,10 +15,8 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.zzti.fengongge.imagepickersample.R;
 import com.zzti.fengyongge.imagepicker.ImagePickerInstance;
 import com.zzti.fengyongge.imagepicker.model.PhotoModel;
-import com.zzti.fengyongge.imagepicker.util.CommonUtils;
 import com.zzti.fengyongge.imagepicker.util.FileUtils;
 import com.zzti.fengyongge.imagepickersample.model.UploadGoodsBean;
 import com.zzti.fengyongge.imagepickersample.utils.Config;

diff --git a/app/src/main/java/com/zzti/fengyongge/imagepickersample/MainActivity.java b/app/src/main/java/com/zzti/fengyongge/imagepickersample/MainActivity.java
@@ -6,7 +6,6 @@
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.zzti.fengongge.imagepickersample.R;
 
 
 

diff --git a/app/src/main/java/com/zzti/fengyongge/imagepickersample/PreViewActivity.java b/app/src/main/java/com/zzti/fengyongge/imagepickersample/PreViewActivity.java
@@ -11,11 +11,8 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.zzti.fengongge.imagepickersample.R;
 import com.zzti.fengyongge.imagepicker.ImagePickerInstance;
-import com.zzti.fengyongge.imagepicker.PhotoPreviewActivity;
 import com.zzti.fengyongge.imagepicker.model.PhotoModel;
-import com.zzti.fengyongge.imagepicker.util.CommonUtils;
 import com.zzti.fengyongge.imagepickersample.model.TestBean;
 import com.zzti.fengyongge.imagepickersample.view.CustomImageView;
 import com.zzti.fengyongge.imagepickersample.view.NineGridlayout;

diff --git a/imagepicker/build.gradle b/imagepicker/build.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 //apply plugin: 'com.novoda.bintray-release'
-//ext{
-//    PUBLISH_GROUP_ID = 'com.zzti.fengyongge'
-//    PUBLISH_ARTIFACT_ID = 'imagepicker'
-//    PUBLISH_VERSION = '1.4.1'
-//}
+ext{
+    PUBLISH_GROUP_ID = 'com.zzti.fengyongge'
+    PUBLISH_ARTIFACT_ID = 'imagepicker'
+    PUBLISH_VERSION = '1.4.2'
+}
 
 android {
     compileSdkVersion 28
@@ -42,4 +42,4 @@ dependencies {
 
 // ./gradlew clean build bintrayUpload -PbintrayUser=username -PbintrayKey=APIKey -PdryRun=false
 //        ./gradlew clean build generateRelease
-//apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'
+apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle'
diff --git a/imagepicker/src/main/java/com/zzti/fengyongge/imagepicker/BasePhotoPreviewActivity.java b/imagepicker/src/main/java/com/zzti/fengyongge/imagepicker/BasePhotoPreviewActivity.java
@@ -13,7 +13,6 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
-import com.zzti.fengongge.imagepicker.R;
 import com.zzti.fengyongge.imagepicker.model.PhotoModel;
 import com.zzti.fengyongge.imagepicker.util.AnimationUtils;
 import com.zzti.fengyongge.imagepicker.view.PhotoPreview;

diff --git a/imagepicker/src/main/java/com/zzti/fengyongge/imagepicker/PhotoSelectorActivity.java b/imagepicker/src/main/java/com/zzti/fengyongge/imagepicker/PhotoSelectorActivity.java
@@ -23,7 +23,6 @@
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
-import com.zzti.fengongge.imagepicker.R;
 import com.zzti.fengyongge.imagepicker.adapter.AlbumAdapter;
 import com.zzti.fengyongge.imagepicker.adapter.PhotoSelectorAdapter;
 import com.zzti.fengyongge.imagepicker.control.PhotoSelectorDomain;
@@ -38,8 +37,6 @@
 import com.zzti.fengyongge.imagepicker.view.SelectPhotoItem;
 
 import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/imagepicker/src/main/java/com/zzti/fengyongge/imagepicker/adapter/PhotoSelectorAdapter.java b/imagepicker/src/main/java/com/zzti/fengyongge/imagepicker/adapter/PhotoSelectorAdapter.java
@@ -7,9 +7,8 @@
 import android.view.ViewGroup;
 import android.widget.AbsListView.LayoutParams;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
 
-import com.zzti.fengongge.imagepicker.R;
+import com.zzti.fengyongge.imagepicker.R;
 import com.zzti.fengyongge.imagepicker.model.PhotoModel;
 import com.zzti.fengyongge.imagepicker.util.StringUtils;
 import com.zzti.fengyongge.imagepicker.view.SelectPhotoItem;

diff --git a/imagepicker/src/main/java/com/zzti/fengyongge/imagepicker/view/AlbumItem.java b/imagepicker/src/main/java/com/zzti/fengyongge/imagepicker/view/AlbumItem.java
@@ -9,7 +9,7 @@
 import android.widget.TextView;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.zzti.fengongge.imagepicker.R;
+import com.zzti.fengyongge.imagepicker.R;
 import com.zzti.fengyongge.imagepicker.model.AlbumModel;
 
 /**

diff --git a/imagepicker/src/main/java/com/zzti/fengyongge/imagepicker/view/PhotoPreview.java b/imagepicker/src/main/java/com/zzti/fengyongge/imagepicker/view/PhotoPreview.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -15,12 +14,11 @@
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
-import com.zzti.fengongge.imagepicker.R;
+import com.zzti.fengyongge.imagepicker.R;
 import com.zzti.fengyongge.imagepicker.model.PhotoModel;
 import com.zzti.fengyongge.imagepicker.util.ImageUtils;
 import com.zzti.fengyongge.imagepicker.util.LogUtils;
 
-import java.util.logging.Logger;
 
 
 public class PhotoPreview extends LinearLayout implements OnClickListener {

diff --git a/imagepicker/src/main/java/com/zzti/fengyongge/imagepicker/view/SelectPhotoItem.java b/imagepicker/src/main/java/com/zzti/fengyongge/imagepicker/view/SelectPhotoItem.java
@@ -16,7 +16,7 @@
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.zzti.fengyongge.imagepicker.PhotoSelectorActivity;
-import com.zzti.fengongge.imagepicker.R;
+import com.zzti.fengyongge.imagepicker.R;
 import com.zzti.fengyongge.imagepicker.model.PhotoModel;
 
 import java.util.Random;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,7 +6,6 @@
		import android.widget.TextView;
		import androidx.appcompat.app.AppCompatActivity;

		import com.zzti.fengongge.imagepickersample.R;



Expand Down