From 9390cb7ec055b6b14c99e20096aa2bfa1709c2a1 Mon Sep 17 00:00:00 2001
From: yanshen <284885166@qq.com>
Date: Fri, 1 Jun 2018 13:41:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9?=
=?UTF-8?q?=E8=B6=85=E8=BF=87=E5=9B=BE=E7=89=87=E6=95=B0=E9=87=8F=E9=99=90?=
=?UTF-8?q?=E5=88=B6=E5=90=8E=E8=BF=98=E5=8F=AF=E4=BB=A5=E7=82=B9=E5=87=BB?=
=?UTF-8?q?=E6=8B=8D=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../multi_image_selector/MultiImageSelectorFragment.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelectorFragment.java b/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelectorFragment.java
index d9d075e..7a4b070 100644
--- a/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelectorFragment.java
+++ b/multi-image-selector/src/main/java/me/nereo/multi_image_selector/MultiImageSelectorFragment.java
@@ -183,6 +183,11 @@ public void onItemClick(AdapterView adapterView, View view, int i, long l) {
if (mImageAdapter.isShowCamera()) {
// 如果显示照相机，则第一个Grid显示为照相机，处理特殊逻辑
if (i == 0) {
+ // 解决当选择图片等于最大选择数量的时候，还可以点击相机拍照
+ if (resultList.size() >= mDesireImageCount) {
+ Toast.makeText(getActivity(), R.string.msg_amount_limit, Toast.LENGTH_SHORT).show();
+ return;
+ }
showCameraAction();
} else {
// 正常操作
From d105eb1f3b156d52246abaa145ec06911188bd5a Mon Sep 17 00:00:00 2001
From: yanshen <284885166@qq.com>
Date: Fri, 1 Jun 2018 13:43:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/gradle.xml | 1 +
.idea/misc.xml | 15 +---
MultiImageSelector.iml | 2 +-
app/app.iml | 75 ++++++++++++++-----
app/build.gradle | 6 +-
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
multi-image-selector/build.gradle | 6 +-
multi-image-selector/multi-image-selector.iml | 66 +++++++++++-----
9 files changed, 117 insertions(+), 58 deletions(-)
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cb01c0c..4006277 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -13,6 +13,7 @@
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 8f8b72d..5f16fef 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/MultiImageSelector.iml b/MultiImageSelector.iml
index f4dae0c..aebcec1 100644
--- a/MultiImageSelector.iml
+++ b/MultiImageSelector.iml
@@ -13,7 +13,7 @@
-
+
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 1524c3b..2684df1 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -9,13 +9,9 @@
-
-
-
- generateDebugAndroidTestSources
generateDebugSources
@@ -26,65 +22,104 @@
-
+
-
+
+
-
+
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
-
+
+
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 5c156f5..80ec8c1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 22
- buildToolsVersion "22.0.1"
defaultConfig {
applicationId "me.nereo.multiimageselector"
@@ -17,6 +16,11 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+ android {
+ lintOptions {
+ abortOnError false
+ }
+ }
}
dependencies {
diff --git a/build.gradle b/build.gradle
index d3ff69d..2540ef4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.1.0'
+ classpath 'com.android.tools.build:gradle:3.0.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e76..649480d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/multi-image-selector/build.gradle b/multi-image-selector/build.gradle
index 397c989..bb26360 100644
--- a/multi-image-selector/build.gradle
+++ b/multi-image-selector/build.gradle
@@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 22
- buildToolsVersion "22.0.1"
defaultConfig {
minSdkVersion 12
@@ -16,6 +15,11 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+ android {
+ lintOptions {
+ abortOnError false
+ }
+ }
}
dependencies {
diff --git a/multi-image-selector/multi-image-selector.iml b/multi-image-selector/multi-image-selector.iml
index 5d52993..104704b 100644
--- a/multi-image-selector/multi-image-selector.iml
+++ b/multi-image-selector/multi-image-selector.iml
@@ -9,13 +9,9 @@
-
-
-
- generateDebugAndroidTestSources
generateDebugSources
@@ -23,68 +19,100 @@
-
+
-
+
-
+
+
-
+
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
+
+
+
+
+
+
-
+
+
+
-
+
+
+
-
+
+
+
+
+
-
-
-
-
+
+
+
+
\ No newline at end of file