Merge branch 'dev_5.25.0' into deploy

Author: 野松

Android/LuaViewDemo/LuaViewDemo.iml

@@ -101,6 +101,5 @@
     <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="glide-3.7.0" level="project" />
     <orderEntry type="module" module-name="LuaViewSDK" exported="" />
-    <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
   </component>
 </module>

Android/LuaViewDemo/assets/luaview/test.szip

@@ -0,0 +1,35 @@
+-- Created by LuaView.
+-- Copyright (c) 2017, Alibaba Group. All rights reserved.
+--
+-- This source code is licensed under the MIT.
+-- For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
+
+-- Created by LuaView.
+-- Copyright (c) 2017, Alibaba Group. All rights reserved.
+--
+-- This source code is licensed under the MIT.
+-- For the full copyright and license information,please view the LICENSE file in the root directory of this source tree.
+
+code = [[
+    a = {}
+    a.x = function()
+        local btn = Button()
+        btn:frame(0, 0, 100, 100)
+        btn:text("button")
+--        btn:callback(function
+--          Toast("btn clicked")
+--        end)
+    end
+
+    a.x()
+]]
+
+
+--hi = load(code)
+--hi()
+
+
+
+load("local btn = Button(); btn:text('yyy'); btn:callback(function Toast('x') end)")()
+
+

Android/LuaViewDemo/assets/test-standard/NUI_DynamicCode.lua

@@ -0,0 +1,26 @@
+-- 活动指示器
+local SCREEN_WIDTH = System:screenSize()
+
+local scrollView = HScrollView()
+
+
+for i = 0, 10, 1 do
+    local btn = Label()
+    btn:text("BTN" .. i)
+    btn:frame(i * 60, 10, 59, 80)
+    btn:backgroundColor(0xff00ff00)
+    scrollView:addView(btn)
+end
+
+scrollView:xy(0, 300)
+scrollView:size(SCREEN_WIDTH, 100)
+scrollView:backgroundColor(0xffcccccc)
+scrollView:showScrollIndicator(false)
+
+
+scrollView:callback({
+    Scrolling = function(x, y)
+        print("Scrolling", x, y)
+        print(scrollView:offset())
+    end
+})

Android/LuaViewDemo/assets/test-standard/UI_HScrollView.lua

@@ -55,17 +55,28 @@ local cellData = function(_, key)
     return {
         Size = function(section, row)
             print("Size", section, row, 10 + row * 2)
-            return 10 + row * 2
+--            return 10 + row * 2
+            return s_width, 200
         end,
         Init = function(cell, section, row) -- 初始化cell
         print("Init", section, row, 10 + row * 2)
         cell.title = Label();
         cell.title.backgroundColor(section == 1 and 0xff0000 or 0x00ff00)
+            cell.title.lines(10)
+            cell.title.maxLine(10)
         end,
         Layout = function(cell, section, row) -- cell复用时调用
         print("Layout", section, row, 10 + row * 2)
-        cell.title.frame(0, 0, s_width, 10 + row * 2)
-        cell.title.text(section .. '--' .. row)
+--        cell.title.frame(0, 0, s_width, 10 + row * 2)
+
+        cell.title.text("sfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfssfadfs")
+
+            print("cell-size 11", cell.title.height())
+
+        cell.title.adjustSize()
+
+            print("cell-size 22", cell.title.height())
+
         end,
         Callback = function(cell, section, row) -- 用户点击了section和row
         Toast("Section " .. section .. ", Row " .. row);

Android/LuaViewDemo/assets/test/UI_CollectionView.lua

@@ -25,7 +25,7 @@
 
 public class DemoActivity extends ListActivity {
     //测试标准语法
-    public static boolean useStandardSyntax = false;
+    public static boolean useStandardSyntax = true;
 
     //非标准语法代码路径
     private static final String FOLDER_NAME = "test";

Android/LuaViewDemo/src/com/taobao/luaview/demo/activity/DemoActivity.java

@@ -109,7 +109,28 @@ private void extendsLuaView(final LuaView luaView) {
      * 加载数据
      */
     public void loadScript(final LuaView luaView) {
-        luaView.load(getLuaUri(), new LuaScriptLoader.ScriptExecuteCallback() {
+//        luaView.load(getLuaUri(), new LuaScriptLoader.ScriptExecuteCallback() {
+//            @Override
+//            public boolean onScriptPrepared(ScriptBundle bundle) {
+//                return false;
+//            }
+//
+//            @Override
+//            public boolean onScriptCompiled(LuaValue value, LuaValue context, LuaValue view) {
+//                return false;
+//            }
+//
+//            @Override
+//            public void onScriptExecuted(String uri, boolean executedSuccess) {
+//                //测试调用 lua function
+//                LogUtil.d("call-lua-function return:", luaView.callLuaFunction("global_fun_test1", 1, "a", 0.1));
+//                LogUtil.d("call-lua-function return:", JsonUtil.toString(luaView.callLuaFunction("global_fun_test2", 2, "b", 0.2)));
+//                LogUtil.d("call-window-function return:", luaView.callWindowFunction("window_fun1", 3, "c", 0.3));
+//                LogUtil.d("call-window-function return:", luaView.callWindowFunction("window_fun2", 4, "d", 0.4));
+//            }
+//        });
+
+        luaView.load("file:///android_asset/luaview/test.szip", new LuaScriptLoader.ScriptExecuteCallback() {
             @Override
             public boolean onScriptPrepared(ScriptBundle bundle) {
                 return false;
@@ -122,11 +143,7 @@ public boolean onScriptCompiled(LuaValue value, LuaValue context, LuaValue view)
 
             @Override
             public void onScriptExecuted(String uri, boolean executedSuccess) {
-                //测试调用 lua function
-                LogUtil.d("call-lua-function return:", luaView.callLuaFunction("global_fun_test1", 1, "a", 0.1));
-                LogUtil.d("call-lua-function return:", JsonUtil.toString(luaView.callLuaFunction("global_fun_test2", 2, "b", 0.2)));
-                LogUtil.d("call-window-function return:", luaView.callWindowFunction("window_fun1", 3, "c", 0.3));
-                LogUtil.d("call-window-function return:", luaView.callWindowFunction("window_fun2", 4, "d", 0.4));
+
             }
         });
     }

Android/LuaViewDemo/src/com/taobao/luaview/demo/activity/DemoLuaViewActivity.java

@@ -12,6 +12,7 @@
 import com.taobao.luaview.userdata.ui.UDEditText;
 import com.taobao.luaview.util.LuaViewUtil;
 
+import org.luaj.vm2.LuaString;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Varargs;
 
@@ -29,7 +30,8 @@ public class UIEditTextMethodMapper<U extends UDEditText> extends UITextViewMeth
     private static final String TAG = "UIEditTextMethodMapper";
     private static final String[] sMethods = new String[]{
             "hint",//0
-            "placeholder"//1
+            "placeholder",//1
+            "inputType"//2
     };
 
     @Override
@@ -45,12 +47,33 @@ public Varargs invoke(int code, U target, Varargs varargs) {
                 return hint(target, varargs);
             case 1:
                 return placeholder(target, varargs);
+            case 2:
+                return inputType(target, varargs);
         }
         return super.invoke(code, target, varargs);
     }
 
     //--------------------------------------- API --------------------------------------------------
 
+    /**
+     * 键盘类型
+     */
+    public LuaValue inputType(U view, Varargs varargs) {
+        if (varargs.narg() > 1) {
+            return setInputType(view, varargs);
+        } else {
+            return getInputType(view, varargs);
+        }
+    }
+
+    public LuaValue setInputType(U view, Varargs varargs) {
+        final CharSequence type = LuaViewUtil.getText(varargs.optvalue(2, NIL));
+        return view.setInputType(type);
+    }
+
+    public LuaValue getInputType(U view, Varargs varargs) {
+        return valueOf(view.getInputType());
+    }
 
     /**
      * 获取placeHolder内容

Android/LuaViewSDK/src/com/taobao/luaview/fun/mapper/ui/UIEditTextMethodMapper.java

@@ -24,6 +24,9 @@ public class Constants {
     public static final String PARAM_URI = "uri";
     public static final String PAGE_PARAMS = "page_params";
 
+    // asset file prefix for loading luaview.load(ASSET_FILE_PREFIX + "foler/name")
+    public static final String ASSET_FILE_PREFIX = "file:///android_asset/";
+
     //Bundle encrypt and decrypt
     public static final String PUBLIC_KEY_PATH = "luaview/luaview_rsa_public_key.der";
     public static final String PUBLIC_KEY_PATH_MD5 = "luaview/luaview_rsa_public_key.der-md5";

Android/LuaViewSDK/src/com/taobao/luaview/global/Constants.java

@@ -45,6 +45,12 @@ public interface ScriptLoaderCallback {
         void onScriptLoaded(final ScriptBundle bundle);//脚本加载
     }
 
+    public interface ScriptLoaderCallback2 extends ScriptLoaderCallback {
+        void onScriptDownloadStart();//下载开始
+
+        void onScriptDownloadEnd(final ScriptBundle bundle);//包内设置的脚本加载
+    }
+
     /**
      * 脚本运行回调
      */
@@ -74,6 +80,26 @@ public interface ScriptExecuteCallback {
         void onScriptExecuted(String uri, boolean executedSuccess);
     }
 
+    /**
+     * 脚本运行回调
+     */
+    public interface ScriptExecuteCallback2 extends ScriptExecuteCallback {
+
+        /**
+         * 脚本下载开始
+         */
+        void onScriptDownloadStart();
+
+        /**
+         * 脚本下载完毕
+         *
+         * @param bundle
+         * @return
+         */
+        void onScriptDownloadEnd(ScriptBundle bundle);
+
+    }
+
     //-----------------------------------------static methods---------------------------------------
 
     /**
@@ -128,7 +154,7 @@ public void load(final String url, final ScriptLoaderCallback callback) {
     public void load(final String url, final String sha256, final ScriptLoaderCallback callback) {
         new ScriptBundleUltimateLoadTask(mContext, callback).load(url, sha256);
     }
-
+    
 
     //--------------------------------preload script------------------------------------------------
 

Android/LuaViewSDK/src/com/taobao/luaview/global/LuaScriptLoader.java

@@ -412,6 +412,12 @@ public String getUri() {
         return mLuaViewCore != null ? mLuaViewCore.getUri() : null;
     }
 
+    public void setUri(String uri) {
+        if (mLuaViewCore != null) {
+            mLuaViewCore.setUri(uri);
+        }
+    }
+
     public Globals getGlobals() {
         return mLuaViewCore != null ? mLuaViewCore.getGlobals() : null;
     }

Android/LuaViewSDK/src/com/taobao/luaview/global/LuaView.java

@@ -105,8 +105,7 @@ public static void createAsync(final Context context, final LuaViewCore.CreatedC
         new SimpleTask1<LuaViewCore>() {
             @Override
             protected LuaViewCore doInBackground(Object... params) {
-                final Globals globals = LuaViewManager.createGlobalsAsync();
-                return createLuaViewCore(context, globals);
+                return create(context);
             }
 
             @Override
@@ -160,7 +159,7 @@ public LuaViewCore load(final String urlOrFileOrScript, final String sha256) {
 
     public LuaViewCore load(final String urlOrFileOrScript, final String sha256, final LuaScriptLoader.ScriptExecuteCallback callback) {
         if (!TextUtils.isEmpty(urlOrFileOrScript)) {
-            if (URLUtil.isNetworkUrl(urlOrFileOrScript)) {//url, http:// or https://
+            if (URLUtil.isNetworkUrl(urlOrFileOrScript) || URLUtil.isAssetUrl(urlOrFileOrScript)) {//url, http:// or https:// or asset://
                 loadUrl(urlOrFileOrScript, sha256, callback);
             } else {
                 loadFile(urlOrFileOrScript, callback);
@@ -182,12 +181,35 @@ public LuaViewCore loadUrl(final String url, final String sha256) {
         return loadUrl(url, sha256, null);
     }
 
+
+    /**
+     * load url
+     *
+     * @param url
+     * @param sha256
+     * @param callback
+     * @return
+     */
     public LuaViewCore loadUrl(final String url, final String sha256, final LuaScriptLoader.ScriptExecuteCallback callback) {
         updateUri(url);
         if (!TextUtils.isEmpty(url)) {
-            new LuaScriptLoader(mContext).load(url, sha256, new LuaScriptLoader.ScriptLoaderCallback() {
+            new LuaScriptLoader(mContext).load(url, sha256, new LuaScriptLoader.ScriptLoaderCallback2() {
+                @Override
+                public void onScriptDownloadStart() {//下载开始，不一定会调用，存在调用失败的情况
+                    if (callback instanceof LuaScriptLoader.ScriptExecuteCallback2) {
+                        ((LuaScriptLoader.ScriptExecuteCallback2) callback).onScriptDownloadStart();
+                    }
+                }
+
                 @Override
-                public void onScriptLoaded(ScriptBundle bundle) {
+                public void onScriptDownloadEnd(ScriptBundle bundle) {//下载完成，不一定会调用，如果调用的话，且packageName不为空的话，则onScriptLoaded加载的是Asset预置脚本
+                    if (callback instanceof LuaScriptLoader.ScriptExecuteCallback2) {
+                        ((LuaScriptLoader.ScriptExecuteCallback2) callback).onScriptDownloadEnd(bundle);
+                    }
+                }
+
+                @Override
+                public void onScriptLoaded(ScriptBundle bundle) {//脚本本地 or Asset or 网络 准备成功
                     if (callback == null || callback.onScriptPrepared(bundle) == false) {//脚本准备完成，且不第三方自己执行
                         loadScriptBundle(bundle, callback);
                     } else if (callback != null) {
@@ -511,6 +533,12 @@ public String getUri() {
         return null;
     }
 
+    public void setUri(String uri) {
+        if (mGlobals != null && mGlobals.getLuaResourceFinder() != null) {
+            mGlobals.getLuaResourceFinder().setUri(uri);
+        }
+    }
+
     public Globals getGlobals() {
         return mGlobals;
     }