Merge branch 'dev_2.9.0_rr_2.10.3_test' into dev_2.10.1

Author: videopls

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

@@ -25,6 +25,7 @@
 import cn.com.venvy.PlatformInfo;
 import cn.com.venvy.VenvyRegisterLibsManager;
 import cn.com.venvy.VideoCopyLuaAssetsHelper;
+import cn.com.venvy.VideoPositionHelper;
 import cn.com.venvy.common.debug.DebugHelper;
 import cn.com.venvy.common.interf.ActionType;
 import cn.com.venvy.common.interf.CallbackType;
@@ -303,7 +304,6 @@ public void stop() {
             mContentView.removeAllViews();
             mContentView.setVisibility(View.GONE);
         }
-
     }
 
     void destroy() {
@@ -409,10 +409,12 @@ protected void navigation(Uri uri, HashMap<String, String> params, IRouterCallba
             return;
         }
 
-        if (mPlatform == null) {
-            mPlatform = initPlatform(mVideoPlusAdapter);
+        if (mContentView.getVisibility() == View.GONE || mContentView.getVisibility() == View.INVISIBLE) {
+            mContentView.setVisibility(View.VISIBLE);
         }
 
+        mPlatform = initPlatform(mVideoPlusAdapter);
+
         PostInfo postInfo = VenvyRouterManager.getInstance().setUri(uri)
                 .withTargetPlatform("platform", mPlatform)
                 .withTargetViewParent(mContentView);
@@ -694,9 +696,7 @@ public void startVisionProgram(final String appletId, final String data, final i
         if (mContentView != null) {
             mContentView.setVisibility(View.VISIBLE);
         }
-        if (this.mPlatform == null) {
-            this.mPlatform = initPlatform(mVideoPlusAdapter);
-        }
+        this.mPlatform = initPlatform(mVideoPlusAdapter);
         VisionProgramConfigModel model = new VisionProgramConfigModel(mPlatform, appletId, isH5Type, new VisionProgramConfigModel.VisionProgramConfigCallback() {
 
             @Override
@@ -776,9 +776,7 @@ public void refreshRecentHistory(String appId) {
     }
 
     public void downloadAdsRes(Bundle bundle) {
-        if (this.mPlatform == null) {
-            this.mPlatform = initPlatform(mVideoPlusAdapter);
-        }
+        this.mPlatform = initPlatform(mVideoPlusAdapter);
         if (videoAdsHandler == null) {
             videoAdsHandler = new VideoAdsHandler(mPlatform);
         }

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

@@ -17,6 +17,7 @@
 import java.util.HashMap;
 
 import cn.com.venvy.App;
+import cn.com.venvy.VideoPositionHelper;
 import cn.com.venvy.common.interf.IServiceCallback;
 import cn.com.venvy.common.interf.ServiceType;
 import cn.com.venvy.common.observer.VenvyObservableTarget;
@@ -32,7 +33,6 @@
 
 public abstract class VideoPlusView<T extends VideoPlusController> extends FrameLayout {
 
-
     // 顶层小程序容器 4
     protected VideoProgramView programTopLevel;
     // A 类小程序 0，1
@@ -51,39 +51,15 @@ public abstract class VideoPlusView<T extends VideoPlusController> extends Frame
     private Pair<Float, Float> videoModeDeskOffset; // 视联网模式桌面偏移量
 
     public VideoPlusView(Context context) {
-        super(context);
-        init();
+        this(context,null);
     }
 
     public VideoPlusView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
+        this(context, attrs, 0);
     }
 
     public VideoPlusView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
-        init();
-    }
-
-
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        if (plusViewHelper != null) {
-            plusViewHelper.detachedFromWindow();
-        }
-    }
-
-    @Override
-    protected void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) {
-            // 手机竖屏
-
-        } else if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) {
-            // 手机横屏
-
-        }
     }
 
     private void init() {
@@ -95,6 +71,7 @@ private void init() {
         addView(programViewB);
         addView(programTopLevel);
         programViewB.setClickable(false);
+        initViewAdapter();
     }
 
     /**
@@ -106,7 +83,6 @@ private VideoProgramView createTypeAProgram() {
         return new VideoProgramView(getContext());
     }
 
-
     /**
      * 生成B类小程序容器
      *
@@ -189,6 +165,10 @@ public void closeInfoView() {
     }
 
     public void setVideoOSAdapter(VideoPlusAdapter adapter) {
+        this.adapter = adapter;
+    }
+
+    private void initViewAdapter() {
         if (programTopLevel != null) {
             programTopLevel.setVideoOSAdapter(adapter);
         }
@@ -198,23 +178,46 @@ public void setVideoOSAdapter(VideoPlusAdapter adapter) {
         if (programViewB != null) {
             programViewB.setVideoOSAdapter(adapter);
         }
-        this.adapter = adapter;
     }
 
     public VideoPlusAdapter getAdapter() {
         return adapter;
     }
 
     public void start() {
+        init();
         if (programViewA != null) {
             programViewA.start();
         }
     }
 
     public void stop() {
+        if (plusViewHelper != null) {
+            plusViewHelper.detachedFromWindow();
+            plusViewHelper = null;
+        }
+
         if (programViewA != null) {
             programViewA.stop();
+            VideoPositionHelper.getInstance().cancel();
+            programViewA = null;
+        }
+
+        if (programViewB != null) {
+            programViewB.closeAllProgram();
+            programViewB = null;
+        }
+
+        if (programTopLevel != null) {
+            programTopLevel.stop();
+            programTopLevel = null;
+        }
+
+        if (programViewDesktop != null) {
+            programViewDesktop.stop();
+            programViewDesktop = null;
         }
+        this.removeAllViews();
     }
 
     /**