Skip to content

admob update and DFP Ad support #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kimukou wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

admob update and DFP Ad support #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6f74f71
admob update and DFP Ad support
kimukou Apr 11, 2014
cf4a17e
support x86(use genymotion)
kimukou Apr 11, 2014
16bb67a
shown Resouce .project
kimukou Apr 11, 2014
950e4a3
update twitter4j 0.4.1 and twitpic support
kimukou Apr 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions plugins/admob/proj.android/res/values/ad_key.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="adUnitId"></string>
</resources>
Binary file modified plugins/admob/proj.android/sdk/GoogleAdMobAdsSdk.jar
100755 → 100644
View file
Open in desktop
Binary file not shown.
143 changes: 84 additions & 59 deletions plugins/admob/proj.android/src/org/cocos2dx/plugin/AdsAdmob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,26 @@ of this software and associated documentation files (the "Software"), to deal
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
****************************************************************************/
package org.cocos2dx.plugin;

import java.util.HashSet;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Set;

import com.google.ads.*;
import com.google.ads.AdRequest.ErrorCode;

import android.app.Activity;
import android.content.Context;
import android.util.Log;
import android.view.WindowManager;

import com.google.ads.Ad;
import com.google.ads.AdListener;
import com.google.ads.AdRequest;
import com.google.ads.AdRequest.ErrorCode;
import com.google.ads.AdSize;
import com.google.ads.AdView;

