change VideoOSLuaView

Author: androidlgf

VideoOS/LuaViewSDK/src/cn/com/venvy/lua/LuaHelper.java

@@ -75,7 +75,7 @@ private static void registerNativeLibs(@NonNull LuaView luaView, Platform platfo
                 getMediaLifeCycleBinder(platform),
                 getMqttBinder(),
                 getSvgaBinder(),
-                getWebViewBinder(),
+                getWebViewBinder(platform),
                 getActivityLifeCycleBinder(),
                 getKeyboardBinder(),
                 getMediaViewBinder(),
@@ -128,8 +128,10 @@ private static VenvyNativeBinder getNativeBinder(Platform platform, ViewGroup vi
         return target;
     }
 
-    private static VenvyWebViewBinder getWebViewBinder() {
-        return venvyWebViewBinder == null ? venvyWebViewBinder = new VenvyWebViewBinder() : venvyWebViewBinder;
+    private static VenvyWebViewBinder getWebViewBinder(Platform platform) {
+        VenvyWebViewBinder target = venvyWebViewBinder == null ? venvyWebViewBinder = new VenvyWebViewBinder() : venvyWebViewBinder;
+        target.setPlatform(platform);
+        return target;
     }
 
     private static VenvySvgaBinder getSvgaBinder() {

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

@@ -195,9 +195,6 @@ private void callLuaFunction(LuaView luaView, Object object) {
             Object dataValue = map.get(key);
             if (dataValue != null && dataValue instanceof String) {
                 dataTable = JsonUtil.toLuaTable((String) dataValue);
-                if (dataTable != null && dataTable.istable()) {
-                    map.remove(key);
-                }
             }
             table = LuaUtil.toTable(map);
             if (dataTable != null && table != null && table.istable()) {
@@ -223,34 +220,6 @@ private void runLuaFile(final LuaView luaView, final String luaName, final Objec
             } else {
                 runLua(luaView, luaName, valueData);
             }
-//            VenvyAsyncTaskUtil.doAsyncTask(INIT_SCRIPT,
-//                    new VenvyAsyncTaskUtil.IDoAsyncTask<Object, ScriptBundle>() {
-//                        @Override
-//                        public ScriptBundle doAsyncTask(Object... objects) throws Exception {
-//                            return initScriptBundle(VenvyFileUtil.getCachePath(VideoOSLuaView.this.getContext()) + PreloadLuaUpdate.LUA_CACHE_PATH);
-//                        }
-//                    }, new VenvyAsyncTaskUtil.CommonAsyncCallback<ScriptBundle>() {
-//                        @Override
-//                        public void onPostExecute(ScriptBundle scriptBundle) {
-//                            if (scriptBundle != null) {
-//                                VenvyLog.d("Router", "LuaView begin run and template is " + luaName + ", " +
-//                                        "time is " + System.currentTimeMillis());
-//                                luaView.loadScriptBundle(scriptBundle, luaName,
-//                                        new LuaCallbackImpl(valueData));
-//                                sScriptBundle = scriptBundle;
-//                            } else {
-//                                runLua(luaView, luaName, valueData);
-//                            }
-//                        }
-//
-//                        @Override
-//                        public void onCancelled() {
-//                        }
-//
-//                        @Override
-//                        public void onException(Exception ie) {
-//                        }
-//                    });
         } else {
             luaView.loadScriptBundle(sScriptBundle, luaName, new LuaCallbackImpl(valueData));
         }
@@ -260,7 +229,6 @@ private void runLua(final LuaView luaView, final String luaName, final Object va
         if (TextUtils.isEmpty(luaName)) {
             return;
         }
-
         LuaValue table = null;
         LuaValue dataTable = null;
         String key = "data";
@@ -269,9 +237,6 @@ private void runLua(final LuaView luaView, final String luaName, final Object va
             Object dataValue = map.get(key);
             if (dataValue != null && dataValue instanceof String) {
                 dataTable = JsonUtil.toLuaTable((String) dataValue);
-                if (dataTable != null && dataTable.istable()) {
-                    map.remove(key);
-                }
             }
             table = LuaUtil.toTable(map);
             if (dataTable != null && table != null && table.istable()) {