Merge pull request #93 from WenhaiLin/master

Sync Bug fix:
This commit is contained in:
Wenhai Lin
2016-05-12 14:39:57 +08:00
6 changed files with 56 additions and 13 deletions
-5
View File
@@ -166,11 +166,6 @@ static int processTask(HttpClient* client, HttpRequest* request, NSString* reque
//if request type is post or put,set header and data
if([requestType isEqual: @"POST"] || [requestType isEqual: @"PUT"])
{
if ([requestType isEqual: @"PUT"])
{
[nsrequest setValue: @"application/x-www-form-urlencoded" forHTTPHeaderField: @"Content-Type"];
}
char* requestDataBuffer = request->getRequestData();
if (nullptr != requestDataBuffer && 0 != request->getRequestDataSize())
{
+16 -1
View File
@@ -234,12 +234,27 @@ void VideoPlayer::setVisible(bool visible)
{
cocos2d::ui::Widget::setVisible(visible);
if (! _videoURL.empty())
if (!visible || isRunning())
{
JniHelper::callStaticVoidMethod(videoHelperClassName, "setVideoVisible", _videoPlayerIndex, visible);
}
}
void VideoPlayer::onEnter()
{
Widget::onEnter();
if (isVisible() && ! _videoURL.empty())
{
JniHelper::callStaticVoidMethod(videoHelperClassName, "setVideoVisible", _videoPlayerIndex, true);
}
}
void VideoPlayer::onExit()
{
Widget::onExit();
JniHelper::callStaticVoidMethod(videoHelperClassName, "setVideoVisible", _videoPlayerIndex, false);
}
void VideoPlayer::addEventListener(const VideoPlayer::ccVideoPlayerCallback& callback)
{
_eventCallback = callback;
+19 -6
View File
@@ -45,7 +45,7 @@ using namespace cocos2d::experimental::ui;
- (void) resume;
- (void) stop;
- (void) seekTo:(float) sec;
- (void) setVisible:(bool) visible;
- (void) setVisible:(BOOL) visible;
- (void) setKeepRatioEnabled:(bool) enabled;
- (void) setFullScreenEnabled:(bool) enabled;
- (bool) isFullScreenEnabled;
@@ -207,7 +207,7 @@ using namespace cocos2d::experimental::ui;
}
}
-(void) setVisible:(bool)visible
-(void) setVisible:(BOOL)visible
{
if (self.moviePlayer != NULL) {
[self.moviePlayer.view setHidden:!visible];
@@ -347,6 +347,19 @@ void VideoPlayer::setFullScreenEnabled(bool enabled)
[((UIVideoViewWrapperIos*)_videoView) setFullScreenEnabled:enabled];
}
void VideoPlayer::onEnter()
{
Widget::onEnter();
if (isVisible())
[((UIVideoViewWrapperIos*)_videoView) setVisible:YES];
}
void VideoPlayer::onExit()
{
Widget::onExit();
[((UIVideoViewWrapperIos*)_videoView) setVisible:NO];
}
void VideoPlayer::setKeepAspectRatioEnabled(bool enable)
{
if (_keepAspectRatioEnabled != enable)
@@ -405,10 +418,10 @@ void VideoPlayer::setVisible(bool visible)
{
cocos2d::ui::Widget::setVisible(visible);
if (! _videoURL.empty())
{
[((UIVideoViewWrapperIos*)_videoView) setVisible:visible];
}
if (!visible)
[((UIVideoViewWrapperIos*)_videoView) setVisible:NO];
else if(isRunning())
[((UIVideoViewWrapperIos*)_videoView) setVisible:YES];
}
void VideoPlayer::addEventListener(const VideoPlayer::ccVideoPlayerCallback& callback)
+2
View File
@@ -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;
+16 -1
View File
@@ -136,7 +136,9 @@ namespace experimental{
void WebView::setVisible(bool visible)
{
Node::setVisible(visible);
_impl->setVisible(visible);
if(!visible || isRunning())
_impl->setVisible(visible);
}
cocos2d::ui::Widget* WebView::createCloneInstance()
@@ -196,6 +198,19 @@ namespace experimental{
{
return _onJSCallback;
}
void WebView::onEnter()
{
Widget::onEnter();
if(isVisible())
_impl->setVisible(true);
}
void WebView::onExit()
{
Widget::onExit();
_impl->setVisible(false);
}
} // namespace ui
} // namespace experimental
+3
View File
@@ -203,6 +203,9 @@ public:
* Toggle visibility of WebView.
*/
virtual void setVisible(bool visible) override;
virtual void onEnter() override;
virtual void onExit() override;
protected:
virtual cocos2d::ui::Widget* createCloneInstance() override;