fix: android type convert error and code opt

Author: JimmyDaddy

.release-it.json

@@ -0,0 +1,17 @@
+{
+  "git": {
+    "commitMessage": "chore: release v${version}"
+  },
+  "github": {
+    "release": true
+  },
+  "npm": {
+    "publish": false
+  },
+  "plugins": {
+    "@release-it/conventional-changelog": {
+      "preset": "angular",
+      "infile": "CHANGELOG.md"
+    }
+  }
+}

CHANGELOG.md

@@ -10,6 +10,7 @@
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.text.Layout;
 import android.text.StaticLayout;
@@ -222,7 +223,6 @@ private void markImageByBitmap(
         System.gc();
       }
 
-
       // 保存
       // canvas.save(Canvas.ALL_SAVE_FLAG);
       canvas.save();
@@ -239,8 +239,6 @@ private void markImageByBitmap(
         promise.resolve("data:image/png;base64,".concat(result));
       } else {
         bos = new BufferedOutputStream(new FileOutputStream(dest));
-
-//            int quaility = (int) (100 / percent > 80 ? 80 : 100 / percent);
         icon.compress(getSaveFormat(opts.saveFormat), opts.quality, bos);
         bos.flush();
         bos.close();
@@ -328,9 +326,17 @@ private void markImageByText(
       textPaint.setTextSize(fSize);
       textPaint.setColor(Color.parseColor(transRGBColor(opts.color)));
 
+      StaticLayout textLayout;
       // ALIGN_CENTER, ALIGN_NORMAL, ALIGN_OPPOSITE
-      StaticLayout textLayout = new StaticLayout(opts.text, textPaint, canvas.getWidth(), Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
-
+      if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+        StaticLayout.Builder builder = StaticLayout.Builder.obtain(opts.text, 0, opts.text.length(), textPaint, canvas.getWidth());
+        builder.setAlignment(Layout.Alignment.ALIGN_NORMAL);
+        builder.setLineSpacing(0.0f, 1.0f);
+        builder.setIncludePad(false);
+        textLayout = builder.build();
+      } else {
+        textLayout = new StaticLayout(opts.text, textPaint, canvas.getWidth(), Layout.Alignment.ALIGN_NORMAL, 1.0f, 0.0f, false);
+      }
       int textHeight = textLayout.getHeight();
       int textWidth = 0;
       int count = textLayout.getLineCount();
@@ -352,6 +358,9 @@ private void markImageByText(
         }
       }
 
+      // textPaint.setUnderlineText(true);
+//      textPaint.setTextSkewX(-0.25f);
+
       float x = position.X;
       float y = position.Y;
 
@@ -495,7 +504,7 @@ public void addTextByPosition(
     ReadableMap opts,
     final Promise promise
   ) {
-    MarkTextOptions markOpts = (MarkTextOptions) Options.checkParams(opts, promise);
+    MarkTextOptions markOpts = MarkTextOptions.checkParams(opts, promise);
     if (null == markOpts) return;
     try {
 

android/src/main/java/com/jimmydaddy/imagemarker/ImageMarkerManager.java

@@ -63,11 +63,13 @@ static public Position getTextPosition(PositionEnum position, int width, int hei
       case CENTER:
         return new Position((width - textWidth) / 2, (height - textHeight) / 2);
       case BOTTOM_LEFT:
-        return new Position(0, height - textHeight - margin);
+        return new Position(margin, height - textHeight - margin);
       case BOTTOM_CENTER:
         return new Position((width - textWidth) / 2, height - textHeight);
-      default:
+      case BOTTOM_RIGHT:
         return new Position(width - textWidth - margin, height - textHeight - margin);
+      default:
+        return new Position(margin, margin);
     }
   }
 

android/src/main/java/com/jimmydaddy/imagemarker/base/Position.java

@@ -62,15 +62,18 @@ @implementation ImageMarker
     int w = image.size.width;
     int h = image.size.height;
 
-    UIGraphicsBeginImageContextWithOptions(image.size, NO, opts.scale);
-    [image drawInRect:CGRectMake(0, 0, w, h)];
-    NSDictionary *attr = @{
+    NSDictionary *attributes = @{
         NSFontAttributeName: opts.font,   //设置字体
         NSForegroundColorAttributeName : opts.color,      //设置字体颜色
         NSShadowAttributeName : opts.shadow
     };
+    NSAttributedString *attributedText = [[NSAttributedString alloc] initWithString:opts.text attributes:attributes];
+    CGSize maxSize = CGSizeMake(w, CGFLOAT_MAX); // 最大宽度和高度
+    CGRect textRect = [attributedText boundingRectWithSize:maxSize options:NSStringDrawingUsesLineFragmentOrigin context:nil];
+    CGSize size = textRect.size;
 
-    CGSize size = [opts.text sizeWithAttributes:attr];
+    UIGraphicsBeginImageContextWithOptions(image.size, NO, opts.scale);
+    [image drawInRect:CGRectMake(0, 0, w, h)];
     TextBackground* textBackground = opts.textBackground;
     if (textBackground != nil) {
         CGContextRef context = UIGraphicsGetCurrentContext();
@@ -87,7 +90,7 @@ @implementation ImageMarker
     CGRect rect = (CGRect){ CGPointMake(opts.X, opts.Y), size };
 
     //    CGRect position = CGRectMake(X, Y, w, h);
-    [opts.text drawInRect:rect withAttributes:attr];
+    [opts.text drawInRect:rect withAttributes:attributes];
     UIImage *aimg = UIGraphicsGetImageFromCurrentImageContext();
     UIGraphicsEndImageContext();
     return aimg;