lua桥接的webView 支持 webViewCallBack 和setInitData 两个方法

lucas · lucas · commit 66fe0dd8c0a9 · 2019-11-21T13:58:05.000+08:00
diff --git a/VideoOS/LuaViewSDK/src/cn/com/venvy/lua/maper/LVWebViewMethodMapper.java b/VideoOS/LuaViewSDK/src/cn/com/venvy/lua/maper/LVWebViewMethodMapper.java
@@ -6,9 +6,11 @@
 import com.taobao.luaview.fun.mapper.LuaViewLib;
 import com.taobao.luaview.fun.mapper.ui.UIViewMethodMapper;
 import com.taobao.luaview.global.VmVersion;
+import com.taobao.luaview.util.JsonUtil;
 import com.taobao.luaview.util.LuaUtil;
 
 import org.luaj.vm2.LuaFunction;
+import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Varargs;
 
@@ -35,7 +37,9 @@ public class LVWebViewMethodMapper<U extends VenvyUDWebView> extends UIViewMetho
             "stopLoading",//8
             "url",//9
             "pullRefreshEnable",//10
-            "callJS"//11
+            "callJS",//11
+            "webViewCallback", // 12
+            "setInitData" // 13
     };
 
     @Override
@@ -71,6 +75,10 @@ public Varargs invoke(int code, U target, Varargs varargs) {
                 return pullRefreshEnable(target, varargs);
             case 11:
                 return callJS(target, varargs);
+            case 12:
+                return webViewCallback(target, varargs);
+            case 13:
+                return setInitData(target, varargs);
         }
         return super.invoke(code, target, varargs);
     }
@@ -147,4 +155,23 @@ public LuaValue callJS(U view, Varargs varargs) {
         final LuaFunction callback = LuaUtil.getFunction(varargs, 3);
         return LuaValue.valueOf(view.callJS(jsMethod, callback));
     }
+
+    public LuaValue webViewCallback(U view, Varargs varargs) {
+        final LuaTable callback = varargs.opttable(2, null);
+        if (callback != null) {
+            LuaValue onClose = LuaUtil.getFunction(callback, "onClose", "onClose");
+            return view.webViewCallback(onClose);
+        }
+
+        return LuaValue.valueOf("");
+    }
+
+    public LuaValue setInitData(U view, Varargs varargs) {
+        final LuaTable data = varargs.opttable(2, null);
+        if (data != null) {
+            String jsData = JsonUtil.toString(data);
+            return view.setInitData(jsData);
+        }
+        return LuaValue.valueOf("");
+    }
 }
diff --git a/VideoOS/LuaViewSDK/src/cn/com/venvy/lua/ud/VenvyUDWebView.java b/VideoOS/LuaViewSDK/src/cn/com/venvy/lua/ud/VenvyUDWebView.java
@@ -13,17 +13,25 @@
 import org.luaj.vm2.Varargs;
 
 import cn.com.venvy.common.webview.IVenvyWebView;
+import cn.com.venvy.common.webview.JsBridge;
 import cn.com.venvy.lua.view.VenvyLVWebView;
 
 /**
  * Created by Arthur on 2017/9/4.
  */
 
 public class VenvyUDWebView extends UDView<VenvyLVWebView> {
+
+    private JsBridge jsBridge;
+
     public VenvyUDWebView(VenvyLVWebView view, Globals globals, LuaValue metatable, Varargs initParams) {
         super(view, globals, metatable, initParams);
     }
 
+    public void setJsBridge(JsBridge jsBridge) {
+        this.jsBridge = jsBridge;
+    }
+
     /**
      * Loads the given URL.
      */
@@ -176,5 +184,24 @@ public void onReceiveValue(String value) {
 
         return "";
     }
+
+    public VenvyUDWebView webViewCallback(final LuaValue callback){
+        jsBridge.setWebViewCloseListener(new JsBridge.WebViewCloseListener() {
+            @Override
+            public void onClose(CloseType actionType) {
+                LuaUtil.callFunction(callback);
+            }
+        });
+        return this;
+    }
+
+    public VenvyUDWebView setInitData(String data){
+        final VenvyLVWebView view = this.getView();
+        if (view != null) {
+            view.setJsData(data);
+        }
+        return this;
+    }
+
 }
 
