Subversion Repositories tpanel

Rev

Rev 250 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 250 Rev 251
Line 161... Line 161...
161 
    env->DeleteLocalRef(stringJbytes);
 161 
    env->DeleteLocalRef(stringJbytes);
162 
    env->DeleteLocalRef(stringClass);
 162 
    env->DeleteLocalRef(stringClass);
163 
 
 163 
 
164 
    try
 164 
    try
165 
    {
 165 
    {
166 
        TError::lock();
 166 
//        TError::lock();
167 
 
 167 
 
168 
        if (TStreamError::checkFilter(mode))
 168 
        if (TStreamError::checkFilter(mode))
169 
            TError::Current()->logMsg(TError::append(mode, *TStreamError::getStream()) << ret << std::endl);
 169 
            TError::Current()->logMsg(TError::append(mode, *TStreamError::getStream()) << ret << std::endl);
170 
 
 170 
 
171 
        TError::unlock();
 171 
//        TError::unlock();
172 
    }
 172 
    }
173 
    catch (std::exception& e)
 173 
    catch (std::exception& e)
174 
    {
 174 
    {
175 
        __android_log_print(ANDROID_LOG_ERROR, "tpanel", "%s", e.what());
 175 
        __android_log_print(ANDROID_LOG_ERROR, "tpanel", "%s", e.what());
176 
    }
 176 
    }
Line 866... Line 866...
866 
}
 866 
}
867 
 
 867 
 
868 
void TPageManager::showSetup()
 868 
void TPageManager::showSetup()
869 
{
 869 
{
870 
    DECL_TRACER("TPageManager::showSetup()");
 870 
    DECL_TRACER("TPageManager::showSetup()");
871 
#ifndef Q_OS_IOS
 871 
#ifdef Q_OS_ANDROID
872 
    if (mSetupActive)
 872 
    if (mSetupActive)
873 
        return;
 873 
        return;
874 
 
 874 
 
875 
    mSetupActive = true;
 875 
    mSetupActive = true;
876 
    mSavedPage = mActualPage;
 876 
    mSavedPage = mActualPage;
Line 1325... Line 1325...
1325 
 
 1325 
 
1326 
    if (iter != mNetCalls.end())
 1326 
    if (iter != mNetCalls.end())
1327 
        mNetCalls.erase(iter);
 1327 
        mNetCalls.erase(iter);
1328 
}
 1328 
}
1329 
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
 1329 
#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS)
1330 
#ifdef Q_IOS_ANDROID
 1330 
#ifdef Q_OS_ANDROID
1331 
void TPageManager::regCallbackBatteryState(std::function<void (int, bool, int)> callBatteryState, ulong handle)
 1331 
void TPageManager::regCallbackBatteryState(std::function<void (int, bool, int)> callBatteryState, ulong handle)
1332 
{
 1332 
{
1333 
    DECL_TRACER("TPageManager::regCallbackBatteryState(std::function<void (int, bool, int)> callBatteryState, ulong handle)");
 1333 
    DECL_TRACER("TPageManager::regCallbackBatteryState(std::function<void (int, bool, int)> callBatteryState, ulong handle)");
1334 
 
 1334 
 
1335 
    if (handle == 0)
 1335 
    if (handle == 0)