Update generated files

This commit is contained in:
pengfei.zhou 2021-12-30 10:50:08 +08:00 committed by osborn
parent e9e2d14a9d
commit cac47ee0b4
6 changed files with 6 additions and 71 deletions

View File

@ -1,4 +1,4 @@
import { Base64Resource, DrawableResource, Group, Panel, coordinator, text, gravity, Color, LayoutSpec, log, vlayout, scroller, layoutConfig, image, ScaleType, Image, modal, RemoteResource, MainBundleResource } from "doric"; import { AssetsResource, AndroidAssetsResource, Base64Resource, DrawableResource, Group, Panel, coordinator, text, gravity, Color, LayoutSpec, log, vlayout, scroller, layoutConfig, image, ScaleType, Image, modal, RemoteResource, MainBundleResource } from "doric";
import { colors, label } from "./utils"; import { colors, label } from "./utils";
import { img_base64 } from "./image_base64"; import { img_base64 } from "./image_base64";

View File

@ -2243,10 +2243,7 @@ var BundleResource = /** @class */ (function (_super) {
return _super.call(this, "bundle", bundleName + "://" + fileName) || this; return _super.call(this, "bundle", bundleName + "://" + fileName) || this;
} }
return BundleResource; return BundleResource;
<<<<<<< HEAD
}(iOSResource)); }(iOSResource));
=======
}(Resource));
var ArrayBufferResource = /** @class */ (function (_super) { var ArrayBufferResource = /** @class */ (function (_super) {
__extends$f(ArrayBufferResource, _super); __extends$f(ArrayBufferResource, _super);
function ArrayBufferResource(data) { function ArrayBufferResource(data) {
@ -2264,7 +2261,6 @@ var ArrayBufferResource = /** @class */ (function (_super) {
}; };
return ArrayBufferResource; return ArrayBufferResource;
}(Resource)); }(Resource));
>>>>>>> f476a5b0... feat:android support ArrayBuffer Resource
var __extends$e = (undefined && undefined.__extends) || (function () { var __extends$e = (undefined && undefined.__extends) || (function () {
var extendStatics = function (d, b) { var extendStatics = function (d, b) {
@ -4646,12 +4642,8 @@ exports.AlphaAnimation = AlphaAnimation;
exports.AndroidAssetsResource = AndroidAssetsResource; exports.AndroidAssetsResource = AndroidAssetsResource;
exports.AndroidResource = AndroidResource; exports.AndroidResource = AndroidResource;
exports.AnimationSet = AnimationSet; exports.AnimationSet = AnimationSet;
<<<<<<< HEAD
exports.AssetsResource = AssetsResource;
=======
exports.ArrayBufferResource = ArrayBufferResource; exports.ArrayBufferResource = ArrayBufferResource;
exports.AssetResource = AssetResource; exports.AssetsResource = AssetsResource;
>>>>>>> f476a5b0... feat:android support ArrayBuffer Resource
exports.BOTTOM = BOTTOM; exports.BOTTOM = BOTTOM;
exports.BackgroundColorAnimation = BackgroundColorAnimation; exports.BackgroundColorAnimation = BackgroundColorAnimation;
exports.Base64Resource = Base64Resource; exports.Base64Resource = Base64Resource;

View File

@ -3540,12 +3540,8 @@ exports.AlphaAnimation = AlphaAnimation;
exports.AndroidAssetsResource = AndroidAssetsResource; exports.AndroidAssetsResource = AndroidAssetsResource;
exports.AndroidResource = AndroidResource; exports.AndroidResource = AndroidResource;
exports.AnimationSet = AnimationSet; exports.AnimationSet = AnimationSet;
<<<<<<< HEAD
exports.AssetsResource = AssetsResource;
=======
exports.ArrayBufferResource = ArrayBufferResource; exports.ArrayBufferResource = ArrayBufferResource;
exports.AssetResource = AssetResource; exports.AssetsResource = AssetsResource;
>>>>>>> f476a5b0... feat:android support ArrayBuffer Resource
exports.BOTTOM = BOTTOM; exports.BOTTOM = BOTTOM;
exports.BackgroundColorAnimation = BackgroundColorAnimation; exports.BackgroundColorAnimation = BackgroundColorAnimation;
exports.Base64Resource = Base64Resource; exports.Base64Resource = Base64Resource;

View File

@ -5309,12 +5309,8 @@ exports.AlphaAnimation = AlphaAnimation;
exports.AndroidAssetsResource = AndroidAssetsResource; exports.AndroidAssetsResource = AndroidAssetsResource;
exports.AndroidResource = AndroidResource; exports.AndroidResource = AndroidResource;
exports.AnimationSet = AnimationSet; exports.AnimationSet = AnimationSet;
<<<<<<< HEAD
exports.AssetsResource = AssetsResource;
=======
exports.ArrayBufferResource = ArrayBufferResource; exports.ArrayBufferResource = ArrayBufferResource;
exports.AssetResource = AssetResource; exports.AssetsResource = AssetsResource;
>>>>>>> f476a5b0... feat:android support ArrayBuffer Resource
exports.BOTTOM = BOTTOM; exports.BOTTOM = BOTTOM;
exports.BackgroundColorAnimation = BackgroundColorAnimation; exports.BackgroundColorAnimation = BackgroundColorAnimation;
exports.Base64Resource = Base64Resource; exports.Base64Resource = Base64Resource;

View File

@ -5142,12 +5142,8 @@ exports.AlphaAnimation = AlphaAnimation;
exports.AndroidAssetsResource = AndroidAssetsResource; exports.AndroidAssetsResource = AndroidAssetsResource;
exports.AndroidResource = AndroidResource; exports.AndroidResource = AndroidResource;
exports.AnimationSet = AnimationSet; exports.AnimationSet = AnimationSet;
<<<<<<< HEAD
exports.AssetsResource = AssetsResource;
=======
exports.ArrayBufferResource = ArrayBufferResource; exports.ArrayBufferResource = ArrayBufferResource;
exports.AssetResource = AssetResource; exports.AssetsResource = AssetsResource;
>>>>>>> f476a5b0... feat:android support ArrayBuffer Resource
exports.BOTTOM = BOTTOM; exports.BOTTOM = BOTTOM;
exports.BackgroundColorAnimation = BackgroundColorAnimation; exports.BackgroundColorAnimation = BackgroundColorAnimation;
exports.Base64Resource = Base64Resource; exports.Base64Resource = Base64Resource;

File diff suppressed because one or more lines are too long