- 优化jsBridge xy逻辑

- jsBridge commonProgram中追加appKey字段

Author: lucas

VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/CommonParam.java

@@ -38,6 +38,7 @@ public class CommonParam {
     private static final String PPI = "PPI";//设备像素密度,物理像素
     private static final String IMSI = "IMSI";//国际移动客户识别码
     private static final String DEVICE_TYPE = "DEVICE_TYPE";//终端类型(1:移动端 2:PC 3:OTT)
+    private static final String APP_KEY = "APP_KEY";//终端类型(1:移动端 2:PC 3:OTT)
 
     public static JSONObject getCommonParamJson(String appKey) {
         Map<String, String> paramMap = new HashMap<>();
@@ -58,6 +59,7 @@ public static JSONObject getCommonParamJson(String appKey) {
         paramMap.put(PHONE_HEIGHT, String.valueOf(VenvyUIUtil.getScreenHeight(context)));
         paramMap.put(PPI, String.valueOf(VenvyUIUtil.getScreenPPI(context)));
         paramMap.put(CARRIER, String.valueOf(VenvyDeviceUtil.getSubscriptionOperatorType(context)));
+        paramMap.put(APP_KEY, appKey);
 
         String ip = VenvyDeviceUtil.getLocalIPAddress();
         if (!TextUtils.isEmpty(ip)) {

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

@@ -25,6 +25,7 @@
 import cn.com.venvy.common.agentweb.common.CommonWebChromeClient;
 import cn.com.venvy.common.interf.IJsParamsCallback;
 import cn.com.venvy.common.interf.IWebViewClient;
+import cn.com.venvy.common.utils.VenvyUIUtil;
 
 
 /**
@@ -184,7 +185,7 @@ private void init(Context context) {
                     .interceptUnkownUrl() //拦截找不到相关页面的Scheme
                     .createAgentWeb().ready().get();
 
-            mAgentWeb.getWebCreator().getWebView().setLayerType(View.LAYER_TYPE_SOFTWARE,null);
+            mAgentWeb.getWebCreator().getWebView().setLayerType(View.LAYER_TYPE_SOFTWARE, null);
         }
     }
 
@@ -211,12 +212,21 @@ public void openApplet(String openApplet) {
 
     @Override
     public int getWebViewX() {
-        return (int) getX();
+        if (VenvyUIUtil.isScreenOriatationPortrait(getContext())) {
+            return VenvyUIUtil.px2dip(getContext(), getX());
+        } else {
+            return VenvyUIUtil.px2dip(getContext(), VenvyUIUtil.getScreenWidth(getContext()) - getWidth());
+        }
+
     }
 
     @Override
     public int getWebViewY() {
-        return (int) getY();
+        if (VenvyUIUtil.isScreenOriatationPortrait(getContext())) {
+            return VenvyUIUtil.px2dip(getContext(), VenvyUIUtil.getScreenHeight(getContext()) - getHeight());
+        } else {
+            return VenvyUIUtil.px2dip(getContext(), getY());
+        }
     }
 
     public void setJsParamsCallback(IJsParamsCallback callback) {

VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoWebToolBarView.java

@@ -223,7 +223,6 @@ public void onReceivedError(WebView view, int errorCode, String description, Str
 
             }
         });
-
         root.addView(webView);
     }