diff --git a/VideoOS/LuaViewSDK/src/cn/com/venvy/lua/view/VenvyLVWebView.java b/VideoOS/LuaViewSDK/src/cn/com/venvy/lua/view/VenvyLVWebView.java
@@ -36,7 +36,7 @@
 
 public class VenvyLVWebView extends FrameLayout implements ILVNativeViewProvider, ILVView {
 
-    protected UDView mLuaUserdata;
+    protected VenvyUDWebView mLuaUserdata;
     protected IVenvyWebView mWebView;
     protected JsBridge mJsBridge;
     protected boolean mIsLoading;
@@ -52,6 +52,7 @@ public void init(Context context, Globals globals) {
         this.mWebView = WebViewFactory.createWebView(context);
         mJsBridge = new JsBridge(context, mWebView, platform);
         mJsBridge.setDeveloperUserId(getDeveloperUserId(globals));
+        this.mLuaUserdata.setJsBridge(mJsBridge);
         if (mWebView instanceof VenvyWebView) {
             ((VenvyWebView) mWebView).setJsBridge(mJsBridge);
         }
@@ -94,6 +95,9 @@ public boolean getLoadingState() {
     }
 
 
+    public void setJsData(String jsData){
+        mJsBridge.setJsData(jsData);
+    }
     @Override
     public View getNativeView() {
         if (mWebView instanceof View) {
diff --git a/VideoOS/VenvyLibrary/src/main/assets/lua/os_shopping_hotspot.lua b/VideoOS/VenvyLibrary/src/main/assets/lua/os_shopping_hotspot.lua
@@ -0,0 +1,113 @@
+-- 商品
+require "os_config"
+require "os_string"
+require "os_constant"
+require "os_util"
+require "os_track"
+shopping = object:new()
+local adTypeName = "shopping"
+local scale = getScale()
+
+local function updateLuaViewSize(luaView, isPortrait)
+    if (luaView == nil) then
+        return
+    end
+    local screenWidth, screenHeight = Native:getVideoSize(2)
+    if (isPortrait) then
+        luaView:frame(0, y, math.min(screenWidth, screenHeight), math.max(screenWidth, screenHeight))
+    else
+        luaView:frame(0, 0, math.max(screenWidth, screenHeight), math.min(screenWidth, screenHeight))
+    end
+end
+
+local function updateWebViewSize(webView, isPortrait)
+    if (webView == nil) then
+        return
+    end
+    local w, h = shopping.luaView:size()
+    if (isPortrait) then
+        local _, videoHeight, y = Native:getVideoSize(0)
+            if System.android() then
+                y = 0.0
+        end
+        webView:frame(0, y + videoHeight, w, h - y - videoHeight)
+    else
+        local webViewWidth = h / 375 * 220
+        webView:frame(w - webViewWidth, 0, webViewWidth, h)
+    end
+end
+
+local function createParent(isPortrait)
+    local luaView
+    if System.android() then
+        luaView = View()
+    else
+        luaView = ThroughView()
+    end
+    updateLuaViewSize(luaView, isPortrait)
+    return luaView
+end
+
+local function createWebView(isPortrait)
+    local webView = WebView()
+    webView:setInitData(shopping.data)
+    webView:webViewCallback({
+        onClose = function()
+            Native:destroyView()
+        end
+    })
+    shopping.luaView:addView(webView)
+
+    updateWebViewSize(webView, isPortrait)
+    return webView
+end
+
+local function onScreenChange(isPortrait)
+    -- body
+    updateLuaViewSize(shopping.luaView, isPortrait)
+    updateWebViewSize(shopping.webView, isPortrait)
+end
+
+local function registerMedia()
+    local media = Media()
+    -- body
+    -- 注册window callback通知
+    local callbackTable = {
+        --0: 竖屏小屏幕，1 竖屏全凭，2 横屏全屏
+        onPlayerSize = function(type)
+            if (type == 0) then
+                onScreenChange(true)
+            elseif (type == 1) then
+                onScreenChange(true)
+            elseif (type == 2) then
+                onScreenChange(false)
+            end
+        end
+    }
+    media:mediaCallback(callbackTable)
+    return media
+end
+
+local function onCreate()
+    -- body
+    local isPortrait = Native:isPortraitScreen()
+    shopping.luaView = createParent(isPortrait)
+    shopping.webView = createWebView(isPortrait)
+    shopping.media = registerMedia()
+
+end
+
+--入口Native调用--
+function show(args)
+
+    local dataTable = args.data
+    if (dataTable == nil) then
+        return
+    end
+
+    shopping.data = dataTable
+
+    onCreate()
+    shopping.webView:loadUrl(shopping.data.data.url)
+
+end
diff --git a/VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoPlusController.java b/VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoPlusController.java
@@ -486,8 +486,8 @@ public void downComplete(String entranceLua, String miniAppInfo) {
                         JSONObject paramsJson = new JSONObject();
 
                         try {
-                            paramsJson.put("data", params.get("data"));
-                            paramsJson.put("miniAppInfo", miniAppInfo);
+                            paramsJson.put("data", new JSONObject(params.get("data")));
+                            paramsJson.put("miniAppInfo", new JSONObject(miniAppInfo));
                         } catch (JSONException e) {
                             e.printStackTrace();
                         }
diff --git a/VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoProgramTypeBView.java b/VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoProgramTypeBView.java
@@ -198,7 +198,7 @@ public void start(@NonNull String appletId, String data, int orientationType, bo
      */
     public void startH5(String url, String developerUserId) {
         currentH5Program.addDeveloperUserIdToJsBridge(developerUserId);
-//        url = "http://cytroncdn.videojj.com/pages/jijiMall/dev/index.html#debug";
+        url = "http://cytroncdn.videojj.com/pages/jijiMall/dev/index.html#debug";
         currentH5Program.openLink(url);
     }
 
diff --git a/VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoWebToolBarView.java b/VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoWebToolBarView.java
@@ -30,6 +30,8 @@
 import cn.com.venvy.common.webview.JsBridge;
 import cn.com.venvy.common.webview.VenvyWebView;
 
+import static cn.com.venvy.common.webview.JsBridge.WebViewCloseListener.CloseType.*;
+
 /**
  * Created by Lucas on 2019/8/30.
  */

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ public void start(@NonNull String appletId, String data, int orientationType, bo`
`198`	`198`	`*/`
`199`	`199`	`public void startH5(String url, String developerUserId) {`
`200`	`200`	`currentH5Program.addDeveloperUserIdToJsBridge(developerUserId);`
`201`		`-// url = "http://cytroncdn.videojj.com/pages/jijiMall/dev/index.html#debug";`
	`201`	`+ url = "http://cytroncdn.videojj.com/pages/jijiMall/dev/index.html#debug";`
`202`	`202`	`currentH5Program.openLink(url);`
`203`	`203`	`}`
`204`	`204`