2.1.3 upgrade dependency

iielse · Jun 13, 2021 · 7c7421d · 7c7421d
1 parent 648e92a
commit 7c7421d
Show file tree

Hide file tree

Showing 15 changed files with 123 additions and 246 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,14 +13,15 @@ kapt {
 }
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion '29.0.2'
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
     defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode rootProject.ext.versionCode
+        versionName rootProject.ext.versionName
         applicationId "com.github.iielse.imageviewer.demo"
-        minSdkVersion 19
-        targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -36,24 +37,24 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.core:core-ktx:1.3.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
     implementation 'androidx.paging:paging-runtime-ktx:2.1.2'
 
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
     implementation 'com.github.chrisbanes:PhotoView:2.2.0'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
-    implementation 'com.google.android.exoplayer:exoplayer:2.11.3'
+    implementation 'com.google.android.exoplayer:exoplayer:2.14.0'
 
     implementation project(':imageviewer')
     // implementation 'com.github.iielse:imageviewer:x.y.z'
 
-    implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.7'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
 }
 
 repositories {

diff --git a/app/src/main/java/com/github/iielse/imageviewer/demo/business/MainActivity.kt b/app/src/main/java/com/github/iielse/imageviewer/demo/business/MainActivity.kt
@@ -52,7 +52,7 @@ class MainActivity : AppCompatActivity() {
             return
         }
 
-        ViewerHelper.provideImageViewerBuilder(this, item)
+        ViewerHelper.provideImageViewerBuilder(this, item, KEY_MAIN)
                 .show()
     }
 

diff --git a/app/src/main/java/com/github/iielse/imageviewer/demo/business/ViewerHelper.kt b/app/src/main/java/com/github/iielse/imageviewer/demo/business/ViewerHelper.kt
@@ -21,14 +21,14 @@ object ViewerHelper {
     var fullScreen: Boolean = false
     var simplePlayVideo: Boolean = true
 
-    fun provideImageViewerBuilder(context: FragmentActivity, clickedData: MyData): ImageViewerBuilder {
+    fun provideImageViewerBuilder(context: FragmentActivity, clickedData: MyData, pageKey: String): ImageViewerBuilder {
         // viewer 构造的基本元素
         val builder = ImageViewerBuilder(
                 context = context,
                 initKey = clickedData.id,
                 dataProvider = myDataProvider(clickedData),
                 imageLoader = MyImageLoader(),
-                transformer = MyTransformer()
+                transformer = MyTransformer(pageKey)
         )
 
         MyViewerCustomizer().process(context, builder) // 添加自定义业务逻辑和UI处理

diff --git a/app/src/main/java/com/github/iielse/imageviewer/demo/core/viewer/MyImageLoader.kt b/app/src/main/java/com/github/iielse/imageviewer/demo/core/viewer/MyImageLoader.kt
@@ -22,7 +22,8 @@ import com.github.iielse.imageviewer.utils.Config
 import com.github.iielse.imageviewer.widgets.video.ExoVideoView
 import com.github.iielse.imageviewer.widgets.video.ExoVideoView2
 import com.google.android.exoplayer2.analytics.AnalyticsListener
-import com.google.android.exoplayer2.source.MediaSourceEventListener
+import com.google.android.exoplayer2.source.LoadEventInfo
+import com.google.android.exoplayer2.source.MediaLoadData
 import com.google.android.exoplayer2.ui.PlayerControlView
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -55,7 +56,7 @@ class MyImageLoader : ImageLoader {
                 .into(cover)
 
         exoVideoView.addAnalyticsListener(object : AnalyticsListener {
-            override fun onLoadError(eventTime: AnalyticsListener.EventTime, loadEventInfo: MediaSourceEventListener.LoadEventInfo, mediaLoadData: MediaSourceEventListener.MediaLoadData, error: IOException, wasCanceled: Boolean) {
+            override fun onLoadError(eventTime: AnalyticsListener.EventTime, loadEventInfo: LoadEventInfo, mediaLoadData: MediaLoadData, error: IOException, wasCanceled: Boolean) {
                 findLoadingView(viewHolder)?.visibility = View.GONE
                 viewHolder.find<TextView>(R.id.errorPlaceHolder)?.text = error.message
             }

diff --git a/app/src/main/java/com/github/iielse/imageviewer/demo/core/viewer/MyTransformer.kt b/app/src/main/java/com/github/iielse/imageviewer/demo/core/viewer/MyTransformer.kt
@@ -5,8 +5,8 @@ import android.widget.ImageView
 import com.github.iielse.imageviewer.core.Transformer
 import com.github.iielse.imageviewer.demo.core.viewer.TransitionViewsRef.KEY_MAIN
 
-class MyTransformer : Transformer {
-    override fun getView(key: Long): ImageView? = TransitionViewsRef.provideTransitionViewsRef(KEY_MAIN)[key]
+class MyTransformer(private val pageKey: String) : Transformer {
+    override fun getView(key: Long): ImageView? = TransitionViewsRef.provideTransitionViewsRef(pageKey)[key]
 }
 
 /**

diff --git a/build.gradle b/build.gradle
@@ -1,35 +1,44 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.72'
+    ext.kotlin_version = "1.5.0"
+
     repositories {
         google()
         jcenter()
         mavenCentral()
+        jcenter() { url 'http://jcenter.bintray.com/' }
         maven { url "https://jitpack.io" }
         maven { url 'https://maven.google.com' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     repositories {
         google()
-        jcenter()
         mavenCentral()
         maven { url "https://jitpack.io" }
         maven { url 'https://maven.google.com' }
-    }
+        jcenter()
+        jcenter() { url 'http://jcenter.bintray.com/' }
 
-    tasks.withType(Javadoc).all {
-        enabled = false
-        options.setEncoding('UTF-8')
     }
 }
 
 task clean(type: Delete) {
     delete rootProject.buildDir
 }
+
+
+ext {
+    compileSdkVersion= 30
+    buildToolsVersion= "30.0.3"
+    minSdkVersion    = 21
+    targetSdkVersion = 30
+    versionCode      = 213
+    versionName      = "2.1.3"
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jul 01 16:04:56 CST 2020
+#Sun Jun 13 13:30:42 CST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/imageviewer/build.gradle b/imageviewer/build.gradle
@@ -7,14 +7,14 @@ androidExtensions {
 }
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion rootProject.ext.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 29
-        versionCode 18
-        versionName "0.1.2"
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionCode rootProject.ext.versionCode
+        versionName rootProject.ext.versionName
     }
 
     kotlinOptions {
@@ -32,14 +32,14 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.core:core-ktx:1.3.0'
-    implementation 'androidx.transition:transition:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation 'androidx.transition:transition:1.4.1'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.paging:paging-runtime-ktx:2.1.2'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.exoplayer:exoplayer:2.11.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'com.google.android.exoplayer:exoplayer:2.14.0'
     implementation 'com.github.chrisbanes:PhotoView:2.2.0'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
 }