Merge branch '2.0.1' into merge

# Conflicts:
#	.gitignore
#	VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoProgramToolBarView.java
#	VideoOS/venvy_pub/src/main/java/cn/com/videopls/pub/VideoProgramTypeBView.java

Author: androidlgf

VideoOS/LuaViewSDK/src/cn/com/venvy/lua/plugin/LVCallbackPlugin.java

@@ -1,11 +1,16 @@
 package cn.com.venvy.lua.plugin;
 
+import android.text.TextUtils;
+
 import com.taobao.luaview.util.LuaUtil;
 
+import org.luaj.vm2.LuaTable;
 import org.luaj.vm2.LuaValue;
 import org.luaj.vm2.Varargs;
 import org.luaj.vm2.lib.VarArgFunction;
 
+import java.util.Map;
+
 import cn.com.venvy.Platform;
 import cn.com.venvy.common.bean.WidgetInfo;
 import cn.com.venvy.lua.binder.VenvyLVLibBinder;
@@ -20,6 +25,7 @@ public class LVCallbackPlugin {
 
     public static void install(VenvyLVLibBinder venvyLVLibBinder, Platform platform) {
         venvyLVLibBinder.set("widgetEvent", new WidgetDelegate(platform));
+        venvyLVLibBinder.set("widgetNotify", new WidgetTableDelegate(platform));
     }
 
     private static class WidgetDelegate extends VarArgFunction {
@@ -88,4 +94,80 @@ public LuaValue invoke(Varargs args) {
             return LuaValue.NIL;
         }
     }
+
+    private static class WidgetTableDelegate extends VarArgFunction {
+        private Platform mPlatform;
+
+        WidgetTableDelegate(Platform platform) {
+            super();
+            this.mPlatform = platform;
+        }
+
+        @Override
+        public LuaValue invoke(Varargs args) {
+            int fixIndex = VenvyLVLibBinder.fixIndex(args);
+            LuaTable table = LuaUtil.getTable(args, fixIndex + 1);
+            Map<String, String> map = LuaUtil.toMap(table);
+            if (map == null || map.size() <= 0) {
+                return LuaValue.NIL;
+            }
+            String eventType = map.get("eventType");
+            String adID = map.get("adID");
+            String adName = map.get("adName");
+            String actionType = map.get("actionType");
+            String actionString = map.get("actionString");
+            String linkUrl = map.get("linkUrl");
+            String deepLink = map.get("deepLink");
+            String selfLink = map.get("selfLink");
+            WidgetInfo.WidgetActionType widgetActionType = WidgetInfo.WidgetActionType.findTypeById(!TextUtils.isEmpty(actionType) ? Integer.valueOf(actionType) : 0);
+            if (TextUtils.isEmpty(eventType)) {
+                return LuaValue.NIL;
+            }
+            if (mPlatform == null) {
+                return LuaValue.NIL;
+            }
+
+            WidgetInfo widgetInfo = new WidgetInfo.Builder()
+                    .setAdId(adID)
+                    .setWidgetActionType(widgetActionType)
+                    .setUrl(actionString)
+                    .setWidgetName(adName)
+                    .setDeepLink(deepLink)
+                    .setLinkUrl(linkUrl)
+                    .setSelfLink(selfLink)
+                    .build();
+            switch (Integer.valueOf(eventType)) {
+                case 1:
+                    if (mPlatform.getPrepareShowListener() != null && adID != null) {
+                        mPlatform.getPrepareShowListener().prepareShow(widgetInfo);
+                    }
+                    break;
+
+                case 2:
+                    if (mPlatform.getWidgetShowListener() != null && adID != null) {
+                        mPlatform.getWidgetShowListener().onShow(widgetInfo);
+                    }
+
+                    break;
+
+                case 3:
+                    if (mPlatform.getWidgetClickListener() != null && adID != null) {
+                        mPlatform.getWidgetClickListener().onClick(widgetInfo);
+                    }
+                    break;
+
+                case 4:
+                    if (mPlatform.getWidgetCloseListener() != null && adID != null) {
+                        mPlatform.getWidgetCloseListener().onClose(widgetInfo);
+                    }
+                    break;
+                case 5:
+                    if (mPlatform.getWedgeListener() != null && adID != null) {
+                        mPlatform.getWedgeListener().goBack();
+                    }
+                    break;
+            }
+            return LuaValue.NIL;
+        }
+    }
 }

VideoOS/LuaViewSDK/src/com/taobao/luaview/userdata/kit/UDApplet.java

@@ -40,8 +40,16 @@ public UDApplet(Globals globals, LuaValue metatable) {
     class AppletSize extends VarArgFunction {
         @Override
         public Varargs invoke(Varargs args) {
-            float width = 222;
-            float height = DimenUtil.pxToDpi(AndroidUtil.getScreenHeight(getContext()));
+            int screenHeight = AndroidUtil.getScreenHeight(getContext());
+            int screenWidth = AndroidUtil.getScreenWidth(getContext());
+
+
+//            float width = Math.max(screenWidth,screenHeight) * 0.332f;
+
+
+            float height = DimenUtil.pxToDpi(Math.min(screenWidth,screenHeight));
+            float width = height / 375.0f * 222;
+
             LuaValue[] luaValue = new LuaValue[]{LuaValue.valueOf(width), LuaValue.valueOf(height)};
             return LuaValue.varargsOf(luaValue);
         }

VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/bean/WidgetInfo.java

@@ -14,6 +14,9 @@ public class WidgetInfo {
     private String mWidgetType;
     private String mWidgetName;
     private String mUrl;
+    private String mLinkUrl;
+    private String mDeepLink;
+    private String mSelfLink;
     private WidgetActionType mWidgetActionType;
     //是否需要获取焦点
     private boolean mNeedFocus;
@@ -25,9 +28,23 @@ private WidgetInfo(Builder builder) {
         mWidgetName = builder.mWidgetName;
         mWidgetActionType = builder.mWidgetActionType;
         mUrl = builder.mUrl;
+        mLinkUrl = builder.mLinkUrl;
+        mDeepLink = builder.mDeepLink;
+        mSelfLink = builder.mSelfLink;
         mNeedFocus = builder.mNeedFocus;
     }
 
+    public String getLinkUrl() {
+        return mLinkUrl;
+    }
+
+    public String getDeepLink() {
+        return mDeepLink;
+    }
+
+    public String getSelfLink() {
+        return mSelfLink;
+    }
 
     public String getAdId() {
         return mAdId;
@@ -63,6 +80,9 @@ public static final class Builder {
         private String mWidgetName;
         private WidgetActionType mWidgetActionType;
         private String mUrl;
+        private String mLinkUrl;
+        private String mDeepLink;
+        private String mSelfLink;
         private String mResourceId;
         private boolean mNeedFocus;
 
@@ -71,6 +91,21 @@ public Builder setAdId(String adId) {
             return this;
         }
 
+        public Builder setLinkUrl(String linkUrl) {
+            this.mLinkUrl = linkUrl;
+            return this;
+        }
+
+        public Builder setDeepLink(String deepLink) {
+            this.mDeepLink = deepLink;
+            return this;
+        }
+
+        public Builder setSelfLink(String selfLink) {
+            this.mSelfLink = selfLink;
+            return this;
+        }
+
         @Deprecated
         public Builder setResourceId(String resourceId) {
             this.mResourceId = resourceId;