HScrollView 优化

Author: lucas

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

@@ -139,13 +139,13 @@ private Map getViewPriority(Globals globals) {
     private String getDeveloperUserId(Globals globals) {
         String developerUserId = null;
         Map<String, String> dataParams = getViewPriority(globals);
-        if (dataParams != null || dataParams.size() <= 0) {
+        if (dataParams.size() <= 0) {
             return developerUserId;
         }
         try {
-            JSONObject dataObj = new JSONObject(dataParams.get("miniAppInfo"));
-//            JSONObject miniAppInfoObj = dataObj.optJSONObject("miniAppInfo");
-            developerUserId = dataObj.optString("developerUserId");
+            JSONObject dataObj = new JSONObject(dataParams.get("data"));
+            JSONObject miniAppInfoObj = dataObj.optJSONObject("miniAppInfo");
+            developerUserId = miniAppInfoObj.optString("developerUserId");
         } catch (Exception e) {
             e.printStackTrace();
         }

VideoOS/LuaViewSDK/src/com/taobao/luaview/fun/mapper/ui/UIHorizontalScrollViewMethodMapper.java

@@ -19,6 +19,8 @@
 
 import java.util.List;
 
+import cn.com.venvy.common.utils.VenvyLog;
+
 /**
  * HorizontalScrollView的方法映射
  */

VideoOS/LuaViewSDK/src/com/taobao/luaview/userdata/ui/UDHorizontalScrollView.java

@@ -17,6 +17,8 @@
 import org.luaj.vm2.Globals;
 import org.luaj.vm2.LuaValue;
 
+import cn.com.venvy.common.utils.VenvyLog;
+
 /**
  * 容器类-ListView，模拟OC的section分区实现，Section顺序排列
  *

VideoOS/LuaViewSDK/src/com/taobao/luaview/view/LVHorizontalScrollView.java

@@ -8,6 +8,7 @@
 
 package com.taobao.luaview.view;
 
+import android.view.MotionEvent;
 import android.view.ViewGroup;
 import android.widget.HorizontalScrollView;
 import android.widget.LinearLayout;
@@ -22,8 +23,6 @@
 
 import java.util.ArrayList;
 
-import cn.com.venvy.common.utils.VenvyUIUtil;
-
 /**
  * LuaView - HorizontalScrollView
  *
@@ -77,20 +76,11 @@ protected void onScrollChanged(int l, int t, int oldl, int oldt) {
     }
 
     @Override
-    protected boolean overScrollBy(int deltaX, int deltaY, int scrollX, int scrollY, int scrollRangeX, int scrollRangeY, int maxOverScrollX, int maxOverScrollY, boolean isTouchEvent) {
-        boolean value = super.overScrollBy(deltaX, deltaY, scrollX, scrollY, scrollRangeX, scrollRangeY, maxOverScrollX, maxOverScrollY, isTouchEvent);
-        //注意deltaX的值和isTouchEvent的值，deltaX可以认为是X轴变化的速度，isTouchEvent意思是移动事件是否来自手势。经过多次确认，当deltaX的值为1，2或-1，-2，以及isTouchEvent值为false的时候，scrollView的移动趋于停止
-        if (deltaX <= 2 && deltaX >= -2 && !isTouchEvent) {
-            //scrollView停止移动了
-            VenvyUIUtil.runOnUIThreadDelay(new Runnable() {
-                @Override
-                public void run() {
-                    mLuaUserdata.callOnScrollEnd();
-                    hasCallScrollBegin = false;
-                }
-            }, 500);
-
+    public boolean onTouchEvent(MotionEvent ev) {
+        if (ev.getAction() == MotionEvent.ACTION_UP) {
+            mLuaUserdata.callOnScrollEnd();
+            hasCallScrollBegin = false;
         }
-        return value;
+        return super.onTouchEvent(ev);
     }
 }

VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/observer/VenvyObservableTarget.java

@@ -38,6 +38,8 @@ public class VenvyObservableTarget {
     public static final String TAG_LAUNCH_DESKTOP_PROGRAM = "notifyLaunchDesktopProgram";
     // 在顶层添加一个lua脚本
     public static final String TAG_ADD_LUA_SCRIPT_TO_TOP_LEVEL = "notifyAddLuaScriptToTopLevel";
+    // 清除所有的视联网小程序
+    public static final String TAG_CLEAR_ALL_VISION_PROGRAM = "notifyClearAllVisionProgram";
 
     public static class Constant {
         public static final int CONSTANT_LANDSCAPE = 1;

VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/utils/VenvyDeviceUtil.java

@@ -1,5 +1,6 @@
 package cn.com.venvy.common.utils;
 
+import android.Manifest;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.net.ConnectivityManager;
@@ -30,6 +31,8 @@
 import java.util.Enumeration;
 import java.util.UUID;
 
+import cn.com.venvy.common.permission.PermissionCheckHelper;
+
 import static android.os.Environment.MEDIA_MOUNTED;
 
 
@@ -93,18 +96,20 @@ public static String getClient() {
      * @param context
      * @return
      */
-    public static String getIMEI(Context context) {
+    public static String getIMEI(final Context context) {
         String IMEI = "";
         if (context == null) {
             return IMEI;
         }
-        try {
-            TelephonyManager telephonyManager = (TelephonyManager) context
-                    .getSystemService(Context.TELEPHONY_SERVICE);
+        TelephonyManager telephonyManager = (TelephonyManager) context
+                .getSystemService(Context.TELEPHONY_SERVICE);
+        if (PermissionCheckHelper.isPermissionGranted(context, Manifest.permission.READ_PHONE_STATE)) {
             IMEI = telephonyManager.getDeviceId();
-            //md5加密
-//            IMEI = VenvyStringUtil.convertMD5(IMEI);
-        } catch (Exception e) {
+            if(TextUtils.isEmpty(IMEI)){
+                // 部分Android 版本下获取的DeviceId为null的解决方案
+                IMEI = Settings.Secure.getString(context.getApplicationContext().getContentResolver(),Settings.Secure.ANDROID_ID);
+            }
+        } else {
             IMEI = "000000000000000";
         }
         return IMEI;

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

@@ -31,6 +31,7 @@
 import cn.com.venvy.common.interf.IPlatformLoginInterface;
 import cn.com.venvy.common.observer.ObservableManager;
 import cn.com.venvy.common.observer.VenvyObservable;
+import cn.com.venvy.common.observer.VenvyObservableTarget;
 import cn.com.venvy.common.observer.VenvyObserver;
 import cn.com.venvy.common.utils.VenvyAesUtil;
 import cn.com.venvy.common.utils.VenvyBase64;
@@ -134,10 +135,11 @@ public void openUrl(String jsParams) {
             String actionString = "";
             if (!TextUtils.isEmpty(linkUrl)) {
                 actionString = linkUrl;
-            } else if (TextUtils.isEmpty(deepLink)) {
+            } else if (!TextUtils.isEmpty(deepLink)) {
                 actionString = deepLink;
-            } else if (TextUtils.isEmpty(selfLink)) {
+            } else if (!TextUtils.isEmpty(selfLink)) {
                 actionString = selfLink;
+                ObservableManager.getDefaultObserable().sendToTarget(VenvyObservableTarget.TAG_CLEAR_ALL_VISION_PROGRAM);
             }
             String adID = VenvyMD5Util.MD5(actionString);
             WidgetInfo.WidgetActionType widgetActionType = WidgetInfo.WidgetActionType.findTypeById(1);

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

@@ -157,7 +157,7 @@ public void clearAllVisionProgramByOrientation(int orientationType) {
 
     public void changeVisionProgramByOrientation(boolean isHorizontal) {
         if (programViewB != null) {
-            programViewB.setVisibility(isHorizontal ? VISIBLE : GONE);
+            programViewB.onScreenChanged(isHorizontal);
         }
     }
 

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

@@ -33,6 +33,7 @@ public VideoPlusViewHelper(VideoPlusView videoPlusView) {
         ObservableManager.getDefaultObserable().addObserver(VenvyObservableTarget.TAG_CLOSE_H5_VISION_PROGRAM, this);
         ObservableManager.getDefaultObserable().addObserver(VenvyObservableTarget.TAG_LAUNCH_DESKTOP_PROGRAM, this);
         ObservableManager.getDefaultObserable().addObserver(VenvyObservableTarget.TAG_ADD_LUA_SCRIPT_TO_TOP_LEVEL, this);
+        ObservableManager.getDefaultObserable().addObserver(VenvyObservableTarget.TAG_CLEAR_ALL_VISION_PROGRAM, this);
     }
 
 
@@ -177,6 +178,17 @@ public void run() {
                 });
                 return;
             }
+            case VenvyObservableTarget.TAG_CLEAR_ALL_VISION_PROGRAM:{
+                VenvyUIUtil.runOnUIThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        if(videoPlusView != null){
+                            videoPlusView.clearAllVisionProgram();
+                        }
+                    }
+                });
+                return;
+            }
         }
     }
 
@@ -191,6 +203,7 @@ public void detachedFromWindow() {
         ObservableManager.getDefaultObserable().removeObserver(VenvyObservableTarget.TAG_CLOSE_H5_VISION_PROGRAM, this);
         ObservableManager.getDefaultObserable().removeObserver(VenvyObservableTarget.TAG_LAUNCH_DESKTOP_PROGRAM, this);
         ObservableManager.getDefaultObserable().removeObserver(VenvyObservableTarget.TAG_ADD_LUA_SCRIPT_TO_TOP_LEVEL, this);
+        ObservableManager.getDefaultObserable().removeObserver(VenvyObservableTarget.TAG_CLEAR_ALL_VISION_PROGRAM, this);
     }
 
     public boolean isHorizontal() {

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

@@ -325,6 +325,17 @@ public void onAnimationEnd(Animator animation) {
     }
 
 
+    public void onScreenChanged(boolean isHorizontal) {
+        setVisibility(isHorizontal ? VISIBLE : GONE);
+
+        if(h5ProgramMap.size() > 0){
+            for(VideoWebToolBarView webToolBarView: h5ProgramMap.values()){
+                webToolBarView.onScreenChanged(isHorizontal);
+            }
+        }
+    }
+
+
     /**
      * 暂时没有注册
      *