request update: LuaView for tao首页

野松 · 野松 · commit 0a5cf55c8494 · 2017-06-13T23:01:26.000+08:00
diff --git a/Android/LuaViewDemo/LuaViewDemo.iml b/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>
diff --git a/Android/LuaViewDemo/assets/test-standard/NUI_DynamicCode.lua b/Android/LuaViewDemo/assets/test-standard/NUI_DynamicCode.lua
@@ -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)")()
+
+
diff --git a/Android/LuaViewDemo/assets/test-standard/UI_HScrollView.lua b/Android/LuaViewDemo/assets/test-standard/UI_HScrollView.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
+})
diff --git a/Android/LuaViewDemo/src/com/taobao/luaview/demo/activity/DemoActivity.java b/Android/LuaViewDemo/src/com/taobao/luaview/demo/activity/DemoActivity.java
@@ -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";
diff --git a/Android/LuaViewSDK/src/com/taobao/luaview/global/LuaScriptLoader.java b/Android/LuaViewSDK/src/com/taobao/luaview/global/LuaScriptLoader.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---------------------------------------
 
     /**
@@ -129,7 +155,6 @@ public void load(final String url, final String sha256, final ScriptLoaderCallba
         new ScriptBundleUltimateLoadTask(mContext, callback).load(url, sha256);
     }
 
-
     //--------------------------------preload script------------------------------------------------
 
     /**
diff --git a/Android/LuaViewSDK/src/com/taobao/luaview/global/LuaViewCore.java b/Android/LuaViewSDK/src/com/taobao/luaview/global/LuaViewCore.java
@@ -181,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 onScriptDownloadEnd(ScriptBundle bundle) {//下载完成，不一定会调用，如果调用的话，且packageName不为空的话，则onScriptLoaded加载的是Asset预置脚本
+                    if (callback instanceof LuaScriptLoader.ScriptExecuteCallback2) {
+                        ((LuaScriptLoader.ScriptExecuteCallback2) callback).onScriptDownloadEnd(bundle);
+                    }
+                }
+
                 @Override
-                public void onScriptLoaded(ScriptBundle bundle) {
+                public void onScriptLoaded(ScriptBundle bundle) {//脚本本地 or Asset or 网络 准备成功
                     if (callback == null || callback.onScriptPrepared(bundle) == false) {//脚本准备完成，且不第三方自己执行
                         loadScriptBundle(bundle, callback);
                     } else if (callback != null) {
diff --git a/Android/LuaViewSDK/src/com/taobao/luaview/scriptbundle/LuaScriptManager.java b/Android/LuaViewSDK/src/com/taobao/luaview/scriptbundle/LuaScriptManager.java
@@ -30,6 +30,7 @@ public class LuaScriptManager {
     //folders
     private static final String PACKAGE_NAME_DEFAULT = "luaview";
     public static final String FOLDER_SCRIPT = "script";
+    public static final String FOLDER_PRE_DOWNLOAD = "predownload";
 
     //默认缓存文件的后缀
     public static final String POSTFIX_SCRIPT_BUNDLE = ".lvraw";
@@ -56,7 +57,8 @@ public static void init(final Context context) {
                 initInternalFilePath(context);
             } else {//测试环境优先使用sd卡路径
                 if (Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
-                    PACKAGE_NAME = context.getPackageName();
+//                    PACKAGE_NAME = context.getPackageName();//改成luaview
+                    PACKAGE_NAME = PACKAGE_NAME_DEFAULT;
                     BASE_FILECACHE_PATH = context.getExternalCacheDir() + File.separator;
                 } else {
                     initInternalFilePath(context);
@@ -84,7 +86,7 @@ private static void initInternalFilePath(Context context) {
     //--------------------------------static methods for get file path------------------------------
 
     /**
-     * 获取基础文件路劲
+     * 获取基础文件路径
      *
      * @return
      */
@@ -101,6 +103,15 @@ public static String getBaseScriptFolderPath() {
         return BASE_FILECACHE_PATH + PACKAGE_NAME + File.separator + FOLDER_SCRIPT + File.separator;
     }
 
+    /**
+     * get predownload folder path
+     *
+     * @return
+     */
+    public static String getBasePredownloadFolderPath() {
+        return BASE_FILECACHE_PATH + PACKAGE_NAME + File.separator + FOLDER_PRE_DOWNLOAD + File.separator;
+    }
+
     /**
      * get path of given folder
      *
@@ -129,6 +140,19 @@ public static String getFilePath(final String subFolderName, final String fileNa
                 .toString();
     }
 
+    /**
+     * get pre downloaded file path
+     *
+     * @param fileNameWithPostfix
+     * @return
+     */
+    public static String getPredownloadFilePath(String fileNameWithPostfix) {
+        return new StringBuffer()
+                .append(getBasePredownloadFolderPath())
+                .append(fileNameWithPostfix).toString();
+    }
+
+
     /**
      * 构建文件名称
      *
@@ -178,6 +202,22 @@ public static String buildScriptBundleFilePath(final String uri) {
         return getFilePath(folderName, fileName);
     }
 
+
+    /**
+     * 构建预下载脚本文件名（这里直接使用脚本地址，不做任何修改）
+     *
+     * @param uri
+     * @return
+     */
+    public static String buildPredownloadScriptBundleFilePath(final String uri) {
+        if(uri != null){
+            String fileName = uri.substring(uri.lastIndexOf('/') + 1);//只取最后的文件名
+            return getPredownloadFilePath(fileName);
+        } else {
+            return null;
+        }
+    }
+
     //------------------------------------------exists----------------------------------------------
 
     /**
@@ -193,6 +233,19 @@ public static boolean existsScriptBundle(final String uri) {
         return false;
     }
 
+    /**
+     * 预下载目录下的某个文件是否存在
+     *
+     * @param uri
+     * @return
+     */
+    public static boolean existsPredownloadBundle(final String uri) {
+        if (!TextUtils.isEmpty(uri)) {
+            return FileUtil.exists(buildPredownloadScriptBundleFilePath(uri));
+        }
+        return false;
+    }
+
     //--------------------------------------------判断函数-------------------------------------------
 
     /**
@@ -241,6 +294,17 @@ public static boolean isLuaStandardSyntaxUrl(final String url) {
         return FileUtil.isSuffix(url, LuaScriptManager.POSTFIX_LV_STANDARD_SYNTAX_ZIP);
     }
 
+    /**
+     * 是否是非标准语法的 zip包
+     *
+     * @param url
+     * @return
+     */
+    public static boolean isLuaUnStandardSyntaxUrl(final String url) {
+        return FileUtil.isSuffix(url, LuaScriptManager.POSTFIX_LV_ZIP);//只有zip包是非标准包，bzip、szip都认为是标准，bzip有问题么？
+    }
+
+
     /**
      * 是否是lua加密脚本
      *
diff --git a/Android/LuaViewSDK/src/com/taobao/luaview/scriptbundle/asynctask/ScriptBundleUltimateLoadTask.java b/Android/LuaViewSDK/src/com/taobao/luaview/scriptbundle/asynctask/ScriptBundleUltimateLoadTask.java
diff --git a/Android/LuaViewSDK/src/com/taobao/luaview/view/LVHorizontalScrollView.java b/Android/LuaViewSDK/src/com/taobao/luaview/view/LVHorizontalScrollView.java
diff --git a/Android/LuaViewSDK/src/org/luaj/vm2/Globals.java b/Android/LuaViewSDK/src/org/luaj/vm2/Globals.java
