Merge branch 'dev_2.7.0' into dev_optimization

Author: lucas

VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/view/VideoOSLuaView.java

@@ -47,6 +47,8 @@ public class VideoOSLuaView extends VideoOSBaseView {
 
     private static final String INIT_SCRIPT = "Init_ScriptBundle";
     private static final String LOCAL_LUA_PATH = "lua/";
+    private static final String KEY_MINIAPPID = "miniAppId";
+    private static final String KEY_APPLETID = "appletId";
     private volatile LuaView mLuaView;
     private boolean hasCallShowFunction = false;
     public static ScriptBundle sScriptBundle;
@@ -212,20 +214,27 @@ private void runLuaFile(final LuaView luaView, final String luaName, final Objec
         if (TextUtils.isEmpty(luaName)) {
             return;
         }
-//        if (luaName.contains("os_video_figureStarList_hotspot.lua")) {
-//            runLua(luaView, luaName, valueData);
-//            return;
-//        }
+        String miniAppId = "";
+        if (valueData instanceof HashMap) {
+            HashMap params = (HashMap) valueData;
+            if (params != null && params.size() >= 0) {
+                if (params.containsKey(KEY_MINIAPPID)) {
+                    miniAppId = params.get(KEY_MINIAPPID) == null ? "" : String.valueOf(params.get(KEY_MINIAPPID));
+                } else if (params.containsKey(KEY_APPLETID)) {
+                    miniAppId = params.get(KEY_APPLETID) == null ? "" : String.valueOf(params.get(KEY_APPLETID));
+                }
+            }
+        }
         if (sScriptBundle == null) {
             sScriptBundle = initScriptBundle(VenvyFileUtil.getCachePath(VideoOSLuaView.this.getContext()) + PreloadLuaUpdate.LUA_CACHE_PATH);
             if (sScriptBundle != null) {
-                luaView.loadScriptBundle(sScriptBundle, luaName,
+                luaView.loadScriptBundle(sScriptBundle, TextUtils.isEmpty(miniAppId) ? luaName : miniAppId + File.separator + luaName,
                         new LuaCallbackImpl(valueData));
             } else {
                 runLua(luaView, luaName, valueData);
             }
         } else {
-            luaView.loadScriptBundle(sScriptBundle, luaName, new LuaCallbackImpl(valueData));
+            luaView.loadScriptBundle(sScriptBundle, TextUtils.isEmpty(miniAppId) ? luaName : miniAppId + File.separator + luaName, new LuaCallbackImpl(valueData));
         }
     }
 
@@ -297,8 +306,9 @@ private ScriptBundle initScriptBundle(String luaPath) {
                 for (File childFile : file.listFiles()) {
                     if (TextUtils.equals("lua", VenvyFileUtil.getExtension(childFile.getName()))) {
                         byte[] data = getBytes(childFile.getPath());
+                        String fileAbsolutePath = file.getAbsolutePath();
                         ScriptFile scriptFile = new ScriptFile(null,
-                                file.getAbsolutePath(), childFile.getName(), data);
+                                fileAbsolutePath, fileAbsolutePath.substring(fileAbsolutePath.lastIndexOf("/") + 1, fileAbsolutePath.length()) + File.separator + childFile.getName(), data);
                         scriptBundle.addScript(scriptFile);
                     }
                 }