Skip to content

L
LuckFarm
Commit 6b2f4d0c authored by zhangshuai's avatar zhangshuai
Browse files
Options

no message

parent 125d6ba8
Show whitespace changes
Inline Side-by-side
Showing with 111 additions and 85 deletions
GYDemo/GYDemo.xcodeproj/project.pbxproj
View file @ 6b2f4d0c
......@@ -977,7 +977,7 @@
CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 102;
CURRENT_PROJECT_VERSION = 103;
DEVELOPMENT_TEAM = XWMRLLSSFL;
ENABLE_BITCODE = NO;
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
......@@ -992,7 +992,7 @@
"$(inherited)",
"$(PROJECT_DIR)/GYDemo/SCAds/GDTLib",
);
MARKETING_VERSION = 1.0.1;
MARKETING_VERSION = 1.0.2;
PRODUCT_BUNDLE_IDENTIFIER = com.xy.nongchang;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Lucky farm";
......@@ -1009,7 +1009,7 @@
CODE_SIGN_ENTITLEMENTS = GYDemo/GYDemo.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 102;
CURRENT_PROJECT_VERSION = 103;
DEVELOPMENT_TEAM = XWMRLLSSFL;
ENABLE_BITCODE = NO;
GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO;
......@@ -1024,7 +1024,7 @@
"$(inherited)",
"$(PROJECT_DIR)/GYDemo/SCAds/GDTLib",
);
MARKETING_VERSION = 1.0.1;
MARKETING_VERSION = 1.0.2;
PRODUCT_BUNDLE_IDENTIFIER = com.xy.nongchang;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Lucky farm";
......
GYDemo/GYDemo/GYPrefixHeader.pch
View file @ 6b2f4d0c
......@@ -14,13 +14,13 @@
#ifndef GYPrefixHeader_pch
#define GYPrefixHeader_pch
//#define ServerReport @"http://reporttest.zhangxinhulian.com"
//#define ServerHost @"https://feedapitest.zhangxinhulian.com" // 服务端接口地址
//#define ServerAds @"http://bstest.zhangxinhulian.com/v4/ads"
#define ServerReport @"http://reporttest.zhangxinhulian.com"
#define ServerHost @"https://feedapitest.zhangxinhulian.com" // 服务端接口地址
#define ServerAds @"http://bstest.zhangxinhulian.com/v4/ads"
#define ServerReport @"http://report.clouddistribute.net"
#define ServerHost @"https://feedapi.clouddistribute.net" // 服务端接口地址
#define ServerAds @"http://bs.clouddistribute.net/v4/ads"
//#define ServerReport @"http://report.clouddistribute.net"
//#define ServerHost @"https://feedapi.clouddistribute.net" // 服务端接口地址
//#define ServerAds @"http://bs.clouddistribute.net/v4/ads"
#define WXAppId @"wxe7a03eb52cce1b51"
#define WXAppSecret @"6fa72a89ea188c4dff5729cff328b587"
......
GYDemo/GYDemo/SCAds/IOSADManager.m
View file @ 6b2f4d0c
......@@ -77,7 +77,14 @@ static IOSADManager * manager = nil;
return _cacheBigImg;
}
#pragma mark -
#pragma mark - 正在加载的广告数组
-(NSMutableArray *)loadADDataArray{
if (_loadADDataArray == nil) {
_loadADDataArray = [[NSMutableArray alloc]init];
}
return _loadADDataArray;
}
- (UIViewController*)currentVC{
UIViewController* vc = [UIApplication sharedApplication].keyWindow.rootViewController;
......@@ -162,6 +169,9 @@ static IOSADManager * manager = nil;
- (void)loadAdWithData:(GYAdsTrackModel *)loadADModel withADType:(eADType )AdType;{
self.haveLodeAD = YES;
loadADModel.loadADType = AdType;
WEAKSELF;
if ([loadADModel.adPlatform isEqualToString:@"chuanshanjia"]) { // 穿山甲
......@@ -172,6 +182,7 @@ static IOSADManager * manager = nil;
self.csjAd = nil;
AddCSJADManager * csjAd = [[AddCSJADManager alloc]init];
self.csjAd = csjAd;
[self.loadADDataArray addObject:csjAd];
[csjAd loadAdWithData:loadADModel withADType:AdType];
......@@ -190,6 +201,8 @@ static IOSADManager * manager = nil;
self.gdtAd = nil;
AddGDTADManager * csjAd = [[AddGDTADManager alloc]init];
self.gdtAd = csjAd;
[self.loadADDataArray addObject:csjAd];
[csjAd loadAdWithData:loadADModel withADType:AdType];
csjAd.loadSuccessCallbackBlock = ^(GYAdsTrackModel * _Nonnull model, BOOL success) {
......@@ -209,6 +222,8 @@ static IOSADManager * manager = nil;
self.sigmobAd = nil;
AddSigmobADManager * csjAd = [[AddSigmobADManager alloc]init];
self.sigmobAd = csjAd;
[self.loadADDataArray addObject:csjAd];
[csjAd loadAdWithData:loadADModel withADType:AdType];
csjAd.loadSuccessCallbackBlock = ^(GYAdsTrackModel * _Nonnull model, BOOL success) {
......@@ -227,6 +242,8 @@ static IOSADManager * manager = nil;
self.ruishiAd = nil;
AddRuiShiADManager * csjAd = [[AddRuiShiADManager alloc]init];
self.ruishiAd = csjAd;
[self.loadADDataArray addObject:csjAd];
[csjAd loadAdWithData:loadADModel withADType:AdType];
csjAd.loadSuccessCallbackBlock = ^(GYAdsTrackModel * _Nonnull model, BOOL success) {
......@@ -235,6 +252,7 @@ static IOSADManager * manager = nil;
csjAd.showSuccessCallbackBlock = ^(GYAdsTrackModel * _Nonnull model, BOOL success) {
[weakSelf blockResultShowWithData:model andSuccess:YES];
};
}
}else{
......@@ -419,7 +437,7 @@ static IOSADManager * manager = nil;
}
//MARK: 处理加载 的回调
//MARK: 处理缓存 的回调
- (void)blockResultLoadWithData:(GYAdsTrackModel *)model andSuccess:(BOOL)success{
WEAKSELF;
......
UnityiOSFarm/Info.plist
View file @ 6b2f4d0c
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<dict>
<key>CADisableMinimumFrameDuration</key>
<false />
<false/>
<key>CFBundleAllowMixedLocalizations</key>
<true />
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
......@@ -21,15 +21,15 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.0</string>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>100</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSRequiresIPhoneOS</key>
<true />
<true/>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true />
<true/>
</dict>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen-iPhone</string>
......@@ -40,18 +40,18 @@
<key>UILaunchStoryboardName~ipod</key>
<string>LaunchScreen-iPhone</string>
<key>UIPrerenderedIcon</key>
<false />
<false/>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>arm64</string>
<string>metal</string>
</array>
<key>UIRequiresFullScreen</key>
<true />
<true/>
<key>UIRequiresPersistentWiFi</key>
<false />
<false/>
<key>UIStatusBarHidden</key>
<true />
<true/>
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleDefault</string>
<key>UISupportedInterfaceOrientations</key>
......@@ -61,13 +61,13 @@
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
</array>
<key>Unity_LoadingActivityIndicatorStyle</key>
<integer>-1</integer>
<key>UnityBuilder</key>
<string>12369893060913</string>
<key>UnityCloudProjectID</key>
<string />
<string></string>
<key>UnityCrashSubmissionURL</key>
<string />
</dict>
<string></string>
<key>Unity_LoadingActivityIndicatorStyle</key>
<integer>-1</integer>
</dict>
</plist>
UnityiOSFarm/Unity-iPhone.xcodeproj/project.pbxproj
View file @ 6b2f4d0c
......@@ -305,7 +305,7 @@
1B1A4CCCB1084E548EEFC2D4 /* Generics1.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Generics1.cpp; path = Classes/Native/Generics1.cpp; sourceTree = SOURCE_ROOT; };
1B8E44109DD6ADA987946565 /* UnityEngine.AnimationModule_CodeGen.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = UnityEngine.AnimationModule_CodeGen.c; path = Classes/Native/UnityEngine.AnimationModule_CodeGen.c; sourceTree = SOURCE_ROOT; };
1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
1D6058910D05DD3D006BFB54 /* Unity-Target-New.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = "Unity-Target-New.app"; path = nongchang.app; sourceTree = BUILT_PRODUCTS_DIR; };
1D6058910D05DD3D006BFB54 /* nongchang.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = nongchang.app; sourceTree = BUILT_PRODUCTS_DIR; };
1DB749B1B2C5FD8AD3CAE982 /* mscorlib5.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mscorlib5.cpp; path = Classes/Native/mscorlib5.cpp; sourceTree = SOURCE_ROOT; };
1E7D4AEB83A8232649847B2B /* UnityEngine.ImageConversionModule.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UnityEngine.ImageConversionModule.cpp; path = Classes/Native/UnityEngine.ImageConversionModule.cpp; sourceTree = SOURCE_ROOT; };
2131424DADC29BD6D3764D17 /* GenericMethods2.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = GenericMethods2.cpp; path = Classes/Native/GenericMethods2.cpp; sourceTree = SOURCE_ROOT; };
......@@ -762,7 +762,7 @@
19C28FACFE9D520D11CA2CBB /* Products */ = {
isa = PBXGroup;
children = (
1D6058910D05DD3D006BFB54 /* Unity-Target-New.app */,
1D6058910D05DD3D006BFB54 /* nongchang.app */,
5623C57317FDCB0800090B9E /* Unity-iPhone Tests.xctest */,
9D25AB9D213FB47800354C27 /* UnityFramework.framework */,
);
......@@ -1044,7 +1044,7 @@
);
name = "Unity-iPhone";
productName = "iPhone-target";
productReference = 1D6058910D05DD3D006BFB54 /* Unity-Target-New.app */;
productReference = 1D6058910D05DD3D006BFB54 /* nongchang.app */;
productType = "com.apple.product-type.application";
};
5623C57217FDCB0800090B9E /* Unity-iPhone Tests */ = {
......@@ -1431,6 +1431,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 103;
DEVELOPMENT_TEAM = "";
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_CPP_EXCEPTIONS = NO;
......@@ -1440,6 +1441,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_GENERATE_MAP_FILE = YES;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.0.2;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
......@@ -1476,12 +1478,14 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 103;
DEVELOPMENT_TEAM = "";
GCC_ENABLE_CPP_EXCEPTIONS = NO;
INFOPLIST_FILE = Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_GENERATE_MAP_FILE = YES;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.0.2;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = (
"$(inherited)",
......@@ -1636,6 +1640,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 103;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = "";
GCC_ENABLE_CPP_EXCEPTIONS = NO;
......@@ -1643,6 +1648,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_GENERATE_MAP_FILE = YES;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.0.2;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
......@@ -1745,12 +1751,14 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 103;
DEVELOPMENT_TEAM = "";
GCC_ENABLE_CPP_EXCEPTIONS = NO;
INFOPLIST_FILE = Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_GENERATE_MAP_FILE = YES;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 1.0.2;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment