dennisthiessen/RiskAhead-API
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DT @27.11.2015: Ad-Werbung wird jetzt nur beim Verlassen der Map, beim Hinzufügen eines Reports und nach einem Vote angezeigt

Browse Source
This commit is contained in:
Dennis Thießen
2015-11-27 15:50:28 +01:00
parent 28b9ac96fe
commit e01b249b93
6 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/app.iml
View File

@@ -102,6 +102,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/release" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />

1
app/src/main/AndroidManifest.xml
View File

@@ -11,6 +11,7 @@
<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
<uses-permission android:name="org.deke.risk.riskahead.permission.MAPS_RECEIVE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="com.android.vending.BILLING" />
<application
android:name=".helper.AppController"

6
app/src/main/java/org/deke/risk/riskahead/MapsActivity.java
View File

@@ -355,4 +355,10 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
public void onClusterItemInfoWindowClick(AppClusterItem appClusterItem) {
gotoViewReportActivity(appClusterItem.getID());
}
@Override
protected void onPause(){
super.onPause();
showAd();
}
}

1
app/src/main/java/org/deke/risk/riskahead/ReportActivity.java
View File

@@ -313,6 +313,7 @@ public class ReportActivity extends BaseActivity {
gotoMapActivity();
}
});
showAd();
gotoMapActivity(latitude+":"+longitude);
} else {
String errorMsg = jObj.getString("error_msg");

1
app/src/main/java/org/deke/risk/riskahead/ViewReportActivity.java
View File

@@ -357,6 +357,7 @@ public class ViewReportActivity extends BaseActivity {
showMessage("Voted! Score updated.");
BootstrapLabel scorelabel = (BootstrapLabel) findViewById(R.id.txt_viewreport_points);
scorelabel.setText(jObj.getString("points"));
showAd();
} else {
String errorMsg = jObj.getString("error_msg");

37
app/src/main/java/org/deke/risk/riskahead/helper/BaseActivity.java
View File

@@ -67,6 +67,8 @@ public abstract class BaseActivity extends AppCompatActivity {
isNetworkAvailable();
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -84,8 +86,6 @@ public abstract class BaseActivity extends AppCompatActivity {
requestNewInterstitial();
overridePendingTransition(R.anim.fade_in_anim, R.anim.fade_out_anim);
pDialog = new ProgressDialog(this);
@@ -125,37 +125,10 @@ public abstract class BaseActivity extends AppCompatActivity {
mInterstitialAd.loadAd(adRequest);
}
@Override
protected void onPause(){
super.onPause();
stopRepeatingTask();
}
@Override
protected void onResume(){
super.onResume();
startRepeatingTask();
}
Runnable mHandlerTask = new Runnable()
{
@Override
public void run() {
if (mInterstitialAd.isLoaded()) {
mInterstitialAd.show();
}
mHandler.postDelayed(mHandlerTask, INTERVAL);
public void showAd(){
if (mInterstitialAd.isLoaded()) {
mInterstitialAd.show();
}
};
void startRepeatingTask()
{
mHandlerTask.run();
}
void stopRepeatingTask()
{
mHandler.removeCallbacks(mHandlerTask);
}
public void isNetworkAvailable() {