Skip to content

Commit 15f55ef

Browse files
author
minggo
committed
Merge pull request #2421 from natural-law/master
issue #1723 : Update the iOS projects in plugin, and remove the win32 projects.
2 parents 25a0927 + 42ca709 commit 15f55ef

37 files changed

+265
-1975
lines changed

plugin/plugins/flurry/proj.ios/PluginFlurry.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
DSTROOT = /tmp/libPluginFlurry.dst;
203203
GCC_PRECOMPILE_PREFIX_HEADER = YES;
204204
GCC_PREFIX_HEADER = "PluginFlurry-Prefix.pch";
205-
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../protocols/include";
205+
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../protocols/include";
206206
LIBRARY_SEARCH_PATHS = (
207207
"$(inherited)",
208208
"\"$(SRCROOT)/../platform/ios\"",
@@ -219,7 +219,7 @@
219219
DSTROOT = /tmp/libPluginFlurry.dst;
220220
GCC_PRECOMPILE_PREFIX_HEADER = YES;
221221
GCC_PREFIX_HEADER = "PluginFlurry-Prefix.pch";
222-
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../protocols/include";
222+
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../protocols/include";
223223
LIBRARY_SEARCH_PATHS = (
224224
"$(inherited)",
225225
"\"$(SRCROOT)/../platform/ios\"",

plugin/plugins/flurry/proj.win32/plugin-analytics-flurry.vcxproj

Lines changed: 0 additions & 90 deletions
This file was deleted.

plugin/plugins/flurry/proj.win32/plugin-analytics-flurry.vcxproj.filters

Lines changed: 0 additions & 21 deletions
This file was deleted.

plugin/plugins/flurry/proj.win32/plugin-analytics-flurry.vcxproj.user

Lines changed: 0 additions & 3 deletions
This file was deleted.

plugin/plugins/umeng/proj.ios/PluginUmeng.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
DSTROOT = /tmp/libPluginUmeng.dst;
201201
GCC_PRECOMPILE_PREFIX_HEADER = YES;
202202
GCC_PREFIX_HEADER = "PluginUmeng-Prefix.pch";
203-
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../protocols/include";
203+
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../protocols/include";
204204
LIBRARY_SEARCH_PATHS = (
205205
"$(inherited)",
206206
"\"$(SRCROOT)\"",
@@ -218,7 +218,7 @@
218218
DSTROOT = /tmp/libPluginUmeng.dst;
219219
GCC_PRECOMPILE_PREFIX_HEADER = YES;
220220
GCC_PREFIX_HEADER = "PluginUmeng-Prefix.pch";
221-
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../protocols/include";
221+
HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../protocols/include";
222222
LIBRARY_SEARCH_PATHS = (
223223
"$(inherited)",
224224
"\"$(SRCROOT)\"",

plugin/plugins/umeng/proj.win32/plugin-analytics-umeng.vcxproj

Lines changed: 0 additions & 90 deletions
This file was deleted.

plugin/plugins/umeng/proj.win32/plugin-analytics-umeng.vcxproj.filters

Lines changed: 0 additions & 21 deletions
This file was deleted.

plugin/plugins/umeng/proj.win32/plugin-analytics-umeng.vcxproj.user

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
#include "ProtocolAds.h"
2+
3+
namespace cocos2d { namespace plugin {
4+
5+
AdListener* ProtocolAds::m_pListener = NULL;
6+
7+
ProtocolAds::ProtocolAds()
8+
{
9+
}
10+
11+
ProtocolAds::~ProtocolAds()
12+
{
13+
}
14+
15+
/**
16+
@brief plugin initialization
17+
*/
18+
bool ProtocolAds::init()
19+
{
20+
return true;
21+
}
22+
23+
/**
24+
@brief initialize the application info
25+
@param appInfo This parameter is the info of aplication,
26+
different plugin have different format
27+
@warning Must invoke this interface before other interfaces.
28+
And invoked only once.
29+
*/
30+
void ProtocolAds::initAppInfo(TAppInfo appInfo)
31+
{
32+
}
33+
34+
/**
35+
@brief show banner ads at specified position
36+
@param pos The position where the banner view be shown
37+
@param sizeEnum The size of the banner view.
38+
In different plugin, it's have different mean.
39+
Pay attention to the subclass definition
40+
*/
41+
void ProtocolAds::showBannerAd(EBannerPos pos, int sizeEnum)
42+
{
43+
}
44+
45+
/**
46+
@brief hide the banner ads view
47+
*/
48+
void ProtocolAds::hideBannerAd()
49+
{
50+
}
51+
52+
/**
53+
@brief Set whether needs to output logs to console.
54+
@param debug If true debug mode enabled, or debug mode disabled.
55+
*/
56+
void ProtocolAds::setDebugMode(bool debug)
57+
{
58+
}
59+
60+
// For the callbak methods
61+
void ProtocolAds::receiveAd()
62+
{
63+
if (m_pListener != NULL)
64+
{
65+
m_pListener->onReceiveAd();
66+
}
67+
}
68+
69+
void ProtocolAds::presentScreen()
70+
{
71+
if (m_pListener != NULL)
72+
{
73+
m_pListener->onPresentScreen();
74+
}
75+
}
76+
77+
void ProtocolAds::failedToReceiveAd(AdListener::EAdErrorCode code, const char* msg)
78+
{
79+
if (m_pListener != NULL)
80+
{
81+
m_pListener->onFailedToReceiveAd(code, msg);
82+
}
83+
}
84+
85+
void ProtocolAds::dismissScreen()
86+
{
87+
if (m_pListener != NULL)
88+
{
89+
m_pListener->onDismissScreen();
90+
}
91+
}
92+
93+
const char* ProtocolAds::getSDKVersion()
94+
{
95+
return "Subclass should override this interface";
96+
}
97+
98+
}} //namespace cocos2d { namespace plugin {

0 commit comments

Comments
 (0)