修改默认图片大小为原始图片大小

Author: yuruiyin

app/src/main/java/com/yuruiyin/richeditor/sample/MainActivity.kt

@@ -408,9 +408,8 @@ class MainActivity : AppCompatActivity() {
     private fun doAddBlockImageSpan(
             realImagePath: String, blockImageSpanObtainObject: IBlockImageSpanObtainObject, isFromDraft: Boolean = false
     ) {
-//        val blockImageSpanVm = BlockImageSpanVm(this, imageVm) // 不指定宽高，使用组件默认宽高
-        val blockImageSpanVm =
-                BlockImageSpanVm(blockImageSpanObtainObject, imageWidth) // 指定宽高
+        val blockImageSpanVm = BlockImageSpanVm(blockImageSpanObtainObject) // 不指定宽高，使用图片原始大小（但组件内对最大宽和最大高还是有约束的）
+//        val blockImageSpanVm = BlockImageSpanVm(blockImageSpanObtainObject, imageWidth, imageMaxHeight) // 指定宽高
         blockImageSpanVm.isFromDraft = isFromDraft
         richEditText.insertBlockImage(realImagePath, blockImageSpanVm) { blockImageSpan ->
             val spanObtainObject = blockImageSpan.blockImageSpanVm.spanObject

richeditor/src/main/java/com/yuruiyin/richeditor/RichEditText.java

@@ -310,9 +310,9 @@ public void insertBlockImage(Drawable drawable, @NonNull BlockImageSpanVm blockI
 
         // 这里减去一个值是为了防止部分手机（如华为Mate-10）ImageSpan右侧超出编辑区的时候，会导致ImageSpan被重复绘制的问题
         int editTextWidth = getWidthWithoutPadding();
-        int imageWidth = blockImageSpanVm.getWidth();
+        int imageWidth = blockImageSpanVm.getWidth() <= 0 ? originWidth : blockImageSpanVm.getWidth();
         int resImageWidth = imageWidth > editTextWidth ? editTextWidth : imageWidth;
-        int imageMaxHeight = blockImageSpanVm.getMaxHeight();
+        int imageMaxHeight = blockImageSpanVm.getMaxHeight() <= 0 ? originHeight : blockImageSpanVm.getMaxHeight();
         int resImageHeight = (int) (originHeight * 1.0 / originWidth * resImageWidth);
         resImageHeight = resImageHeight > imageMaxHeight ? imageMaxHeight : resImageHeight;
         // 控制显示出来的图片的高度不会大于宽度的3倍

richeditor/src/main/java/com/yuruiyin/richeditor/model/BlockImageSpanVm.java

@@ -1,8 +1,5 @@
 package com.yuruiyin.richeditor.model;
 
-import android.content.Context;
-
-import com.yuruiyin.richeditor.R;
 import com.yuruiyin.richeditor.config.AppConfig;
 
 /**
@@ -54,12 +51,6 @@ public class BlockImageSpanVm<T extends IBlockImageSpanObtainObject> {
      */
     private boolean isFromDraft;
 
-    public BlockImageSpanVm(Context context, T spanObject) {
-        this.width = (int) context.getResources().getDimension(R.dimen.rich_editor_default_image_width);
-        this.maxHeight = (int) (this.width * AppConfig.IMAGE_MAX_HEIGHT_WIDTH_RATIO);
-        this.spanObject = spanObject;
-    }
-
     public BlockImageSpanVm(T spanObject, int width, int maxHeight) {
         this.width = width;
         this.maxHeight = maxHeight;
@@ -72,6 +63,12 @@ public BlockImageSpanVm(T spanObject, int width) {
         this.spanObject = spanObject;
     }
 
+    public BlockImageSpanVm(T spanObject) {
+        this.width = 0;
+        this.maxHeight = 0;
+        this.spanObject = spanObject;
+    }
+
     public int getWidth() {
         return width;
     }