支持jsTitle设置

Author: lucas

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

@@ -73,8 +73,7 @@ public void setJsData(String jsData) {
         this.mJsData = jsData;
     }
 
-    public void setJsData(String jsData, String jsTitle) {
-        this.mJsData = jsData;
+    public void setJsTitle(String jsTitle){
         this.mJsTitle = jsTitle;
     }
 

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

@@ -50,8 +50,8 @@ public class VideoProgramTypeBView extends FrameLayout implements VenvyObserver
      */
     private HashMap<String, VideoWebToolBarView> h5ProgramMap = new HashMap<>();
 
+    // 当前最近启动的容器。为互斥关系，当一方有实例的时候，另一方为null
     private VideoProgramToolBarView currentProgram;
-
     private VideoWebToolBarView currentH5Program;
 
     private FrameLayout programContent;
@@ -60,7 +60,6 @@ public class VideoProgramTypeBView extends FrameLayout implements VenvyObserver
     private VideoPlusAdapter mAdapter;
 
     private String currentProgramId;
-
     private String currentH5ProgramId;
 
     public VideoProgramTypeBView(@NonNull Context context) {
@@ -152,9 +151,11 @@ public void start(@NonNull String appletId, String data, int orientationType, bo
                 VideoWebToolBarView h5View = h5ProgramMap.get(appletId);
                 h5View.reload(appletId);
                 currentH5Program = h5View;
+                currentProgram = null;
                 return;
             }
             currentH5Program = createH5Program();
+            currentProgram = null;
             if (mAdapter != null) {
                 currentH5Program.setAdapter(mAdapter);
             }
@@ -173,10 +174,12 @@ public void start(@NonNull String appletId, String data, int orientationType, bo
                 existView.notifyLua(data);
                 existView.refreshHistory(appletId);
                 currentProgram = existView;
+                currentH5Program = null;
                 return;
             }
 
             currentProgram = createProgram(orientationType);
+            currentH5Program = null;
             if (mAdapter != null) {
                 currentProgram.setVideoOSAdapter(mAdapter);
             }
@@ -281,6 +284,10 @@ public void setCurrentProgramTitle(String title) {
         if (currentProgram != null) {
             currentProgram.setTitle(title);
         }
+
+        if(currentH5Program != null){
+            currentH5Program.setTitle(title);
+        }
     }
 
 

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

@@ -42,6 +42,8 @@ public class VideoWebToolBarView extends BaseVideoVisionView {
 
     private VideoPlusH5Controller controller;
 
+    private JsBridge jsBridge;
+
     public VideoWebToolBarView(Context context) {
         super(context);
         init();
@@ -110,12 +112,12 @@ public void showErrorPage(final String showErrorPage) {
                     public void run() {
                         errorContent.setVisibility(VISIBLE);
                         String message = "";
-                        if(TextUtils.isEmpty(showErrorPage)){
+                        if (TextUtils.isEmpty(showErrorPage)) {
                             message = getContext().getString(
                                     VenvyResourceUtil.getStringId(getContext(), "errorDesc"));
-                        }else{
+                        } else {
                             try {
-                                message =  new JSONObject(showErrorPage).getString("message");
+                                message = new JSONObject(showErrorPage).getString("message");
                             } catch (JSONException e) {
                                 e.printStackTrace();
                             }
@@ -226,6 +228,12 @@ public void onReceivedError(WebView view, int errorCode, String description, Str
         addView(webView);
     }
 
+    public void setTitle(final String title) {
+        tvTitle.setText(title);
+        if (jsBridge != null) {
+            jsBridge.setJsTitle(title);
+        }
+    }
 
     public void fetchTargetUrl(String appletId, String data) {
         this.appletId = appletId;
@@ -235,13 +243,15 @@ public void fetchTargetUrl(String appletId, String data) {
         controller.startH5Program(appletId);
         freshProgram(appletId);
 
-        JsBridge jsBridge = new JsBridge(getContext(), webView, controller.getPlatform());
+        if (jsBridge == null) {
+            jsBridge = new JsBridge(getContext(), webView, controller.getPlatform());
+        }
         jsBridge.setJsData(data);
         webView.setJsBridge(jsBridge);
     }
 
 
-    public void freshProgram(String appletId){
+    public void freshProgram(String appletId) {
         controller.refreshRecentHistory(appletId);
     }
 
@@ -253,7 +263,7 @@ public void openLink(final String url) {
         cancelLoadingAnimation();
     }
 
-    public void reload(String appletId){
+    public void reload(String appletId) {
         webView.reload();
         freshProgram(appletId);
     }