fix H5小程序没有隐藏导航栏的Bug; 优化webView 通过jsBridge close容器的逻辑

Author: lucas

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

@@ -198,7 +198,12 @@ public void start(@NonNull String appletId, String data, int orientationType, bo
      */
     public void startH5(String url, String developerUserId) {
         currentH5Program.addDeveloperUserIdToJsBridge(developerUserId);
-        url = "http://cytroncdn.videojj.com/pages/jijiMall/dev/index.html#debug";
+        currentH5Program.setWebViewCloseListener(new VideoWebToolBarView.WebViewCloseListener() {
+            @Override
+            public void onClose(String appletId) {
+                closeH5(appletId);
+            }
+        });
         currentH5Program.openLink(url);
     }
 

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

@@ -87,7 +87,13 @@ public void requestFinish(Request request, IResponse response) {
                     final JSONObject decryptData = new JSONObject(jsonStr);
 
                     final JSONObject miniAppInfoObj = decryptData.optJSONObject("miniAppInfo");
-
+                    if(miniAppInfoObj == null){
+                        VenvyLog.e("miniAppInfoObj is null");
+                        if (callback != null) {
+                            callback.downError(new NullPointerException("miniAppInfoObj is null"));
+                        }
+                        return;
+                    }
                     final String miniAppId = miniAppInfoObj.optString("miniAppId");
                     final String template = miniAppInfoObj.optString("template");
                     JSONArray fileListArray = miniAppInfoObj.optJSONArray("luaList");

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

@@ -46,6 +46,7 @@ public class VideoWebToolBarView extends BaseVideoVisionView {
 
     private JsBridge jsBridge;
 
+
     public VideoWebToolBarView(Context context) {
         super(context);
         init();
@@ -272,6 +273,19 @@ public void addDeveloperUserIdToJsBridge(String developerUserId){
         }
     }
 
+    public void setWebViewCloseListener(final WebViewCloseListener closeListener){
+        if(jsBridge != null){
+            jsBridge.setWebViewCloseListener(new JsBridge.WebViewCloseListener() {
+                @Override
+                public void onClose(CloseType actionType) {
+                    if(closeListener != null){
+                        closeListener.onClose(appletId);
+                    }
+                }
+            });
+        }
+    }
+
     public void reload(String data) {
         if (jsBridge != null) {
             jsBridge.setJsData(data);
@@ -289,4 +303,8 @@ protected void onDetachedFromWindow() {
             removeView(webView);
         }
     }
+
+    public interface WebViewCloseListener{
+        void onClose(String appletId);
+    }
 }

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

@@ -143,6 +143,14 @@ public void requestFinish(Request request, IResponse response) {
                     final String developerUserId = miniAppInfoObj.optString("developerUserId");
                     JSONArray fileListArray = miniAppInfoObj.optJSONArray("luaList");
 
+                    String resCode = App.isIsDevMode() ? "-1" : decryptData.optString("resCode"); //  应答码  00-成功  01-失败
+                    JSONObject displayObj = decryptData.optJSONObject("display");
+                    if (displayObj != null) {
+                        final String nativeTitle = displayObj.optString("navTitle");
+                        nvgShow = displayObj.optBoolean("navShow", true);
+                        updateVisionTitle(nativeTitle, nvgShow);
+                    }
+
                     if (isH5Type) {
                         final String h5Url = decryptData.optString("h5Url");
                         if (TextUtils.isEmpty(h5Url)) {
@@ -157,13 +165,7 @@ public void requestFinish(Request request, IResponse response) {
                         return;
                     }
 
-                    String resCode = App.isIsDevMode() ? "-1" : decryptData.optString("resCode"); //  应答码  00-成功  01-失败
-                    JSONObject displayObj = decryptData.optJSONObject("display");
-                    if (displayObj != null) {
-                        final String nativeTitle = displayObj.optString("navTitle");
-                        nvgShow = displayObj.optBoolean("navShow", true);
-                        updateVisionTitle(nativeTitle, nvgShow);
-                    }
+
 
                     if (resCode.equalsIgnoreCase("00")) {
                         //LuaArray --> JavaBean