diff --git a/app/build.gradle b/app/build.gradle index c10a5fa..38b31f3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,11 +25,12 @@ android { enabled = true } - compileSdkVersion 31 + compileSdkVersion 30 buildToolsVersion '29.0.2' aaptOptions.cruncherEnabled = false aaptOptions.useNewCruncher = false defaultConfig { + // multiDexEnabled true javaCompileOptions { annotationProcessorOptions { includeCompileClasspath = true } } // multiDexEnabled true @@ -51,6 +52,7 @@ android { JPUSH_APPKEY : "4b6e03f9cc9466efbc0b2528", //JPush 上注册的包名对应的 Appkey. JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可. ] + } buildTypes { release { @@ -75,14 +77,13 @@ android { jniLibs.srcDirs = ['libs'] } } + dependencies { - implementation 'com.android.support:multidex:1.0.1' implementation fileTree(dir: 'libs', include: ['*.jar']) androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - testImplementation 'junit:junit:4.12' implementation 'com.zhy:percent-support-extends:1.0.1' implementation 'com.arialyy.aria:Aria:3.1.1' implementation 'com.jcodecraeer:xrecyclerview:1.3.2' @@ -110,6 +111,7 @@ android { implementation 'com.nineoldandroids:library:2.4.0' implementation 'fm.jiecao:jiecaovideoplayer:4.6.3' + implementation 'androidx.multidex:multidex:2.0.1' //noinspection GradleCompatible implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar' @@ -159,9 +161,13 @@ android { api 'io.reactivex.rxjava2:rxjava:2.1.5' implementation 'me.jessyan:autosize:1.1.2' - implementation 'androidx.camera:camera-view:1.0.0-alpha30' + // implementation 'androidx.camera:camera-view:1.0.0-alpha30' // implementation 'io.github.lucksiege:pictureselector:v2.7.3-rc05'//视频图片选择器 - implementation 'io.github.lucksiege:pictureselector:v2.7.3-rc10' + implementation 'io.github.lucksiege:pictureselector:v2.7.3-rc05' + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ece7436..576c17b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -67,7 +67,7 @@ @@ -139,47 +140,57 @@ @@ -187,221 +198,286 @@ - + - + - + implements } if (resultcode.status == 0) { if (requstecode == 0) { + SPUtils.cleanAllSP(LoginActivity.this); Gson gs = new Gson(); ArrayList adta = (ArrayList) resultcode.data; String s = gs.toJson(adta); diff --git a/app/src/main/java/com/sl/house_property/MyApplication.java b/app/src/main/java/com/sl/house_property/MyApplication.java index b201033..e6f8249 100644 --- a/app/src/main/java/com/sl/house_property/MyApplication.java +++ b/app/src/main/java/com/sl/house_property/MyApplication.java @@ -4,9 +4,10 @@ import android.app.Activity; import android.app.Application; import android.content.Context; import android.os.StrictMode; -import androidx.multidex.MultiDex; import android.util.Log; +import androidx.multidex.MultiDex; + import com.lzy.ninegrid.NineGridView; import com.lzy.okgo.OkGo; import com.lzy.okgo.cache.CacheEntity; diff --git a/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java b/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java index 7b5817c..7957fc7 100644 --- a/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java +++ b/app/src/main/java/com/sl/house_property/discovery/DiscoveryFragment.java @@ -147,8 +147,11 @@ public class DiscoveryFragment extends BaseFragment im } }); - mDataBinding.v.setOnClickListener(v -> { - checkAlbumPermission(191, 1); + mDataBinding.v.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + checkAlbumPermission(191, 1); + } }); } diff --git a/app/src/main/java/com/sl/house_property/discovery/ImageViewerAndDeleteActivity.java b/app/src/main/java/com/sl/house_property/discovery/ImageViewerAndDeleteActivity.java index 2033b9f..b0c7fe1 100644 --- a/app/src/main/java/com/sl/house_property/discovery/ImageViewerAndDeleteActivity.java +++ b/app/src/main/java/com/sl/house_property/discovery/ImageViewerAndDeleteActivity.java @@ -82,14 +82,17 @@ public class ImageViewerAndDeleteActivity extends BaseActivity { + mDataBinding.tvDelete.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { mList.remove(index); Intent intent = new Intent(); intent.putStringArrayListExtra("images", mList); - setResult(111, intent); - finish(); + ImageViewerAndDeleteActivity.this.setResult(111, intent); + ImageViewerAndDeleteActivity.this.finish(); + } }); } diff --git a/app/src/main/java/tools/GlideEngine.java b/app/src/main/java/tools/GlideEngine.java index 2124e8c..a418b8e 100644 --- a/app/src/main/java/tools/GlideEngine.java +++ b/app/src/main/java/tools/GlideEngine.java @@ -106,49 +106,51 @@ public class GlideEngine implements ImageEngine { } }); } -// -// /** -// * 加载网络图片适配长图方案 -// * # 注意:此方法只有加载网络图片才会回调 -// * -// * @param context -// * @param url -// * @param imageView -// * @param longImageView -// * @ 已废弃 -// */ -// @Override -// public void loadImage(@NonNull Context context, @NonNull String url, -// @NonNull final ImageView imageView, -// final SubsamplingScaleImageView longImageView) { -// Glide.with(context) -// .asBitmap() -// .load(url) -// .into(new ImageViewTarget(imageView) { -// @Override -// protected void setResource(@Nullable Bitmap resource) { -// if (resource != null) { -// boolean eqLongImage = MediaUtils.isLongImg(resource.getWidth(), -// resource.getHeight()); -// longImageView.setVisibility(eqLongImage ? View.VISIBLE : View.GONE); -// imageView.setVisibility(eqLongImage ? View.GONE : View.VISIBLE); -// if (eqLongImage) { -// // 加载长图 -// longImageView.setQuickScaleEnabled(true); -// longImageView.setZoomEnabled(true); -// longImageView.setDoubleTapZoomDuration(100); -// longImageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_CROP); -// longImageView.setDoubleTapZoomDpi(SubsamplingScaleImageView.ZOOM_FOCUS_CENTER); -// longImageView.setImage(ImageSource.cachedBitmap(resource), -// new ImageViewState(0, new PointF(0, 0), 0)); -// } else { -// // 普通图片 -// imageView.setImageBitmap(resource); -// } -// } -// } -// }); -// } + + + + /** + * 加载网络图片适配长图方案 + * # 注意:此方法只有加载网络图片才会回调 + * + * @param context + * @param url + * @param imageView + * @param longImageView + * @ 已废弃 + */ + @Override + public void loadImage(@NonNull Context context, @NonNull String url, + @NonNull final ImageView imageView, + final SubsamplingScaleImageView longImageView) { + Glide.with(context) + .asBitmap() + .load(url) + .into(new ImageViewTarget(imageView) { + @Override + protected void setResource(@Nullable Bitmap resource) { + if (resource != null) { + boolean eqLongImage = MediaUtils.isLongImg(resource.getWidth(), + resource.getHeight()); + longImageView.setVisibility(eqLongImage ? View.VISIBLE : View.GONE); + imageView.setVisibility(eqLongImage ? View.GONE : View.VISIBLE); + if (eqLongImage) { + // 加载长图 + longImageView.setQuickScaleEnabled(true); + longImageView.setZoomEnabled(true); + longImageView.setDoubleTapZoomDuration(100); + longImageView.setMinimumScaleType(SubsamplingScaleImageView.SCALE_TYPE_CENTER_CROP); + longImageView.setDoubleTapZoomDpi(SubsamplingScaleImageView.ZOOM_FOCUS_CENTER); + longImageView.setImage(ImageSource.cachedBitmap(resource), + new ImageViewState(0, new PointF(0, 0), 0)); + } else { + // 普通图片 + imageView.setImageBitmap(resource); + } + } + } + }); + } /** * 加载相册目录 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f56dfcf..9641cce 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Wed Jul 21 22:05:06 CST 2021 +#Wed Dec 08 14:35:23 CST 2021 distributionBase=GRADLE_USER_HOME distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip distributionPath=wrapper/dists diff --git a/ninegridview/build.gradle b/ninegridview/build.gradle index ea66f38..a767a50 100644 --- a/ninegridview/build.gradle +++ b/ninegridview/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 27 - buildToolsVersion "27.0.3" + compileSdkVersion 30 + buildToolsVersion '30.0.2' defaultConfig { minSdkVersion 21 @@ -14,6 +14,10 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies {