Merge branch 'dev_jlzhang' into 'dev_2.9.0'

guofang · guofang · commit 81c08f7dcb48 · 2020-01-11T13:53:27.000+08:00
Dev jlzhang

See merge request Mobile/VideoOS-Android-SDK!27
diff --git a/VideoOS/LuaViewSDK/src/com/taobao/luaview/userdata/kit/UDApplet.java b/VideoOS/LuaViewSDK/src/com/taobao/luaview/userdata/kit/UDApplet.java
@@ -246,6 +246,7 @@ public Varargs invoke(Varargs args) {
                             if (targetType.equalsIgnoreCase("1")) {
                                 builder.setLinkUrl(linkData.optString("linkUrl"));
                             } else if (targetType.equalsIgnoreCase("2")) {
+                                builder.setLinkUrl(linkData.optString("linkUrl"));
                                 builder.setDeepLink(linkData.optString("deepLink"));
                             }
                             WidgetInfo widgetInfo = builder.build();
diff --git a/VideoOS/VenvyLibrary/build.gradle b/VideoOS/VenvyLibrary/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 29
     buildToolsVersion '28.0.3'
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion 16
         targetSdkVersion 28
 
         javaCompileOptions {
diff --git a/VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/statistics/StatisticDCUtils.java b/VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/statistics/StatisticDCUtils.java
@@ -101,6 +101,7 @@ public static String obtainFlowStatisticJson(int type, StatisticsInfoBean.FileIn
     }
 
 
+
     public static String obtainFlowStatisticJson(int type, List<DownloadTask> downloadTaskList, int downLoadStage) throws JSONException {
         JSONArray fileInfoArray = new JSONArray();
         JSONObject tmpObj = null;
diff --git a/VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/statistics/VenvyStatisticsManager.java b/VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/statistics/VenvyStatisticsManager.java
@@ -23,8 +23,10 @@ public final class VenvyStatisticsManager {
     public static final int PRELOAD_FLOW = 5;
     public static final int OPEN_PAGE = 6;
     public static final int CLOSE_PAGE = 7;
+    public static final int PAGE_NAME = 8;
 
     private Platform platform;
+
     private VenvyStatisticsManager() {
 
     }
@@ -42,25 +44,27 @@ public void init(Platform platform) {
     }
 
     public void submitCommonTrack(int type, JSONObject jsonObj) {
-        if(jsonObj == null){
+        if (jsonObj == null) {
             return;
         }
         if (VenvyStatisticsManager.AB_APPLET_TRACK == type) {
             submitABAppletTrackStatisticsInfo(jsonObj);
         } else if (VenvyStatisticsManager.USER_ACTION == type) {
             submitUserActionStatisticsInfo(jsonObj);
-        }else if (VenvyStatisticsManager.VISUAL_SWITCH_COUNT == type) {
+        } else if (VenvyStatisticsManager.VISUAL_SWITCH_COUNT == type) {
             submitVisualSwitchStatisticsInfo(jsonObj);
-        }else if (VenvyStatisticsManager.PLAY_CONFIRM == type) {
+        } else if (VenvyStatisticsManager.PLAY_CONFIRM == type) {
             submitPlayConfirmStatisticsInfo(jsonObj);
-        }else if (VenvyStatisticsManager.PRELOAD_FLOW == type) {
+        } else if (VenvyStatisticsManager.PRELOAD_FLOW == type) {
             submitPreLoadFlowStatisticsInfo(jsonObj);
-        }else if (VenvyStatisticsManager.OPEN_PAGE == type || VenvyStatisticsManager.CLOSE_PAGE == type) {
-            executeThread(jsonObj.toString());
+        } else if (VenvyStatisticsManager.OPEN_PAGE == type
+                || VenvyStatisticsManager.CLOSE_PAGE == type
+                || VenvyStatisticsManager.PAGE_NAME == type) {
+            submitABAppletTrackStatisticsInfo(type, jsonObj);
         }
     }
 
-    private void submitPreLoadFlowStatisticsInfo(JSONObject jsonObj){
+    private void submitPreLoadFlowStatisticsInfo(JSONObject jsonObj) {
         try {
             String dataJson = StatisticDCUtils.obtainPreLoadFlowStatisticsJson(VenvyStatisticsManager.PRELOAD_FLOW, jsonObj);
             executeThread(dataJson);
@@ -69,7 +73,7 @@ private void submitPreLoadFlowStatisticsInfo(JSONObject jsonObj){
         }
     }
 
-    private void submitPlayConfirmStatisticsInfo(JSONObject jsonObj){
+    private void submitPlayConfirmStatisticsInfo(JSONObject jsonObj) {
         try {
             String dataJson = StatisticDCUtils.obtainPlayConfirmStatisticsJson(VenvyStatisticsManager.PLAY_CONFIRM, jsonObj);
             executeThread(dataJson);
@@ -78,7 +82,7 @@ private void submitPlayConfirmStatisticsInfo(JSONObject jsonObj){
         }
     }
 
-    private void submitVisualSwitchStatisticsInfo(JSONObject jsonObj){
+    private void submitVisualSwitchStatisticsInfo(JSONObject jsonObj) {
         try {
             String dataJson = StatisticDCUtils.obtainVisualSwitchStatisticsJson(VenvyStatisticsManager.VISUAL_SWITCH_COUNT, jsonObj);
             executeThread(dataJson);
@@ -105,14 +109,23 @@ private void submitABAppletTrackStatisticsInfo(JSONObject jsonObj) {
         }
     }
 
+    private void submitABAppletTrackStatisticsInfo(int type, JSONObject jsonObj) {
+        try {
+            String dataJson = StatisticDCUtils.obtainABAppletTrackStatisticsJson(type, jsonObj);
+            executeThread(dataJson);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+    }
+
     private void executeThread(String dataJson) {
-        if(!TextUtils.isEmpty(dataJson) && platform != null){
-            ThreadManager.getInstance().createLongPool().execute(new AsyncStatisticsRunnable(platform,dataJson));
+        if (!TextUtils.isEmpty(dataJson) && platform != null) {
+            ThreadManager.getInstance().createLongPool().execute(new AsyncStatisticsRunnable(platform, dataJson));
         }
     }
 
     public void submitVisualSwitchStatisticsInfo(String onOrOff) {
-        if(TextUtils.isEmpty(onOrOff) || platform == null){
+        if (TextUtils.isEmpty(onOrOff) || platform == null) {
             return;
         }
         try {
@@ -123,20 +136,20 @@ public void submitVisualSwitchStatisticsInfo(String onOrOff) {
         }
     }
 
-    public void submitFileStatisticsInfo(List<DownloadTask> downloadTaskList ,int downLoadStage) {
-        if(downloadTaskList == null || downloadTaskList.size() <= 0 || platform == null){
+    public void submitFileStatisticsInfo(List<DownloadTask> downloadTaskList, int downLoadStage) {
+        if (downloadTaskList == null || downloadTaskList.size() <= 0 || platform == null) {
             return;
         }
         try {
-            String  dataJson = StatisticDCUtils.obtainFlowStatisticJson(VenvyStatisticsManager.PRELOAD_FLOW,downloadTaskList,downLoadStage);
+            String dataJson = StatisticDCUtils.obtainFlowStatisticJson(VenvyStatisticsManager.PRELOAD_FLOW, downloadTaskList, downLoadStage);
             executeThread(dataJson);
         } catch (JSONException e) {
             e.printStackTrace();
         }
     }
 
-    public void submitFileStatisticsInfo(StatisticsInfoBean.FileInfoBean fileInfoBean , int downLoadStage) {
-        if(fileInfoBean == null || platform == null){
+    public void submitFileStatisticsInfo(StatisticsInfoBean.FileInfoBean fileInfoBean, int downLoadStage) {
+        if (fileInfoBean == null || platform == null) {
             return;
         }
         try {
diff --git a/VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/webview/JsBridge.java b/VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/webview/JsBridge.java
@@ -65,6 +65,7 @@ public class JsBridge implements VenvyObserver {
     private BaseRequestConnect mBaseRequestConnect;
     protected Context mContext;
     protected String ssid = System.currentTimeMillis() + "";
+
     private WebViewCloseListener mWebViewCloseListener;
     //是否禁止打开支付宝app true：禁止；false：打开支付宝
     public boolean payDisabled;
@@ -278,7 +279,7 @@ public void openAds(String jsParams) {
                     trackData.putString(VenvyObservableTarget.Constant.CONSTANT_DOWNLOAD_API, downAPI);
                     trackData.putStringArray("isTrackLinks", toStringArray(downloadTrackLink.optJSONArray("isTrackLinks")));
                     trackData.putStringArray("dsTrackLinks", toStringArray(downloadTrackLink.optJSONArray("dsTrackLinks")));
-                    trackData.putStringArray("dfTrackLinks",toStringArray(downloadTrackLink.optJSONArray("dfTrackLinks")));
+                    trackData.putStringArray("dfTrackLinks", toStringArray(downloadTrackLink.optJSONArray("dfTrackLinks")));
                     trackData.putStringArray("instTrackLinks", toStringArray(downloadTrackLink.optJSONArray("instTrackLinks")));
                     trackData.putString("launchPlanId", jsonObject.optString("launchPlanId"));
                     ObservableManager.getDefaultObserable().sendToTarget(VenvyObservableTarget.TAG_DOWNLOAD_TASK, trackData);
@@ -290,11 +291,17 @@ public void openAds(String jsParams) {
                     if (targetType.equalsIgnoreCase("1")) {
                         builder.setLinkUrl(linkData.optString("linkUrl"));
                     } else if (targetType.equalsIgnoreCase("2")) {
+                        builder.setLinkUrl(linkData.optString("linkUrl"));
                         builder.setDeepLink(linkData.optString("deepLink"));
                     }
-                    WidgetInfo widgetInfo = builder.build();
+                    final WidgetInfo widgetInfo = builder.build();
                     if (mPlatform.getWidgetClickListener() != null) {
-                        mPlatform.getWidgetClickListener().onClick(widgetInfo);
+                        VenvyUIUtil.runOnUIThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                mPlatform.getWidgetClickListener().onClick(widgetInfo);
+                            }
+                        });
                     }
                 }
             }
diff --git a/VideoOS/venvy_pub/build.gradle b/VideoOS/venvy_pub/build.gradle
@@ -4,7 +4,7 @@ android {
     buildToolsVersion '28.0.3'
 
     defaultConfig {
-        minSdkVersion 19
+        minSdkVersion 16
         targetSdkVersion 28
         javaCompileOptions {
             annotationProcessorOptions {
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
@@ -773,7 +773,6 @@ public void downloadAdsRes(Bundle bundle) {
     public void trackPageTime(boolean isOpen, String appletId) {
         JSONObject jsonObject = new JSONObject();
         try {
-            jsonObject.put("type", isOpen ? String.valueOf(VenvyStatisticsManager.OPEN_PAGE) : String.valueOf(VenvyStatisticsManager.CLOSE_PAGE));
             jsonObject.put("appletId", appletId);
         } catch (JSONException e) {
             e.printStackTrace();

Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,7 @@ public Varargs invoke(Varargs args) {`
`246`	`246`	`if (targetType.equalsIgnoreCase("1")) {`
`247`	`247`	`builder.setLinkUrl(linkData.optString("linkUrl"));`
`248`	`248`	`} else if (targetType.equalsIgnoreCase("2")) {`
	`249`	`+ builder.setLinkUrl(linkData.optString("linkUrl"));`
`249`	`250`	`builder.setDeepLink(linkData.optString("deepLink"));`
`250`	`251`	`}`
`251`	`252`	`WidgetInfo widgetInfo = builder.build();`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ public static String obtainFlowStatisticJson(int type, StatisticsInfoBean.FileIn`
`101`	`101`	`}`
`102`	`102`
`103`	`103`
	`104`	`+`
`104`	`105`	`public static String obtainFlowStatisticJson(int type, List<DownloadTask> downloadTaskList, int downLoadStage) throws JSONException {`
`105`	`106`	`JSONArray fileInfoArray = new JSONArray();`
`106`	`107`	`JSONObject tmpObj = null;`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,10 @@ public final class VenvyStatisticsManager {`
`23`	`23`	`public static final int PRELOAD_FLOW = 5;`
`24`	`24`	`public static final int OPEN_PAGE = 6;`
`25`	`25`	`public static final int CLOSE_PAGE = 7;`
	`26`	`+ public static final int PAGE_NAME = 8;`
`26`	`27`
`27`	`28`	`private Platform platform;`
	`29`	`+`
`28`	`30`	`private VenvyStatisticsManager() {`
`29`	`31`
`30`	`32`	`}`
`@@ -42,25 +44,27 @@ public void init(Platform platform) {`
`42`	`44`	`}`
`43`	`45`
`44`	`46`	`public void submitCommonTrack(int type, JSONObject jsonObj) {`
`45`		`- if(jsonObj == null){`
	`47`	`+ if (jsonObj == null) {`
`46`	`48`	`return;`
`47`	`49`	`}`
`48`	`50`	`if (VenvyStatisticsManager.AB_APPLET_TRACK == type) {`
`49`	`51`	`submitABAppletTrackStatisticsInfo(jsonObj);`
`50`	`52`	`} else if (VenvyStatisticsManager.USER_ACTION == type) {`
`51`	`53`	`submitUserActionStatisticsInfo(jsonObj);`
`52`		`- }else if (VenvyStatisticsManager.VISUAL_SWITCH_COUNT == type) {`
	`54`	`+ } else if (VenvyStatisticsManager.VISUAL_SWITCH_COUNT == type) {`
`53`	`55`	`submitVisualSwitchStatisticsInfo(jsonObj);`
`54`		`- }else if (VenvyStatisticsManager.PLAY_CONFIRM == type) {`
	`56`	`+ } else if (VenvyStatisticsManager.PLAY_CONFIRM == type) {`
`55`	`57`	`submitPlayConfirmStatisticsInfo(jsonObj);`
`56`		`- }else if (VenvyStatisticsManager.PRELOAD_FLOW == type) {`
	`58`	`+ } else if (VenvyStatisticsManager.PRELOAD_FLOW == type) {`
`57`	`59`	`submitPreLoadFlowStatisticsInfo(jsonObj);`
`58`		`- }else if (VenvyStatisticsManager.OPEN_PAGE == type \|\| VenvyStatisticsManager.CLOSE_PAGE == type) {`
`59`		`- executeThread(jsonObj.toString());`
	`60`	`+ } else if (VenvyStatisticsManager.OPEN_PAGE == type`
	`61`	`+ \|\| VenvyStatisticsManager.CLOSE_PAGE == type`
	`62`	`+ \|\| VenvyStatisticsManager.PAGE_NAME == type) {`
	`63`	`+ submitABAppletTrackStatisticsInfo(type, jsonObj);`
`60`	`64`	`}`
`61`	`65`	`}`
`62`	`66`
`63`		`- private void submitPreLoadFlowStatisticsInfo(JSONObject jsonObj){`
	`67`	`+ private void submitPreLoadFlowStatisticsInfo(JSONObject jsonObj) {`
`64`	`68`	`try {`
`65`	`69`	`String dataJson = StatisticDCUtils.obtainPreLoadFlowStatisticsJson(VenvyStatisticsManager.PRELOAD_FLOW, jsonObj);`
`66`	`70`	`executeThread(dataJson);`
`@@ -69,7 +73,7 @@ private void submitPreLoadFlowStatisticsInfo(JSONObject jsonObj){`
`69`	`73`	`}`
`70`	`74`	`}`
`71`	`75`
`72`		`- private void submitPlayConfirmStatisticsInfo(JSONObject jsonObj){`
	`76`	`+ private void submitPlayConfirmStatisticsInfo(JSONObject jsonObj) {`
`73`	`77`	`try {`
`74`	`78`	`String dataJson = StatisticDCUtils.obtainPlayConfirmStatisticsJson(VenvyStatisticsManager.PLAY_CONFIRM, jsonObj);`
`75`	`79`	`executeThread(dataJson);`
`@@ -78,7 +82,7 @@ private void submitPlayConfirmStatisticsInfo(JSONObject jsonObj){`
`78`	`82`	`}`
`79`	`83`	`}`
`80`	`84`
`81`		`- private void submitVisualSwitchStatisticsInfo(JSONObject jsonObj){`
	`85`	`+ private void submitVisualSwitchStatisticsInfo(JSONObject jsonObj) {`
`82`	`86`	`try {`
`83`	`87`	`String dataJson = StatisticDCUtils.obtainVisualSwitchStatisticsJson(VenvyStatisticsManager.VISUAL_SWITCH_COUNT, jsonObj);`
`84`	`88`	`executeThread(dataJson);`
`@@ -105,14 +109,23 @@ private void submitABAppletTrackStatisticsInfo(JSONObject jsonObj) {`
`105`	`109`	`}`
`106`	`110`	`}`
`107`	`111`
	`112`	`+ private void submitABAppletTrackStatisticsInfo(int type, JSONObject jsonObj) {`
	`113`	`+ try {`
	`114`	`+ String dataJson = StatisticDCUtils.obtainABAppletTrackStatisticsJson(type, jsonObj);`
	`115`	`+ executeThread(dataJson);`
	`116`	`+ } catch (JSONException e) {`
	`117`	`+ e.printStackTrace();`
	`118`	`+ }`
	`119`	`+ }`
	`120`	`+`
`108`	`121`	`private void executeThread(String dataJson) {`
`109`		`- if(!TextUtils.isEmpty(dataJson) && platform != null){`
`110`		`- ThreadManager.getInstance().createLongPool().execute(new AsyncStatisticsRunnable(platform,dataJson));`
	`122`	`+ if (!TextUtils.isEmpty(dataJson) && platform != null) {`
	`123`	`+ ThreadManager.getInstance().createLongPool().execute(new AsyncStatisticsRunnable(platform, dataJson));`
`111`	`124`	`}`
`112`	`125`	`}`
`113`	`126`
`114`	`127`	`public void submitVisualSwitchStatisticsInfo(String onOrOff) {`
`115`		`- if(TextUtils.isEmpty(onOrOff) \|\| platform == null){`
	`128`	`+ if (TextUtils.isEmpty(onOrOff) \|\| platform == null) {`
`116`	`129`	`return;`
`117`	`130`	`}`
`118`	`131`	`try {`
`@@ -123,20 +136,20 @@ public void submitVisualSwitchStatisticsInfo(String onOrOff) {`
`123`	`136`	`}`
`124`	`137`	`}`
`125`	`138`
`126`		`- public void submitFileStatisticsInfo(List<DownloadTask> downloadTaskList ,int downLoadStage) {`
`127`		`- if(downloadTaskList == null \|\| downloadTaskList.size() <= 0 \|\| platform == null){`
	`139`	`+ public void submitFileStatisticsInfo(List<DownloadTask> downloadTaskList, int downLoadStage) {`
	`140`	`+ if (downloadTaskList == null \|\| downloadTaskList.size() <= 0 \|\| platform == null) {`
`128`	`141`	`return;`
`129`	`142`	`}`
`130`	`143`	`try {`
`131`		`- String dataJson = StatisticDCUtils.obtainFlowStatisticJson(VenvyStatisticsManager.PRELOAD_FLOW,downloadTaskList,downLoadStage);`
	`144`	`+ String dataJson = StatisticDCUtils.obtainFlowStatisticJson(VenvyStatisticsManager.PRELOAD_FLOW, downloadTaskList, downLoadStage);`
`132`	`145`	`executeThread(dataJson);`
`133`	`146`	`} catch (JSONException e) {`
`134`	`147`	`e.printStackTrace();`
`135`	`148`	`}`
`136`	`149`	`}`
`137`	`150`
`138`		`- public void submitFileStatisticsInfo(StatisticsInfoBean.FileInfoBean fileInfoBean , int downLoadStage) {`
`139`		`- if(fileInfoBean == null \|\| platform == null){`
	`151`	`+ public void submitFileStatisticsInfo(StatisticsInfoBean.FileInfoBean fileInfoBean, int downLoadStage) {`
	`152`	`+ if (fileInfoBean == null \|\| platform == null) {`
`140`	`153`	`return;`
`141`	`154`	`}`
`142`	`155`	`try {`