Merge pull request #15568 from zilongshanren/fix-jsb-related-issues

fix jsb 3.11 related issues

cocos/ui/UIVideoPlayer-android.cpp

@@ -240,6 +240,18 @@ void VideoPlayer::setVisible(bool visible)
     } 
 }
 
+void VideoPlayer::onEnter()
+{
+    Widget::onEnter();
+    this->setVisible(true);
+}
+
+void VideoPlayer::onExit()
+{
+    Widget::onExit();
+    this->setVisible(false);
+}
+
 void VideoPlayer::addEventListener(const VideoPlayer::ccVideoPlayerCallback& callback)
 {
     _eventCallback = callback;

cocos/ui/UIVideoPlayer-ios.mm

@@ -343,6 +343,18 @@ bool VideoPlayer::isFullScreenEnabled()const
     return [((UIVideoViewWrapperIos*)_videoView) isFullScreenEnabled];
 }
 
+void VideoPlayer::onEnter()
+{
+    Widget::onEnter();
+    [((UIVideoViewWrapperIos*)_videoView) setVisible:YES];
+}
+
+void VideoPlayer::onExit()
+{
+    Widget::onExit();
+    [((UIVideoViewWrapperIos*)_videoView) setVisible:NO];
+}
+
 void VideoPlayer::setFullScreenEnabled(bool enabled)
 {
     [((UIVideoViewWrapperIos*)_videoView) setFullScreenEnabled:enabled];

cocos/ui/UIVideoPlayer.h

@@ -172,6 +172,8 @@ namespace experimental{
             virtual void onPlayEvent(int event);
             virtual void setVisible(bool visible) override;
             virtual void draw(Renderer *renderer, const Mat4& transform, uint32_t flags) override;
+            virtual void onEnter() override;
+            virtual void onExit() override;
 
         protected:
             virtual cocos2d::ui::Widget* createCloneInstance() override;

cocos/ui/UIWebView-inl.h

@@ -198,6 +198,18 @@ namespace experimental{
             return _onJSCallback;
         }
         
+        void WebView::onEnter()
+        {
+            Widget::onEnter();
+            _impl->setVisible(true);
+        }
+        
+        void WebView::onExit()
+        {
+            Widget::onExit();
+            _impl->setVisible(false);
+        }
+        
     } // namespace ui
 } // namespace experimental
 } //namespace cocos2d

cocos/ui/UIWebView.h

@@ -204,6 +204,9 @@ public:
      */
     virtual void setVisible(bool visible) override;
     
+    virtual void onEnter() override;
+    virtual void onExit() override;
+    
 protected:
     virtual cocos2d::ui::Widget* createCloneInstance() override;
     virtual void copySpecialProperties(Widget* model) override;

tests/js-tests/src/LabelTest/LabelTest.js

@@ -1965,7 +1965,7 @@ var WrapAlgorithmTest = AtlasDemo.extend({
             LabelTTF.setString(text);
             LabelTTF.setPosition(480 + i * 25, 300);
             LabelTTF.setAnchorPoint(0,1);
-            LabelTTF.boundingWidth = 3;
+            LabelTTF.boundingWidth = 13;
             LabelTTF.boundingHeight = 0;
             LabelTTF.enableStroke(cc.color(0, 0, 0, 1), 3.0);
             if (cc.sys.os === cc.sys.OS_WP8)