提交测试代码

xujianliu · Jul 7, 2020 · ab1e600 · ab1e600
1 parent ad9bfc6
commit ab1e600
Show file tree

Hide file tree

Showing 12 changed files with 191 additions and 100 deletions.
diff --git a/rximagepicker_support/build.gradle b/rximagepicker_support/build.gradle
@@ -31,10 +31,11 @@ android {
 }
 
 dependencies {
+    api project(':rximagepicker')
+
     implementation rootProject.ext.dependencies["appcompat"]
     implementation rootProject.ext.dependencies["recyclerview"]
 
-    implementation project(':rximagepicker')
     implementation rootProject.ext.dependencies["kotlin-android"]
     implementation rootProject.ext.dependencies["constraint-layout"]
 

diff --git a/...er_support/src/main/java/com/qingmei2/rximagepicker_extension/utils/PhotoMetadataUtils.kt b/...er_support/src/main/java/com/qingmei2/rximagepicker_extension/utils/PhotoMetadataUtils.kt
@@ -32,6 +32,9 @@ import com.qingmei2.rximagepicker_extension.R
 import com.qingmei2.rximagepicker_extension.entity.IncapableCause
 import com.qingmei2.rximagepicker_extension.entity.Item
 import com.qingmei2.rximagepicker_extension.entity.SelectionSpec
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.core.Observable
+import io.reactivex.rxjava3.schedulers.Schedulers
 import java.io.File
 
 import java.io.FileNotFoundException
@@ -78,20 +81,25 @@ class PhotoMetadataUtils private constructor() {
             } else Point((w * widthScale).toInt(), (h * heightScale).toInt())
         }
 
