feat:Image add imageFilePath

doric-android/doric/src/main/java/pub/doric/shader/ImageNode.java

@@ -51,6 +51,8 @@ import com.github.pengfeizhou.jscore.JSONBuilder;
 import com.github.pengfeizhou.jscore.JSObject;
 import com.github.pengfeizhou.jscore.JSValue;
 
+import java.io.File;
+
 import jp.wasabeef.glide.transformations.BlurTransformation;
 import pub.doric.DoricContext;
 import pub.doric.extension.bridge.DoricPlugin;
@@ -422,6 +424,14 @@ public class ImageNode extends ViewNode<ImageView> {
                     }
                 }
                 break;
+            case "imageFilePath":
+                if (!prop.isString()) {
+                    return;
+                }
+                String filePath = prop.asString().value();
+                File file = new File(filePath);
+                loadIntoTarget(Glide.with(getContext()).load(file));
+                break;
             default:
                 super.blend(view, name, prop);
                 break;

doric-iOS/Pod/Classes/Shader/DoricImageNode.m

@@ -345,16 +345,7 @@ - (void)blendView:(UIImageView *)view forPropName:(NSString *)name propValue:(id
 
         }
     } else if ([@"imageRes" isEqualToString:name]) {
-#if __has_include(<YYWebImage/YYWebImage.h>)
+        UIImage *image = [self imageNamed:prop];
-        YYImage *image = [YYImage imageNamed:prop];
-#elif __has_include(<SDWebImage/SDWebImage.h>)
-        UIImage *image = [SDAnimatedImage imageNamed:prop];
-        if (!image) {
-            image = [UIImage imageNamed:prop];
-        }
-#else
-        UIImage *image = [UIImage imageNamed:prop];
-#endif
         if (image) {
             view.image = image;
         } else {
@@ -375,16 +366,20 @@ - (void)blendView:(UIImageView *)view forPropName:(NSString *)name propValue:(id
         NSString *path = [[NSBundle mainBundle] bundlePath];
         NSString *fullPath = [path stringByAppendingPathComponent:prop];
         NSData *imgData = [[NSData alloc] initWithContentsOfFile:fullPath];
-#if __has_include(<YYWebImage/YYWebImage.h>)
+        UIImage *image = [self imageFromData:imgData];
-        YYImage *image = [YYImage imageWithData:imgData scale:self.imageScale];
+        view.image = image;
-#elif __has_include(<SDWebImage/SDWebImage.h>)
+        if (self.loadCallbackId.length > 0) {
-        UIImage *image = [SDAnimatedImage imageWithData:imgData scale:self.imageScale];
+            if (image) {
-        if (!image) {
+                [self callJSResponse:self.loadCallbackId,
-            image = [UIImage imageWithData:imgData scale:self.imageScale];
+                                     @{@"width": @(image.size.width), @"height": @(image.size.height)},
+                                nil];
+            } else {
+                [self callJSResponse:self.loadCallbackId, nil];
+            }
         }
-#else
+    } else if ([@"imageFilePath" isEqualToString:name]) {
-        UIImage *image = [UIImage imageWithData:imgData scale:self.imageScale];
+        NSData *imgData = [[NSData alloc] initWithContentsOfFile:prop];
-#endif
+        UIImage *image = [self imageFromData:imgData];
         view.image = image;
         if (self.loadCallbackId.length > 0) {
             if (image) {
@@ -404,6 +399,34 @@ - (void)blendView:(UIImageView *)view forPropName:(NSString *)name propValue:(id
     }
 }
 
+- (UIImage *)imageNamed:(NSString *)name {
+#if __has_include(<YYWebImage/YYWebImage.h>)
+    YYImage *image = [YYImage imageNamed:name];
+#elif __has_include(<SDWebImage/SDWebImage.h>)
+    UIImage *image = [SDAnimatedImage imageNamed:name];
+    if (!image) {
+        image = [UIImage imageNamed:name];
+    }
+#else
+    UIImage *image = [UIImage imageNamed:prop];
+#endif
+    return image;
+}
+
+- (UIImage *)imageFromData:(NSData *)imgData {
+#if __has_include(<YYWebImage/YYWebImage.h>)
+    YYImage *image = [YYImage imageWithData:imgData scale:self.imageScale];
+#elif __has_include(<SDWebImage/SDWebImage.h>)
+    UIImage *image = [SDAnimatedImage imageWithData:imgData scale:self.imageScale];
+    if (!image) {
+        image = [UIImage imageWithData:imgData scale:self.imageScale];
+    }
+#else
+    UIImage *image = [UIImage imageWithData:imgData scale:self.imageScale];
+#endif
+    return image;
+}
+
 - (void)afterBlended:(NSDictionary *)props {
     if (self.stretchInsetDic != nil) {
         CGFloat left = [self.stretchInsetDic[@"left"] floatValue];

doric-js/bundle/doric-lib.es5.js

@@ -2035,6 +2035,10 @@ var Image = /** @class */ (function (_super) {
         Property,
         __metadata$9("design:type", String)
     ], Image.prototype, "imageUrl", void 0);
+    __decorate$9([
+        Property,
+        __metadata$9("design:type", String)
+    ], Image.prototype, "imageFilePath", void 0);
     __decorate$9([
         Property,
         __metadata$9("design:type", String)

doric-js/bundle/doric-lib.js

@@ -1545,6 +1545,10 @@ __decorate$9([
     Property,
     __metadata$9("design:type", String)
 ], Image.prototype, "imageUrl", void 0);
+__decorate$9([
+    Property,
+    __metadata$9("design:type", String)
+], Image.prototype, "imageFilePath", void 0);
 __decorate$9([
     Property,
     __metadata$9("design:type", String)

doric-js/bundle/doric-vm.js

@@ -3066,6 +3066,10 @@ __decorate$9([
     Property,
     __metadata$9("design:type", String)
 ], Image.prototype, "imageUrl", void 0);
+__decorate$9([
+    Property,
+    __metadata$9("design:type", String)
+], Image.prototype, "imageFilePath", void 0);
 __decorate$9([
     Property,
     __metadata$9("design:type", String)

doric-js/index.d.ts

@@ -528,6 +528,10 @@ declare module 'doric/lib/src/widget/image' {
     }
     export class Image extends View {
             imageUrl?: string;
+            /**
+                * Read image from local file system.
+             */
+            imageFilePath?: string;
             /**
                 * Read image from local path
                 * For android,it based on assets dir.

doric-js/lib/src/widget/image.d.ts

@@ -7,6 +7,10 @@ export declare enum ScaleType {
 }
 export declare class Image extends View {
     imageUrl?: string;
+    /**
+     * Read image from local file system.
+    */
+    imageFilePath?: string;
     /**
      * Read image from local path
      * For android,it based on assets dir.

doric-js/lib/src/widget/image.js

@@ -37,6 +37,10 @@ __decorate([
     Property,
     __metadata("design:type", String)
 ], Image.prototype, "imageUrl", void 0);
+__decorate([
+    Property,
+    __metadata("design:type", String)
+], Image.prototype, "imageFilePath", void 0);
 __decorate([
     Property,
     __metadata("design:type", String)

doric-js/src/widget/image.ts

@@ -27,6 +27,11 @@ export class Image extends View {
     @Property
     imageUrl?: string
 
+    /** 
+     * Read image from local file system.
+    */
+    @Property
+    imageFilePath?: string
     /** 
      * Read image from local path
      * For android,it based on assets dir.

doric-web/dist/index.js

@@ -3120,6 +3120,10 @@ __decorate$9([
     Property,
     __metadata$9("design:type", String)
 ], Image.prototype, "imageUrl", void 0);
+__decorate$9([
+    Property,
+    __metadata$9("design:type", String)
+], Image.prototype, "imageFilePath", void 0);
 __decorate$9([
     Property,
     __metadata$9("design:type", String)