diff --git a/samples/01-base/build.hxml b/samples/01-view/build.hxml similarity index 100% rename from samples/01-base/build.hxml rename to samples/01-view/build.hxml diff --git a/samples/01-base/src/ViewExample.hx b/samples/01-view/src/ViewExample.hx similarity index 100% rename from samples/01-base/src/ViewExample.hx rename to samples/01-view/src/ViewExample.hx diff --git a/samples/01-base/src/form.json b/samples/01-view/src/form.json similarity index 100% rename from samples/01-base/src/form.json rename to samples/01-view/src/form.json diff --git a/samples/02-loader/build.hxml b/samples/02-loader/build.hxml new file mode 100755 index 0000000..566066b --- /dev/null +++ b/samples/02-loader/build.hxml @@ -0,0 +1,5 @@ +-cp src +-lib haxework +-main LoaderExample.hx +-swf-version 10.1 +-swf target/LoaderExample.swf \ No newline at end of file diff --git a/samples/02-loader/src/LoaderExample.hx b/samples/02-loader/src/LoaderExample.hx new file mode 100755 index 0000000..7097f82 --- /dev/null +++ b/samples/02-loader/src/LoaderExample.hx @@ -0,0 +1,43 @@ +package; + +import flash.display.Bitmap; +import flash.Lib; +import flash.display.BitmapData; +import haxework.net.ImageLoader; +import haxework.net.JsonLoader; + +typedef ChannelItem = { + var id:String; + var maker:String; + var title:String; + var message:String; +} + +class LoaderExample { + + public static function main() { + // Json + trace("Json Request"); + new JsonLoader().GET("http://umix.tv/channel/data2/renova.json") + .success(function(channel:Array) { + trace("Json Ok: " + channel.length); + for (item in channel) { + trace(item.id + ": " + item.message); + } + }) + .fail(function(error) { + trace(error); + }); + + // Image + trace("Image Request"); + new ImageLoader().GET("http://umix.tv/channel/block/renova/1") + .success(function(image:BitmapData) { + trace("Image Ok: " + image.width + "x" + image.height); + Lib.current.addChild(new Bitmap(image)); + }) + .fail(function(error) { + trace(error); + }); + } +} diff --git a/src/main/haxework/net/BaseLoader.hx b/src/main/haxework/net/BaseLoader.hx index 04afb26..5a54321 100755 --- a/src/main/haxework/net/BaseLoader.hx +++ b/src/main/haxework/net/BaseLoader.hx @@ -74,7 +74,7 @@ class BaseLoader implements ILoader { } public function GET(url:String, data:Dynamic = null):ICallback { - #if openfl + #if (openfl && lime) if (StringTools.startsWith(url, "%assets%")) { var path:String = url.substring(9); var bytes:ByteArray = openfl.Assets.getBytes(path); diff --git a/src/main/haxework/provider/Provider.hx b/src/main/haxework/provider/Provider.hx index afbc3b6..f64c1f2 100755 --- a/src/main/haxework/provider/Provider.hx +++ b/src/main/haxework/provider/Provider.hx @@ -1,10 +1,15 @@ package haxework.provider; +import haxework.net.manage.LoaderManager; +import haxework.net.manage.ILoaderManager; import haxe.ds.ObjectMap; class Provider { - private static var factories:ObjectMap> = new ObjectMap>(); + //private static var factories:ObjectMap> = new ObjectMap>(); + private static var factories:ObjectMap> = cast [ + ILoaderManager => LoaderManager + ]; private static var args:ObjectMap> = new ObjectMap>(); private static var instances:ObjectMap = new ObjectMap();