Merge branch 'merge_dev' into 'dev_2.9.0'

Merge dev

See merge request Mobile/VideoOS-Android-SDK!29

Author: qinpengcheng

VideoOS/LuaViewSDK/src/cn/com/venvy/lua/maper/LVWebViewMethodMapper.java

@@ -38,8 +38,9 @@ public class LVWebViewMethodMapper<U extends VenvyUDWebView> extends UIViewMetho
             "url",//9
             "pullRefreshEnable",//10
             "callJS",//11
-            "callback", // 12
-            "setInitData" // 13
+            "webViewCallback", // 12
+            "setInitData", // 13
+            "setZoomScale" // 14
     };
 
     @Override
@@ -79,6 +80,8 @@ public Varargs invoke(int code, U target, Varargs varargs) {
                 return webViewCallback(target, varargs);
             case 13:
                 return setInitData(target, varargs);
+            case 14:
+                return setZoomScale(target, varargs);
         }
         return super.invoke(code, target, varargs);
     }
@@ -174,4 +177,12 @@ public LuaValue setInitData(U view, Varargs varargs) {
         }
         return LuaValue.valueOf("");
     }
+
+    public LuaValue setZoomScale(U view, Varargs varargs) {
+        Float scale = LuaUtil.getFloat(varargs, 2);
+        if (scale > 0) {
+            view.setZoomScale(scale);
+        }
+        return LuaValue.TRUE;
+    }
 }

VideoOS/LuaViewSDK/src/cn/com/venvy/lua/ud/VenvyUDWebView.java

@@ -203,5 +203,12 @@ public VenvyUDWebView setInitData(String data){
         return this;
     }
 
+    public void setZoomScale(float scale) {
+        final VenvyLVWebView view = this.getView();
+        if (view != null) {
+            view.setZoomScale(scale);
+        }
+    }
+
 }
 

VideoOS/LuaViewSDK/src/cn/com/venvy/lua/view/VenvyLVWebView.java

@@ -94,6 +94,9 @@ public boolean getLoadingState() {
         return mIsLoading;
     }
 
+    public void setZoomScale(float scale) {
+        mWebView.setZoomScale(scale);
+    }
 
     public void setJsData(String jsData){
         mJsBridge.setJsData(jsData);

VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/webview/IVenvyWebView.java

@@ -29,6 +29,8 @@ public interface IVenvyWebView {
 
     void stopLoading();
 
+    void setZoomScale(float scale);
+
     String getTitle();
 
     String getUrl();

VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/webview/VenvyWebView.java

@@ -69,6 +69,17 @@ public void setWebChromeClient(IVenvyWebChromeClient webChromeClient) {
     }
 
 
+    @Override
+    public void setZoomScale(float scale) {
+        if (mAgentWeb != null && mAgentWeb.getWebCreator() != null) {
+            WebView webView = mAgentWeb.getWebCreator().getWebView();
+            if (webView == null) {
+                return;
+            }
+            webView.setInitialScale((int) (scale * 100));
+        }
+    }
+
     @Override
     public boolean canGoBack() {
         if (mAgentWeb == null || mAgentWeb.getWebCreator() == null) {