From 2465a59717764a002316b01e96845b33fb1e7d8e Mon Sep 17 00:00:00 2001 From: FalsinSoft Date: Thu, 20 Jun 2019 16:30:35 +0200 Subject: [PATCH] Removed incorrect pause/resume event --- QtAndroidTools/QAndroidAdMobInterstitial.cpp | 6 ----- QtAndroidTools/QAndroidAdMobInterstitial.h | 3 --- QtAndroidTools/QAndroidAdMobRewardedVideo.cpp | 6 ----- QtAndroidTools/QAndroidAdMobRewardedVideo.h | 3 --- .../AndroidAdMobRewardedVideo.java | 23 ------------------- 5 files changed, 41 deletions(-) diff --git a/QtAndroidTools/QAndroidAdMobInterstitial.cpp b/QtAndroidTools/QAndroidAdMobInterstitial.cpp index b8986ce..fe7c26c 100644 --- a/QtAndroidTools/QAndroidAdMobInterstitial.cpp +++ b/QtAndroidTools/QAndroidAdMobInterstitial.cpp @@ -48,7 +48,6 @@ QAndroidAdMobInterstitial::QAndroidAdMobInterstitial(QQuickItem *parent) : QQuic JniEnv->RegisterNatives(ObjectClass, JniMethod, sizeof(JniMethod)/sizeof(JNINativeMethod)); JniEnv->DeleteLocalRef(ObjectClass); } - connect(qGuiApp, &QGuiApplication::applicationStateChanged, this, &QAndroidAdMobInterstitial::ApplicationStateChanged); SetNewAppState(APP_STATE_CREATE); } @@ -144,11 +143,6 @@ void QAndroidAdMobInterstitial::InterstitialError(JNIEnv *env, jobject thiz, jin } } -void QAndroidAdMobInterstitial::ApplicationStateChanged(Qt::ApplicationState State) -{ - SetNewAppState((State == Qt::ApplicationActive) ? APP_STATE_START : APP_STATE_STOP); -} - void QAndroidAdMobInterstitial::SetNewAppState(APP_STATE NewState) { if(m_JavaAdMobInterstitial.isValid()) diff --git a/QtAndroidTools/QAndroidAdMobInterstitial.h b/QtAndroidTools/QAndroidAdMobInterstitial.h index b034703..061f3c1 100644 --- a/QtAndroidTools/QAndroidAdMobInterstitial.h +++ b/QtAndroidTools/QAndroidAdMobInterstitial.h @@ -60,9 +60,6 @@ signals: void closed(); void clicked(); -private slots: - void ApplicationStateChanged(Qt::ApplicationState State); - private: const QAndroidJniObject m_JavaAdMobInterstitial; static QMap m_pInstancesMap; diff --git a/QtAndroidTools/QAndroidAdMobRewardedVideo.cpp b/QtAndroidTools/QAndroidAdMobRewardedVideo.cpp index e63d6ac..8af85f1 100644 --- a/QtAndroidTools/QAndroidAdMobRewardedVideo.cpp +++ b/QtAndroidTools/QAndroidAdMobRewardedVideo.cpp @@ -49,7 +49,6 @@ QAndroidAdMobRewardedVideo::QAndroidAdMobRewardedVideo(QQuickItem *parent) : QQu JniEnv->RegisterNatives(ObjectClass, JniMethod, sizeof(JniMethod)/sizeof(JNINativeMethod)); JniEnv->DeleteLocalRef(ObjectClass); } - connect(qGuiApp, &QGuiApplication::applicationStateChanged, this, &QAndroidAdMobRewardedVideo::ApplicationStateChanged); SetNewAppState(APP_STATE_CREATE); } @@ -165,11 +164,6 @@ void QAndroidAdMobRewardedVideo::RewardedVideoError(JNIEnv *env, jobject thiz, j } } -void QAndroidAdMobRewardedVideo::ApplicationStateChanged(Qt::ApplicationState State) -{ - SetNewAppState((State == Qt::ApplicationActive) ? APP_STATE_START : APP_STATE_STOP); -} - void QAndroidAdMobRewardedVideo::SetNewAppState(APP_STATE NewState) { if(m_JavaAdMobRewardedVideo.isValid()) diff --git a/QtAndroidTools/QAndroidAdMobRewardedVideo.h b/QtAndroidTools/QAndroidAdMobRewardedVideo.h index 04dbb14..4644080 100644 --- a/QtAndroidTools/QAndroidAdMobRewardedVideo.h +++ b/QtAndroidTools/QAndroidAdMobRewardedVideo.h @@ -64,9 +64,6 @@ signals: void completed(); void leftApplication(); -private slots: - void ApplicationStateChanged(Qt::ApplicationState State); - private: const QAndroidJniObject m_JavaAdMobRewardedVideo; static QMap m_pInstancesMap; diff --git a/QtAndroidTools/src/com/falsinsoft/qtandroidtools/AndroidAdMobRewardedVideo.java b/QtAndroidTools/src/com/falsinsoft/qtandroidtools/AndroidAdMobRewardedVideo.java index c3e3c40..de19484 100644 --- a/QtAndroidTools/src/com/falsinsoft/qtandroidtools/AndroidAdMobRewardedVideo.java +++ b/QtAndroidTools/src/com/falsinsoft/qtandroidtools/AndroidAdMobRewardedVideo.java @@ -96,30 +96,7 @@ public class AndroidAdMobRewardedVideo createRewardedVideoAd(); break; case APP_STATE_START: - if(mRewardedVideoAd != null) - { - mActivityInstance.runOnUiThread(new Runnable() - { - @Override - public void run() - { - mRewardedVideoAd.resume(mActivityInstance); - } - }); - } - break; case APP_STATE_STOP: - if(mRewardedVideoAd != null) - { - mActivityInstance.runOnUiThread(new Runnable() - { - @Override - public void run() - { - mRewardedVideoAd.pause(mActivityInstance); - } - }); - } break; case APP_STATE_DESTROY: destroyRewardedVideoAd();