public class AdsAdmob implements InterfaceAds {

private static final String LOG_TAG = "AdsAdmob";
Expand Down Expand Up @@ -71,6 +75,18 @@ protected static void LogD(String msg) {
public AdsAdmob(Context context) {
mContext = (Activity) context;
mAdapter = this;

m_r = mContext.getResources();
android.util.DisplayMetrics metrics = new android.util.DisplayMetrics();
mContext.getWindowManager().getDefaultDisplay().getMetrics(metrics);
m_density = (int) metrics.density;
}

private static android.content.res.Resources m_r = null;
private static int m_density = 0;

public static int dens(int val) {
return val * m_density;
}

@Override
Expand All @@ -80,13 +96,16 @@ public void setDebugMode(boolean debug) {

@Override
public String getSDKVersion() {
return "6.3.1";
return "6.4.1";
}

@Override
public void configDeveloperInfo(Hashtable<String, String> devInfo) {
try {
mPublishID = devInfo.get("AdmobID");
if(mPublishID==null){
mPublishID = m_r.getString(org.cocos2dx.libAdsAdmob.R.string.adUnitId);
}
LogD("init AppInfo : " + mPublishID);
} catch (Exception e) {
LogE("initAppInfo, The format of appInfo is wrong", e);
Expand All @@ -95,28 +114,26 @@ public void configDeveloperInfo(Hashtable<String, String> devInfo) {

@Override
public void showAds(Hashtable<String, String> info, int pos) {
try
{
String strType = info.get("AdmobType");
int adsType = Integer.parseInt(strType);

switch (adsType) {
case ADMOB_TYPE_BANNER:
{
String strSize = info.get("AdmobSizeEnum");
int sizeEnum = Integer.parseInt(strSize);
showBannerAd(sizeEnum, pos);
break;
}
case ADMOB_TYPE_FULLSCREEN:
LogD("Now not support full screen view in Admob");
break;
default:
break;
}
} catch (Exception e) {
LogE("Error when show Ads ( " + info.toString() + " )", e);
}
try {
String strType = info.get("AdmobType");
int adsType = Integer.parseInt(strType);

switch (adsType) {
case ADMOB_TYPE_BANNER: {
String strSize = info.get("AdmobSizeEnum");
int sizeEnum = Integer.parseInt(strSize);
showBannerAd(sizeEnum, pos);
break;
}
case ADMOB_TYPE_FULLSCREEN:
LogD("Now not support full screen view in Admob");
break;
default:
break;
}
} catch (Exception e) {
LogE("Error when show Ads ( " + info.toString() + " )", e);
}
}

@Override
Expand All @@ -126,24 +143,23 @@ public void spendPoints(int points) {

@Override
public void hideAds(Hashtable<String, String> info) {
try
{
String strType = info.get("AdmobType");
int adsType = Integer.parseInt(strType);

switch (adsType) {
case ADMOB_TYPE_BANNER:
hideBannerAd();
break;
case ADMOB_TYPE_FULLSCREEN:
LogD("Now not support full screen view in Admob");
break;
default:
break;
}
} catch (Exception e) {
LogE("Error when hide Ads ( " + info.toString() + " )", e);
}
try {
String strType = info.get("AdmobType");
int adsType = Integer.parseInt(strType);

switch (adsType) {
case ADMOB_TYPE_BANNER:
hideBannerAd();
break;
case ADMOB_TYPE_FULLSCREEN:
LogD("Now not support full screen view in Admob");
break;
default:
break;
}
} catch (Exception e) {
LogE("Error when hide Ads ( " + info.toString() + " )", e);
}
}

private void showBannerAd(int sizeEnum, int pos) {
Expand Down Expand Up @@ -178,32 +194,37 @@ public void run() {
size = AdSize.IAB_LEADERBOARD;
break;
case AdsAdmob.ADMOB_SIZE_Skyscraper:
size = AdSize.IAB_WIDE_SKYSCRAPER;
break;
size = AdSize.IAB_WIDE_SKYSCRAPER;
break;
default:
break;
}
adView = new AdView(mContext, size, mPublishID);
AdRequest req = new AdRequest();

try {
if (mTestDevices != null) {
Iterator<String> ir = mTestDevices.iterator();
while(ir.hasNext())
{
while (ir.hasNext()) {
req.addTestDevice(ir.next());
}
}
} catch (Exception e) {
LogE("Error during add test device", e);
}

adView.loadAd(req);
adView.setAdListener(new AdmobAdsListener());

if (null == mWm) {
mWm = (WindowManager) mContext.getSystemService("window");
}
if (size == AdSize.BANNER) {
AdsWrapper.addAdView(mWm, adView, dens(320), dens(50),
curPos);
} else {
AdsWrapper.addAdView(mWm, adView, curPos);
}
AdsWrapper.addAdView(mWm, adView, curPos);
}
});
Expand Down Expand Up @@ -237,7 +258,8 @@ private class AdmobAdsListener implements AdListener {
@Override
public void onDismissScreen(Ad arg0) {
LogD("onDismissScreen invoked");
AdsWrapper.onAdsResult(mAdapter, AdsWrapper.RESULT_CODE_AdsDismissed, "Ads view dismissed!");
AdsWrapper.onAdsResult(mAdapter,
AdsWrapper.RESULT_CODE_AdsDismissed, "Ads view dismissed!");
}

@Override
Expand All @@ -246,7 +268,7 @@ public void onFailedToReceiveAd(Ad arg0, ErrorCode arg1) {
String errorMsg = "Unknow error";
switch (arg1) {
case NETWORK_ERROR:
errorNo = AdsWrapper.RESULT_CODE_NetworkError;
errorNo = AdsWrapper.RESULT_CODE_NetworkError;
errorMsg = "Network error";
break;
case INVALID_REQUEST:
Expand All @@ -271,13 +293,16 @@ public void onLeaveApplication(Ad arg0) {
@Override
public void onPresentScreen(Ad arg0) {
LogD("onPresentScreen invoked");
AdsWrapper.onAdsResult(mAdapter, AdsWrapper.RESULT_CODE_AdsShown, "Ads view shown!");
AdsWrapper.onAdsResult(mAdapter, AdsWrapper.RESULT_CODE_AdsShown,
"Ads view shown!");
}

@Override
public void onReceiveAd(Ad arg0) {
LogD("onReceiveAd invoked");
AdsWrapper.onAdsResult(mAdapter, AdsWrapper.RESULT_CODE_AdsReceived, "Ads request received success!");
AdsWrapper.onAdsResult(mAdapter,
AdsWrapper.RESULT_CODE_AdsReceived,
"Ads request received success!");
}
}

Expand All @@ -286,8 +311,8 @@ public String getPluginVersion() {
return "0.2.0";
}

@Override
public void queryPoints() {
LogD("Admob not support query points!");
}
@Override
public void queryPoints() {
LogD("Admob not support query points!");
}
}
10 changes: 6 additions & 4 deletions plugins/twitter/proj.android/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="lib" path="sdk/signpost-commonshttp4-1.2.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="sdk/signpost-core-1.2.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="sdk/signpost-jetty6-1.2.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="sdk/twitter4j-core-android-3.0.1.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="lib" path="sdk/twitter4j-core-4.0.1.jar"/>
<classpathentry kind="lib" path="sdk/twitter4j-media-support-4.0.1.jar"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
11 changes: 11 additions & 0 deletions plugins/twitter/proj.android/res/values/ad_sns.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- //SNS support setting -->
<string name="consumar_key"></string>
<string name="consumar_secret"></string>
<string name="twitpic_api_key"></string>

<string name="callback_host"></string>
<string name="callback_scheme"></string>

</resources>
Binary file added plugins/twitter/proj.android/sdk/okhttp-1.5.1.jar
View file
Open in desktop
Binary file not shown.
Binary file added plugins/twitter/proj.android/sdk/twitter4j-core-4.0.1.jar
View file
Open in desktop
Binary file not shown.
Binary file removed plugins/twitter/proj.android/sdk/twitter4j-core-android-3.0.1.jar
View file
Open in desktop
Binary file not shown.
Binary file added plugins/twitter/proj.android/sdk/twitter4j-media-support-4.0.1.jar
View file
Open in desktop
Binary file not shown.
Binary file added plugins/twitter/proj.android/sdk/twitter4j-spdy-support-4.0.1.jar
View file
Open in desktop
Binary file not shown.
Loading