Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed bugs: the image stoped when switch app fore/background several times. The background music not stoped when app enter background some time.

This commit is contained in:
yangws 2011-05-18 11:08:18 +08:00
parent 01c5048203
commit 7a6a891242
4 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos2dx/platform/CCCommon.cpp
View File

@ -108,10 +108,12 @@ void CCLog(const char * pszFormat, ...)
#endif
va_end(ap);
SS_printf("%s", szBuf);
#ifdef _TRANZDA_VM_
SS_printf("\n");
WCHAR wszBuf[MAX_LEN + 2] = {0};
wszBuf[MultiByteToWideChar(CP_UTF8, 0, szBuf, -1, wszBuf, sizeof(wszBuf))] = '\n';
OutputDebugStringW(wszBuf);
#else
SS_printf("%s", szBuf);
SS_printf("\r\n");
FILE * pf = fopen(s_szLogFilePath, "a+");
if (! pf)

63
cocos2dx/platform/wophone/CCApplication_wophone.cpp
View File

@ -28,9 +28,10 @@ static long long getTimeOfDayMicroSecond()
#endif
CCApplication::CCApplication()
: m_bRunning(FALSE)
, m_bNeedStop(FALSE)
, m_bInBackground(FALSE)
: m_bRunning(false)
, m_bNeedStop(false)
, m_bInBackground(false)
, m_bEnterBackgroundCalled(false)
{
memset(&m_tMsg, 0, sizeof(m_tMsg));
SS_GetCurrentGTID(&m_tMsg.gtid);
@ -108,9 +109,14 @@ Boolean CCApplication::EventHandler(EventType* pEvent)
case EVENT_AppActiveNotify:
if (pEvent->sParam1 == 0)
{
CCLOG("EVENT_AppActiveNotify false");
if (!m_bInBackground)
{
applicationDidEnterBackground();
if (! m_bEnterBackgroundCalled)
{
applicationDidEnterBackground();
m_bEnterBackgroundCalled = true;
}
m_bInBackground = true;
}
@ -125,15 +131,17 @@ Boolean CCApplication::EventHandler(EventType* pEvent)
CfgTurnOnBackLightEx(SYS_BACK_LIGHT_MODE_TIME_LONG);
CCLOG("AppActiveNotify::TurnOnBackLight:MODE_TIME_LONG");
}
// EnableKeyLock();
// CCLOG("AppActiveNotify::InBackground");
}
else if (pEvent->sParam1 > 0)
{
CCLOG("EVENT_AppActiveNotify true");
if (m_bInBackground)
{
applicationWillEnterForeground();
if (m_bEnterBackgroundCalled)
{
applicationWillEnterForeground();
m_bEnterBackgroundCalled = false;
}
m_bInBackground = false;
}
@ -147,13 +155,6 @@ Boolean CCApplication::EventHandler(EventType* pEvent)
CfgTurnOnBackLightDelay(0x7fffffff);
CCLOG("AppActiveNotify::TurnOnBackLight:0x7fffffff");
}
// if KeyLock disactived, disable it.
// if (! CfgKeyLock_GetActive())
// {
// DisableKeyLock();
// CCLOG("AppActiveNotify::DisableKeyLock");
// }
}
break;
}
@ -208,12 +209,12 @@ void CCApplication::switchNotify(int nTurnOn)
if (! nTurnOn) // turn off screen
{
// CCDirector::sharedDirector()->pause();
applicationDidEnterBackground();
if (! m_bEnterBackgroundCalled)
{
applicationDidEnterBackground();
m_bEnterBackgroundCalled = true;
}
StopMainLoop();
// EnableKeyLock();
// CCLOG("BLswitchNotify::EnableKeyLock");
}
else
{
@ -223,15 +224,11 @@ void CCApplication::switchNotify(int nTurnOn)
CfgTurnOnBackLightDelay(0x7fffffff);
CCLOG("AppActiveNotify::TurnOnBackLight:0x7fffffff");
// // if KeyLock disactived, disable it.
// if (! CfgKeyLock_GetActive())
// {
// DisableKeyLock();
// CCLOG("BLswitchNotify::DisableKeyLock");
// }
//
// CCDirector::sharedDirector()->resume();
applicationWillEnterForeground();
if (m_bEnterBackgroundCalled)
{
applicationWillEnterForeground();
m_bEnterBackgroundCalled = false;
}
StartMainLoop();
}
} while (0);
@ -244,13 +241,13 @@ bool CCApplication::isInBackground()
void CCApplication::StartMainLoop()
{
m_bNeedStop = FALSE;
if (m_bRunning)
{
m_bNeedStop = FALSE;
return;
}
CCLOG("Post StartMainLoop");
Sys_PostMessage2(MESSAGE_PRIOR_LOWEST, &m_tMsg);
m_bRunning = TRUE;
}
void CCApplication::StopMainLoop()
@ -262,15 +259,17 @@ Int32 CCApplication::_OnAppIdle(MESSAGE_t * pMsg, UInt32 uData)
{
CCApplication& rThis = (CCApplication&) CCApplication::sharedApplication();
CCEGLView * pView = CCDirector::sharedDirector()->getOpenGLView();
if (pView && rThis.m_bRunning)
if (pView)
{
if (rThis.m_bNeedStop)
{
CCLOG("_OnAppIdle: Stop");
rThis.m_bNeedStop = FALSE;
rThis.m_bRunning = FALSE;
}
else
{
rThis.m_bRunning = TRUE;
#ifdef _TRANZDA_VM_
LARGE_INTEGER nNow;
QueryPerformanceCounter(&nNow);

1
cocos2dx/platform/wophone/CCApplication_wophone.h
View File

@ -109,6 +109,7 @@ protected:
bool m_bRunning;
bool m_bNeedStop;
bool m_bInBackground;
bool m_bEnterBackgroundCalled;
char m_AppDataPath[EOS_FILE_MAX_PATH];
char m_AppWritablePath[EOS_FILE_MAX_PATH];

5
tests/AppDelegate.cpp
View File

@ -2,8 +2,10 @@
#include "cocos2d.h"
#include "tests/controller.h"
#include "SimpleAudioEngine.h"
USING_NS_CC;
using namespace CocosDenshion;
AppDelegate::AppDelegate()
{
@ -51,6 +53,7 @@ bool AppDelegate::initInstance()
#ifndef _TRANZDA_VM_
// on wophone emulator, we copy resources files to Work7/NEWPLUS/TDA_DATA/Data folder instead of zip file
cocos2d::CCFileUtils::setResource("TestCocos2dx.zip");
CocosDenshion::SimpleAudioEngine::setResource("TestCocos2dx.zip");
#endif
#endif
@ -93,10 +96,12 @@ bool AppDelegate::applicationDidFinishLaunching()
void AppDelegate::applicationDidEnterBackground()
{
CCDirector::sharedDirector()->pause();
SimpleAudioEngine::sharedEngine()->pauseBackgroundMusic();
}
// this function will be called when the app is active again
void AppDelegate::applicationWillEnterForeground()
{
CCDirector::sharedDirector()->resume();
SimpleAudioEngine::sharedEngine()->resumeBackgroundMusic();
}