Merge branch 'dev_yunce' into 'dev_2.9.0'

fix 一些云测的Bug

See merge request Mobile/VideoOS-Android-SDK!19

Author: guofang

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

@@ -652,18 +652,23 @@ public void startVisionProgram(final String appletId, final String data, final i
         if (mContentView != null) {
             mContentView.setVisibility(View.VISIBLE);
         }
-        this.mPlatform = initPlatform(mVideoPlusAdapter);
+        if (this.mPlatform == null) {
+            this.mPlatform = initPlatform(mVideoPlusAdapter);
+        }
         VisionProgramConfigModel model = new VisionProgramConfigModel(mPlatform, appletId, isH5Type, new VisionProgramConfigModel.VisionProgramConfigCallback() {
 
             @Override
             public void downComplete(final String entranceLua, boolean isUpdateByNet, boolean nvgShow) {
                 VenvyLog.d("vision program downComplete : " + isUpdateByNet + "   - " + entranceLua);
+                if (mPlatform == null) {
+                    mPlatform = initPlatform(mVideoPlusAdapter);
+                }
                 mPlatform.setNvgShow(false);
                 VenvyUIUtil.runOnUIThread(new Runnable() {
                     @Override
                     public void run() {
                         String luaId = entranceLua;
-                        if (entranceLua.contains(".")) {
+                        if (entranceLua != null && entranceLua.contains(".")) {
                             luaId = entranceLua.split("\\.")[0];
                         }
                         //LuaView://applets?appletId=xxxx&template=xxxx.lua&id=xxxx&(priority=x)

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

@@ -84,12 +84,15 @@ private void init() {
             @Override
             public void onClick(View view) {
                 if (VenvyDeviceUtil.isNetworkAvailable(getContext())) {
-                    VideoOSLuaView osLuaView = getCurrentLuaView();
-                    HashMap<String, String> map = new HashMap<>();
-                    map.put("eventType", "2");
-                    map.put("appletActionType", "1");
-                    map.put("data", retryData);
-                    osLuaView.callLuaFunction("event", map);
+                    if(getCurrentLuaView() instanceof VideoOSLuaView){
+                        VideoOSLuaView osLuaView = (VideoOSLuaView)getCurrentLuaView();
+                        HashMap<String, String> map = new HashMap<>();
+                        map.put("eventType", "2");
+                        map.put("appletActionType", "1");
+                        map.put("data", retryData);
+                        osLuaView.callLuaFunction("event", map);
+                    }
+
                 }
             }
         });
@@ -229,17 +232,19 @@ public void notifyLua(String data) {
         VenvyLog.d("call event function");
 
         // 通知正在展示的lua refresh
-        VideoOSLuaView osLuaView = getCurrentLuaView();
-        HashMap<String, String> map = new HashMap<>();
-        map.put("eventType", "2");
-        map.put("appletActionType", "2");
-        map.put("data", data);
-        osLuaView.callLuaFunction("event", map);
+        if (getCurrentLuaView() instanceof VideoOSLuaView) {
+            VideoOSLuaView osLuaView = (VideoOSLuaView) getCurrentLuaView();
+            HashMap<String, String> map = new HashMap<>();
+            map.put("eventType", "2");
+            map.put("appletActionType", "2");
+            map.put("data", data);
+            osLuaView.callLuaFunction("event", map);
+        }
 
     }
 
-    public VideoOSLuaView getCurrentLuaView() {
-        return (VideoOSLuaView) videoProgramView.getChildAt(videoProgramView.getChildCount() - 1);
+    public View getCurrentLuaView() {
+        return videoProgramView.getChildAt(videoProgramView.getChildCount() - 1);
     }
 
     public void launchLuaScript(String template, final String id, String data) {

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

@@ -197,6 +197,7 @@ public void start(@NonNull String appletId, String data, int orientationType, bo
      * @param url
      */
     public void startH5(String url, String developerUserId) {
+        if (currentH5Program == null) return;
         currentH5Program.addDeveloperUserIdToJsBridge(developerUserId);
         currentH5Program.setWebViewCloseListener(new VideoWebToolBarView.WebViewCloseListener() {
             @Override
@@ -345,8 +346,6 @@ public void onScreenChanged(boolean isHorizontal) {
      */
     @Override
     public void notifyChanged(VenvyObservable observable, String tag, Bundle bundle) {
-        // TODO : bundle maybe is null..
-
         if (VenvyObservableTarget.TAG_ADD_LUA_SCRIPT_TO_VISION_PROGRAM.equals(tag)) {
             if (bundle != null) {
                 String appletId = bundle.getString(VenvyObservableTarget.KEY_APPLETS_ID);