-        fun getBitmapSize(path:String, activity: Activity): Point {
-            val imageSize = getBitmapBound(path)
-            val w = imageSize.x
-            val h = imageSize.y
-            if (h == 0) return Point(MAX_WIDTH, MAX_WIDTH)
-            val metrics = DisplayMetrics()
-            activity.windowManager.defaultDisplay.getMetrics(metrics)
-            val screenWidth = metrics.widthPixels.toFloat()
-            val screenHeight = metrics.heightPixels.toFloat()
-            val widthScale = screenWidth / w
-            val heightScale = screenHeight / h
-            return if (widthScale > heightScale) {
-                Point((w * widthScale).toInt(), (h * heightScale).toInt())
-            } else Point((w * widthScale).toInt(), (h * heightScale).toInt())
+        fun getBitmapSize(path: String, activity: Activity,callback:((point:Point) -> Unit)){
+            getBitmapBound(path){imageSize ->
+                val w = imageSize.x
+                val h = imageSize.y
+                if (h == 0) {
+                    callback.invoke(Point(MAX_WIDTH, MAX_WIDTH))
+                    return@getBitmapBound
+                }
+                val metrics = DisplayMetrics()
+                activity.windowManager.defaultDisplay.getMetrics(metrics)
+                val screenWidth = metrics.widthPixels.toFloat()
+                val screenHeight = metrics.heightPixels.toFloat()
+                val widthScale = screenWidth / w
+                val heightScale = screenHeight / h
+                callback.invoke(if (widthScale > heightScale) {
+                    Point((w * widthScale).toInt(), (h * heightScale).toInt())
+                } else Point((w * widthScale).toInt(), (h * heightScale).toInt()))
+            }
+
         }
 
         private fun getBitmapBound(resolver: ContentResolver, uri: Uri): Point {
@@ -118,41 +126,49 @@ class PhotoMetadataUtils private constructor() {
             }
         }
 
-        private fun getBitmapBound(path:String): Point {
+        private fun getBitmapBound(path: String,callback:((point:Point) -> Unit)) {
+
 
-            if(path.startsWith("http")){
-                var inputStream: InputStream? = null
+            if (path.startsWith("http")) {
+                Observable.create<Point> {
+                    var inputStream: InputStream? = null
+                    try {
+                        val connection = URL(path).openConnection() as HttpURLConnection
+                        inputStream = connection.inputStream
+                        val options = BitmapFactory.Options()
+                        options.inJustDecodeBounds = true
+                        BitmapFactory.decodeStream(inputStream, null, options)
+                        val width = options.outWidth
+                        val height = options.outHeight
+                        it.onNext(Point(width, height))
+                        return@create
+                    } catch (e: IOException) {
+                        it.onNext(Point(0, 0))
+                    } finally {
+                        try {
+                            inputStream?.close()
+                        } catch (e: IOException) {
+                            e.printStackTrace()
+                        }
+                    }
+                }.subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe {
+                            callback.invoke(it)
+                        }
+            }else{
                 try {
-                    val connection = URL(path).openConnection() as HttpURLConnection
-                    inputStream =  connection.inputStream
                     val options = BitmapFactory.Options()
                     options.inJustDecodeBounds = true
-                    BitmapFactory.decodeStream(inputStream, null, options)
+                    BitmapFactory.decodeFile(path, options)
                     val width = options.outWidth
                     val height = options.outHeight
-                    return Point(width, height)
-                } catch ( e:IOException) {
-                    return Point(0, 0)
-                }finally {
-                    try {
-                        inputStream?.close()
-                    } catch (e: IOException) {
-                        e.printStackTrace()
-                    }
+                    callback.invoke(Point(width, height))
+                } catch (e: Exception) {
+                    callback.invoke(Point(0, 0))
                 }
-            }else{
-
-            }
-            return try {
-                val options = BitmapFactory.Options()
-                options.inJustDecodeBounds = true
-                BitmapFactory.decodeFile(path, options)
-                val width = options.outWidth
-                val height = options.outHeight
-                Point(width, height)
-            } catch (e: Exception) {
-                Point(0, 0)
             }
+
         }
 
         fun getPath(resolver: ContentResolver, uri: Uri?): String? {

diff --git a/rximagepicker_support_wechat/build.gradle b/rximagepicker_support_wechat/build.gradle
@@ -32,16 +32,14 @@ android {
 }
 
 dependencies {
-    implementation project(':rximagepicker')
-    implementation project(':rximagepicker_support')
+//    implementation project(':rximagepicker')
+    api project(':rximagepicker_support')
 
     implementation rootProject.ext.dependencies["appcompat"]
     implementation rootProject.ext.dependencies["recyclerview"]
     implementation rootProject.ext.dependencies["constraint-layout"]
     implementation rootProject.ext.dependencies["kotlin-android"]
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     compileOnly rootProject.ext.dependencies["glide"]
     kapt rootProject.ext.dependencies["glide-compiler"]
     testImplementation rootProject.ext.dependencies["junit"]

diff --git a/rximagepicker_support_wechat/src/main/AndroidManifest.xml b/rximagepicker_support_wechat/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     package="com.qingmei2.rximagepicker_extension_wechat">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET"/>
 
     <application>
         <activity android:name=".ui.CustomPreviewActivity"></activity>

diff --git a/...rc/main/java/com/qingmei2/rximagepicker_extension_wechat/engine/impl/WechatGlideEngine.kt b/...rc/main/java/com/qingmei2/rximagepicker_extension_wechat/engine/impl/WechatGlideEngine.kt
@@ -54,6 +54,13 @@ class WechatGlideEngine : ImageEngine {
                 .into(imageView)
     }
 
+    override fun loadImage(context: Context, resizeX: Int, resizeY: Int, imageView: ImageView, path: String) {
+        Glide.with(context)
+                .load(path)
+                .apply(RequestOptions.priorityOf(Priority.HIGH))
+                .into(imageView)
+    }
+
     override fun loadGifImage(context: Context, resizeX: Int, resizeY: Int, imageView: ImageView, uri: Uri) {
         Glide.with(context)
                 .asGif()
@@ -62,6 +69,14 @@ class WechatGlideEngine : ImageEngine {
                 .into(imageView)
     }
 
+    override fun loadGifImage(context: Context, resizeX: Int, resizeY: Int, imageView: ImageView, path: String) {
+        Glide.with(context)
+                .asGif()
+                .load(path)
+                .apply(RequestOptions.priorityOf(Priority.HIGH))
+                .into(imageView)
+    }
+
     override fun supportAnimatedGif(): Boolean {
         return true
     }

diff --git a/...pport_wechat/src/main/java/com/qingmei2/rximagepicker_extension_wechat/entity/BaseItem.kt b/...pport_wechat/src/main/java/com/qingmei2/rximagepicker_extension_wechat/entity/BaseItem.kt
@@ -19,6 +19,11 @@ open class BaseItem() :Parcelable{
     /** 文件资源 */
     var itemUri: Uri? = null
 
+    constructor(type:Int,path:String,uri:Uri? = null): this(){
+        this.itemType = type
+        this.itemPath = path
+        this.itemUri = uri
+    }
     constructor(parcel: Parcel) : this() {
         itemType = parcel.readInt()
         itemPath = parcel.readString()?:""

diff --git a/...hat/src/main/java/com/qingmei2/rximagepicker_extension_wechat/ui/CustomPreviewActivity.kt b/...hat/src/main/java/com/qingmei2/rximagepicker_extension_wechat/ui/CustomPreviewActivity.kt
@@ -6,7 +6,6 @@ import android.view.WindowManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.viewpager.widget.ViewPager
 import com.qingmei2.rximagepicker_extension.entity.SelectionSpec
-import com.qingmei2.rximagepicker_extension.ui.adapter.PreviewPagerAdapter
 import com.qingmei2.rximagepicker_extension.utils.Platform
 import com.qingmei2.rximagepicker_extension_wechat.R
 import com.qingmei2.rximagepicker_extension_wechat.entity.BaseItem
@@ -18,7 +17,10 @@ const val PREVIEW_POSITION = "extra_position"
 
 class CustomPreviewActivity : AppCompatActivity(), ViewPager.OnPageChangeListener {
 
-    protected var mPreviousPos = -1
+    private var mPreviousPos = -1
+    private val mAdapter by lazy {
+        MediaPreviewPagerAdapter<BaseItem>(supportFragmentManager)
+    }
 
     @SuppressLint("SourceLockedOrientationActivity")
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -32,14 +34,15 @@ class CustomPreviewActivity : AppCompatActivity(), ViewPager.OnPageChangeListene
         if (SelectionSpec.instance.needOrientationRestriction()) {
             requestedOrientation = SelectionSpec.instance.orientation
         }
-        pager.addOnPageChangeListener(this)
-        val adapter = MediaPreviewPagerAdapter<BaseItem>(fm = supportFragmentManager)
         val data = intent.getParcelableArrayListExtra<BaseItem>(PREVIEW_DATA)
-        adapter.addAll(data.toList())
-        pager.adapter = adapter
+        mAdapter.addAll(data.toList())
+        pager.adapter = mAdapter
+        pager.addOnPageChangeListener(this)
         val position = intent.getIntExtra(PREVIEW_POSITION, -1)
         if (position != -1) {
             pager.currentItem = position
+        }else{
+            pager.currentItem = 0
         }
 
     }
@@ -54,10 +57,10 @@ class CustomPreviewActivity : AppCompatActivity(), ViewPager.OnPageChangeListene
 
     @SuppressLint("SetTextI18n")
     override fun onPageSelected(position: Int) {
-        val adapter = pager.adapter as PreviewPagerAdapter
+        tv_page.text = "${position + 1}/${mAdapter.count}"
         if (mPreviousPos != -1 && mPreviousPos != position) {
-            (adapter.instantiateItem(pager, mPreviousPos) as MediaItemFragment<*>).resetView()
-            tv_page.text = "${position + 1}/${adapter.count}"
+            (mAdapter.getItem(mPreviousPos) as MediaItemFragment<BaseItem>).resetView()
+//            (mAdapter.instantiateItem(pager, mPreviousPos) as MediaItemFragment<BaseItem>).resetView()
         }
         mPreviousPos = position
     }