DT @27.11.2015: Ad-Werbung wird jetzt nur beim Verlassen der Map, beim Hinzufügen eines Reports und nach einem Vote angezeigt
This commit is contained in:
@@ -102,6 +102,7 @@
|
|||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
|
<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/res" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
|
<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="org.deke.risk.riskahead.permission.MAPS_RECEIVE" />
|
||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||||
|
<uses-permission android:name="com.android.vending.BILLING" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:name=".helper.AppController"
|
android:name=".helper.AppController"
|
||||||
|
|||||||
@@ -355,4 +355,10 @@ public class MapsActivity extends BaseActivity implements LoaderManager.LoaderCa
|
|||||||
public void onClusterItemInfoWindowClick(AppClusterItem appClusterItem) {
|
public void onClusterItemInfoWindowClick(AppClusterItem appClusterItem) {
|
||||||
gotoViewReportActivity(appClusterItem.getID());
|
gotoViewReportActivity(appClusterItem.getID());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onPause(){
|
||||||
|
super.onPause();
|
||||||
|
showAd();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -313,6 +313,7 @@ public class ReportActivity extends BaseActivity {
|
|||||||
gotoMapActivity();
|
gotoMapActivity();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
showAd();
|
||||||
gotoMapActivity(latitude+":"+longitude);
|
gotoMapActivity(latitude+":"+longitude);
|
||||||
} else {
|
} else {
|
||||||
String errorMsg = jObj.getString("error_msg");
|
String errorMsg = jObj.getString("error_msg");
|
||||||
|
|||||||
@@ -357,6 +357,7 @@ public class ViewReportActivity extends BaseActivity {
|
|||||||
showMessage("Voted! Score updated.");
|
showMessage("Voted! Score updated.");
|
||||||
BootstrapLabel scorelabel = (BootstrapLabel) findViewById(R.id.txt_viewreport_points);
|
BootstrapLabel scorelabel = (BootstrapLabel) findViewById(R.id.txt_viewreport_points);
|
||||||
scorelabel.setText(jObj.getString("points"));
|
scorelabel.setText(jObj.getString("points"));
|
||||||
|
showAd();
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
String errorMsg = jObj.getString("error_msg");
|
String errorMsg = jObj.getString("error_msg");
|
||||||
|
|||||||
@@ -67,6 +67,8 @@ public abstract class BaseActivity extends AppCompatActivity {
|
|||||||
isNetworkAvailable();
|
isNetworkAvailable();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
@@ -84,8 +86,6 @@ public abstract class BaseActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
requestNewInterstitial();
|
requestNewInterstitial();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
overridePendingTransition(R.anim.fade_in_anim, R.anim.fade_out_anim);
|
overridePendingTransition(R.anim.fade_in_anim, R.anim.fade_out_anim);
|
||||||
|
|
||||||
pDialog = new ProgressDialog(this);
|
pDialog = new ProgressDialog(this);
|
||||||
@@ -125,37 +125,10 @@ public abstract class BaseActivity extends AppCompatActivity {
|
|||||||
mInterstitialAd.loadAd(adRequest);
|
mInterstitialAd.loadAd(adRequest);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
public void showAd(){
|
||||||
protected void onPause(){
|
if (mInterstitialAd.isLoaded()) {
|
||||||
super.onPause();
|
mInterstitialAd.show();
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
void startRepeatingTask()
|
|
||||||
{
|
|
||||||
mHandlerTask.run();
|
|
||||||
}
|
|
||||||
|
|
||||||
void stopRepeatingTask()
|
|
||||||
{
|
|
||||||
mHandler.removeCallbacks(mHandlerTask);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void isNetworkAvailable() {
|
public void isNetworkAvailable() {
|
||||||
|
|||||||
Reference in New Issue
Block a user