Merge branch 'dev_2.9.0_rr_2.10.1' into dev_jlzhang

Author: videopls

VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/interf/CallbackType.java

@@ -0,0 +1,21 @@
+package cn.com.venvy.common.interf;
+
+/**
+ * Created by videopls on 2020/2/26.
+ */
+
+public enum CallbackType {
+    CallbackTypeDesktop(0),
+    CallbackTypePreloadZip(1),
+    CallbackTypeQueryAds(2);
+
+    int id;
+
+    CallbackType(int id) {
+        this.id = id;
+    }
+
+    public int getId() {
+        return id;
+    }
+}

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

@@ -1,11 +1,13 @@
 package cn.com.videopls.pub;
 
+import cn.com.venvy.common.interf.CallbackType;
+
 /**
  * Created by yanjiangbo on 2018/4/12.
  */
 
 public interface IStartQueryResult {
-    void successful(Object result,String miniAppInfo, String originData, ServiceQueryAdsInfo queryAdsInfo);
+    void successful(CallbackType callbackType, Object result, String miniAppInfo, String originData, ServiceQueryAdsInfo queryAdsInfo);
 
     void failed(Throwable throwable);
 }

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

@@ -27,6 +27,7 @@
 import cn.com.venvy.VideoCopyLuaAssetsHelper;
 import cn.com.venvy.common.debug.DebugHelper;
 import cn.com.venvy.common.interf.ActionType;
+import cn.com.venvy.common.interf.CallbackType;
 import cn.com.venvy.common.interf.EventType;
 import cn.com.venvy.common.interf.IAppletListener;
 import cn.com.venvy.common.interf.IServiceCallback;
@@ -156,7 +157,11 @@ public void startService(final ServiceType serviceType, final HashMap<String, St
         params.put(VenvySchemeUtil.QUERY_PARAMETER_ADS_TYPE, String.valueOf(serviceType.getId()));
         startQueryConnect(serviceType, params, new IStartQueryResult() {
             @Override
-            public void successful(Object result, String miniAppInfo, String originData, final ServiceQueryAdsInfo queryAdsInfo) {
+            public void successful(CallbackType callbackType, Object result, String miniAppInfo, String originData, final ServiceQueryAdsInfo queryAdsInfo) {
+                if (CallbackType.CallbackTypeDesktop ==  callbackType && callback != null) {
+                    callback.onCompleteForService();
+                    return;
+                }
                 if (queryAdsInfo == null) {
                     if (callback != null) {
                         callback.onFailToCompleteForService(new Exception("error query ads params" +
@@ -483,9 +488,9 @@ private void startQueryConnect(ServiceType serviceType, final Map<String, String
                 // 视联网模式
                 mQueryAdsModel = new VideoServiceQueryChainModel(mPlatform, params, serviceType == ServiceTypeVideoMode_TAG, new VideoServiceQueryChainModel.ServiceQueryChainCallback() {
                     @Override
-                    public void queryComplete(Object queryAdsData, String miniAppInfo, String originData, ServiceQueryAdsInfo queryAdsInfo) {
+                    public void queryComplete(CallbackType callbackType, Object queryAdsData, String miniAppInfo, String originData, ServiceQueryAdsInfo queryAdsInfo) {
                         if (result != null) {
-                            result.successful(queryAdsData, miniAppInfo, originData, queryAdsInfo);
+                            result.successful(callbackType, queryAdsData, miniAppInfo, originData, queryAdsInfo);
                         }
                     }
 
@@ -574,7 +579,7 @@ public void downError(Throwable t) {
                             @Override
                             public void queryComplete(Object queryAdsData, String miniAppInfo, ServiceQueryAdsInfo queryAdsInfo) {
                                 if (result != null) {
-                                    result.successful(queryAdsData, miniAppInfo, "", queryAdsInfo);
+                                    result.successful(CallbackType.CallbackTypeQueryAds, queryAdsData, miniAppInfo, "", queryAdsInfo);
                                 }
                             }
 

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

@@ -23,6 +23,7 @@
 import cn.com.venvy.common.http.base.IRequestHandler;
 import cn.com.venvy.common.http.base.IResponse;
 import cn.com.venvy.common.http.base.Request;
+import cn.com.venvy.common.interf.CallbackType;
 import cn.com.venvy.common.observer.ObservableManager;
 import cn.com.venvy.common.observer.VenvyObservableTarget;
 import cn.com.venvy.common.utils.VenvyAesUtil;
@@ -174,6 +175,11 @@ public void updateComplete(boolean isUpdateByNetWork) {
 
                                         if (dataJsonArray != null && dataJsonArray.length() > 0) {
                                             mDownZipUpdate.startDownloadZipFile(dataJsonArray);
+                                        } else {
+                                            ServiceQueryChainCallback callback = getQueryChainCallback();
+                                            if (callback != null) {
+                                                callback.queryComplete(CallbackType.CallbackTypeDesktop,null,null,null,null);
+                                            }
                                         }
                                     }
 
@@ -208,7 +214,7 @@ public void updateComplete(JSONArray zipJsonDataArray) {
                                         if (zipJsonDataArray != null && zipJsonDataArray.length() > 0) {
                                             jsonObject.put("data", zipJsonDataArray);
                                         }
-                                        callback.queryComplete(jsonObject, videoModeMiniAppInfoObj.toString(), obj.toString(),
+                                        callback.queryComplete(CallbackType.CallbackTypePreloadZip, jsonObject, videoModeMiniAppInfoObj.toString(), obj.toString(),
                                                 queryAdsInfo);
                                     } catch (Exception e) {
                                         e.printStackTrace();
@@ -296,7 +302,7 @@ private void loadDesktopProgram(String luaName, String miniAppInfo, String origi
 
 
     public interface ServiceQueryChainCallback {
-        void queryComplete(Object queryAdsData, String miniAppInfo, String originData ,ServiceQueryAdsInfo queryAdsInfo);
+        void queryComplete(CallbackType callbackType, Object queryAdsData, String miniAppInfo, String originData , ServiceQueryAdsInfo queryAdsInfo);
 
         void queryError(Throwable t);
     }