Skip to content

Commit ecf4bc6

Browse files
and3r817and3r817
authored
Release/3.1.1 (#20)
1 parent 845d457 commit ecf4bc6

File tree

77 files changed

+847
-177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+847
-177
lines changed

‎Assets/BidMachine/Api/AuctionResult.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using System;
2+
3+
namespace BidMachineAds.Unity.Api
4+
{
5+
[Serializable]
6+
public sealed class AuctionResult
7+
{
8+
public string DealID { get; set; }
9+
public string DemandSource { get; set; }
10+
public string CID { get; set; }
11+
12+
public CustomParams CustomParams { get; set; }
13+
public CustomExtras CustomExtras { get; set; }
14+
15+
public string CreativeID { get; set; }
16+
public string BidID { get; set; }
17+
public double Price { get; set; }
18+
}
19+
}

‎Assets/BidMachine/Api/BannerRequest.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using BidMachineAds.Unity.Common;
2+
using BidMachineAds.Unity.Api;
23

34
namespace BidMachineAds.Unity.Api
45
{
@@ -21,6 +22,11 @@ public string GetAuctionResult()
2122
return client.GetAuctionResult();
2223
}
2324

25+
public AuctionResult GetAuctionResultObject()
26+
{
27+
return client.GetAuctionResultObject();
28+
}
29+
2430
public bool IsDestroyed()
2531
{
2632
return client.IsDestroyed();
@@ -63,12 +69,24 @@ public IAdRequestBuilder SetPriceFloorParams(PriceFloorParams priceFloorParamete
6369
return this;
6470
}
6571

72+
public IAdRequestBuilder SetCustomParams(CustomParams customParams)
73+
{
74+
client.SetCustomParams(customParams);
75+
return this;
76+
}
77+
6678
public IAdRequestBuilder SetListener(IAdRequestListener listener)
6779
{
6880
client.SetListener(listener);
6981
return this;
7082
}
7183

84+
public IAdRequestBuilder SetListener(IAdAuctionRequestListener listener)
85+
{
86+
client.SetListener(listener);
87+
return this;
88+
}
89+
7290
public IAdRequestBuilder SetLoadingTimeOut(int value)
7391
{
7492
client.SetLoadingTimeOut(value);

‎Assets/BidMachine/Api/BidMachine.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ private static IBidMachine GetInstance()
2020
return client ??= BidMachineClientFactory.GetBidMachine();
2121
}
2222

23-
public static string BIDMACHINE_UNITY_PLUGIN_VERSION = "3.0.1";
23+
public static string BIDMACHINE_UNITY_PLUGIN_VERSION = "3.1.1";
2424

2525
/// <summary>
2626
/// Initializes BidMachine SDK.

‎Assets/BidMachine/Api/CustomExtras.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System;
2+
using System.Collections.Generic;
3+
4+
namespace BidMachineAds.Unity.Api
5+
{
6+
[Serializable]
7+
public sealed class CustomExtras
8+
{
9+
public Dictionary<string, string> Extras { get; } = new Dictionary<string, string>();
10+
11+
public CustomExtras() { }
12+
13+
public CustomExtras(Dictionary<string, string> customExtras)
14+
{
15+
Extras = customExtras;
16+
}
17+
18+
public CustomExtras AddExtra(string key, string value)
19+
{
20+
Extras[key] = value;
21+
return this;
22+
}
23+
}
24+
}

‎Assets/BidMachine/Api/CustomParams.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System;
2+
using System.Collections.Generic;
3+
4+
namespace BidMachineAds.Unity.Api
5+
{
6+
[Serializable]
7+
public sealed class CustomParams
8+
{
9+
public Dictionary<string, string> Params { get; } = new Dictionary<string, string>();
10+
11+
public CustomParams() { }
12+
13+
public CustomParams(Dictionary<string, string> customParams)
14+
{
15+
Params = customParams;
16+
}
17+
18+
public CustomParams AddParam(string key, string value)
19+
{
20+
Params[key] = value;
21+
return this;
22+
}
23+
}
24+
}

‎Assets/BidMachine/Api/InterstitialRequest.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ public string GetAuctionResult()
1616
return client.GetAuctionResult();
1717
}
1818

19+
public AuctionResult GetAuctionResultObject()
20+
{
21+
return client.GetAuctionResultObject();
22+
}
23+
1924
public bool IsDestroyed()
2025
{
2126
return client.IsDestroyed();
@@ -53,12 +58,24 @@ public IAdRequestBuilder SetPriceFloorParams(PriceFloorParams priceFloorParamete
5358
return this;
5459
}
5560

61+
public IAdRequestBuilder SetCustomParams(CustomParams customParams)
62+
{
63+
client.SetCustomParams(customParams);
64+
return this;
65+
}
66+
5667
public IAdRequestBuilder SetListener(IAdRequestListener listener)
5768
{
5869
client.SetListener(listener);
5970
return this;
6071
}
6172

73+
public IAdRequestBuilder SetListener(IAdAuctionRequestListener listener)
74+
{
75+
client.SetListener(listener);
76+
return this;
77+
}
78+
6279
public IAdRequestBuilder SetLoadingTimeOut(int value)
6380
{
6481
client.SetLoadingTimeOut(value);

‎Assets/BidMachine/Api/RewardedRequest.cs‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ public RewardedRequest(IAdRequest client)
1313

1414
public string GetAuctionResult()
1515
{
16-
return client.GetAuctionResult();
16+
return client.GetAuctionResult();
17+
}
18+
19+
public AuctionResult GetAuctionResultObject()
20+
{
21+
return client.GetAuctionResultObject();
1722
}
1823

1924
public bool IsDestroyed()
@@ -53,12 +58,24 @@ public IAdRequestBuilder SetPriceFloorParams(PriceFloorParams priceFloorParamete
5358
return this;
5459
}
5560

61+
public IAdRequestBuilder SetCustomParams(CustomParams customParams)
62+
{
63+
client.SetCustomParams(customParams);
64+
return this;
65+
}
66+
5667
public IAdRequestBuilder SetListener(IAdRequestListener listener)
5768
{
5869
client.SetListener(listener);
5970
return this;
6071
}
6172

73+
public IAdRequestBuilder SetListener(IAdAuctionRequestListener listener)
74+
{
75+
client.SetListener(listener);
76+
return this;
77+
}
78+
6279
public IAdRequestBuilder SetLoadingTimeOut(int loadingTimeout)
6380
{
6481
client.SetLoadingTimeOut(loadingTimeout);

‎Assets/BidMachine/Common/IAd.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using BidMachineAds.Unity.Api;
2+
using System;
23

34
namespace BidMachineAds.Unity.Common
45
{
@@ -32,8 +33,11 @@ public interface IAdListener<TAd> : ICommonAdListener<TAd, BMError> { }
3233

3334
public interface IAdRequest
3435
{
36+
[System.Obsolete("Use GetAuctionResultObject() instead.")]
3537
string GetAuctionResult();
3638

39+
AuctionResult GetAuctionResultObject();
40+
3741
bool IsDestroyed();
3842

3943
bool IsExpired();
@@ -47,8 +51,13 @@ public interface IAdRequestBuilder
4751

4852
IAdRequestBuilder SetPriceFloorParams(PriceFloorParams priceFloorParams);
4953

54+
IAdRequestBuilder SetCustomParams(CustomParams customParams);
55+
56+
[Obsolete("IAdRequestListener is deprecated. Use SetListener(IAdAuctionRequestListener listener) instead.")]
5057
IAdRequestBuilder SetListener(IAdRequestListener listener);
5158

59+
IAdRequestBuilder SetListener(IAdAuctionRequestListener listener);
60+
5261
IAdRequestBuilder SetLoadingTimeOut(int loadingTimeout);
5362

5463
IAdRequestBuilder SetPlacementId(string placementId);
@@ -69,5 +78,8 @@ void onRequestFailed(TAdRequest request, TAdError error) { }
6978
void onRequestExpired(TAdRequest request) { }
7079
}
7180

81+
[Obsolete("IAdRequestListener is deprecated. Use IAdAuctionRequestListener instead.")]
7282
public interface IAdRequestListener : ICommonAdRequestListener<IAdRequest, string, BMError> { }
83+
84+
public interface IAdAuctionRequestListener : ICommonAdRequestListener<IAdRequest, AuctionResult, BMError> { }
7385
}

‎Assets/BidMachine/Demo/BidMachineController.cs‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public class BidMachineController : MonoBehaviour
1616

1717
private TargetingParams targetingParams;
1818
private PriceFloorParams priceFloorParams;
19+
private CustomParams customParams;
1920

2021
private BannerView bannerView;
2122
private readonly IAdListener<IBannerView> bannerListener = new BannerListener();
@@ -44,6 +45,9 @@ private void Start()
4445
priceFloorParams = new PriceFloorParams();
4546
priceFloorParams.AddPriceFloor(Guid.NewGuid().ToString(), 0.01);
4647

48+
customParams = new CustomParams();
49+
customParams.AddParam("mediation_mode", "pdb_is");
50+
4751
targetingParams = new TargetingParams
4852
{
4953
UserId = "UserId",
@@ -96,7 +100,7 @@ public void BidMachineInitialize()
96100
BidMachine.SetUSPrivacyString("test_string");
97101
BidMachine.SetLoggingEnabled(tgLogging.isOn);
98102
BidMachine.SetTestMode(tgTesting.isOn);
99-
BidMachine.Initialize("YOUR_SELLER_ID");
103+
BidMachine.Initialize("1");
100104
}
101105

102106
public void IsInitialized()
@@ -131,6 +135,7 @@ public void LoadBanner(BannerSize bannerSize)
131135
// .SetLoadingTimeOut(10 * 1000)
132136
// .SetBidPayload("123")
133137
// .SetNetworks("admob")
138+
// .SetCustomParams(customParams)
134139
.SetListener(bannerRequestListener)
135140
.Build();
136141

@@ -189,6 +194,7 @@ public void LoadInterstitialAd()
189194
// .SetLoadingTimeOut(10 * 1000)
190195
// .SetBidPayload("123")
191196
// .SetNetworks("admob")
197+
// .SetCustomParams(customParams)
192198
.SetListener(interstitialRequestListener)
193199
.Build();
194200

@@ -246,6 +252,7 @@ public void LoadRewardedAd()
246252
// .SetBidPayload("123")
247253
// .SetNetworks("admob")
248254
// .SetAdContentType(AdContentType.Video)
255+
// .SetCustomParams(customParams)
249256
.SetListener(rewardedRequestListener)
250257
.Build();
251258

@@ -333,7 +340,7 @@ public void onRequestFailed(IAdRequest request, BMError error)
333340
Debug.Log($"BidMachine: BannerRequest: OnAdRequestFailed");
334341
}
335342

336-
public void onRequestSuccess(IAdRequest request, string auctionResult)
343+
public void onRequestSuccess(IAdRequest request, AuctionResult auctionResult)
337344
{
338345
Debug.Log($"BidMachine: BannerRequest: OnAdRequestSuccess");
339346
}
@@ -389,7 +396,7 @@ public void onRequestFailed(IAdRequest request, BMError error)
389396
Debug.Log($"BidMachine: InterstitialRequest: OnAdRequestFailed");
390397
}
391398

392-
public void onRequestSuccess(IAdRequest request, string auctionResult)
399+
public void onRequestSuccess(IAdRequest request, AuctionResult auctionResult)
393400
{
394401
Debug.Log($"BidMachine: InterstitialRequest: OnAdRequestSuccess");
395402
}
@@ -450,7 +457,7 @@ public void onRequestFailed(IAdRequest request, BMError error)
450457
Debug.Log($"BidMachine: RewardedRequest: OnAdRequestFailed");
451458
}
452459

453-
public void onRequestSuccess(IAdRequest request, string auctionResult)
460+
public void onRequestSuccess(IAdRequest request, AuctionResult auctionResult)
454461
{
455462
Debug.Log($"BidMachine: RewardedRequest: OnAdRequestSuccess");
456463
}

‎Assets/BidMachine/Demo/BidMachineDemoScene.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ MonoBehaviour:
385385
m_GameObject: {fileID: 107517181}
386386
m_Enabled: 1
387387
m_EditorHideFlags: 0
388-
m_Script: {fileID: 11500000, guid: 8f0a01235d71c4a64a06f5f4f11a4267, type: 3}
388+
m_Script: {fileID: 11500000, guid: 038d648a2aa354f9aa2d52bc5b69390a, type: 3}
389389
m_Name:
390390
m_EditorClassIdentifier:
391391
tgTesting: {fileID: 2038355073}

0 commit comments

Comments
 (0)