fix(ios): Image capInsets bug

Tencent · Nov 17, 2023 · 092db23 · 092db23
1 parent e7b8241
commit 092db23
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/modules/ios/image/HippyDefaultImageProvider.m b/modules/ios/image/HippyDefaultImageProvider.m
@@ -35,7 +35,8 @@ @interface HippyDefaultImageProvider () {
 
 @implementation HippyDefaultImageProvider
 
-@synthesize imageDataPath;
+@synthesize scale = _scale;
+@synthesize imageDataPath = _imageDataPath;
 
 + (BOOL)canHandleData:(NSData *)data {
     return YES;
@@ -46,6 +47,14 @@ + (BOOL)isAnimatedImage:(NSData *)data {
     return ret;
 }
 
+- (instancetype)init {
+    self = [super init];
+    if (self) {
+        _scale = 1.0;
+    }
+    return self;
+}
+
 - (void)setImageData:(NSData *)imageData {
     if ([[self class] isAnimatedImage:imageData]) {
         _imageSourceRef = CGImageSourceCreateWithData((__bridge CFDataRef)imageData, NULL);
@@ -55,12 +64,12 @@ - (void)setImageData:(NSData *)imageData {
 }
 
 - (UIImage *)image {
-    CGFloat scale = [UIScreen mainScreen].scale;
     if (!_image) {
         if (_data) {
             CGFloat view_width = _imageViewSize.width;
             CGFloat view_height = _imageViewSize.height;
             if (_downSample && view_width > 0 && view_height > 0) {
+                CGFloat scale = self.scale;
                 NSDictionary *options = @{ (NSString *)kCGImageSourceShouldCache: @(NO) };
                 CGImageSourceRef ref = CGImageSourceCreateWithData((__bridge CFDataRef)_data, (__bridge CFDictionaryRef)options);
                 if (ref) {
@@ -95,7 +104,7 @@ - (UIImage *)image {
         }
     }
     if (!_image) {
-        _image = [UIImage imageWithData:_data scale:scale];
+        _image = [UIImage imageWithData:_data scale:self.scale];
     }
     return _image;
 }

diff --git a/modules/ios/image/HippyImageProviderProtocol.h b/modules/ios/image/HippyImageProviderProtocol.h
@@ -38,6 +38,11 @@
 
 @property(nonatomic, copy)NSString *imageDataPath;
 
+/**
+ * Image scale
+ */
+@property (nonatomic, assign) CGFloat scale;
+
 /**
  * Set image data for provider
  *