castbox
/
com.guru.unity.sdk.core
31
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: castbox:dev
Branches Tags
castbox:dev
castbox:hotfix/v1.0.12.2
castbox:main
castbox:deeplink
castbox:feature/Inventory
castbox:1.1.3
castbox:1.1.2
castbox:1.1.1
castbox:1.0.12.3
castbox:1.1.0
castbox:1.0.12.2
castbox:1.0.14
castbox:1.0.12.1
castbox:1.0.13
castbox:1.0.12
castbox:1.0.11
castbox:1.0.10
castbox:1.0.9
castbox:1.0.8
castbox:1.0.7
castbox:1.0.6
castbox:1.0.5
castbox:1.0.4
castbox:1.0.2
castbox:1.0.3
castbox:1.0.0
..
compare: castbox:main
Branches Tags
castbox:dev
castbox:hotfix/v1.0.12.2
castbox:main
castbox:deeplink
castbox:feature/Inventory
castbox:1.1.3
castbox:1.1.2
castbox:1.1.1
castbox:1.0.12.3
castbox:1.1.0
castbox:1.0.12.2
castbox:1.0.14
castbox:1.0.12.1
castbox:1.0.13
castbox:1.0.12
castbox:1.0.11
castbox:1.0.10
castbox:1.0.9
castbox:1.0.8
castbox:1.0.7
castbox:1.0.6
castbox:1.0.5
castbox:1.0.4
castbox:1.0.2
castbox:1.0.3
castbox:1.0.0

No commits in common. "dev" and "main" have entirely different histories.
dev ... main

107 changed files with 911 additions and 3408 deletions
Show Stats Expand all files Collapse all files

50
Editor/BuildTool/AppBuilder.cs
View File

@ -1,5 +1,3 @@
namespace Guru.Editor namespace Guru.Editor
{ {
using System.Linq; using System.Linq;
@ -16,21 +14,17 @@ namespace Guru.Editor
/// </summary> /// </summary>
public partial class AppBuilder public partial class AppBuilder
{ {
private const int DefaultAndroidTargetSdkVersion = 34; public static int AndroidTargetSdkVersion = 33;
private const string IOSTargetOSVersion = "13.0"; public static string IOSTargetOSVersion = "13.0";
private const string GuruIOSTeamId = "39253T242A"; public static string GuruIOSTeamId = "39253T242A";
private const string GuruKeystoreName = "guru_key.jks"; public static string GuruKeystoreName => "guru_key.jks";
private const string GuruKeystorePass = "guru0622"; public static string GuruKeystorePass => "guru0622";
private const string GuruAliasName = "guru"; public static string GuruAliasName => "guru";
private const string GuruAliasPass = "guru0622"; public static string GuruAliasPass => "guru0622";
public static string GuruKeystorePath => Application.dataPath + $"/Plugins/Android/{GuruKeystoreName}";
private const string UnityGradlePath_2021_3_41 = public static string ProguardName => "proguard-user.txt";
"/Applications/Unity/Hub/Editor/2021.3.41f1/PlaybackEngines/AndroidPlayer/Tools/gradle"; public static string ProguardPath => Application.dataPath + $"/Plugins/Android/{ProguardName}";
public static string OutputDirName => "BuildOutput";
private static string GuruKeystorePath => Application.dataPath + $"/Plugins/Android/{GuruKeystoreName}";
private static string ProguardName => "proguard-user.txt";
private static string ProguardPath => Application.dataPath + $"/Plugins/Android/{ProguardName}";
private static string OutputDirName => "BuildOutput";
#region 构建接口 #region 构建接口
@ -76,14 +70,11 @@ namespace Guru.Editor
SwitchBuildPlatform(BuildTarget.Android); SwitchBuildPlatform(BuildTarget.Android);
// 打包通用设置 // 打包通用设置
ChangeBuildPlayerCommonSetting(buildParam, BuildTargetGroup.Android); ChangeBuildPlayerCommonSetting(buildParam, BuildTargetGroup.Android);
// Set GradlePath
SetGradlePath();
var isDebug = !buildParam.IsBuildRelease; var isDebug = !buildParam.IsBuildRelease;
var useMinify = buildParam.AndroidUseMinify; var useMinify = buildParam.AndroidUseMinify;
var buildNumber= GetBuildNumberString(BuildTarget.Android); var buildNumber= GetBuildNumberString(BuildTarget.Android);
var androidTargetVersion = buildParam.AndroidTargetVersion == 0 ? DefaultAndroidTargetSdkVersion : buildParam.AndroidTargetVersion; if(buildParam.AutoSetBuildNumber) buildNumber = ChangeBuildNumber(BuildTarget.Android);
if (buildParam.AutoSetBuildNumber) buildNumber = ChangeBuildNumber(BuildTarget.Android);
// 保存版本信息 // 保存版本信息
SaveBuildVersion(buildParam.BuildVersion, buildNumber); SaveBuildVersion(buildParam.BuildVersion, buildNumber);
@ -99,6 +90,7 @@ namespace Guru.Editor
PlayerSettings.muteOtherAudioSources = false; PlayerSettings.muteOtherAudioSources = false;
// ---- 开启 Minify 后需要配置 proguard-user.txt 文件 ---- // ---- 开启 Minify 后需要配置 proguard-user.txt 文件 ----
if (useMinify) DeployProguardTxt(); if (useMinify) DeployProguardTxt();
PlayerSettings.Android.minifyWithR8 = useMinify;
PlayerSettings.Android.minifyRelease = useMinify; PlayerSettings.Android.minifyRelease = useMinify;
PlayerSettings.Android.minifyDebug = useMinify; PlayerSettings.Android.minifyDebug = useMinify;
// ---- 部署 Guru 专用的 Keystore ---- // ---- 部署 Guru 专用的 Keystore ----
@ -121,9 +113,10 @@ namespace Guru.Editor
PlayerSettings.Android.keyaliasPass = buildParam.AndroidAliasPass; PlayerSettings.Android.keyaliasPass = buildParam.AndroidAliasPass;
} }
PlayerSettings.Android.targetArchitectures = AndroidArchitecture.ARMv7 | AndroidArchitecture.ARM64; // 构建 armv7, arm64 PlayerSettings.Android.targetArchitectures = AndroidArchitecture.ARMv7 | AndroidArchitecture.ARM64; //只构建 armv7 和 arm64
PlayerSettings.Android.minSdkVersion = AndroidSdkVersions.AndroidApiLevel22; PlayerSettings.Android.minSdkVersion = AndroidSdkVersions.AndroidApiLevel22;
PlayerSettings.Android.targetSdkVersion = (AndroidSdkVersions)androidTargetVersion; // 设置 API Version if (buildParam.AndroidTargetVersion > 0) AndroidTargetSdkVersion = buildParam.AndroidTargetVersion;
PlayerSettings.Android.targetSdkVersion = (AndroidSdkVersions)AndroidTargetSdkVersion; // 默认设置API为33
//打包 //打包
string symbolDefine = buildParam.IsBuildRelease ? GameDefine.MACRO_RELEASE : GameDefine.MACRO_DEBUG; string symbolDefine = buildParam.IsBuildRelease ? GameDefine.MACRO_RELEASE : GameDefine.MACRO_DEBUG;
@ -149,17 +142,6 @@ namespace Guru.Editor
return apkPath; return apkPath;
} }
private static void SetGradlePath()
{
#if UNITY_ANDROID && UNITY_2021_3_41
if (Directory.Exists(UnityGradlePath_2021_3_41))
{
UnityEditor.Android.AndroidExternalToolsSettings.gradlePath = UnityGradlePath_2021_3_41;
}
#endif
}
/// <summary> /// <summary>
/// 部署 Guru 专用的 Keystore /// 部署 Guru 专用的 Keystore
/// </summary> /// </summary>

110
Editor/GuruBuildSuit/AND_POST_PROGUARD/UserProguardHelper.cs
View File

@ -1,6 +1,3 @@
using System.Collections.Generic;
using NUnit.Framework;
#if UNITY_ANDROID #if UNITY_ANDROID
namespace Guru namespace Guru
{ {
@ -16,8 +13,7 @@ namespace Guru
/// Android混淆器内容填充 /// Android混淆器内容填充
/// 于应用构建前执行 /// 于应用构建前执行
/// </summary> /// </summary>
// public class UserProguardHelper: IPreprocessBuildWithReport public class UserProguardHelper: IPreprocessBuildWithReport
public class UserProguardHelper
{ {
public int callbackOrder { get; } = 0; public int callbackOrder { get; } = 0;
public void OnPreprocessBuild(BuildReport report) public void OnPreprocessBuild(BuildReport report)
@ -31,6 +27,7 @@ namespace Guru
string proguardPath = $"{Application.dataPath}/Plugins/Android/proguard-user.txt"; string proguardPath = $"{Application.dataPath}/Plugins/Android/proguard-user.txt";
if (File.Exists(proguardPath)) if (File.Exists(proguardPath))
{ {
List<string> keeps = new List<string>();
DirectoryInfo dir = new DirectoryInfo(Application.dataPath); DirectoryInfo dir = new DirectoryInfo(Application.dataPath);
string raw = File.ReadAllText(proguardPath); string raw = File.ReadAllText(proguardPath);
@ -45,37 +42,33 @@ namespace Guru
// Debug.Log($"--- Proguard Files: {files.Length}"); // Debug.Log($"--- Proguard Files: {files.Length}");
ProguardItemBuilder builder = new ProguardItemBuilder(); string[] lens = null;
string l = "";
var allItems = new List<ProguardItem>(30);
string[] lines = null;
for (int i = 0; i < files.Count; i++) for (int i = 0; i < files.Count; i++)
{ {
lines = File.ReadAllLines(files[i].FullName); lens = File.ReadAllLines(files[i].FullName);
var items = builder.BuildItemsFormLines(lines); foreach (var s in lens)
if(items != null && items.Count > 0) allItems.AddRange(items);
}
List<string> finalLines = new List<string>(50);
foreach (var item in allItems)
{ {
finalLines.AddRange(item.lines); l = s.TrimStart();
if(string.IsNullOrEmpty(l)) continue;
if(raw.Contains(l)) continue;
keeps.Add(l);
Debug.Log($"--- ✏️ Apply: [ {l} ]");
}
}
} }
File.WriteAllLines(proguardPath, finalLines.ToArray()); if (keeps.Count == 0) return; // 无注入文件则退出
List<string> lines = File.ReadAllLines(proguardPath).ToList();
lines.Add("");
lines.AddRange(keeps);
File.WriteAllLines(proguardPath, lines.ToArray());
Debug.Log($"--- Update proguard-user.txt done! ☀️ ---"); Debug.Log($"--- Update proguard-user.txt done! ☀️ ---");
} }
} }
}
[MenuItem("Tools/Android/Add proguard-user")] [MenuItem("Tools/Android/Add proguard-user")]
@ -85,67 +78,6 @@ namespace Guru
} }
} }
internal class ProguardItemBuilder
{
public List<ProguardItem> BuildItemsFormLines(string[] lines)
{
List<ProguardItem> items = new List<ProguardItem>(30);
string line = "";
ProguardItem curItem = null;
for(int i =0; i < lines.Length; i++)
{
line = lines[i];
if(string.IsNullOrEmpty(line)) continue;
if (curItem == null)
{
curItem = new ProguardItem();
}
curItem.Append(line);
if(line.Contains("}"))
{
items.Add(curItem);
curItem = null;
}
}
return items;
}
}
internal class ProguardItem
{
public List<string> lines = new List<string>();
public string key = "";
public void Append(string line)
{
if (string.IsNullOrEmpty(key) &&
line.StartsWith("-"))
{
key = line;
}
if (lines == null) lines = new List<string>(5);
lines.Add(line);
}
}
} }
#endif #endif

3
Editor/GuruBuildSuit/AndroidSettingsTemplateFixer.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: f0cef2fc19b2407381c7163d3a87ddec
timeCreated: 1722257668

56
Editor/GuruBuildSuit/AndroidSettingsTemplateFixer/AndroidSettingsGradleFixer.cs
View File

@ -1,56 +0,0 @@
#if UNITY_ANDROID
namespace Guru.BuildTool
{
using System.IO;
using UnityEditor.Android;
using UnityEngine;
public class AndroidSettingsGradleFixer: IPostGenerateGradleAndroidProject
{
private const string SettingsGradleName= "settings.gradle";
private const string K_LINE_UNITYPROJECT = "def unityProjectPath";
public int callbackOrder => 1;
public void OnPostGenerateGradleAndroidProject(string buildPath)
{
FixSettingsInAndroidProject(buildPath);
}
/// <summary>
/// 设置项目中的 Settings 文件
/// </summary>
/// <param name="buildPath"></param>
private void FixSettingsInAndroidProject(string buildPath)
{
var settingsPath = Path.GetFullPath($"{buildPath}/../{SettingsGradleName}");
if (File.Exists(settingsPath))
{
bool isDirty = false;
var lines = File.ReadAllLines(settingsPath);
string projectPath = Path.GetFullPath($"{Application.dataPath}/../").Replace("\\", "/"); // Unity project path
for (int i = 0; i < lines.Length; i++)
{
if (lines[i].Contains(K_LINE_UNITYPROJECT))
{
lines[i] = $" def unityProjectPath = $/file:////{projectPath}/$.replace(\"\\\\\", \"/\")";
isDirty = true;
break;
}
}
if (isDirty)
{
File.WriteAllLines(settingsPath, lines);
Debug.Log($"[SDK] --- Fix Unity Project Path at:{settingsPath}");
}
}
}
}
}
#endif

3
Editor/GuruBuildSuit/AndroidSettingsTemplateFixer/AndroidSettingsGradleFixer.cs.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 125df18a1af243018be105c54ab9bb5b
timeCreated: 1722257677

2
Editor/GuruBuildSuit/IOS_POST_AD/IOSPostBuild_SKAdNetwork.cs
View File

@ -8,8 +8,6 @@ namespace Guru.Editor
using UnityEditor.iOS.Xcode; using UnityEditor.iOS.Xcode;
using UnityEngine; using UnityEngine;
// ----------- SKAdNetwork 更新版本日志： 2024-06-27 --------------------
/// <summary> /// <summary>
/// SKAdNetwork 注入逻辑 /// SKAdNetwork 注入逻辑
/// </summary> /// </summary>

128
Editor/GuruBuildSuit/IOS_POST_AD/SKADNetwork.plist
View File

@ -596,10 +596,6 @@
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>k6y4y55b64.skadnetwork</string> <string>k6y4y55b64.skadnetwork</string>
</dict> </dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>6yxyv74ff7.skadnetwork</string>
</dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>t6d3zquu66.skadnetwork</string> <string>t6d3zquu66.skadnetwork</string>
@ -612,10 +608,6 @@
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>h65wbv5k3f.skadnetwork</string> <string>h65wbv5k3f.skadnetwork</string>
</dict> </dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>tvvz7th9br.skadnetwork</string>
</dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>bvpn9ufa9b.skadnetwork</string> <string>bvpn9ufa9b.skadnetwork</string>
@ -624,93 +616,33 @@
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>hjevpa356n.skadnetwork</string> <string>hjevpa356n.skadnetwork</string>
</dict> </dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>6yxyv74ff7.skadnetwork</string>
</dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>mqn7fxpca7.skadnetwork</string> <string>mqn7fxpca7.skadnetwork</string>
</dict> </dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>vhf287vqwu.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>g6gcrrvk4p.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ce8ybjwass.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>jk2fsx2rgz.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>z959bm4gru.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>dt3cjx1a9i.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>z4gj7hsk7h.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>ln5gz23vtd.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>pu4na253f3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>6rd35atwn8.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>gvmwg8q7h5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>fz2k2k5tej.skadnetwork</string>
</dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>7953jerfzd.skadnetwork</string> <string>7953jerfzd.skadnetwork</string>
</dict> </dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>577p5t736z.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>tmhh9296z4.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>7fbxrn65az.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>r8lj5b58b5.skadnetwork</string>
</dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>qu637u8glc.skadnetwork</string> <string>qu637u8glc.skadnetwork</string>
</dict> </dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>7bxrt786m8.skadnetwork</string> <string>g6gcrrvk4p.skadnetwork</string>
</dict> </dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>xga6mpmplv.skadnetwork</string> <string>ln5gz23vtd.skadnetwork</string>
</dict> </dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>55644vm79v.skadnetwork</string> <string>z959bm4gru.skadnetwork</string>
</dict> </dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
@ -718,7 +650,23 @@
</dict> </dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>mj797d8u6f.skadnetwork</string> <string>gvmwg8q7h5.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>pu4na253f3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>yrqqpx2mcb.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>z4gj7hsk7h.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>bd757ywx3.skadnetwork</string>
</dict> </dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
@ -730,11 +678,11 @@
</dict> </dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>qwpu75vrh2.skadnetwork</string> <string>633vhxswh4.skadnetwork</string>
</dict> </dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>633vhxswh4.skadnetwork</string> <string>tmhh9296z4.skadnetwork</string>
</dict> </dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
@ -784,6 +732,10 @@
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>899vrgt9g8.skadnetwork</string> <string>899vrgt9g8.skadnetwork</string>
</dict> </dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>mj797d8u6f.skadnetwork</string>
</dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>88k8774x49.skadnetwork</string> <string>88k8774x49.skadnetwork</string>
@ -816,6 +768,10 @@
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>t7ky8fmwkd.skadnetwork</string> <string>t7ky8fmwkd.skadnetwork</string>
</dict> </dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>fz2k2k5tej.skadnetwork</string>
</dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>w28pnjg2k4.skadnetwork</string> <string>w28pnjg2k4.skadnetwork</string>
@ -868,6 +824,10 @@
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>dmv22haz9p.skadnetwork</string> <string>dmv22haz9p.skadnetwork</string>
</dict> </dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>7fbxrn65az.skadnetwork</string>
</dict>
<dict> <dict>
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>b55w3d8y8z.skadnetwork</string> <string>b55w3d8y8z.skadnetwork</string>
@ -960,18 +920,6 @@
<key>SKAdNetworkIdentifier</key> <key>SKAdNetworkIdentifier</key>
<string>x2jnk7ly8j.skadnetwork</string> <string>x2jnk7ly8j.skadnetwork</string>
</dict> </dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>yrqqpx2mcb.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>bd757ywx3.skadnetwork</string>
</dict>
<dict>
<key>SKAdNetworkIdentifier</key>
<string>w7jznl3r6g.skadnetwork</string>
</dict>
</array> </array>
</dict> </dict>
</plist> </plist>

2
Runtime/ABTest/ABTestManager.cs
View File

@ -72,7 +72,7 @@ namespace Guru
for (int i = 0; i < _params.Count; i++) for (int i = 0; i < _params.Count; i++)
{ {
// 上报实验AB属性 // 上报实验AB属性
GuruAnalytics.Instance.SetUserProperty(_params[i].id, _params[i].group); GuruAnalytics.SetUserProperty(_params[i].id, _params[i].group);
#if UNITY_EDITOR #if UNITY_EDITOR
Debug.Log($"[AB] --- Add AB Param <color=cyan>{_params[i].ToString()}</color>"); Debug.Log($"[AB] --- Add AB Param <color=cyan>{_params[i].ToString()}</color>");
#else #else

68
Runtime/GuruAdjust/AdjustService.cs
View File

@ -18,7 +18,7 @@ namespace Guru
public const string K_IAP_PURCHASE = "iap_purchase"; // 固定点位事件 public const string K_IAP_PURCHASE = "iap_purchase"; // 固定点位事件
public const string K_SUB_PURCHASE = "sub_purchase"; // 固定点位事件 public const string K_SUB_PURCHASE = "sub_purchase"; // 固定点位事件
private static Action<string> _onInitComplete; private static Action<string> _onSessionSuccessCallback;
private static string _adId = ""; private static string _adId = "";
@ -43,9 +43,6 @@ namespace Guru
} }
} }
private static bool _isReady = false;
public static bool IsReady => _isReady;
#region 启动服务 #region 启动服务
/// <summary> /// <summary>
@ -53,9 +50,7 @@ namespace Guru
/// </summary> /// </summary>
/// <param name="appToken"></param> /// <param name="appToken"></param>
/// <param name="fbAppId">MIR 追踪 AppID</param> /// <param name="fbAppId">MIR 追踪 AppID</param>
/// <param name="onInitComplete"></param> public static void StartService(string appToken, string fbAppId = "", Action<string> onSessionSuccess = null)
/// <param name="onDeeplinkCallback"></param>
public static void StartService(string appToken, string fbAppId = "", Action<string> onInitComplete = null, Action<string> onDeeplinkCallback = null)
{ {
if (string.IsNullOrEmpty(appToken)) if (string.IsNullOrEmpty(appToken))
{ {
@ -63,7 +58,7 @@ namespace Guru
return; return;
} }
_onInitComplete = onInitComplete; _onSessionSuccessCallback = onSessionSuccess;
InstallEvent(IPMConfig.FIREBASE_ID, IPMConfig.IPM_DEVICE_ID); // 注入启动参数 InstallEvent(IPMConfig.FIREBASE_ID, IPMConfig.IPM_DEVICE_ID); // 注入启动参数
@ -71,13 +66,10 @@ namespace Guru
AdjustConfig config = new AdjustConfig(appToken, environment); AdjustConfig config = new AdjustConfig(appToken, environment);
config.setLogLevel(GetAdjustLogLevel()); config.setLogLevel(GetAdjustLogLevel());
config.setDelayStart(DelayTime); config.setDelayStart(DelayTime);
config.setPreinstallTrackingEnabled(true); // Adjust Preinstall config.setPreinstallTrackingEnabled(true); // Adjust Preinstall
config.setSessionSuccessDelegate(OnSessionSuccessCallback); // SessionSuccess config.setSessionSuccessDelegate(OnSessionSuccessCallback); // SessionSuccess
if(onDeeplinkCallback != null)
config.setDeferredDeeplinkDelegate(onDeeplinkCallback);
#if UNITY_ANDROID #if UNITY_ANDROID
if (!string.IsNullOrEmpty(fbAppId)) config.setFbAppId(fbAppId); // 注入 MIR ID if (!string.IsNullOrEmpty(fbAppId)) config.setFbAppId(fbAppId); // 注入 MIR ID
#endif #endif
@ -87,6 +79,7 @@ namespace Guru
config.setLogDelegate(log => LogI(LOG_TAG, log)); config.setLogDelegate(log => LogI(LOG_TAG, log));
config.setEventSuccessDelegate(OnEventSuccessCallback); config.setEventSuccessDelegate(OnEventSuccessCallback);
config.setEventFailureDelegate(OnEventFailureCallback); config.setEventFailureDelegate(OnEventFailureCallback);
config.setSessionFailureDelegate(OnSessionFailureCallback); config.setSessionFailureDelegate(OnSessionFailureCallback);
config.setAttributionChangedDelegate(OnAttributionChangedCallback); config.setAttributionChangedDelegate(OnAttributionChangedCallback);
#endif #endif
@ -94,6 +87,9 @@ namespace Guru
SetupInstance(); SetupInstance();
Adjust.start(config); Adjust.start(config);
// 缓存标准属性
_adjustId = Adjust.getAdid(); // 获取AdjustID
// 异步加载AdId // 异步加载AdId
FetchGoogleAdId(); FetchGoogleAdId();
@ -165,22 +161,6 @@ namespace Guru
#region 事件回调函数 #region 事件回调函数
/// <summary>
/// Session 启动后回调
/// 回调中可以获取实际的 AdjustID
/// </summary>
/// <param name="sessionSuccessData"></param>
private static void OnSessionSuccessCallback(AdjustSessionSuccess sessionSuccessData)
{
LogI(LOG_TAG,$"{LOG_TAG} --- Session tracked successfully!");
var adid = sessionSuccessData.Adid;
_adjustId = adid;
_isReady = true;
_onInitComplete?.Invoke(adid);
}
private static void OnAttributionChangedCallback(AdjustAttribution attributionData) private static void OnAttributionChangedCallback(AdjustAttribution attributionData)
{ {
LogI(LOG_TAG, "Attribution changed!"); LogI(LOG_TAG, "Attribution changed!");
@ -298,6 +278,14 @@ namespace Guru
LogI(LOG_TAG, "WillRetry: " + eventFailureData.WillRetry.ToString()); LogI(LOG_TAG, "WillRetry: " + eventFailureData.WillRetry.ToString());
} }
private static void OnSessionSuccessCallback(AdjustSessionSuccess sessionSuccessData)
{
LogI(LOG_TAG,$"{LOG_TAG} --- Session tracked successfully!");
var adid = sessionSuccessData.Adid;
_onSessionSuccessCallback?.Invoke(adid);
}
private static void OnSessionFailureCallback(AdjustSessionFailure sessionFailureData) private static void OnSessionFailureCallback(AdjustSessionFailure sessionFailureData)
{ {
LogI(LOG_TAG,"Session tracking failed!"); LogI(LOG_TAG,"Session tracking failed!");
@ -370,22 +358,24 @@ namespace Guru
/// <summary> /// <summary>
/// 广告收入上报 (Adjust 特有的接口) /// 广告收入上报 (Adjust 特有的接口)
/// </summary> /// </summary>
/// <param name="value"></param> /// <param name="adInfo"></param>
/// <param name="currency"></param> public static void TrackADRevenue(MaxSdkBase.AdInfo adInfo)
/// <param name="adSource"></param>
/// <param name="adUnitId"></param>
/// <param name="adPlacement"></param>
public static void TrackADRevenue(double value, string currency, string adSource, string adUnitId, string adPlacement)
{ {
if (adInfo == null)
return;
var adRevenue = new AdjustAdRevenue(AdjustConfig.AdjustAdRevenueSourceAppLovinMAX); var adRevenue = new AdjustAdRevenue(AdjustConfig.AdjustAdRevenueSourceAppLovinMAX);
if (string.IsNullOrEmpty(currency)) currency = "USD"; adRevenue.setRevenue(adInfo.Revenue, "USD");
adRevenue.setRevenue(value, currency); adRevenue.setAdRevenueNetwork(adInfo.NetworkName);
adRevenue.setAdRevenueNetwork(adSource); adRevenue.setAdRevenueUnit(adInfo.AdUnitIdentifier);
adRevenue.setAdRevenueUnit(adUnitId); adRevenue.setAdRevenuePlacement(adInfo.Placement);
adRevenue.setAdRevenuePlacement(adPlacement);
Adjust.trackAdRevenue(adRevenue); Adjust.trackAdRevenue(adRevenue);
} }
#endregion #endregion
#region 关键属性上报 #region 关键属性上报

196
Runtime/GuruAnalytics/Runtime/Script/GuruAnalytics.cs
View File

@ -14,60 +14,37 @@ namespace Guru
public class GuruAnalytics public class GuruAnalytics
{ {
// Plugin Version // Plugin Version
public const string Version = "1.11.1"; public const string Version = "1.10.5";
public static readonly string Tag = "[ANU]"; public static readonly string Tag = "[ANU]";
private static readonly string ActionName = "logger_error"; private static readonly string ActionName = "logger_error";
private const int EventPriorityDefault = 10; internal const int EventPriorityDefault = 10;
private static IAnalyticsAgent _agent;
private static GuruAnalytics _instance; public static IAnalyticsAgent Agent
public static GuruAnalytics Instance
{
get
{
if (_instance == null)
{
throw new Exception("GuruAnalytics not initialized. Please call <Analytics.InitAnalytics()> first.");
}
return _instance;
}
}
private bool _isReady = false;
public bool IsReady => _isReady;
private IAnalyticsAgent _agent;
private IAnalyticsAgent Agent
{ {
get get
{ {
if (_agent == null) if (_agent == null)
{ {
#if UNITY_EDITOR #if UNITY_EDITOR
_agent = new AnalyticsAgentMock(); _agent = new AnalyticsAgentStub();
#elif UNITY_ANDROID #elif UNITY_ANDROID
_agent = new AnalyticsAgentAndroid(); _agent = new AnalyticsAgentAndroid();
#elif UNITY_IOS #elif UNITY_IOS
_agent = new AnalyticsAgentIOS(); _agent = new AnalyticsAgentIOS();
#endif #endif
} }
if (_agent == null)
{
throw new NotImplementedException("You Should Implement IAnalyticsAgent on platform first.");
}
return _agent; return _agent;
} }
} }
private Dictionary<string, string> _userProperties; private static Dictionary<string, string> _userProperties;
/// <summary> /// <summary>
/// 用户属性缓存字典 /// 用户属性缓存字典
/// </summary> /// </summary>
private Dictionary<string, string> UserProperties public static Dictionary<string, string> UserProperties
{ {
get get
{ {
@ -82,13 +59,15 @@ namespace Guru
/// <summary> /// <summary>
/// 错误 code 表 /// 错误 code 表
/// </summary> /// </summary>
public List<int> ErrorCodeList = new List<int>(); public static List<int> ErrorCodeList = new List<int>();
private bool _enableErrorLog = false;
private static bool _autoSyncProperties = false;
private static bool _enableErrorLog = false;
/// <summary> /// <summary>
/// 启动日志错误上报 /// 启动日志错误上报
/// </summary> /// </summary>
public bool EnableErrorLog public static bool EnableErrorLog
{ {
get => _enableErrorLog; get => _enableErrorLog;
set set
@ -104,40 +83,37 @@ namespace Guru
/// <summary> /// <summary>
/// 初始化接口 /// 初始化接口
/// </summary> /// </summary>
public static void Init(string appId, string deviceInfo, Action onInitComplete, bool isDebug = false, public static void Init(string appId, string deviceInfo, bool isDebug = false,
bool enableErrorLog = false) bool enableErrorLog = false, bool syncProperties = false)
{ {
Debug.Log($"{Tag} --- Guru Analytics [{Version}] initialing..."); Debug.Log($"{Tag} --- Guru Analytics [{Version}] initialing...");
if (_instance == null) _autoSyncProperties = syncProperties;
{ _enableErrorLog = enableErrorLog;
_instance = new GuruAnalytics(); Agent?.Init(appId, deviceInfo, isDebug);
_instance.Agent.Init(appId, deviceInfo, onInitComplete, isDebug); if(_enableErrorLog) InitCallbacks(); // 激活错误日志回调
_instance.EnableErrorLog = enableErrorLog;
_instance._isReady = true;
}
} }
/// <summary> /// <summary>
/// 设置视图名称 /// 设置视图名称
/// </summary> /// </summary>
/// <param name="screenName"></param> /// <param name="screenName"></param>
public void SetScreen(string screenName) public static void SetScreen(string screenName)
{ {
if (string.IsNullOrEmpty(screenName)) return; if (string.IsNullOrEmpty(screenName)) return;
CacheUserProperty($"screen_name", screenName); CacheUserProperty($"screen_name", screenName);
Agent.SetScreen(screenName); Agent?.SetScreen(screenName);
} }
/// <summary> /// <summary>
/// 设置广告ID /// 设置广告ID
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
public void SetAdId(string id) public static void SetAdId(string id)
{ {
if (string.IsNullOrEmpty(id)) return; if (string.IsNullOrEmpty(id)) return;
CacheUserProperty($"ad_id", id); CacheUserProperty($"ad_id", id);
Agent.SetAdId(id); Agent?.SetAdId(id);
} }
/// <summary> /// <summary>
@ -145,59 +121,59 @@ namespace Guru
/// </summary> /// </summary>
/// <param name="key"></param> /// <param name="key"></param>
/// <param name="value"></param> /// <param name="value"></param>
public void SetUserProperty(string key, string value) public static void SetUserProperty(string key, string value)
{ {
if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(value)) return; if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(value)) return;
CacheUserProperty(key, value); // 添加用户属性 CacheUserProperty(key, value); // 添加用户属性
Agent.SetUserProperty(key, value); Agent?.SetUserProperty(key, value);
} }
/// <summary> /// <summary>
/// 设置Firebase ID /// 设置Firebase ID
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
public void SetFirebaseId(string id) public static void SetFirebaseId(string id)
{ {
if (string.IsNullOrEmpty(id)) return; if (string.IsNullOrEmpty(id)) return;
CacheUserProperty($"firebase_id", id); CacheUserProperty($"firebase_id", id);
Agent.SetFirebaseId(id); Agent?.SetFirebaseId(id);
} }
/// <summary> /// <summary>
/// 设置Adjust ID /// 设置Adjust ID
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
public void SetAdjustId(string id) public static void SetAdjustId(string id)
{ {
if (string.IsNullOrEmpty(id)) return; if (string.IsNullOrEmpty(id)) return;
CacheUserProperty($"adjust_id", id); CacheUserProperty($"adjust_id", id);
Agent.SetAdjustId(id); Agent?.SetAdjustId(id);
} }
/// <summary> /// <summary>
/// 设置设备ID /// 设置设备ID
/// </summary> /// </summary>
/// <param name="deviceId"></param> /// <param name="deviceId"></param>
public void SetDeviceId(string deviceId) public static void SetDeviceId(string deviceId)
{ {
if (string.IsNullOrEmpty(deviceId)) return; if (string.IsNullOrEmpty(deviceId)) return;
CacheUserProperty($"device_id", deviceId); CacheUserProperty($"device_id", deviceId);
Agent.SetDeviceId(deviceId); Agent?.SetDeviceId(deviceId);
} }
public void SetAndroidID(string androidId) public static void SetAndroidID(string androidId)
{ {
if (string.IsNullOrEmpty(androidId)) return; if (string.IsNullOrEmpty(androidId)) return;
CacheUserProperty(Analytics.PropertyAndroidID, androidId); CacheUserProperty(Analytics.PropertyAndroidID, androidId);
} }
public void SetIDFV(string idfv) public static void SetIDFV(string idfv)
{ {
if (string.IsNullOrEmpty(idfv)) return; if (string.IsNullOrEmpty(idfv)) return;
CacheUserProperty(Analytics.PropertyIDFV, idfv); CacheUserProperty(Analytics.PropertyIDFV, idfv);
} }
public void SetIDFA(string idfa) public static void SetIDFA(string idfa)
{ {
if (string.IsNullOrEmpty(idfa)) return; if (string.IsNullOrEmpty(idfa)) return;
CacheUserProperty(Analytics.PropertyIDFA, idfa); CacheUserProperty(Analytics.PropertyIDFA, idfa);
@ -208,17 +184,17 @@ namespace Guru
/// 设置用户ID /// 设置用户ID
/// </summary> /// </summary>
/// <param name="uid"></param> /// <param name="uid"></param>
public void SetUid(string uid) public static void SetUid(string uid)
{ {
if (string.IsNullOrEmpty(uid)) return; if (string.IsNullOrEmpty(uid)) return;
CacheUserProperty($"uid", uid); CacheUserProperty($"uid", uid);
Agent.SetUid(uid); Agent?.SetUid(uid);
} }
/// <summary> /// <summary>
/// 上报事件成功率 /// 上报事件成功率
/// </summary> /// </summary>
public void ReportEventSuccessRate() => Agent.ReportEventSuccessRate(); public static void ReportEventSuccessRate() => Agent?.ReportEventSuccessRate();
/// <summary> /// <summary>
/// 上报打点事件 /// 上报打点事件
@ -226,19 +202,21 @@ namespace Guru
/// <param name="eventName">事件名称</param> /// <param name="eventName">事件名称</param>
/// <param name="data">INT类型的值</param> /// <param name="data">INT类型的值</param>
/// <param name="priority"></param> /// <param name="priority"></param>
public void LogEvent(string eventName, Dictionary<string, dynamic> data = null, int priority = -1) public static void LogEvent(string eventName, Dictionary<string, dynamic> data = null, int priority = -1)
{ {
if(_autoSyncProperties)
UpdateAllUserProperties(); // 每次打点更新用户属性
string raw = ""; string raw = "";
if (data != null && data.Count > 0) if (data != null && data.Count > 0)
{ {
raw = BuildParamsJson(data); raw = BuildParamsJson(data);
} }
if (priority < 0) priority = EventPriorityDefault; if (priority < 0) priority = EventPriorityDefault;
Debug.Log($"{Tag} --- LogEvent GuruAnalytics:{eventName} | raw: {raw} | priority: {priority}"); Debug.Log($"{Tag} event:{eventName} | raw: {raw} | priority: {priority}");
Agent.LogEvent(eventName, raw, priority); Agent?.LogEvent(eventName, raw, priority);
} }
/*
private static string BuildParamsString(Dictionary<string, dynamic> data) private static string BuildParamsString(Dictionary<string, dynamic> data)
{ {
string raw = ""; string raw = "";
@ -250,9 +228,8 @@ namespace Guru
} }
return raw; return raw;
} }
*/
private string BuildParamsJson(Dictionary<string, dynamic> data) private static string BuildParamsJson(Dictionary<string, dynamic> data)
{ {
try try
{ {
@ -270,7 +247,6 @@ namespace Guru
return ""; return "";
} }
/*
/// <summary> /// <summary>
/// 构建带有类型格式的Str值 /// 构建带有类型格式的Str值
/// </summary> /// </summary>
@ -291,16 +267,15 @@ namespace Guru
return $"{kvp.Key}:s{kvp.Value}"; return $"{kvp.Key}:s{kvp.Value}";
} }
*/
/// <summary> /// <summary>
/// 设置太极02值 /// 设置太极02值
/// </summary> /// </summary>
/// <param name="value"></param> /// <param name="value"></param>
public void SetTch02Value(double value) public static void SetTch02Value(double value)
{ {
Debug.Log($"{Tag} set tch_02_value:{value}"); Debug.Log($"{Tag} set tch_02_value:{value}");
Agent.SetTch02Value(value); Agent?.SetTch02Value(value);
} }
#endregion #endregion
@ -321,19 +296,37 @@ namespace Guru
/// </summary> /// </summary>
/// <param name="key"></param> /// <param name="key"></param>
/// <param name="value"></param> /// <param name="value"></param>
private void CacheUserProperty(string key, string value) private static void CacheUserProperty(string key, string value)
{ {
// bool needUpdate = !UserProperties.ContainsKey(key) || UserProperties[key] != value; bool needUpdate = !UserProperties.ContainsKey(key) || UserProperties[key] != value;
UserProperties[key] = value; UserProperties[key] = value;
// if (needUpdate) UpdateAllUserProperties(); // if (needUpdate) UpdateAllUserProperties();
} }
private static void UpdateAllUserProperties()
{
if (UserProperties != null && UserProperties.Count > 0)
{
var keys = UserProperties.Keys.ToArray();
int i = 0;
string key = "";
while (i < keys.Length)
{
key = keys[i];
if(!string.IsNullOrEmpty(key)) SetUserProperty(key, UserProperties[key]);
i++;
}
keys = null;
}
}
#endregion #endregion
#region 日志回调 #region 日志回调
private void InitCallbacks() private static void InitCallbacks()
{ {
try try
{ {
@ -353,8 +346,8 @@ namespace Guru
/// <summary> /// <summary>
/// 获取SDK回调 /// 获取SDK回调
/// </summary> /// </summary>
/// <param name="raw"></param> /// <param name="msg"></param>
private void OnSDKCallback(string raw) private static void OnSDKCallback(string raw)
{ {
if (string.IsNullOrEmpty(raw)) return; if (string.IsNullOrEmpty(raw)) return;
if (!raw.Contains($"\"{ActionName}\"")) return; // 不对其他行为的日志进行过滤 if (!raw.Contains($"\"{ActionName}\"")) return; // 不对其他行为的日志进行过滤
@ -366,7 +359,7 @@ namespace Guru
/// </summary> /// </summary>
/// <param name="code"></param> /// <param name="code"></param>
/// <param name="errorInfo"></param> /// <param name="errorInfo"></param>
private void OnLoggerErrorEvent(int code, string errorInfo = "") private static void OnLoggerErrorEvent(int code, string errorInfo = "")
{ {
// Debug.Log($"{Tag} --- OnLoggerErrorEvent: code:{code}\tinfo:{errorInfo}"); // Debug.Log($"{Tag} --- OnLoggerErrorEvent: code:{code}\tinfo:{errorInfo}");
@ -396,12 +389,16 @@ namespace Guru
Debug.Log($"{Tag} ------ ErrorLogInfo:: code:{codeString}\tinfo:{errorInfo}"); Debug.Log($"{Tag} ------ ErrorLogInfo:: code:{codeString}\tinfo:{errorInfo}");
#if !UNITY_EDITOR
// Only for firebase GA // Only for firebase GA
Analytics.TrackEvent("dev_audit", parameters, new Analytics.EventSetting() { EnableFirebaseAnalytics = true }); Analytics.LogEvent("dev_audit", parameters,
new Analytics.EventSetting() { EnableFirebaseAnalytics = true });
#endif
} }
private bool ParseWithJson(string json) private static bool ParseWithJson(string json)
{ {
Debug.Log($"{Tag} ------ ParseWithJson: json:\n{json}"); Debug.Log($"{Tag} ------ ParseWithJson: json:\n{json}");
@ -438,7 +435,7 @@ namespace Guru
{ {
string p = "\"msg\":\""; string p = "\"msg\":\"";
string m = json; string m = json;
if (json.Contains(p)) m = json.Substring(json.IndexOf(p, StringComparison.Ordinal) + p.Length); if (json.Contains(p)) m = json.Substring(json.IndexOf(p) + p.Length);
info = $"JsonEX:{m}"; info = $"JsonEX:{m}";
// Debug.Log($"{Tag} --- {info}"); // Debug.Log($"{Tag} --- {info}");
Analytics.LogCrashlytics(json, false); Analytics.LogCrashlytics(json, false);
@ -448,17 +445,22 @@ namespace Guru
return false; return false;
} }
/** private static void ParseWithRaw(string raw)
private void ParseWithRaw(string raw)
{ {
var code = (int)AnalyticsCode.Unknown; int code = (int)AnalyticsCode.Unknown;
string info; string info = raw;
//------- message send to unity ---------- //------- message send to unity ----------
Debug.Log($"{Tag} get callback errorInfo:\n{raw}"); Debug.Log($"{Tag} get callback errorInfo:\n{raw}");
string patten = "";
string patten2 = "";
int idx = 0;
int idx2 = 0;
int len = 0;
var patten = "msg\":\"";
patten = "msg\":\"";
if (raw.Contains(patten)) if (raw.Contains(patten))
{ {
@ -481,16 +483,16 @@ namespace Guru
try try
{ {
var idx = raw.IndexOf(patten, StringComparison.Ordinal) + patten.Length; idx = raw.IndexOf(patten, StringComparison.Ordinal) + patten.Length;
string act = raw.Substring(idx, ActionName.Length); string act = raw.Substring(idx, ActionName.Length);
if (act == ActionName) if (act == ActionName)
{ {
patten = "code\":"; patten = "code\":";
var patten2 = ",\"msg"; patten2 = ",\"msg";
idx = raw.IndexOf(patten, StringComparison.Ordinal); idx = raw.IndexOf(patten);
var idx2 = raw.IndexOf(patten2, StringComparison.Ordinal); idx2 = raw.IndexOf(patten2);
var len = idx2 - (idx + patten.Length); len = idx2 - (idx + patten.Length);
if (len > 0) if (len > 0)
{ {
string c = raw.Substring(idx + patten.Length, len); string c = raw.Substring(idx + patten.Length, len);
@ -529,12 +531,12 @@ namespace Guru
{ {
Analytics.LogCrashlytics(raw, false); Analytics.LogCrashlytics(raw, false);
Analytics.LogCrashlytics($"{Tag} --- format error:{raw}"); Analytics.LogCrashlytics($"{Tag} --- format error:{raw}");
OnLoggerErrorEvent(code, raw.Substring(raw.IndexOf("msg\":", StringComparison.Ordinal) + 5)); OnLoggerErrorEvent(code, raw.Substring(raw.IndexOf("msg\":" ) + 5));
} }
} }
**/
private void ReportCodeInfo(int code, string info)
private static void ReportCodeInfo(int code, string info)
{ {
var ac = (AnalyticsCode)code; var ac = (AnalyticsCode)code;
Debug.Log($"{Tag} ------ Get Code And Info: code:{code}[{ac}] \tinfo:{info}"); Debug.Log($"{Tag} ------ Get Code And Info: code:{code}[{ac}] \tinfo:{info}");
@ -590,7 +592,7 @@ namespace Guru
public static void TestOnCallback(string msg) public static void TestOnCallback(string msg)
{ {
Instance.OnSDKCallback(msg); OnSDKCallback(msg);
} }
#endif #endif

4
Runtime/GuruAnalytics/Runtime/Script/IAnalyticsAgent.cs
View File

@ -1,13 +1,11 @@
namespace Guru namespace Guru
{ {
using System;
/// <summary> /// <summary>
/// 自打点代理接口 /// 自打点代理接口
/// </summary> /// </summary>
public interface IAnalyticsAgent public interface IAnalyticsAgent
{ {
void Init(string appId, string deviceInfo, Action onInitComplete, bool isDebug = false); void Init(string appId, string deviceInfo, bool isDebug = false);
void SetScreen(string screenName); void SetScreen(string screenName);
void SetAdId(string id); void SetAdId(string id);
void SetUserProperty(string key, string value); void SetUserProperty(string key, string value);

8
Runtime/GuruAnalytics/Runtime/Script/Impl/AnalyticsAgentAndroid.cs
View File

@ -1,7 +1,5 @@
using System.Threading.Tasks;
namespace Guru namespace Guru
{ {
using System; using System;
@ -78,16 +76,12 @@ namespace Guru
#region 接口实现 #region 接口实现
public async void Init(string appId, string deviceInfo, Action onInitComplete, bool isDebug = false) public void Init(string appId, string deviceInfo, bool isDebug = false)
{ {
_isDebug = isDebug; _isDebug = isDebug;
string bundleId = Application.identifier; string bundleId = Application.identifier;
// public static void init(String appId, String deviceInfo, String bundleId, boolean isDebug, boolean useWorker, boolean useCronet, String baseUrl) // public static void init(String appId, String deviceInfo, String bundleId, boolean isDebug, boolean useWorker, boolean useCronet, String baseUrl)
// TODO: 将来把 CallStatic 转为异步实现
CallStatic("init", appId, deviceInfo, bundleId, isDebug, UseWorker, UseCronet, BaseUrl); // 调用接口 CallStatic("init", appId, deviceInfo, bundleId, isDebug, UseWorker, UseCronet, BaseUrl); // 调用接口
onInitComplete?.Invoke();
} }
public void SetScreen(string screenName) public void SetScreen(string screenName)

7
Runtime/GuruAnalytics/Runtime/Script/Impl/AnalyticsAgentIOS.cs
View File

@ -1,9 +1,7 @@
using System.Runtime.InteropServices;
namespace Guru namespace Guru
{ {
using System;
using System.Runtime.InteropServices;
public class AnalyticsAgentIOS: IAnalyticsAgent public class AnalyticsAgentIOS: IAnalyticsAgent
{ {
@ -57,14 +55,13 @@ namespace Guru
} }
public void Init(string appId, string deviceInfo, Action onInitComplete, bool isDebug = false) public void Init(string appId, string deviceInfo, bool isDebug = false)
{ {
_isDebug = isDebug; _isDebug = isDebug;
#if UNITY_IOS #if UNITY_IOS
unityInitAnalytics(appId, deviceInfo, isDebug); unityInitAnalytics(appId, deviceInfo, isDebug);
unityInitException(); // 初始化报错守护进程 unityInitException(); // 初始化报错守护进程
#endif #endif
onInitComplete?.Invoke();
} }
public void SetScreen(string screenName) public void SetScreen(string screenName)

15
Runtime/GuruAnalytics/Runtime/Script/Impl/AnalyticsAgentMock.cs → Runtime/GuruAnalytics/Runtime/Script/Impl/AnalyticsAgentStub.cs
View File

@ -1,12 +1,9 @@
using System.Text;
using UnityEngine;
namespace Guru namespace Guru
{ {
using System.Text; public class AnalyticsAgentStub: IAnalyticsAgent
using UnityEngine;
using System;
public class AnalyticsAgentMock: IAnalyticsAgent
{ {
public static readonly string TAG = "[EDT]"; public static readonly string TAG = "[EDT]";
@ -27,7 +24,7 @@ namespace Guru
} }
public void Init(string appId, string deviceInfo, Action onInitComplete, bool isDebug = false) public void Init(string appId, string deviceInfo, bool isDebug = false)
{ {
#if UNITY_EDITOR #if UNITY_EDITOR
_isShowLog = true; _isShowLog = true;
@ -35,8 +32,6 @@ namespace Guru
_isDebug = isDebug; _isDebug = isDebug;
if(_isShowLog) if(_isShowLog)
Debug.Log($"{TAG} init with Debug: <color=orange>{isDebug}</color> appId:{appId} deviceInfo:{deviceInfo}"); Debug.Log($"{TAG} init with Debug: <color=orange>{isDebug}</color> appId:{appId} deviceInfo:{deviceInfo}");
onInitComplete?.Invoke();
} }
@ -132,7 +127,7 @@ namespace Guru
} }
} }
Debug.Log($"{TAG} LogEvent: GuruAnalytics:<color=orange>{eventName} ({priority})</color> Properties:\n{sb.ToString()}"); Debug.Log($"{TAG} LogEvent: event:<color=orange>{eventName} ({priority})</color> Properties:\n{sb.ToString()}");
} }
} }
} }

0
Runtime/GuruAnalytics/Runtime/Script/Impl/AnalyticsAgentMock.cs.meta → Runtime/GuruAnalytics/Runtime/Script/Impl/AnalyticsAgentStub.cs.meta
View File

31
Runtime/GuruAnalytics/~Sample/GuruAnalyticsDemo.cs → Runtime/GuruAnalytics/~Sample/CuruAnalyticsDemo.cs
View File

@ -5,7 +5,7 @@ using UnityEngine.UI;
namespace Guru namespace Guru
{ {
public class GuruAnalyticsDemo: MonoBehaviour public class CuruAnalyticsDemo: MonoBehaviour
{ {
[SerializeField] private bool _isDebug = true; [SerializeField] private bool _isDebug = true;
[SerializeField] private Button _btnInitSDK; [SerializeField] private Button _btnInitSDK;
@ -54,22 +54,17 @@ namespace Guru
private void OnClickInit() private void OnClickInit()
{ {
Debug.Log($"---- [DEMO] Call Analytics init"); Debug.Log($"---- [DEMO] Call Analytics init");
GuruAnalytics.Init(AppID, DeviceInfo, OnGuruAnalyticsInitComplete, _isDebug); GuruAnalytics.Init(AppID, DeviceInfo, _isDebug);
}
private void OnGuruAnalyticsInitComplete()
{
} }
private void OnClickStatus() private void OnClickStatus()
{ {
Debug.Log($"---- [DEMO] Report Stats IDs: UID:{UID} DeviceID:{DeviceID} FirebaseID:{FirebaseID} AdID:{AdID} AdjustID:{AdjustID}"); Debug.Log($"---- [DEMO] Report Stats IDs: UID:{UID} DeviceID:{DeviceID} FirebaseID:{FirebaseID} AdID:{AdID} AdjustID:{AdjustID}");
GuruAnalytics.Instance.SetUid(UID); GuruAnalytics.SetUid(UID);
GuruAnalytics.Instance.SetDeviceId(DeviceID); GuruAnalytics.SetDeviceId(DeviceID);
GuruAnalytics.Instance.SetFirebaseId(FirebaseID); GuruAnalytics.SetFirebaseId(FirebaseID);
GuruAnalytics.Instance.SetAdId(AdID); GuruAnalytics.SetAdId(AdID);
GuruAnalytics.Instance.SetAdjustId(AdjustID); GuruAnalytics.SetAdjustId(AdjustID);
} }
private void OnClickUserProperties() private void OnClickUserProperties()
@ -77,14 +72,14 @@ namespace Guru
string item_category = "main"; string item_category = "main";
int level = 7; int level = 7;
Debug.Log($"---- [DEMO] Call SetUserProperty: item_category:{item_category} level:{level}"); Debug.Log($"---- [DEMO] Call SetUserProperty: item_category:{item_category} level:{level}");
GuruAnalytics.Instance.SetUserProperty("item_category", item_category); GuruAnalytics.SetUserProperty("item_category", item_category);
GuruAnalytics.Instance.SetUserProperty("level", level.ToString()); GuruAnalytics.SetUserProperty("level", level.ToString());
} }
private void OnClickEvents() private void OnClickEvents()
{ {
Debug.Log($"---- [DEMO] Report Screen: {ScreenName}"); Debug.Log($"---- [DEMO] Report Screen: {ScreenName}");
GuruAnalytics.Instance.SetScreen(ScreenName); GuruAnalytics.SetScreen(ScreenName);
string eventName = "user_get_coin"; string eventName = "user_get_coin";
Dictionary<string, dynamic> data = new Dictionary<string, dynamic>() Dictionary<string, dynamic> data = new Dictionary<string, dynamic>()
@ -104,19 +99,19 @@ namespace Guru
Debug.Log(s); Debug.Log(s);
Debug.Log($"---- [DEMO] Call LogEvent"); Debug.Log($"---- [DEMO] Call LogEvent");
GuruAnalytics.Instance.LogEvent(eventName, data); GuruAnalytics.LogEvent(eventName, data);
} }
private void OnClickEvents2() private void OnClickEvents2()
{ {
string eventName = "user_data_loaded"; string eventName = "user_data_loaded";
GuruAnalytics.Instance.LogEvent(eventName); GuruAnalytics.LogEvent(eventName);
} }
private void OnClickReport() private void OnClickReport()
{ {
GuruAnalytics.Instance.ReportEventSuccessRate(); GuruAnalytics.ReportEventSuccessRate();
} }

0
Runtime/GuruAnalytics/~Sample/GuruAnalyticsDemo.cs.meta → Runtime/GuruAnalytics/~Sample/CuruAnalyticsDemo.cs.meta
View File

2
Runtime/GuruConsent/Runtime/Script/Consent/GoogleDMAHelper.cs
View File

@ -140,7 +140,7 @@ namespace Guru
DmaResult = result; DmaResult = result;
//----------- Guru Analytics report --------------- //----------- Guru Analytics report ---------------
Analytics.TrackEvent("dma_gg", new Dictionary<string, dynamic>() Analytics.LogEvent("dma_gg", new Dictionary<string, dynamic>()
{ {
{ "purpose", purposeStr }, { "purpose", purposeStr },
{ "result", result } { "result", result }

20
Runtime/GuruConsent/Runtime/Script/Consent/Impl/ConsentAgentStub.cs
View File

@ -1,7 +1,5 @@
using System.Threading.Tasks;
namespace Guru namespace Guru
{ {
using UnityEngine; using UnityEngine;
@ -32,21 +30,6 @@ namespace Guru
Debug.Log($"{Tag} Consent Request -> deviceid: {deviceId} debugGeography: {debugGeography}"); Debug.Log($"{Tag} Consent Request -> deviceid: {deviceId} debugGeography: {debugGeography}");
#if UNITY_EDITOR #if UNITY_EDITOR
SendEditorCallback();
#endif
}
#if UNITY_EDITOR
#endif
/// <summary>
/// 延迟触发 Consent
/// </summary>
private async void SendEditorCallback()
{
await Task.Delay(2000);
string msg = callbackMsgFmt.Replace("$0", $"{DebugStatusCode}").Replace("$1",DebugMessage); string msg = callbackMsgFmt.Replace("$0", $"{DebugStatusCode}").Replace("$1",DebugMessage);
var go = GameObject.Find(_objName); var go = GameObject.Find(_objName);
if (go != null) if (go != null)
@ -57,10 +40,9 @@ namespace Guru
{ {
Debug.LogError($"{Tag} Can't find callback object"); Debug.LogError($"{Tag} Can't find callback object");
} }
#endif
} }
/// <summary> /// <summary>
/// 获取 DMA 字段 /// 获取 DMA 字段
/// </summary> /// </summary>

7
Runtime/GuruCore/Runtime/Ads/ADService.cs
View File

@ -1,5 +1,4 @@
using System;
using UnityEngine; using UnityEngine;
namespace Guru namespace Guru
@ -116,7 +115,7 @@ namespace Guru
private void OnLoadMaxBanner() private void OnLoadMaxBanner()
{ {
_badsloadStartTime = DateTime.UtcNow; _badsloadStartTime = Time.realtimeSinceStartup;
_chanelMax.LoadBannerAD(); _chanelMax.LoadBannerAD();
OnBannerStartLoad?.Invoke(_chanelMax.MaxBADSSlotID); OnBannerStartLoad?.Invoke(_chanelMax.MaxBADSSlotID);
} }
@ -148,7 +147,7 @@ namespace Guru
} }
private void OnLoadMaxIV() { private void OnLoadMaxIV() {
_iadsLoadStartTime = DateTime.UtcNow; // 更新计时器 _iadsLoadStartTime = Time.realtimeSinceStartup; // 更新计时器
_chanelMax.LoadInterstitialAD(); _chanelMax.LoadInterstitialAD();
OnInterstitialStartLoad?.Invoke(_chanelMax.MaxIADSSlotID); OnInterstitialStartLoad?.Invoke(_chanelMax.MaxIADSSlotID);
} }
@ -181,7 +180,7 @@ namespace Guru
private void OnLoadMaxRV() private void OnLoadMaxRV()
{ {
_radsLoadStartTime = DateTime.UtcNow; // 更新计时器 _radsLoadStartTime = Time.realtimeSinceStartup; // 更新计时器
_chanelMax.LoadRewardAD(); _chanelMax.LoadRewardAD();
OnRewardedStartLoad?.Invoke(_chanelMax.MaxRADSSlotID); OnRewardedStartLoad?.Invoke(_chanelMax.MaxRADSSlotID);
} }

280
Runtime/GuruCore/Runtime/Ads/ADServiceBase.cs
View File

@ -1,11 +1,8 @@
using System.Linq;
namespace Guru namespace Guru
{ {
using System; using System;
using UnityEngine; using UnityEngine;
using System.Collections.Generic; using System.Collections.Generic;
using Guru.Ads;
public abstract class ADServiceBase<T> : IADService where T : new() public abstract class ADServiceBase<T> : IADService where T : new()
{ {
@ -21,7 +18,7 @@ namespace Guru
} }
} }
protected static readonly string Tag = "[SDK][ADS]"; protected static readonly string Tag = "[Ads]";
public bool IsInitialized => MaxSdk.IsInitialized() || _isServiceStarted; public bool IsInitialized => MaxSdk.IsInitialized() || _isServiceStarted;
protected bool IsNetworkEnabled => Application.internetReachability != NetworkReachability.NotReachable; protected bool IsNetworkEnabled => Application.internetReachability != NetworkReachability.NotReachable;
@ -44,14 +41,9 @@ namespace Guru
public static Action OnRewardFailed; public static Action OnRewardFailed;
public static Action OnRewardClosed; public static Action OnRewardClosed;
private Dictionary<string, string> _reviewCreativeIds = new Dictionary<string, string>(10); // Creative ID 缓存： Cid : RCid
private Dictionary<string, List<AdImpressionData>> _impressionCache = new Dictionary<string, List<AdImpressionData>>(10);
protected AdsModel _model; protected AdsModel _model;
protected AdsInitSpec _initSpec = null; protected AdsInitSpec _initSpec = null;
private AdImpressionDriver _impressionDriver;
public AdsModel Model public AdsModel Model
{ {
get get
@ -82,9 +74,6 @@ namespace Guru
if(_model == null) _model = AdsModel.Create(); if(_model == null) _model = AdsModel.Create();
this.Log("AD SDK Start Init"); this.Log("AD SDK Start Init");
_impressionDriver = new AdImpressionDriver();
_impressionDriver.Init(ReportAdsRevenue); // 初始化 Impression 驱动器
InitMaxCallbacks(); // 初始化 MAX 广告 InitMaxCallbacks(); // 初始化 MAX 广告
InitService(); // 内部继承接口 InitService(); // 内部继承接口
} }
@ -96,16 +85,14 @@ namespace Guru
{ {
//-------------- 初始化回调 ------------------ //-------------- 初始化回调 ------------------
MaxSdkCallbacks.OnSdkInitializedEvent += OnMaxSdkInitializedCallBack; MaxSdkCallbacks.OnSdkInitializedEvent += OnMaxSdkInitializedCallBack;
MaxSdkCallbacks.Interstitial.OnAdRevenuePaidEvent += OnAdRevenuePaidEvent;
//--------------- MRec 回调 ----------------- MaxSdkCallbacks.Rewarded.OnAdRevenuePaidEvent += OnAdRevenuePaidEvent;
// MaxSdkCallbacks.MRec.OnAdRevenuePaidEvent += OnAdRevenuePaidEvent; MaxSdkCallbacks.Banner.OnAdRevenuePaidEvent += OnBannerRevenuePaidEvent;
MaxSdkCallbacks.MRec.OnAdRevenuePaidEvent += OnAdRevenuePaidEvent;
//--------------- Banner 回调 ----------------- //--------------- Banner 回调 -----------------
MaxSdkCallbacks.Banner.OnAdLoadedEvent += OnBannerLoadedEvent; MaxSdkCallbacks.Banner.OnAdLoadedEvent += OnBannerLoadedEvent;
MaxSdkCallbacks.Banner.OnAdLoadFailedEvent += OnBannerFailedEvent; MaxSdkCallbacks.Banner.OnAdLoadFailedEvent += OnBannerFailedEvent;
MaxSdkCallbacks.Banner.OnAdClickedEvent += OnBannerClickedEvent; MaxSdkCallbacks.Banner.OnAdClickedEvent += OnBannerClickedEvent;
MaxSdkCallbacks.Banner.OnAdRevenuePaidEvent += OnBannerRevenuePaidEvent;
MaxSdkCallbacks.Banner.OnAdReviewCreativeIdGeneratedEvent += OnAdReviewCreativeIdGeneratedEvent;
//--------------- IV 回调 ----------------- //--------------- IV 回调 -----------------
MaxSdkCallbacks.Interstitial.OnAdLoadedEvent += OnInterstitialLoadedEvent; MaxSdkCallbacks.Interstitial.OnAdLoadedEvent += OnInterstitialLoadedEvent;
MaxSdkCallbacks.Interstitial.OnAdLoadFailedEvent += OnInterstitialFailedEvent; MaxSdkCallbacks.Interstitial.OnAdLoadFailedEvent += OnInterstitialFailedEvent;
@ -113,8 +100,6 @@ namespace Guru
MaxSdkCallbacks.Interstitial.OnAdClickedEvent += OnInterstitialClickEvent; MaxSdkCallbacks.Interstitial.OnAdClickedEvent += OnInterstitialClickEvent;
MaxSdkCallbacks.Interstitial.OnAdDisplayedEvent += OnInterstitialDisplayEvent; MaxSdkCallbacks.Interstitial.OnAdDisplayedEvent += OnInterstitialDisplayEvent;
MaxSdkCallbacks.Interstitial.OnAdHiddenEvent += OnInterstitialDismissedEvent; MaxSdkCallbacks.Interstitial.OnAdHiddenEvent += OnInterstitialDismissedEvent;
MaxSdkCallbacks.Interstitial.OnAdRevenuePaidEvent += OnInterstitialPaidEvent;
MaxSdkCallbacks.Interstitial.OnAdReviewCreativeIdGeneratedEvent += OnAdReviewCreativeIdGeneratedEvent;
//--------------- RV 回调 ----------------- //--------------- RV 回调 -----------------
MaxSdkCallbacks.Rewarded.OnAdLoadedEvent += OnRewardedAdLoadedEvent; MaxSdkCallbacks.Rewarded.OnAdLoadedEvent += OnRewardedAdLoadedEvent;
MaxSdkCallbacks.Rewarded.OnAdLoadFailedEvent += OnRewardedAdFailedEvent; MaxSdkCallbacks.Rewarded.OnAdLoadFailedEvent += OnRewardedAdFailedEvent;
@ -123,19 +108,11 @@ namespace Guru
MaxSdkCallbacks.Rewarded.OnAdClickedEvent += OnRewardedAdClickedEvent; MaxSdkCallbacks.Rewarded.OnAdClickedEvent += OnRewardedAdClickedEvent;
MaxSdkCallbacks.Rewarded.OnAdHiddenEvent += OnRewardedAdDismissedEvent; MaxSdkCallbacks.Rewarded.OnAdHiddenEvent += OnRewardedAdDismissedEvent;
MaxSdkCallbacks.Rewarded.OnAdReceivedRewardEvent += OnRewardedAdReceivedRewardEvent; MaxSdkCallbacks.Rewarded.OnAdReceivedRewardEvent += OnRewardedAdReceivedRewardEvent;
MaxSdkCallbacks.Rewarded.OnAdRevenuePaidEvent += OnRewardedAdPaidEvent;
MaxSdkCallbacks.Rewarded.OnAdReviewCreativeIdGeneratedEvent += OnAdReviewCreativeIdGeneratedEvent;
//--------------- Creative 回调 -----------------
//-------------- SDK 初始化 ------------------- //-------------- SDK 初始化 -------------------
MaxSdk.SetExtraParameter("enable_black_screen_fixes", "true"); // 修复黑屏 MaxSdk.SetExtraParameter("enable_black_screen_fixes", "true"); // 修复黑屏
} }
protected virtual void InitService() protected virtual void InitService()
{ {
} }
@ -197,7 +174,7 @@ namespace Guru
#endregion #endregion
#region 收益打点 #region ILRD
private double TchAD001RevValue private double TchAD001RevValue
{ {
@ -211,34 +188,49 @@ namespace Guru
set => _model.TchAD02RevValue = value; set => _model.TchAD02RevValue = value;
} }
/// <summary> public void OnAdRevenuePaidEvent(string adUnitId, MaxSdkBase.AdInfo adInfo)
/// 上报广告收益
/// </summary>
/// <param name="adInfo"></param>
/// <param name="reviewedCreativeId"></param>
private void ReportAdsRevenue(AdImpressionData data)
{ {
// #1 ad_impression if (adInfo == null) return;
Analytics.ADImpression(data);
// #2 tch_001 和 tch_02 try
double revenue = data.value; {
CalcTch001Value(revenue); Log.I( $"[ADRevenue] - adUnitId:{adUnitId}, Revenue:{adInfo?.Revenue : 0}");
CalcTch02Value(revenue);
// #1 ad_impression
OnAdImpression(adInfo);
// #2 tch_001
double revenue = adInfo.Revenue;
CalcTaichi001Value(revenue);
CalcTaichi02Value(revenue);
// #3 adjust_ad_revenue // #3 adjust_ad_revenue
AdjustService.TrackADRevenue(data.value, data.currency, data.ad_source, data.ad_unit_name, data.ad_placement); AdjustService.TrackADRevenue(adInfo);
}
catch (Exception ex)
{
Analytics.LogCrashlytics(ex);
} }
}
/// <summary>
/// 广告ARO收益打点
/// </summary>
/// <param name="adInfo"></param>
/// <param name="platform"></param>
private void OnAdImpression(MaxSdkBase.AdInfo adInfo, string platform = "")
{
Analytics.ADImpression(adInfo, platform);
}
/// <summary> /// <summary>
/// 计算太极001收益 /// 计算太极001收益
/// </summary> /// </summary>
/// <param name="revenue"></param> /// <param name="revenue"></param>
private void CalcTch001Value(double revenue) private void CalcTaichi001Value(double revenue)
{ {
TchAD001RevValue += revenue; TchAD001RevValue += revenue;
double revenueValue = TchAD001RevValue; double revenueValue = TchAD001RevValue;
@ -255,7 +247,7 @@ namespace Guru
/// 计算太极02收益 /// 计算太极02收益
/// </summary> /// </summary>
/// <param name="revenue"></param> /// <param name="revenue"></param>
private void CalcTch02Value(double revenue) private void CalcTaichi02Value(double revenue)
{ {
if (!Analytics.EnableTch02Event) return; if (!Analytics.EnableTch02Event) return;
@ -277,24 +269,21 @@ namespace Guru
private string _backColorStr = "#50A436"; private string _backColorStr = "#50A436";
private Color _backColor = new Color(0, 0, 0, 0); private Color _backColor = new Color(0, 0, 0, 0);
private string _badsCategory; private string _badsCategory;
protected DateTime _badsloadStartTime; protected float _badsloadStartTime = 0;
private bool _bannerVisible = false; private bool _bannerVisible = false;
public bool IsBannerVisible => _bannerVisible; public bool IsBannerVisible => _bannerVisible;
private int _badsloadedNum = 0; private int _badsloadedNum = 0;
private int _badsLoadFailNum = 0; private int _badsLoadFailNum = 0;
/// <summary>
/// 获取动作间隔之间的毫秒数
/// </summary>
/// <param name="startTime"></param>
/// <returns></returns>
private int GetActionDuration(DateTime startTime)
{
var sp = DateTime.UtcNow.Subtract(startTime.ToUniversalTime()).Duration();
return (int) sp.TotalMilliseconds;
}
private int GetAdsLoadDuration(ref float startTime)
{
int duration = (int)((Time.realtimeSinceStartup - startTime) * 1000);
startTime = Time.realtimeSinceStartup;
return duration;
}
public virtual void RequestBannerAD() public virtual void RequestBannerAD()
{ {
_backColor = Color.clear; _backColor = Color.clear;
@ -325,12 +314,12 @@ namespace Guru
public void OnLoadBads() public void OnLoadBads()
{ {
_badsloadStartTime = DateTime.UtcNow; _badsloadStartTime = Time.realtimeSinceStartup;
} }
protected virtual void OnBadsLoaded() protected virtual void OnBadsLoaded()
{ {
_badsloadStartTime = DateTime.UtcNow; _badsloadStartTime = Time.realtimeSinceStartup;
OnBannerLoaded?.Invoke(); OnBannerLoaded?.Invoke();
} }
@ -397,7 +386,6 @@ namespace Guru
// --- fixed by Yufei 2024-5-29 为 don't report bads_loaded any more. --- // --- fixed by Yufei 2024-5-29 为 don't report bads_loaded any more. ---
// Analytics.ADBadsLoaded(AdParams.Build(adUnitId, adInfo, // Analytics.ADBadsLoaded(AdParams.Build(adUnitId, adInfo,
// duration: GetAdsLoadDuration(ref _badsloadStartTime), category: _badsCategory)); // duration: GetAdsLoadDuration(ref _badsloadStartTime), category: _badsCategory));
Debug.Log( $"[SDK][Ads][Loaded] --- adUnitId:{adUnitId} Revenue:{adInfo.Revenue} Type:{adInfo.AdFormat} CreativeId:{adInfo.CreativeIdentifier}");
OnBadsLoaded(); OnBadsLoaded();
} }
@ -406,7 +394,7 @@ namespace Guru
_badsLoadFailNum ++; _badsLoadFailNum ++;
// Analytics.ADBadsFailed(adUnitId, (int)errorInfo.Code, GetAdsLoadDuration(ref _badsloadStartTime), _badsCategory); // Analytics.ADBadsFailed(adUnitId, (int)errorInfo.Code, GetAdsLoadDuration(ref _badsloadStartTime), _badsCategory);
Analytics.ADBadsFailed(AdParams.Build(adUnitId, Analytics.ADBadsFailed(AdParams.Build(adUnitId,
duration: GetActionDuration(_badsloadStartTime), category: _badsCategory, duration: GetAdsLoadDuration(ref _badsloadStartTime), category: _badsCategory,
errorCode: (int)errorInfo.Code, errorCode: (int)errorInfo.Code,
waterfallName: errorInfo?.WaterfallInfo?.Name ?? "")); waterfallName: errorInfo?.WaterfallInfo?.Name ?? ""));
} }
@ -438,8 +426,7 @@ namespace Guru
{ {
if (_bannerVisible) if (_bannerVisible)
{ {
// Banner 只有显示时才上报收益值 OnAdRevenuePaidEvent(adUnitId, adInfo); // Banner 只有显示时才上报收益值
AppendImpressionData(adInfo, eventName:Analytics.EventBadsPaid, itemCategory:_badsCategory);
} }
} }
@ -449,12 +436,9 @@ namespace Guru
private string _iadsCategory = "main"; private string _iadsCategory = "main";
private int _interstitialRetryAttempt; private int _interstitialRetryAttempt;
protected float _iadsLoadStartTime;
private Action _interCloseAction; private Action _interCloseAction;
protected bool _isIadsLoading = false; protected bool _isIadsLoading = false;
protected DateTime _iadsLoadStartTime;
private DateTime _iadsDisplayStartTime;
public bool IsIadsLoading => _isIadsLoading; public bool IsIadsLoading => _isIadsLoading;
public virtual void RequestInterstitialAD() public virtual void RequestInterstitialAD()
@ -478,7 +462,7 @@ namespace Guru
public void OnLoadIads() public void OnLoadIads()
{ {
_iadsLoadStartTime = DateTime.UtcNow; _iadsLoadStartTime = Time.realtimeSinceStartup;
} }
@ -512,7 +496,6 @@ namespace Guru
_interCloseAction = dismissAction; _interCloseAction = dismissAction;
MaxSdk.ShowInterstitial(GetInterstitialID()); MaxSdk.ShowInterstitial(GetInterstitialID());
_iadsDisplayStartTime = DateTime.UtcNow;
// RequestInterstitialAD(); // 直接加载下一个广告 // RequestInterstitialAD(); // 直接加载下一个广告
} }
@ -523,11 +506,9 @@ namespace Guru
// Reset retry attempt // Reset retry attempt
// Analytics.ADIadsLoaded(adUnitId, GetAdsLoadDuration(ref _iadsLoadStartTime), _iadsCategory); // Analytics.ADIadsLoaded(adUnitId, GetAdsLoadDuration(ref _iadsLoadStartTime), _iadsCategory);
Analytics.ADIadsLoaded(AdParams.Build(adUnitId, Analytics.ADIadsLoaded(AdParams.Build(adUnitId,
duration: GetActionDuration(_iadsLoadStartTime), category: _iadsCategory)); duration: GetAdsLoadDuration(ref _iadsLoadStartTime), category: _iadsCategory));
_interstitialRetryAttempt = 0; _interstitialRetryAttempt = 0;
Debug.Log( $"[SDK][Ads][Loaded] --- adUnitId:{adUnitId} Revenue:{adInfo.Revenue} Type:{adInfo.AdFormat} CreativeId:{adInfo.CreativeIdentifier}");
OnInterstitialLoaded?.Invoke(); OnInterstitialLoaded?.Invoke();
} }
@ -542,9 +523,8 @@ namespace Guru
float retryDelay = GetRetryDelaySeconds(_interstitialRetryAttempt); float retryDelay = GetRetryDelaySeconds(_interstitialRetryAttempt);
DelayCall(retryDelay, RequestInterstitialAD); DelayCall(retryDelay, RequestInterstitialAD);
// Analytics.ADIadsFailed(adUnitId, (int)errorInfo.Code, GetAdsLoadDuration(ref _iadsLoadStartTime), _iadsCategory); // Analytics.ADIadsFailed(adUnitId, (int)errorInfo.Code, GetAdsLoadDuration(ref _iadsLoadStartTime), _iadsCategory);
if(string.IsNullOrEmpty(_iadsCategory)) _iadsCategory = "not_set";
Analytics.ADIadsFailed(AdParams.Build(adUnitId, Analytics.ADIadsFailed(AdParams.Build(adUnitId,
duration: GetActionDuration(_iadsLoadStartTime), category: _iadsCategory, duration: GetAdsLoadDuration(ref _iadsLoadStartTime), category: _iadsCategory,
errorCode: (int)errorInfo.Code, errorCode: (int)errorInfo.Code,
waterfallName: errorInfo?.WaterfallInfo?.Name ?? "")); waterfallName: errorInfo?.WaterfallInfo?.Name ?? ""));
@ -559,61 +539,42 @@ namespace Guru
$"InterstitialFailedToDisplayEvent AdLoadFailureInfo:{errorInfo.AdLoadFailureInfo}, Message: {errorInfo.Message}"); $"InterstitialFailedToDisplayEvent AdLoadFailureInfo:{errorInfo.AdLoadFailureInfo}, Message: {errorInfo.Message}");
// Analytics.ADIadsFailed(adUnitId, (int)errorInfo.Code, GetAdsLoadDuration(ref _iadsLoadStartTime), _iadsCategory); // Analytics.ADIadsFailed(adUnitId, (int)errorInfo.Code, GetAdsLoadDuration(ref _iadsLoadStartTime), _iadsCategory);
Analytics.ADIadsFailed(AdParams.Build(adUnitId, Analytics.ADIadsFailed(AdParams.Build(adUnitId,
duration: GetActionDuration(_iadsDisplayStartTime), category: _iadsCategory, duration: GetAdsLoadDuration(ref _iadsLoadStartTime), category: _iadsCategory,
errorCode: (int)errorInfo.Code, errorCode: (int)errorInfo.Code,
waterfallName: errorInfo.WaterfallInfo?.Name ?? "")); waterfallName: errorInfo?.WaterfallInfo?.Name ?? ""));
DelayCall(2.0f, RequestInterstitialAD); DelayCall(2.0f, RequestInterstitialAD);
} }
// iads_imp
protected virtual void OnInterstitialDisplayEvent(string adUnitId, MaxSdkBase.AdInfo adInfo) protected virtual void OnInterstitialDisplayEvent(string adUnitId, MaxSdkBase.AdInfo adInfo)
{ {
// Analytics.ADIadsImp(adUnitId, _iadsCategory); // Analytics.ADIadsImp(adUnitId, _iadsCategory);
AppendImpressionData(adInfo, eventName:Analytics.EventIadsImp, itemCategory:_iadsCategory); Analytics.ADIadsImp(AdParams.Build(adUnitId, category: _iadsCategory));
} }
protected virtual void OnInterstitialClickEvent(string adUnitId, MaxSdkBase.AdInfo adInfo) protected virtual void OnInterstitialClickEvent(string adUnitId, MaxSdkBase.AdInfo adInfo)
{ {
// Analytics.ADIadsClick(adUnitId, _iadsCategory); // Analytics.ADIadsClick(adUnitId, _iadsCategory);
if(string.IsNullOrEmpty(_iadsCategory)) _iadsCategory = "not_set"; Analytics.ADIadsClick(AdParams.Build(adUnitId, category: _iadsCategory));
AppendImpressionData(adInfo,
eventName:Analytics.EventIadsClick,
itemCategory:_iadsCategory);
} }
// Close
protected virtual void OnInterstitialDismissedEvent(string adUnitId, MaxSdkBase.AdInfo adInfo) protected virtual void OnInterstitialDismissedEvent(string adUnitId, MaxSdkBase.AdInfo adInfo)
{ {
// Interstitial ad is hidden. Pre-load the next ad // Interstitial ad is hidden. Pre-load the next ad
_interCloseAction?.Invoke(); _interCloseAction?.Invoke();
OnInterstitialClosed?.Invoke(); OnInterstitialClosed?.Invoke();
// Analytics.ADIadsClose(adUnitId, _iadsCategory); // Analytics.ADIadsClose(adUnitId, _iadsCategory);
Analytics.ADIadsClose(new Dictionary<string, object>() Analytics.ADIadsClose(AdParams.Build(adUnitId, category: _iadsCategory));
{
[Analytics.ParameterItemCategory] = _iadsCategory,
[Analytics.ParameterDuration] = GetActionDuration(_iadsDisplayStartTime),
});
_impressionDriver.CleanCreativeId(adInfo.CreativeIdentifier);
//延时加载下一个广告 //延时加载下一个广告
DelayCall(2.0f, RequestInterstitialAD); DelayCall(2.0f, RequestInterstitialAD);
} }
private void OnInterstitialPaidEvent(string adUnitId, MaxSdkBase.AdInfo adInfo)
{
AppendImpressionData(adInfo, eventName:Analytics.EventIadsPaid, itemCategory: _iadsCategory);
}
#endregion #endregion
#region Rewarded Ads #region Rewarded Ads
private string _rewardCategory = "main"; private string _rewardCategory = "main";
private int _rewardRetryAttempt; private int _rewardRetryAttempt;
protected DateTime _radsLoadStartTime; protected float _radsLoadStartTime;
protected DateTime _radsShowStartTime;
private Action _rvRewardAction; private Action _rvRewardAction;
private Action<string> _rvFailAction; private Action<string> _rvFailAction;
private Action _rvDismissAction; private Action _rvDismissAction;
@ -646,7 +607,7 @@ namespace Guru
public void OnLoadRads() public void OnLoadRads()
{ {
_radsLoadStartTime = DateTime.UtcNow; _radsLoadStartTime = Time.realtimeSinceStartup;
} }
@ -685,8 +646,6 @@ namespace Guru
_rvDismissAction = dismissAction; _rvDismissAction = dismissAction;
MaxSdk.ShowRewardedAd(GetRewardedID()); MaxSdk.ShowRewardedAd(GetRewardedID());
_radsShowStartTime = DateTime.UtcNow;
// RequestRewardedAD(); // RequestRewardedAD();
} }
@ -699,11 +658,9 @@ namespace Guru
// this.Log("OnRewardedAdLoadedEvent"); // this.Log("OnRewardedAdLoadedEvent");
// Analytics.ADRadsLoaded(adUnitId, GetAdsLoadDuration(ref _radsLoadStartTime), _rewardCategory); // Analytics.ADRadsLoaded(adUnitId, GetAdsLoadDuration(ref _radsLoadStartTime), _rewardCategory);
Analytics.ADRadsLoaded(AdParams.Build(adUnitId, Analytics.ADRadsLoaded(AdParams.Build(adUnitId,
duration: GetActionDuration(_radsLoadStartTime), category: _iadsCategory)); duration: GetAdsLoadDuration(ref _radsLoadStartTime), category: _iadsCategory));
_rewardRetryAttempt = 0; _rewardRetryAttempt = 0;
Debug.Log( $"[SDK][Ads][Loaded] --- adUnitId:{adUnitId} Revenue:{adInfo.Revenue} Type:{adInfo.AdFormat} CreativeId:{adInfo.CreativeIdentifier}");
OnRewardLoaded?.Invoke(); OnRewardLoaded?.Invoke();
} }
@ -717,7 +674,7 @@ namespace Guru
$"OnRewardedAdFailedEvent AdLoadFailureInfo:{errorInfo.AdLoadFailureInfo}, Message: {errorInfo.Message}"); $"OnRewardedAdFailedEvent AdLoadFailureInfo:{errorInfo.AdLoadFailureInfo}, Message: {errorInfo.Message}");
// Analytics.ADRadsFailed(adUnitId, (int)errorInfo.Code, GetAdsLoadDuration(ref _radsLoadStartTime), _rewardCategory); // Analytics.ADRadsFailed(adUnitId, (int)errorInfo.Code, GetAdsLoadDuration(ref _radsLoadStartTime), _rewardCategory);
Analytics.ADRadsFailed(AdParams.Build(adUnitId, Analytics.ADRadsFailed(AdParams.Build(adUnitId,
duration: GetActionDuration(_radsLoadStartTime), category: _rewardCategory, duration: GetAdsLoadDuration(ref _radsLoadStartTime), category: _rewardCategory,
errorCode: (int)errorInfo.Code, errorCode: (int)errorInfo.Code,
waterfallName: errorInfo?.WaterfallInfo?.Name ?? "")); waterfallName: errorInfo?.WaterfallInfo?.Name ?? ""));
_rewardRetryAttempt++; _rewardRetryAttempt++;
@ -735,7 +692,7 @@ namespace Guru
$"OnRewardedAdFailedToDisplayEvent AdLoadFailureInfo:{errorInfo.AdLoadFailureInfo}, Message: {errorInfo.Message}"); $"OnRewardedAdFailedToDisplayEvent AdLoadFailureInfo:{errorInfo.AdLoadFailureInfo}, Message: {errorInfo.Message}");
// Analytics.ADRadsFailed(adUnitId, (int)errorInfo.Code, GetAdsLoadDuration(ref _radsLoadStartTime), _rewardCategory); // Analytics.ADRadsFailed(adUnitId, (int)errorInfo.Code, GetAdsLoadDuration(ref _radsLoadStartTime), _rewardCategory);
Analytics.ADRadsFailed(AdParams.Build(adUnitId, Analytics.ADRadsFailed(AdParams.Build(adUnitId,
duration: GetActionDuration(_radsShowStartTime), category: _rewardCategory, duration: GetAdsLoadDuration(ref _radsLoadStartTime), category: _rewardCategory,
errorCode: (int)errorInfo.Code, errorCode: (int)errorInfo.Code,
waterfallName: errorInfo?.WaterfallInfo?.Name ?? "")); waterfallName: errorInfo?.WaterfallInfo?.Name ?? ""));
_rvFailAction?.Invoke("OnRewardedAdFailedToDisplayEvent"); _rvFailAction?.Invoke("OnRewardedAdFailedToDisplayEvent");
@ -748,17 +705,16 @@ namespace Guru
{ {
this.Log("OnRewardedAdDisplayedEvent"); this.Log("OnRewardedAdDisplayedEvent");
// Analytics.ADRadsImp(adUnitId, _rewardCategory); // Analytics.ADRadsImp(adUnitId, _rewardCategory);
AppendImpressionData(adInfo, eventName:Analytics.EventRadsImp, itemCategory: _rewardCategory); Analytics.ADRadsImp(AdParams.Build(adUnitId, category: _rewardCategory));
} }
protected virtual void OnRewardedAdClickedEvent(string adUnitId, MaxSdkBase.AdInfo adInfo) protected virtual void OnRewardedAdClickedEvent(string adUnitId, MaxSdkBase.AdInfo adInfo)
{ {
this.Log("OnRewardedAdClickedEvent"); this.Log("OnRewardedAdClickedEvent");
// Analytics.ADRadsClick(adUnitId, _rewardCategory); // Analytics.ADRadsClick(adUnitId, _rewardCategory);
AppendImpressionData(adInfo, eventName:Analytics.EventRadsClick, itemCategory: _rewardCategory); Analytics.ADRadsClick(AdParams.Build(adUnitId, category: _rewardCategory));
} }
// rads_close
protected virtual void OnRewardedAdDismissedEvent(string adUnitId, MaxSdkBase.AdInfo adInfo) protected virtual void OnRewardedAdDismissedEvent(string adUnitId, MaxSdkBase.AdInfo adInfo)
{ {
this.Log("OnRewardedAdDismissedEvent"); this.Log("OnRewardedAdDismissedEvent");
@ -767,36 +723,24 @@ namespace Guru
OnRewardClosed?.Invoke(); OnRewardClosed?.Invoke();
// Analytics.ADRadsClose(adUnitId, _rewardCategory); // Analytics.ADRadsClose(adUnitId, _rewardCategory);
Analytics.ADRadsClose(new Dictionary<string, object>() Analytics.ADRadsClose(AdParams.Build(adUnitId, category: _rewardCategory));
{
[Analytics.ParameterItemCategory] = _rewardCategory,
[Analytics.ParameterDuration] = GetActionDuration(_radsShowStartTime),
});
_impressionDriver.CleanCreativeId(adInfo.CreativeIdentifier);
//延时加载下一个广告 //延时加载下一个广告
DelayCall(2.0f, RequestRewardedAD); DelayCall(2.0f, RequestRewardedAD);
} }
// rads_rewarded
protected virtual void OnRewardedAdReceivedRewardEvent(string adUnitId, MaxSdk.Reward reward, protected virtual void OnRewardedAdReceivedRewardEvent(string adUnitId, MaxSdk.Reward reward,
MaxSdkBase.AdInfo adInfo) MaxSdkBase.AdInfo arg3)
{ {
this.Log("OnRewardedAdReceivedRewardEvent"); this.Log("OnRewardedAdReceivedRewardEvent");
// Analytics.ADRadsRewarded(adUnitId, _rewardCategory); // Analytics.ADRadsRewarded(adUnitId, _rewardCategory);
AppendImpressionData(adInfo, eventName:Analytics.EventRadsRewarded, itemCategory: _rewardCategory); Analytics.ADRadsRewarded(AdParams.Build(adUnitId, category: _rewardCategory));
// Rewarded ad was displayed and user should receive the reward
_rvRewardAction?.Invoke(); _rvRewardAction?.Invoke();
} }
// rads_paid
private void OnRewardedAdPaidEvent(string adUnitId, MaxSdkBase.AdInfo adInfo)
{
this.Log("OnRewardedAdReceivedRewardEvent");
AppendImpressionData(adInfo, eventName:Analytics.EventRadsPaid, itemCategory: _rewardCategory);
}
#endregion #endregion
#region Ad Settings #region Ad Settings
@ -838,87 +782,5 @@ namespace Guru
} }
#endregion #endregion
#region ImpressionData
const int MAX_BADS_CID_NUMBER = 6;
private List<string> _badsCreativeIds = new List<string>(MAX_BADS_CID_NUMBER);
/// <summary>
/// 构建 Impression 数据
/// </summary>
/// <param name="adInfo"></param>
/// <param name="reviewCreativeId"></param>
/// <param name="platform"></param>
/// <param name="eventName"></param>
/// <param name="itemCategory"></param>
/// <param name="duration"></param>
/// <returns></returns>
private AdImpressionData CreateImpressionData(MaxSdkBase.AdInfo adInfo,
string reviewCreativeId = "", string platform = "",
string eventName = "", string itemCategory = "", int duration = 0)
{
var impression = AdImpressionDriver.Build(adInfo.Revenue, Analytics.USD, platform,
adInfo.NetworkName,
adInfo.AdFormat,
adInfo.AdUnitIdentifier,
adInfo.NetworkPlacement,
adInfo.CreativeIdentifier, reviewCreativeId,
eventName, itemCategory, duration);
return impression;
} }
/// <summary>
/// 添加一条ImpressionData 数据
/// </summary>
/// <param name="adInfo"></param>
/// <param name="reviewCreativeId"></param>
/// <param name="platform"></param>
/// <param name="eventName"></param>
/// <param name="itemCategory"></param>
/// <param name="duration"></param>
/// <returns></returns>
private void AppendImpressionData(MaxSdkBase.AdInfo adInfo, string reviewCreativeId = "", string platform = "", string eventName = "", string itemCategory = "", int duration = 0)
{
var data = CreateImpressionData(adInfo, reviewCreativeId, platform, eventName, itemCategory, duration);
_impressionDriver.Append(data);
}
/// <summary>
/// 获取 AdReviewCreativeId 后的回调
/// </summary>
/// <param name="adUnitId"></param>
/// <param name="reviewCreativeId"></param>
/// <param name="adInfo"></param>
private void OnAdReviewCreativeIdGeneratedEvent(string adUnitId, string reviewCreativeId, MaxSdkBase.AdInfo adInfo)
{
Debug.Log($"{Tag} --- ReviewCreativeId:{reviewCreativeId} adUnitId: {adUnitId} Type:{adInfo?.AdFormat ?? "NULL"} CreativeId: {adInfo?.CreativeIdentifier ?? "NULL"} Revenue:{adInfo.Revenue}");
if (string.IsNullOrEmpty(adInfo.CreativeIdentifier))
{
Debug.LogError($"{Tag} --- Get ReviewCreativeId:{reviewCreativeId} but CreativeIdentifier is null");
return;
}
_impressionDriver.SetReviewCreativeId(adInfo.CreativeIdentifier, reviewCreativeId); // 缓存 ReviewCreateId
if (adUnitId == GetBannerID() || adInfo.AdFormat.ToUpper().Contains("BANNER"))
{
// 清理 BADS CID 缓存
_badsCreativeIds.Add(adInfo.CreativeIdentifier);
if (_badsCreativeIds.Count > MAX_BADS_CID_NUMBER)
{
var cid = _badsCreativeIds[0];
_badsCreativeIds.Remove(cid);
_impressionDriver.CleanCreativeId(cid);
}
}
}
#endregion
}
} }

3
Runtime/GuruCore/Runtime/Ads/Data.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 1866d6a2a7d7447b867e491b9354a49b
timeCreated: 1722313457

185
Runtime/GuruCore/Runtime/Ads/Data/AdImpressionData.cs
View File

@ -1,185 +0,0 @@
namespace Guru.Ads
{
using System;
using System.Collections.Generic;
/// <summary>
/// AdImpression 对象
/// </summary>
public class AdImpressionData
{
private const int MAX_VALUE_LENGTH = 96;
public double value;
public string currency = "USD";
public string ad_platform = "MAX";
public string ad_source;
public string ad_format;
public string ad_unit_name;
public string ad_placement;
public string ad_creative_id;
public string review_creative_id;
public string event_name;
public DateTime createTime;
public string item_category;
public int duration;
public AdImpressionData()
{
createTime = DateTime.UtcNow;
}
public override string ToString()
{
return $"[AdImpressionData] ad_unit_name:{ad_unit_name} value:{value} currency:{currency} ad_platform:{ad_platform} ad_source:{ad_source} ad_format:{ad_format} ad_placement:{ad_placement} ad_creative_id:{ad_creative_id} review_creative_id:{review_creative_id} event_name:{event_name} duration:{duration} item_category:{item_category}";
}
public bool EqualsCreativeId(string cid)
{
if (string.IsNullOrEmpty(cid)) return false;
return ad_creative_id.Equals(cid);
}
public bool EqualsReviewCreativeId(string rcid)
{
if (string.IsNullOrEmpty(rcid)) return false;
return review_creative_id.Equals(rcid);
}
/// <summary>
/// 设置 CreativeId
/// </summary>
/// <param name="creativeId"></param>
public void SetCreativeId(string creativeId)
{
ad_creative_id = FixStringLength(creativeId);
}
/// <summary>
/// 设置 ReviewCreativeId
/// </summary>
/// <param name="reviewCreativeId"></param>
public void SetReviewCreativeId(string reviewCreativeId)
{
if (string.IsNullOrEmpty(reviewCreativeId)) return;
review_creative_id = FixStringLength(reviewCreativeId);
}
/// <summary>
/// 限制字符串长度为 96
/// </summary>
/// <param name="source"></param>
/// <returns></returns>
private string FixStringLength(string source)
{
return source.Length <= MAX_VALUE_LENGTH ? source : source.Substring(0, MAX_VALUE_LENGTH);
}
/// <summary>
/// 获取自创建开始经过的秒数
/// </summary>
/// <returns></returns>
public double GetPassedSecond()
{
return (DateTime.UtcNow - createTime).TotalSeconds;
}
public Dictionary<string, object> BuildEventData()
{
var data = new Dictionary<string, object>()
{
{ "value", value },
{ "currency", currency },
{ "ad_platform", ad_platform },
{ "ad_format", ad_format },
{ "ad_source", ad_source },
{ "ad_unit_name", ad_unit_name },
{ "ad_placement", ad_placement },
{ "ad_creative_id", ad_creative_id },
{ "review_creative_id", review_creative_id },
};
return data;
}
public Dictionary<string, object> BuildEventAdImpData()
{
var data = new Dictionary<string, object>()
{
{ "ad_platform", ad_platform },
{ "ad_source", ad_source },
{ "ad_unit_name", ad_unit_name },
{ "ad_placement", ad_placement },
{ "ad_creative_id", ad_creative_id },
{ "review_creative_id", review_creative_id },
{ "item_category", item_category}
};
return data;
}
public Dictionary<string, object> BuildEventAdClickData()
{
var data = new Dictionary<string, object>()
{
{ "value", value },
{ "currency", currency },
{ "ad_platform", ad_platform },
{ "ad_source", ad_source },
{ "ad_unit_name", ad_unit_name },
{ "ad_placement", ad_placement },
{ "ad_creative_id", ad_creative_id },
{ "review_creative_id", review_creative_id },
{ "item_category", item_category}
};
return data;
}
public Dictionary<string, object> BuildEventAdPaidData()
{
var data = new Dictionary<string, object>()
{
{ "value", value },
{ "currency", currency },
{ "ad_platform", ad_platform },
{ "ad_source", ad_source },
{ "ad_unit_name", ad_unit_name },
{ "ad_placement", ad_placement },
{ "ad_creative_id", ad_creative_id },
{ "review_creative_id", review_creative_id },
{ "item_category", item_category}
};
return data;
}
public Dictionary<string, object> BuildEventAdRewardedData()
{
var data = new Dictionary<string, object>()
{
{ "value", value },
{ "currency", currency },
{ "ad_platform", ad_platform },
{ "ad_source", ad_source },
{ "ad_unit_name", ad_unit_name },
{ "ad_placement", ad_placement },
{ "ad_creative_id", ad_creative_id },
{ "review_creative_id", review_creative_id },
{ "item_category", item_category}
};
return data;
}
}
}

3
Runtime/GuruCore/Runtime/Ads/Data/AdImpressionData.cs.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 1aca2a4507b94dfe9f88040125708edb
timeCreated: 1721883318

251
Runtime/GuruCore/Runtime/Ads/Data/AdImpressionDriver.cs
View File

@ -1,251 +0,0 @@
namespace Guru.Ads
{
// using System.Collections.Concurrent;
using System;
using System.Collections.Generic;
using UnityEngine;
public class AdImpressionDriver
{
private const string Tag = "[SDK][ADS]";
private const double NEED_FLUSH_TIME = 40.0; // 单条 Impression data 存在的最大间隔时间（秒）
private List<AdImpressionData> _impressionData; // 所有缓存待上报的 impression data
private Dictionary<string, string> _savedReviewCreativeIds;
private Action<AdImpressionData> _onReportAdsRevenue;
public static AdImpressionData Build(double value, string currency,
string adPlatform, string adSource, string adFormat,
string adUnitName, string adPlacement, string adCreativeID, string reviewCreativeID,
string eventName = "", string itemCategory = "", int duration = 0)
{
if (string.IsNullOrEmpty(adPlatform)) adPlatform = Analytics.AdMAX;
if (string.IsNullOrEmpty(itemCategory)) itemCategory = "not_set";
if (string.IsNullOrEmpty(eventName)) eventName = Analytics.EventAdImpression;
var data = new AdImpressionData()
{
value = value,
currency = currency,
ad_platform = adPlatform,
ad_source = adSource,
ad_format = adFormat,
ad_unit_name = adUnitName,
ad_placement = adPlacement,
ad_creative_id = adCreativeID,
event_name = eventName,
item_category = itemCategory,
duration = duration,
};
data.SetCreativeId(adCreativeID);
data.SetReviewCreativeId(reviewCreativeID);
return data;
}
public void Init(Action<AdImpressionData> onReportRevenue)
{
_impressionData = new List<AdImpressionData>(20);
_savedReviewCreativeIds = new Dictionary<string, string>(100);
_onReportAdsRevenue = onReportRevenue;
}
public bool IsCreativeIdExists(string creativeId) => _savedReviewCreativeIds.ContainsKey(creativeId);
public void SetReviewCreativeId(string creativeId, string reviewCreativeId)
{
bool isCidExists = IsCreativeIdExists(creativeId);
_savedReviewCreativeIds[creativeId] = reviewCreativeId;
if (isCidExists && !string.IsNullOrEmpty(reviewCreativeId))
{
FlushAllImpressionData(creativeId, reviewCreativeId);
}
}
/// <summary>
/// 强制发送相关的数据
/// </summary>
/// <param name="creativeId"></param>
public void CleanCreativeId(string creativeId)
{
if (string.IsNullOrEmpty(creativeId)) return;
if (IsCreativeIdExists(creativeId))
{
FlushAllImpressionData(creativeId, "", true);
}
RemoveCreativeId(creativeId); //清理对应的 createId
}
private string GetReviewCreativeId(string creativeId)
{
if(string.IsNullOrEmpty(creativeId)) return "";
return _savedReviewCreativeIds.GetValueOrDefault(creativeId, "");
}
public void RemoveCreativeId(string creativeId)
{
if (IsCreativeIdExists(creativeId))
{
_savedReviewCreativeIds.Remove(creativeId);
}
}
/// <summary>
/// 添加一条Impression数据
/// </summary>
/// <param name="data"></param>
public void Append(AdImpressionData data)
{
if (CanFlushData(data))
{
// 立即触发数据
FlushImpressionData(data);
}
else
{
if (!IsCreativeIdExists(data.ad_creative_id))
{
SetReviewCreativeId(data.ad_creative_id, "");
}
// 缓存数据
PushImpressionData(data);
}
}
private void PushImpressionData(AdImpressionData data)
{
_impressionData.Add(data);
}
private bool CanFlushData(AdImpressionData data)
{
// #1 如果超时， 强制上报
if (data.GetPassedSecond() > NEED_FLUSH_TIME) return true;
// #2 如果 cid 和 rcid 都赋值了 则上报
if (!string.IsNullOrEmpty(data.review_creative_id)) return true;
// #3 如果 rcid 为空， 但是可以找到，也上报
var rcid = GetReviewCreativeId(data.ad_creative_id);
if (!string.IsNullOrEmpty(rcid))
{
data.SetReviewCreativeId(rcid);
return true;
}
return false;
}
/// <summary>
/// 触发所有相关的 cid 和 reviewCreateId
/// </summary>
/// <param name="creativeId"></param>
/// <param name="reviewCreativeId"></param>
/// <param name="force">强制触发</param>
private void FlushAllImpressionData(string creativeId, string reviewCreativeId = "", bool force = false)
{
List<AdImpressionData> tmp = new List<AdImpressionData>(_impressionData.Count);
if(string.IsNullOrEmpty(reviewCreativeId)) reviewCreativeId = GetReviewCreativeId(creativeId); //获取 reviewCreativeId
foreach(var data in _impressionData)
{
if (data.EqualsCreativeId(creativeId))
{
data.SetReviewCreativeId(reviewCreativeId);
if (CanFlushData(data) || force)
{
FlushImpressionData(data);
}
else
{
tmp.Add(data);
}
}
else if (CanFlushData(data))
{
FlushImpressionData(data);
}
else
{
tmp.Add(data);
}
}
_impressionData = tmp;
}
/// <summary>
/// 输出一个 Impression 事件
/// </summary>
/// <param name="data"></param>
private void FlushImpressionData(AdImpressionData data)
{
Debug.Log($"{Tag} --- FlushImpressionData: {data}");
switch (data.event_name)
{
case Analytics.EventBadsPaid:
// BADS 收入事件
// BADS 尚未统计 bads_paid 打点
_onReportAdsRevenue?.Invoke(data);
break;
case Analytics.EventIadsImp:
Analytics.ADIadsImp(data.BuildEventAdImpData());
break;
case Analytics.EventIadsClick:
Analytics.ADIadsClick(data.BuildEventAdClickData());
break;
case Analytics.EventIadsPaid:
// IADS 收入事件
Analytics.ADIadsPaid(data.BuildEventAdPaidData());
_onReportAdsRevenue?.Invoke(data);
break;
case Analytics.EventRadsImp:
Analytics.ADRadsImp(data.BuildEventAdImpData());
break;
case Analytics.EventRadsClick:
Analytics.ADRadsClick(data.BuildEventAdClickData());
break;
case Analytics.EventRadsRewarded:
Analytics.ADRadsRewarded(data.BuildEventAdRewardedData());
break;
case Analytics.EventRadsPaid:
// RADS 收入事件
Analytics.ADRadsPaid(data.BuildEventAdPaidData());
_onReportAdsRevenue?.Invoke(data);
break;
}
}
}
}

3
Runtime/GuruCore/Runtime/Ads/Data/AdImpressionDriver.cs.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 7194cdd8ed1447508011264371e2c23d
timeCreated: 1722313472

2
Runtime/GuruCore/Runtime/Analytics/Analytics.AdjustToken.cs
View File

@ -22,7 +22,7 @@ namespace Guru
} }
} }
internal static AdjustEvent CreateAdjustEvent(string eventName) private static AdjustEvent CreateAdjustEvent(string eventName)
{ {
string tokenID = GetAdjustEventToken(eventName); string tokenID = GetAdjustEventToken(eventName);
if (string.IsNullOrEmpty(tokenID)) if (string.IsNullOrEmpty(tokenID))

143
Runtime/GuruCore/Runtime/Analytics/Analytics.Ads.cs
View File

@ -36,37 +36,15 @@ namespace Guru
if (adParams.duration > 0) if (adParams.duration > 0)
data[ParameterDuration] = adParams.duration; data[ParameterDuration] = adParams.duration;
if (adParams.errorCode != 0) if (adParams.errorCode != 0)
data[ParameterErrorCode] = adParams.errorCode; data[ParameterErrorCode] = adParams.errorCode;
if (!string.IsNullOrEmpty(adParams.networkName)) if (!string.IsNullOrEmpty(adParams.networkName))
data[ParameterNetworkName] = adParams.networkName; data[ParameterNetworkName] = adParams.networkName;
if (!string.IsNullOrEmpty(adParams.networkPlacement)) if (!string.IsNullOrEmpty(adParams.networkPlacement))
{
data[ParameterNetworkPlacement] = adParams.networkPlacement; data[ParameterNetworkPlacement] = adParams.networkPlacement;
data[ParameterAdPlacement] = adParams.networkPlacement;
}
if (!string.IsNullOrEmpty(adParams.waterfallName)) if (!string.IsNullOrEmpty(adParams.waterfallName))
data[ParameterWaterfall] = adParams.waterfallName; data[ParameterWaterfall] = adParams.waterfallName;
if (!string.IsNullOrEmpty(adParams.creativeId))
data[ParameterAdCreativeId] = adParams.creativeId;
if (!string.IsNullOrEmpty(adParams.reviewCreativeId))
data[ParameterReviewCreativeId] = adParams.reviewCreativeId;
if (!string.IsNullOrEmpty(adParams.adPlatform))
data[ParameterAdPlatform] = adParams.adPlatform;
if (!string.IsNullOrEmpty(adParams.adSource))
data[ParameterAdSource] = adParams.adSource;
if (!string.IsNullOrEmpty(adParams.adFormat))
data[ParameterAdFormat] = adParams.adFormat;
if (extra != null && extra.Count > 0) if (extra != null && extra.Count > 0)
{ {
foreach (var k in extra.Keys) foreach (var k in extra.Keys)
@ -81,26 +59,26 @@ namespace Guru
//---------------------- BANNER ------------------------- //---------------------- BANNER -------------------------
public static void ADBadsLoad(AdParams adParams) public static void ADBadsLoad(AdParams adParams)
{ {
TrackEvent(EventBadsLoad, BuildAdEventData(adParams)); LogEvent(EventBadsLoad, BuildAdEventData(adParams));
} }
public static void ADBadsLoaded(AdParams adParams) public static void ADBadsLoaded(AdParams adParams)
{ {
TrackEvent(EventBadsLoaded, BuildAdEventData(adParams)); LogEvent(EventBadsLoaded, BuildAdEventData(adParams));
} }
public static void ADBadsFailed(AdParams adParams) public static void ADBadsFailed(AdParams adParams)
{ {
TrackEvent(EventBadsFailed, BuildAdEventData(adParams)); LogEvent(EventBadsFailed, BuildAdEventData(adParams));
} }
/// <summary> /// <summary>
/// 广告点击 /// 广告点击
/// </summary> /// </summary>
public static void ADBadsClick(AdParams adParams) public static void ADBadsClick(AdParams adParams)
{ {
TrackEvent(EventBadsClick, BuildAdEventData(adParams)); LogEvent(EventBadsClick, BuildAdEventData(adParams));
} }
public static void ADBadsImp(AdParams adParams) public static void ADBadsImp(AdParams adParams)
{ {
TrackEvent(EventBadsImp, BuildAdEventData(adParams)); LogEvent(EventBadsImp, BuildAdEventData(adParams));
} }
public static void ADBadsHide( int loadedTimes, int failTimes) public static void ADBadsHide( int loadedTimes, int failTimes)
@ -110,7 +88,7 @@ namespace Guru
["loaded_times"] = loadedTimes, ["loaded_times"] = loadedTimes,
["fail_times"] = failTimes ["fail_times"] = failTimes
}; };
TrackEvent(EventBadsHide, dict); LogEvent(EventBadsHide, dict);
} }
//---------------------- INTERSTITIAL ------------------------- //---------------------- INTERSTITIAL -------------------------
/// <summary> /// <summary>
@ -118,7 +96,7 @@ namespace Guru
/// </summary> /// </summary>
public static void ADIadsLoad(AdParams adParams) public static void ADIadsLoad(AdParams adParams)
{ {
TrackEvent(EventIadsLoad, BuildAdEventData(adParams)); LogEvent(EventIadsLoad, BuildAdEventData(adParams));
} }
/// <summary> /// <summary>
@ -126,7 +104,7 @@ namespace Guru
/// </summary> /// </summary>
public static void ADIadsLoaded(AdParams adParams) public static void ADIadsLoaded(AdParams adParams)
{ {
TrackEvent(EventIadsLoaded, BuildAdEventData(adParams)); LogEvent(EventIadsLoaded, BuildAdEventData(adParams));
} }
/// <summary> /// <summary>
@ -134,7 +112,7 @@ namespace Guru
/// </summary> /// </summary>
public static void ADIadsFailed(AdParams adParams) public static void ADIadsFailed(AdParams adParams)
{ {
TrackEvent(EventIadsFailed, BuildAdEventData(adParams)); LogEvent(EventIadsFailed, BuildAdEventData(adParams));
} }
/// <summary> /// <summary>
@ -142,12 +120,7 @@ namespace Guru
/// </summary> /// </summary>
public static void ADIadsImp(AdParams adParams) public static void ADIadsImp(AdParams adParams)
{ {
ADIadsImp(BuildAdEventData(adParams)); LogEvent(EventIadsImp, BuildAdEventData(adParams));
}
public static void ADIadsImp(Dictionary<string, dynamic> data)
{
TrackEvent(EventIadsImp, data);
} }
/// <summary> /// <summary>
@ -155,12 +128,7 @@ namespace Guru
/// </summary> /// </summary>
public static void ADIadsClick(AdParams adParams) public static void ADIadsClick(AdParams adParams)
{ {
ADIadsClick(BuildAdEventData(adParams)); LogEvent(EventIadsClick, BuildAdEventData(adParams));
}
public static void ADIadsClick(Dictionary<string, object> data)
{
TrackEvent(EventIadsClick, data);
} }
/// <summary> /// <summary>
@ -168,21 +136,7 @@ namespace Guru
/// </summary> /// </summary>
public static void ADIadsClose(AdParams adParams) public static void ADIadsClose(AdParams adParams)
{ {
ADIadsClose(BuildAdEventData(adParams)); LogEvent(EventIadsClose, BuildAdEventData(adParams));
}
public static void ADIadsClose(Dictionary<string, object> data)
{
TrackEvent(EventIadsClose, data);
}
/// <summary>
/// 插屏广告收到奖励
/// </summary>
/// <param name="data"></param>
public static void ADIadsPaid(Dictionary<string, object> data)
{
TrackEvent(EventIadsPaid, data);
} }
//---------------------- REWARDS ------------------------- //---------------------- REWARDS -------------------------
@ -191,48 +145,36 @@ namespace Guru
/// </summary> /// </summary>
public static void ADRadsLoad(AdParams adParams) public static void ADRadsLoad(AdParams adParams)
{ {
TrackEvent(EventRadsLoad, BuildAdEventData(adParams)); LogEvent(EventRadsLoad, BuildAdEventData(adParams));
} }
/// <summary> /// <summary>
/// 广告拉取成功 /// 广告拉取成功
/// </summary> /// </summary>
public static void ADRadsLoaded(AdParams adParams) public static void ADRadsLoaded(AdParams adParams)
{ {
TrackEvent(EventRadsLoaded, BuildAdEventData(adParams)); LogEvent(EventRadsLoaded, BuildAdEventData(adParams));
} }
/// <summary> /// <summary>
/// 广告拉取失败 /// 广告拉取失败
/// </summary> /// </summary>
public static void ADRadsFailed(AdParams adParams) public static void ADRadsFailed(AdParams adParams)
{ {
TrackEvent(EventRadsFailed, BuildAdEventData(adParams)); LogEvent(EventRadsFailed, BuildAdEventData(adParams));
} }
/// <summary> /// <summary>
/// 广告展示 /// 广告展示
/// </summary> /// </summary>
public static void ADRadsImp(AdParams adParams) public static void ADRadsImp(AdParams adParams)
{ {
ADRadsImp(BuildAdEventData(adParams)); LogEvent(EventRadsImp, BuildAdEventData(adParams));
} }
public static void ADRadsImp(Dictionary<string, dynamic> data)
{
TrackEvent(EventRadsImp, data);
}
/// <summary> /// <summary>
/// 广告完成观看发奖励 /// 广告完成观看发奖励
/// </summary> /// </summary>
public static void ADRadsRewarded(AdParams adParams) public static void ADRadsRewarded(AdParams adParams)
{ {
ADRadsRewarded(BuildAdEventData(adParams)); var data = BuildAdEventData(adParams);
} LogEvent(EventRadsRewarded, data);
public static void ADRadsRewarded(Dictionary<string, object> data)
{
TrackEvent(EventRadsRewarded, data);
if (RadsRewardCount == 0) if (RadsRewardCount == 0)
{ {
@ -241,15 +183,6 @@ namespace Guru
} }
} }
/// <summary>
/// 插屏广告收到奖励
/// </summary>
/// <param name="data"></param>
public static void ADRadsPaid(Dictionary<string, object> data)
{
TrackEvent(EventRadsPaid, data);
}
private static int RadsRewardCount private static int RadsRewardCount
{ {
@ -262,7 +195,7 @@ namespace Guru
/// </summary> /// </summary>
public static void ADRadsFirstRewarded(Dictionary<string, object> data) public static void ADRadsFirstRewarded(Dictionary<string, object> data)
{ {
TrackEvent(EventFirstRadsRewarded, data); LogEvent(EventFirstRadsRewarded, data);
} }
/// <summary> /// <summary>
@ -270,12 +203,7 @@ namespace Guru
/// </summary> /// </summary>
public static void ADRadsClick(AdParams adParams) public static void ADRadsClick(AdParams adParams)
{ {
ADRadsClick(BuildAdEventData(adParams)); LogEvent(EventRadsClick, BuildAdEventData(adParams));
}
public static void ADRadsClick(Dictionary<string, object> data)
{
TrackEvent(EventRadsClick, data);
} }
/// <summary> /// <summary>
@ -283,12 +211,7 @@ namespace Guru
/// </summary> /// </summary>
public static void ADRadsClose(AdParams adParams) public static void ADRadsClose(AdParams adParams)
{ {
ADRadsClose( BuildAdEventData(adParams)); LogEvent(EventRadsClose, BuildAdEventData(adParams));
}
public static void ADRadsClose(Dictionary<string, dynamic> data)
{
TrackEvent(EventRadsClose, data);
} }
#endregion #endregion
@ -312,6 +235,7 @@ namespace Guru
{ "type", type } { "type", type }
}; };
if(!string.IsNullOrEmpty(scene)) dict[ParameterItemName] = scene; if(!string.IsNullOrEmpty(scene)) dict[ParameterItemName] = scene;
LogEvent(EventATTResult, dict);
} }
/// <summary> /// <summary>
@ -337,15 +261,10 @@ namespace Guru
public string category; public string category;
public string networkName; public string networkName;
public string networkPlacement; public string networkPlacement;
public string adPlatform;
public string adSource;
public string adFormat;
public string waterfallName; public string waterfallName;
public string adUnitId; public string adUnitId;
public int errorCode = 0; public int errorCode = 0;
public int duration = 0; public int duration = 0;
public string creativeId;
public string reviewCreativeId;
/// <summary> /// <summary>
@ -357,47 +276,31 @@ namespace Guru
/// <param name="duration"></param> /// <param name="duration"></param>
/// <param name="errorCode"></param> /// <param name="errorCode"></param>
/// <param name="waterfallName"></param> /// <param name="waterfallName"></param>
/// <param name="reviewCreativeId"></param>
/// <param name="adPlatform"></param>
/// <returns></returns> /// <returns></returns>
public static AdParams Build(string adUnitId, MaxSdkBase.AdInfo adInfo = null, string category = "", public static AdParams Build(string adUnitId, MaxSdkBase.AdInfo adInfo = null, string category = "",
int duration = 0, int errorCode = 0, string waterfallName = "", string reviewCreativeId = "", string adPlatform = "") int duration = 0, int errorCode = 0, string waterfallName = "")
{ {
if (string.IsNullOrEmpty(adUnitId) && adInfo != null) adUnitId = adInfo.AdUnitIdentifier; if (string.IsNullOrEmpty(adUnitId) && adInfo != null) adUnitId = adInfo.AdUnitIdentifier;
var networkName = ""; var networkName = "";
var networkPlacement = ""; var networkPlacement = "";
var creativeId = "";
var adSource = "";
var adFormart = "";
if (string.IsNullOrEmpty(adPlatform)) adPlatform = Analytics.AdMAX;
if (adInfo != null) if (adInfo != null)
{ {
networkName = adInfo.NetworkName; networkName = adInfo.NetworkName;
networkPlacement = adInfo.NetworkPlacement; networkPlacement = adInfo.NetworkPlacement;
creativeId = adInfo.CreativeIdentifier;
adSource = adInfo.NetworkName;
adFormart = adInfo.AdFormat;
if (string.IsNullOrEmpty(waterfallName)) if (string.IsNullOrEmpty(waterfallName))
waterfallName = adInfo.WaterfallInfo?.Name ?? ""; waterfallName = adInfo.WaterfallInfo?.Name ?? "";
} }
var p = new AdParams() var p = new AdParams()
{ {
adUnitId = adUnitId, adUnitId = adUnitId,
adPlatform = adPlatform,
adSource = adSource,
adFormat = adFormart,
duration = duration, duration = duration,
networkName = networkName, networkName = networkName,
networkPlacement = networkPlacement, networkPlacement = networkPlacement,
waterfallName = waterfallName, waterfallName = waterfallName,
category = category, category = category,
errorCode = errorCode, errorCode = errorCode,
creativeId = creativeId,
reviewCreativeId = reviewCreativeId,
}; };
return p; return p;
} }

165
Runtime/GuruCore/Runtime/Analytics/Analytics.Const.cs
View File

@ -11,119 +11,112 @@ namespace Guru
//打点常量定义 //打点常量定义
public static partial class Analytics public static partial class Analytics
{ {
public const string TAG = "Analytics"; public static readonly string TAG = "Analytics";
// 美元符号 // 美元符号
public const string USD = "USD"; public static readonly string USD = "USD";
// 广告平台 // 广告平台
public const string AdMAX = "MAX"; public static readonly string AdMAX = "MAX";
public const string AdIronSource = "IronSource";
//IAP打点事件 //IAP打点事件
public const string EventIAPFirst = "first_iap"; public static readonly string EventIAPFirst = "first_iap";
public const string EventIAPImp = "iap_imp"; public static readonly string EventIAPImp = "iap_imp";
public const string EventIAPClose = "iap_close"; public static readonly string EventIAPClose = "iap_close";
public const string EventIAPClick = "iap_clk"; public static readonly string EventIAPClick = "iap_clk";
public const string EventIAPReturnTrue = "iap_ret_true"; public static readonly string EventIAPReturnTrue = "iap_ret_true";
public const string EventIAPReturnFalse = "iap_ret_false"; public static readonly string EventIAPReturnFalse = "iap_ret_false";
// 关卡打点 // 关卡打点
public const string EventLevelFirstEnd = "level_first_end"; public static readonly string EventLevelFirstEnd = "level_first_end";
//横幅广告打点事件 //横幅广告打点事件
public const string EventBadsLoad = "bads_load"; public static readonly string EventBadsLoad = "bads_load";
public const string EventBadsLoaded = "bads_loaded"; public static readonly string EventBadsLoaded = "bads_loaded";
public const string EventBadsFailed = "bads_failed"; public static readonly string EventBadsFailed = "bads_failed";
public const string EventBadsClick = "bads_clk"; public static readonly string EventBadsClick = "bads_clk";
public const string EventBadsImp = "bads_imp"; public static readonly string EventBadsImp = "bads_imp";
public const string EventBadsHide = "bads_hide"; public static readonly string EventBadsHide = "bads_hide";
public const string EventBadsPaid = "bads_paid";
//插屏广告打点事件 //插屏广告打点事件
public const string EventIadsLoad = "iads_load"; public static readonly string EventIadsLoad = "iads_load";
public const string EventIadsLoaded = "iads_loaded"; public static readonly string EventIadsLoaded = "iads_loaded";
public const string EventIadsFailed = "iads_failed"; public static readonly string EventIadsFailed = "iads_failed";
public const string EventIadsImp = "iads_imp"; public static readonly string EventIadsImp = "iads_imp";
public const string EventIadsClick = "iads_clk"; public static readonly string EventIadsClick = "iads_clk";
public const string EventIadsClose = "iads_close"; public static readonly string EventIadsClose = "iads_close";
public const string EventIadsPaid = "iads_paid";
//激励视频广告打点事件 //激励视频广告打点事件
public const string EventRadsLoad = "rads_load"; public static readonly string EventRadsLoad = "rads_load";
public const string EventRadsLoaded = "rads_loaded"; public static readonly string EventRadsLoaded = "rads_loaded";
public const string EventRadsFailed = "rads_failed"; public static readonly string EventRadsFailed = "rads_failed";
public const string EventRadsImp = "rads_imp"; public static readonly string EventRadsImp = "rads_imp";
public const string EventRadsRewarded = "rads_rewarded"; public static readonly string EventRadsRewarded = "rads_rewarded";
public const string EventRadsClick = "rads_clk"; public static readonly string EventRadsClick = "rads_clk";
public const string EventRadsClose = "rads_close"; public static readonly string EventRadsClose = "rads_close";
public const string EventRadsPaid = "rads_paid"; public static readonly string EventFirstRadsRewarded = "first_rads_rewarded";
public const string EventFirstRadsRewarded = "first_rads_rewarded";
//广告收益打点事件 //广告收益打点事件
public const string EventTchAdRev001Impression = "tch_ad_rev_roas_001"; public static readonly string EventTchAdRev001Impression = "tch_ad_rev_roas_001";
public const string EventTchAdRev02Impression = "tch_ad_rev_roas_02"; public static readonly string EventTchAdRev02Impression = "tch_ad_rev_roas_02";
public const string EventTchAdRevAbnormal = "tch_ad_rev_value_abnormal"; public static readonly string EventTchAdRevAbnormal = "tch_ad_rev_value_abnormal";
//内购成功事件上报 //内购成功事件上报
public const string EventIAPPurchase = "iap_purchase"; public static readonly string EventIAPPurchase = "iap_purchase";
public const string EventSubPurchase = "sub_purchase"; public static readonly string EventSubPurchase = "sub_purchase";
public const string IAPStoreCategory = "Store"; public static readonly string IAPStoreCategory = "Store";
public const string IAPTypeProduct = "product"; public static readonly string IAPTypeProduct = "product";
public const string IAPTypeSubscription = "subscription"; public static readonly string IAPTypeSubscription = "subscription";
//打点参数名 //打点参数名
public const string ParameterResult = "result"; public static readonly string ParameterResult = "result";
public const string ParameterStep = "step"; public static readonly string ParameterStep = "step";
public const string ParameterDuration = "duration"; public static readonly string ParameterDuration = "duration";
public const string ParameterErrorCode = "error_code"; public static readonly string ParameterErrorCode = "error_code";
public const string ParameterProductId = "product_id"; public static readonly string ParameterProductId = "product_id";
public const string ParameterPlatform = "platform"; public static readonly string ParameterPlatform = "platform";
public const string ParameterStartType = "start_type"; // 游戏启动类型 public static readonly string ParameterStartType = "start_type"; // 游戏启动类型
public const string ParameterReplay = "replay"; // 游戏重玩 public static readonly string ParameterReplay = "replay"; // 游戏重玩
public const string ParameterContinue = "continue"; // 游戏继续 public static readonly string ParameterContinue = "continue"; // 游戏继续
public const string ParameterAdUnitName = "ad_unit_name"; public static readonly string ParameterAdUnitName = "ad_unit_name";
public const string ParameterAdPlacement = "ad_placement"; public static readonly string ParameterAdCreativeId = "ad_creative_id";
public const string ParameterAdCreativeId = "ad_creative_id";
public const string ParameterReviewCreativeId = "review_creative_id";
// 评价参数 // 评价参数
public const string EventRateImp = "rate_imp"; // 评价弹窗展示 public static readonly string EventRateImp = "rate_imp"; // 评价弹窗展示
public const string EventRateNow = "rate_now"; // 点击评分引导弹窗中的评分 public static readonly string EventRateNow = "rate_now"; // 点击评分引导弹窗中的评分
//打点内部执行错误 //打点内部执行错误
public static string ParameterEventError => "event_error"; public static string ParameterEventError => "event_error";
//ios ATT打点 //ios ATT打点
public const string ATTGuideShow = "att_guide_show"; public static readonly string ATTGuideShow = "att_guide_show";
public const string ATTGuideOK = "att_guide_ok"; public static readonly string ATTGuideOK = "att_guide_ok";
public const string ATTWindowShow = "att_window_show"; public static readonly string ATTWindowShow = "att_window_show";
public const string ATTOptIn = "att_opt_in"; public static readonly string ATTOptIn = "att_opt_in";
public const string ATTOpOut = "att_opt_out"; public static readonly string ATTOpOut = "att_opt_out";
public const string ParameterATTStatus = "att_status"; public static readonly string ParameterATTStatus = "att_status";
public const string EventATTResult = "att_result"; public static readonly string EventATTResult = "att_result";
// 用户属性 // 用户属性
public const string PropertyFirstOpenTime = "first_open_time"; //用户第一次first_open的时间 public static readonly string PropertyFirstOpenTime = "first_open_time"; //用户第一次first_open的时间
public const string PropertyDeviceID = "device_id"; //用户的设备ID public static readonly string PropertyDeviceID = "device_id"; //用户的设备ID
public const string PropertyUserID = "user_id"; public static readonly string PropertyUserID = "user_id";
public const string PropertyLevel = "b_level"; //"每次完成通关上升一次，显示用户完成的最大关卡数。只针对主关卡和主玩法的局数做累加，初始值为0。" public static readonly string PropertyLevel = "b_level"; //"每次完成通关上升一次，显示用户完成的最大关卡数。只针对主关卡和主玩法的局数做累加，初始值为0。"
public const string PropertyPlay = "b_play"; //每完成一局或者游戏触发， public static readonly string PropertyPlay = "b_play"; //每完成一局或者游戏触发，
public const string PropertyLastPlayedLevel = "last_played_level"; public static readonly string PropertyLastPlayedLevel = "last_played_level";
public const string PropertyGrade = "grade"; //当游戏玩家角色升级时触发 public static readonly string PropertyGrade = "grade"; //当游戏玩家角色升级时触发
public const string PropertyIsIAPUser = "is_iap_user"; //付费成功后设置属性参数为true，如果没有发生付费可以不用设置该属性 public static readonly string PropertyIsIAPUser = "is_iap_user"; //付费成功后设置属性参数为true，如果没有发生付费可以不用设置该属性
public const string PropertyIAPCoin = "iap_coin"; //付费所得的总金币数(iap获取累计值)\ public static readonly string PropertyIAPCoin = "iap_coin"; //付费所得的总金币数(iap获取累计值)\
public const string PropertyNonIAPCoin = "noniap_coin"; //非付费iap获取累计值 public static readonly string PropertyNonIAPCoin = "noniap_coin"; //非付费iap获取累计值
public const string PropertyCoin = "coin"; //当前金币数 public static readonly string PropertyCoin = "coin"; //当前金币数
public const string PropertyExp = "exp"; // 经验值 public static readonly string PropertyExp = "exp"; // 经验值
public const string PropertyHp = "hp"; // 生命值/体力 public static readonly string PropertyHp = "hp"; // 生命值/体力
public const string PropertyAndroidID = "android_id"; // Android 平台 AndroidID public static readonly string PropertyAndroidID = "android_id"; // Android 平台 AndroidID
public const string PropertyIDFV = "idfv"; // iOS 平台 IDFV public static readonly string PropertyIDFV = "idfv"; // iOS 平台 IDFV
public const string PropertyIDFA = "idfa"; // iOS 平台 IDFA public static readonly string PropertyIDFA = "idfa"; // iOS 平台 IDFA
public const string PropertyPicture = "picture"; // 玩家在主线的mapid public static readonly string PropertyPicture = "picture"; // 玩家在主线的mapid
public const string PropertyNoAds = "no_ads"; // 玩家是否去广告 public static readonly string PropertyNoAds = "no_ads"; // 玩家是否去广告
public const string PropertyATTStatus = "att_status"; // ATT 状态 public static readonly string PropertyATTStatus = "att_status"; // ATT 状态
public const string PropertyGDPR = "gdpr"; // GDPR状态 public static readonly string PropertyGDPR = "gdpr"; // GDPR状态
// 经济相关 // 经济相关
public const string ParameterBalance = "balance"; // 用于余额 public const string ParameterBalance = "balance"; // 用于余额
@ -131,6 +124,6 @@ namespace Guru
public const string ParameterVirtualCurrencyName = "virtual_currency_name"; // 虚拟货币名称 public const string ParameterVirtualCurrencyName = "virtual_currency_name"; // 虚拟货币名称
// 中台 // 中台
public const string EventDevAudit = "dev_audit"; // 中台事件异常 public static readonly string EventDevAudit = "dev_audit"; // 中台事件异常
} }
} }

40
Runtime/GuruCore/Runtime/Analytics/Analytics.Custom.cs
View File

@ -26,7 +26,9 @@ namespace Guru
public static bool IsDebug { get; set; } = false; public static bool IsDebug { get; set; } = false;
private static bool _isGuruAnalyticInitOnce = false; private static bool _hasInited = false;
public static bool IsReady => _hasInited;
/// <summary> /// <summary>
/// 初始化Guru自打点系统 (请优先于 Firebase 初始化调用) /// 初始化Guru自打点系统 (请优先于 Firebase 初始化调用)
@ -34,7 +36,7 @@ namespace Guru
public static void InstallGuruAnalytics(bool isDebug = false, bool enableErrorLog = false) public static void InstallGuruAnalytics(bool isDebug = false, bool enableErrorLog = false)
{ {
if (_isGuruAnalyticInitOnce) return; if (_hasInited) return;
try try
{ {
@ -45,7 +47,7 @@ namespace Guru
#endif #endif
string appId = IPMConfig.IPM_X_APP_ID; string appId = IPMConfig.IPM_X_APP_ID;
string deviceInfo = new DeviceInfoData().ToString(); string deviceInfo = new DeviceInfoData().ToString();
GuruAnalytics.Init(appId, deviceInfo, OnGuruAnalyticsInitComplete, IsDebug, enableErrorLog); // 初始化(带Header) GuruAnalytics.Init(appId, deviceInfo, IsDebug, enableErrorLog); // 初始化(带Header)
_hasGotFirebaseId = false; _hasGotFirebaseId = false;
_hasGotAdId = false; _hasGotAdId = false;
@ -57,7 +59,7 @@ namespace Guru
UpdateAllValues(); UpdateAllValues();
_isGuruAnalyticInitOnce = true; _hasInited = true;
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -77,7 +79,7 @@ namespace Guru
if (!string.IsNullOrEmpty(IPMConfig.IPM_UID)) if (!string.IsNullOrEmpty(IPMConfig.IPM_UID))
{ {
Debug.Log($"---[ANA] UID: {IPMConfig.IPM_UID}"); Debug.Log($"---[ANA] UID: {IPMConfig.IPM_UID}");
GuruAnalytics.Instance.SetUid(IPMConfig.IPM_UID); GuruAnalytics.SetUid(IPMConfig.IPM_UID);
FirebaseAnalytics.SetUserProperty(PropertyUserID, IPMConfig.IPM_UID); FirebaseAnalytics.SetUserProperty(PropertyUserID, IPMConfig.IPM_UID);
_hasGotUid = true; _hasGotUid = true;
} }
@ -93,7 +95,7 @@ namespace Guru
if (!string.IsNullOrEmpty(IPMConfig.IPM_DEVICE_ID)) if (!string.IsNullOrEmpty(IPMConfig.IPM_DEVICE_ID))
{ {
GuruAnalytics.Instance.SetDeviceId(IPMConfig.IPM_DEVICE_ID); GuruAnalytics.SetDeviceId(IPMConfig.IPM_DEVICE_ID);
FirebaseAnalytics.SetUserProperty(PropertyDeviceID, IPMConfig.IPM_DEVICE_ID); FirebaseAnalytics.SetUserProperty(PropertyDeviceID, IPMConfig.IPM_DEVICE_ID);
_hasGotDeviceId = true; _hasGotDeviceId = true;
} }
@ -119,7 +121,7 @@ namespace Guru
if (!string.IsNullOrEmpty(IPMConfig.ADJUST_ID)) if (!string.IsNullOrEmpty(IPMConfig.ADJUST_ID))
{ {
GuruAnalytics.Instance.SetAdjustId(IPMConfig.ADJUST_ID); GuruAnalytics.SetAdjustId(IPMConfig.ADJUST_ID);
_hasGotAdjustId = true; _hasGotAdjustId = true;
} }
else else
@ -150,7 +152,7 @@ namespace Guru
if (!string.IsNullOrEmpty(IPMConfig.ADJUST_ADID)) if (!string.IsNullOrEmpty(IPMConfig.ADJUST_ADID))
{ {
GuruAnalytics.Instance.SetAdId(IPMConfig.ADJUST_ADID); GuruAnalytics.SetAdId(IPMConfig.ADJUST_ADID);
_hasGotAdId = true; _hasGotAdId = true;
} }
@ -169,7 +171,7 @@ namespace Guru
if (!string.IsNullOrEmpty(IPMConfig.FIREBASE_ID)) if (!string.IsNullOrEmpty(IPMConfig.FIREBASE_ID))
{ {
GuruAnalytics.Instance.SetFirebaseId(IPMConfig.FIREBASE_ID); GuruAnalytics.SetFirebaseId(IPMConfig.FIREBASE_ID);
_hasGotFirebaseId = true; _hasGotFirebaseId = true;
} }
else else
@ -183,8 +185,6 @@ namespace Guru
/// </summary> /// </summary>
private static void FetchFirebaseId() private static void FetchFirebaseId()
{ {
if (!IsFirebaseReady) return;
FirebaseAnalytics.GetAnalyticsInstanceIdAsync() FirebaseAnalytics.GetAnalyticsInstanceIdAsync()
.ContinueWithOnMainThread(task => .ContinueWithOnMainThread(task =>
{ {
@ -207,12 +207,12 @@ namespace Guru
private static void SetATTStatus() private static void SetATTStatus()
{ {
string status = ATTManager.GetStatus(); string status = ATTManager.GetStatus();
GuruAnalytics.Instance.SetUserProperty(ParameterATTStatus, status); GuruAnalytics.SetUserProperty(ParameterATTStatus, status);
} }
private static void SetIDFV() private static void SetIDFV()
{ {
GuruAnalytics.Instance.SetIDFV(DeviceIDHelper.IDFV); GuruAnalytics.SetIDFV(DeviceIDHelper.IDFV);
} }
private static void SetIDFA() private static void SetIDFA()
@ -228,7 +228,7 @@ namespace Guru
if (!string.IsNullOrEmpty(IPMConfig.ADJUST_IDFA)) if (!string.IsNullOrEmpty(IPMConfig.ADJUST_IDFA))
{ {
GuruAnalytics.Instance.SetIDFA(IPMConfig.ADJUST_IDFA); GuruAnalytics.SetIDFA(IPMConfig.ADJUST_IDFA);
_hasGotIDFA = true; _hasGotIDFA = true;
} }
} }
@ -241,7 +241,7 @@ namespace Guru
/// </summary> /// </summary>
private static void SetAndroidId() private static void SetAndroidId()
{ {
GuruAnalytics.Instance.SetAndroidID(DeviceIDHelper.AndroidID); GuruAnalytics.SetAndroidID(DeviceIDHelper.AndroidID);
} }
#endif #endif
@ -276,7 +276,7 @@ namespace Guru
var interval = (DateTime.Now - _lastReportRateDate).TotalSeconds; var interval = (DateTime.Now - _lastReportRateDate).TotalSeconds;
if (interval > _reportSuccessInterval) if (interval > _reportSuccessInterval)
{ {
GuruAnalytics.Instance.ReportEventSuccessRate(); GuruAnalytics.ReportEventSuccessRate();
_lastReportRateDate = DateTime.Now; _lastReportRateDate = DateTime.Now;
} }
} }
@ -294,7 +294,7 @@ namespace Guru
{ {
try try
{ {
GuruAnalytics.Instance.SetUserProperty(key, value); GuruAnalytics.SetUserProperty(key, value);
UpdateAllValues(); // 同步所有的ID UpdateAllValues(); // 同步所有的ID
} }
catch (Exception e) catch (Exception e)
@ -309,12 +309,12 @@ namespace Guru
/// </summary> /// </summary>
/// <param name="key"></param> /// <param name="key"></param>
/// <param name="data"></param> /// <param name="data"></param>
private static void TrackEventGuru(string key, Dictionary<string, dynamic> data = null, int priority = -1) private static void CustomLogEvent(string key, Dictionary<string, dynamic> data = null, int priority = -1)
{ {
try try
{ {
if (data == null) data = new Dictionary<string, dynamic>(); if (data == null) data = new Dictionary<string, dynamic>();
GuruAnalytics.Instance.LogEvent(key, data, priority); GuruAnalytics.LogEvent(key, data, priority);
UpdateAllValues(); // 同步所有的ID UpdateAllValues(); // 同步所有的ID
} }
catch (Exception e) catch (Exception e)
@ -337,7 +337,7 @@ namespace Guru
if (Math.Abs(_tch02TargetValue - value) > 0.001d) if (Math.Abs(_tch02TargetValue - value) > 0.001d)
{ {
_tch02TargetValue = value; _tch02TargetValue = value;
GuruAnalytics.Instance.SetTch02Value(value); GuruAnalytics.SetTch02Value(value);
} }
} }
} }

4
Runtime/GuruCore/Runtime/Analytics/Analytics.Economic.cs
View File

@ -103,7 +103,7 @@ namespace Guru
if(!string.IsNullOrEmpty(scene)) data[ParameterScene] = scene; // 获取的虚拟货币或者道具的场景 if(!string.IsNullOrEmpty(scene)) data[ParameterScene] = scene; // 获取的虚拟货币或者道具的场景
if (extra != null) data.AddRange(extra, isOverride: true); if (extra != null) data.AddRange(extra, isOverride: true);
TrackEvent(EventEarnVirtualCurrency, data, new EventSetting() { EnableFirebaseAnalytics = true }); LogEvent(EventEarnVirtualCurrency, data, new EventSetting() { EnableFirebaseAnalytics = true });
// FB 上报收入点 // FB 上报收入点
FBService.LogEvent(EventEarnVirtualCurrency, value, data); FBService.LogEvent(EventEarnVirtualCurrency, value, data);
@ -131,7 +131,7 @@ namespace Guru
if(!string.IsNullOrEmpty(scene)) data[ParameterScene] = scene; // 获取的虚拟货币或者道具的场景 if(!string.IsNullOrEmpty(scene)) data[ParameterScene] = scene; // 获取的虚拟货币或者道具的场景
TrackEvent(EventSpendVirtualCurrency, data, new EventSetting() { EnableFirebaseAnalytics = true }); LogEvent(EventSpendVirtualCurrency, data, new EventSetting() { EnableFirebaseAnalytics = true });
// FB 上报消费点 // FB 上报消费点
FBService.LogEvent(EventSpendVirtualCurrency, value, data); FBService.LogEvent(EventSpendVirtualCurrency, value, data);

196
Runtime/GuruCore/Runtime/Analytics/Analytics.FirebaseDefine.cs
View File

@ -5,104 +5,104 @@ namespace Guru
//Firebase内置定义事件名称和参数名称 //Firebase内置定义事件名称和参数名称
public static partial class Analytics public static partial class Analytics
{ {
internal const string EventAdImpression = "ad_impression"; internal static readonly string EventAdImpression = "ad_impression";
internal const string EventAddPaymentInfo = "add_payment_info"; internal static readonly string EventAddPaymentInfo = "add_payment_info";
internal const string EventAddShippingInfo = "add_shipping_info"; internal static readonly string EventAddShippingInfo = "add_shipping_info";
internal const string EventAddToCart = "add_to_cart"; internal static readonly string EventAddToCart = "add_to_cart";
internal const string EventAddToWishlist = "add_to_wishlist"; internal static readonly string EventAddToWishlist = "add_to_wishlist";
internal const string EventAppOpen = "app_open"; internal static readonly string EventAppOpen = "app_open";
internal const string EventBeginCheckout = "begin_checkout"; internal static readonly string EventBeginCheckout = "begin_checkout";
internal const string EventCampaignDetails = "campaign_details"; internal static readonly string EventCampaignDetails = "campaign_details";
internal const string EventEarnVirtualCurrency = "earn_virtual_currency"; internal static readonly string EventEarnVirtualCurrency = "earn_virtual_currency";
internal const string EventGenerateLead = "generate_lead"; internal static readonly string EventGenerateLead = "generate_lead";
internal const string EventJoinGroup = "join_group"; internal static readonly string EventJoinGroup = "join_group";
internal const string EventLevelEnd = "level_end"; internal static readonly string EventLevelEnd = "level_end";
internal const string EventLevelStart = "level_start"; internal static readonly string EventLevelStart = "level_start";
internal const string EventLevelUp = "level_up"; internal static readonly string EventLevelUp = "level_up";
internal const string EventLogin = "login"; internal static readonly string EventLogin = "login";
internal const string EventPostScore = "post_score"; internal static readonly string EventPostScore = "post_score";
internal const string EventPurchase = "purchase"; internal static readonly string EventPurchase = "purchase";
internal const string EventRefund = "refund"; internal static readonly string EventRefund = "refund";
internal const string EventRemoveFromCart = "remove_from_cart"; internal static readonly string EventRemoveFromCart = "remove_from_cart";
internal const string EventScreenView = "screen_view"; internal static readonly string EventScreenView = "screen_view";
internal const string EventSearch = "search"; internal static readonly string EventSearch = "search";
internal const string EventSelectContent = "select_content"; internal static readonly string EventSelectContent = "select_content";
internal const string EventSelectItem = "select_item"; internal static readonly string EventSelectItem = "select_item";
internal const string EventSelectPromotion = "select_promotion"; internal static readonly string EventSelectPromotion = "select_promotion";
internal const string EventShare = "share"; internal static readonly string EventShare = "share";
internal const string EventSignUp = "sign_up"; internal static readonly string EventSignUp = "sign_up";
internal const string EventSpendVirtualCurrency = "spend_virtual_currency"; internal static readonly string EventSpendVirtualCurrency = "spend_virtual_currency";
internal const string EventTutorialBegin = "tutorial_begin"; internal static readonly string EventTutorialBegin = "tutorial_begin";
internal const string EventTutorialComplete = "tutorial_complete"; internal static readonly string EventTutorialComplete = "tutorial_complete";
internal const string EventUnlockAchievement = "unlock_achievement"; internal static readonly string EventUnlockAchievement = "unlock_achievement";
internal const string EventViewCart = "view_cart"; internal static readonly string EventViewCart = "view_cart";
internal const string EventViewItem = "view_item"; internal static readonly string EventViewItem = "view_item";
internal const string EventViewItemList = "view_item_list"; internal static readonly string EventViewItemList = "view_item_list";
internal const string EventViewPromotion = "view_promotion"; internal static readonly string EventViewPromotion = "view_promotion";
internal const string EventViewSearchResults = "view_search_results"; internal static readonly string EventViewSearchResults = "view_search_results";
internal const string ParameterAchievementId = "achievement_id"; internal static readonly string ParameterAchievementId = "achievement_id";
internal const string ParameterAdFormat = "ad_format"; internal static readonly string ParameterAdFormat = "ad_format";
internal const string ParameterAdNetworkClickID = "aclid"; internal static readonly string ParameterAdNetworkClickID = "aclid";
internal const string ParameterAdPlatform = "ad_platform"; internal static readonly string ParameterAdPlatform = "ad_platform";
internal const string ParameterAdSource = "ad_source"; internal static readonly string ParameterAdSource = "ad_source";
internal const string ParameterAffiliation = "affiliation"; internal static readonly string ParameterAffiliation = "affiliation";
internal const string ParameterCP1 = "cp1"; internal static readonly string ParameterCP1 = "cp1";
internal const string ParameterCampaign = "campaign"; internal static readonly string ParameterCampaign = "campaign";
internal const string ParameterCharacter = "character"; internal static readonly string ParameterCharacter = "character";
internal const string ParameterContent = "content"; internal static readonly string ParameterContent = "content";
internal const string ParameterContentType = "content_type"; internal static readonly string ParameterContentType = "content_type";
internal const string ParameterCoupon = "coupon"; internal static readonly string ParameterCoupon = "coupon";
internal const string ParameterCreativeName = "creative_name"; internal static readonly string ParameterCreativeName = "creative_name";
internal const string ParameterCreativeSlot = "creative_slot"; internal static readonly string ParameterCreativeSlot = "creative_slot";
internal const string ParameterCurrency = "currency"; internal static readonly string ParameterCurrency = "currency";
internal const string ParameterDestination = "destination"; internal static readonly string ParameterDestination = "destination";
internal const string ParameterDiscount = "discount"; internal static readonly string ParameterDiscount = "discount";
internal const string ParameterEndDate = "end_date"; internal static readonly string ParameterEndDate = "end_date";
internal const string ParameterExtendSession = "extend_session"; internal static readonly string ParameterExtendSession = "extend_session";
internal const string ParameterFlightNumber = "flight_number"; internal static readonly string ParameterFlightNumber = "flight_number";
internal const string ParameterGroupId = "group_id"; internal static readonly string ParameterGroupId = "group_id";
internal const string ParameterIndex = "index"; internal static readonly string ParameterIndex = "index";
internal const string ParameterItemBrand = "item_brand"; internal static readonly string ParameterItemBrand = "item_brand";
internal const string ParameterItemCategory = "item_category"; internal static readonly string ParameterItemCategory = "item_category";
internal const string ParameterItemCategory2 = "item_category2"; internal static readonly string ParameterItemCategory2 = "item_category2";
internal const string ParameterItemCategory3 = "item_category3"; internal static readonly string ParameterItemCategory3 = "item_category3";
internal const string ParameterItemCategory4 = "item_category4"; internal static readonly string ParameterItemCategory4 = "item_category4";
internal const string ParameterItemCategory5 = "item_category5"; internal static readonly string ParameterItemCategory5 = "item_category5";
internal const string ParameterItemId = "item_id"; internal static readonly string ParameterItemId = "item_id";
internal const string ParameterItemList = "item_list"; internal static readonly string ParameterItemList = "item_list";
internal const string ParameterItemListID = "item_list_id"; internal static readonly string ParameterItemListID = "item_list_id";
internal const string ParameterItemListName = "item_list_name"; internal static readonly string ParameterItemListName = "item_list_name";
internal const string ParameterItemName = "item_name"; internal static readonly string ParameterItemName = "item_name";
internal const string ParameterLevel = "level"; internal static readonly string ParameterLevel = "level";
internal const string ParameterLevelName = "level_name"; internal static readonly string ParameterLevelName = "level_name";
internal const string ParameterLocation = "location"; internal static readonly string ParameterLocation = "location";
internal const string ParameterLocationID = "location_id"; internal static readonly string ParameterLocationID = "location_id";
internal const string ParameterMedium = "medium"; internal static readonly string ParameterMedium = "medium";
internal const string ParameterMethod = "method"; internal static readonly string ParameterMethod = "method";
internal const string ParameterNumberOfNights = "number_of_nights"; internal static readonly string ParameterNumberOfNights = "number_of_nights";
internal const string ParameterNumberOfPassengers = "number_of_passengers"; internal static readonly string ParameterNumberOfPassengers = "number_of_passengers";
internal const string ParameterNumberOfRooms = "number_of_rooms"; internal static readonly string ParameterNumberOfRooms = "number_of_rooms";
internal const string ParameterOrigin = "origin"; internal static readonly string ParameterOrigin = "origin";
internal const string ParameterPaymentType = "payment_type"; internal static readonly string ParameterPaymentType = "payment_type";
internal const string ParameterPrice = "price"; internal static readonly string ParameterPrice = "price";
internal const string ParameterPromotionID = "promotion_id"; internal static readonly string ParameterPromotionID = "promotion_id";
internal const string ParameterPromotionName = "promotion_name"; internal static readonly string ParameterPromotionName = "promotion_name";
internal const string ParameterQuantity = "quantity"; internal static readonly string ParameterQuantity = "quantity";
internal const string ParameterScore = "score"; internal static readonly string ParameterScore = "score";
internal const string ParameterScreenClass = "screen_class"; internal static readonly string ParameterScreenClass = "screen_class";
internal const string ParameterScreenName = "screen_name"; internal static readonly string ParameterScreenName = "screen_name";
internal const string ParameterSearchTerm = "search_term"; internal static readonly string ParameterSearchTerm = "search_term";
internal const string ParameterShipping = "shipping"; internal static readonly string ParameterShipping = "shipping";
internal const string ParameterShippingTier = "shipping_tier"; internal static readonly string ParameterShippingTier = "shipping_tier";
internal const string ParameterSignUpMethod = "sign_up_method"; internal static readonly string ParameterSignUpMethod = "sign_up_method";
internal const string ParameterSource = "source"; internal static readonly string ParameterSource = "source";
internal const string ParameterStartDate = "start_date"; internal static readonly string ParameterStartDate = "start_date";
internal const string ParameterSuccess = "success"; internal static readonly string ParameterSuccess = "success";
internal const string ParameterTax = "tax"; internal static readonly string ParameterTax = "tax";
internal const string ParameterTerm = "term"; internal static readonly string ParameterTerm = "term";
internal const string ParameterTransactionId = "transaction_id"; internal static readonly string ParameterTransactionId = "transaction_id";
internal const string ParameterTravelClass = "travel_class"; internal static readonly string ParameterTravelClass = "travel_class";
internal const string ParameterValue = "value"; internal static readonly string ParameterValue = "value";
} }
} }

68
Runtime/GuruCore/Runtime/Analytics/Analytics.TemplateDefine.cs
View File

@ -6,7 +6,6 @@ namespace Guru
using System.Collections.Generic; using System.Collections.Generic;
using Facebook.Unity; using Facebook.Unity;
using UnityEngine; using UnityEngine;
using Guru.Ads;
//游戏通用模版打点定义 //游戏通用模版打点定义
public static partial class Analytics public static partial class Analytics
@ -28,7 +27,7 @@ namespace Guru
}; };
if (extra != null) dict.AddRange(extra, isOverride:true); if (extra != null) dict.AddRange(extra, isOverride:true);
TrackEvent(EventLevelUp, dict); LogEvent(EventLevelUp, dict);
} }
/// <summary> /// <summary>
@ -43,7 +42,7 @@ namespace Guru
}; };
if (extra != null) dict.AddRange(extra, isOverride:true); if (extra != null) dict.AddRange(extra, isOverride:true);
TrackEvent(EventUnlockAchievement, dict); LogEvent(EventUnlockAchievement, dict);
} }
/// <summary> /// <summary>
@ -54,7 +53,7 @@ namespace Guru
[Obsolete("Obsolete method, please use <LogLevelStart> instead. will be discard in next version.")] [Obsolete("Obsolete method, please use <LogLevelStart> instead. will be discard in next version.")]
public static void LevelStart(int level) public static void LevelStart(int level)
{ {
TrackEvent(EventLevelStart, new Dictionary<string, object>() LogEvent(EventLevelStart, new Dictionary<string, object>()
{ {
{ ParameterLevel, level }, { ParameterLevel, level },
{ ParameterItemCategory, "main" }, { ParameterItemCategory, "main" },
@ -92,7 +91,7 @@ namespace Guru
dict.AddRange(extra, isOverride:true); dict.AddRange(extra, isOverride:true);
} }
TrackEvent(EventLevelStart, dict); LogEvent(EventLevelStart, dict);
} }
/// <summary> /// <summary>
@ -132,7 +131,7 @@ namespace Guru
if(extra != null) dict.AddRange(extra, isOverride:true); if(extra != null) dict.AddRange(extra, isOverride:true);
TrackEvent(EventLevelEnd, dict); LogEvent(EventLevelEnd, dict);
// if (isSuccess) // if (isSuccess)
// { // {
@ -161,7 +160,7 @@ namespace Guru
["level"] = level, ["level"] = level,
}; };
} }
TrackEvent(eventName, extra, new EventSetting() LogEvent(eventName, extra, new EventSetting()
{ {
EnableFirebaseAnalytics = true, EnableFirebaseAnalytics = true,
EnableFacebookAnalytics = true, EnableFacebookAnalytics = true,
@ -189,7 +188,7 @@ namespace Guru
if (extra != null) if (extra != null)
dict.AddRange(extra, isOverride: true); dict.AddRange(extra, isOverride: true);
TrackEvent(EventLevelFirstEnd, dict); LogEvent(EventLevelFirstEnd, dict);
} }
#endregion #endregion
@ -216,7 +215,7 @@ namespace Guru
}; };
if(extra != null) dict.AddRange(extra, isOverride: true); if(extra != null) dict.AddRange(extra, isOverride: true);
TrackEvent(EventEarnVirtualCurrency, dict); LogEvent(EventEarnVirtualCurrency, dict);
} }
/// <summary> /// <summary>
@ -238,7 +237,7 @@ namespace Guru
}; };
if(extra != null) dict.AddRange(extra, isOverride: true); if(extra != null) dict.AddRange(extra, isOverride: true);
TrackEvent(EventSpendVirtualCurrency, dict); LogEvent(EventSpendVirtualCurrency, dict);
} }
#endregion #endregion
@ -261,7 +260,7 @@ namespace Guru
}; };
if(extra != null) dict.AddRange(extra, isOverride: true); if(extra != null) dict.AddRange(extra, isOverride: true);
TrackEvent("hit_points", dict); LogEvent("hit_points", dict);
} }
#endregion #endregion
@ -388,7 +387,7 @@ namespace Guru
//--------- Extra data for IAP receipt --------------- //--------- Extra data for IAP receipt ---------------
TrackEvent(evtName, data); LogEvent(evtName, data);
} }
@ -417,6 +416,7 @@ namespace Guru
/// Google ARO买量点 /// Google ARO买量点
/// </summary> /// </summary>
/// <param name="impressionData">广告收入数据</param> /// <param name="impressionData">广告收入数据</param>
/// <param name="platform">广告平台</param>
/// <a href="https://docs.google.com/spreadsheets/d/1lFWLeOGJgq34QDBTfl6OpNh7MoI37ehGrhdbxlOrJgs/edit#gid=983654222"></a> /// <a href="https://docs.google.com/spreadsheets/d/1lFWLeOGJgq34QDBTfl6OpNh7MoI37ehGrhdbxlOrJgs/edit#gid=983654222"></a>
/// <li> /// <li>
/// value double eg：0.002 /// value double eg：0.002
@ -427,25 +427,25 @@ namespace Guru
/// ad_unit_name string 广告位名称 /// ad_unit_name string 广告位名称
/// ad_creative_id string 广告素材id /// ad_creative_id string 广告素材id
/// </li> /// </li>
public static void ADImpression(AdImpressionData impressionData) public static void ADImpression(MaxSdkBase.AdInfo impressionData, string platform = "")
{ {
TrackEvent(EventAdImpression, new Dictionary<string, dynamic>() if (string.IsNullOrEmpty(platform)) platform = AdMAX;
double revenue = impressionData.Revenue;
LogEvent(EventAdImpression, new Dictionary<string, dynamic>()
{ {
[ParameterValue] = impressionData.value, [ParameterValue] = revenue,
[ParameterCurrency] = impressionData.currency, [ParameterCurrency] = USD,
[ParameterAdPlatform] = impressionData.ad_platform, [ParameterAdPlatform] = platform,
[ParameterAdSource] = impressionData.ad_source, [ParameterAdSource] = impressionData.NetworkName,
[ParameterAdFormat] = impressionData.ad_format, [ParameterAdFormat] = impressionData.AdFormat,
[ParameterAdUnitName] = impressionData.ad_unit_name, [ParameterAdUnitName] = impressionData.AdUnitIdentifier,
[ParameterAdPlacement] = impressionData.ad_placement, [ParameterAdCreativeId] = impressionData.CreativeIdentifier,
[ParameterAdCreativeId] = impressionData.ad_creative_id,
[ParameterReviewCreativeId] = impressionData.review_creative_id,
}); });
} }
public static void TchAdAbnormalEvent(double value) public static void TchAdAbnormalEvent(double value)
{ {
TrackEvent(EventTchAdRevAbnormal, new Dictionary<string, dynamic>() LogEvent(EventTchAdRevAbnormal, new Dictionary<string, dynamic>()
{ {
{ ParameterAdPlatform, AdMAX }, { ParameterAdPlatform, AdMAX },
{ ParameterCurrency, USD }, { ParameterCurrency, USD },
@ -470,7 +470,7 @@ namespace Guru
}; };
if(extra != null) dict = GuruSDKUtils.MergeDictionary(dict, extra); if(extra != null) dict = GuruSDKUtils.MergeDictionary(dict, extra);
TrackEvent(EventIAPImp, dict); LogEvent(EventIAPImp, dict);
} }
/// <summary> /// <summary>
@ -486,7 +486,7 @@ namespace Guru
}; };
if(extra != null) dict = GuruSDKUtils.MergeDictionary(dict, extra); if(extra != null) dict = GuruSDKUtils.MergeDictionary(dict, extra);
TrackEvent(EventIAPClose, dict); LogEvent(EventIAPClose, dict);
} }
/// <summary> /// <summary>
@ -512,7 +512,7 @@ namespace Guru
}; };
if(extra != null) dict = GuruSDKUtils.MergeDictionary(dict, extra); if(extra != null) dict = GuruSDKUtils.MergeDictionary(dict, extra);
TrackEvent(EventIAPClick, dict); LogEvent(EventIAPClick, dict);
} }
/// <summary> /// <summary>
@ -543,7 +543,7 @@ namespace Guru
if(!string.IsNullOrEmpty(offerId)) if(!string.IsNullOrEmpty(offerId))
dict["basePlan"] = offerId; dict["basePlan"] = offerId;
TrackEvent(EventIAPReturnTrue, dict, new EventSetting() LogEvent(EventIAPReturnTrue, dict, new EventSetting()
{ {
EnableFirebaseAnalytics = true, EnableFirebaseAnalytics = true,
EnableAdjustAnalytics = true, EnableAdjustAnalytics = true,
@ -559,7 +559,7 @@ namespace Guru
/// <param name="failReason"></param> /// <param name="failReason"></param>
internal static void IAPRetFalse(string itemCategory, string productId, string failReason) internal static void IAPRetFalse(string itemCategory, string productId, string failReason)
{ {
TrackEvent(EventIAPReturnFalse, new Dictionary<string, object>() LogEvent(EventIAPReturnFalse, new Dictionary<string, object>()
{ {
{ ParameterItemCategory, itemCategory }, { ParameterItemCategory, itemCategory },
{ ParameterItemName, productId }, { ParameterItemName, productId },
@ -576,7 +576,7 @@ namespace Guru
/// <param name="currency">币种</param> /// <param name="currency">币种</param>
public static void FirstIAP(string itemName, double value, string currency) public static void FirstIAP(string itemName, double value, string currency)
{ {
TrackEvent(EventIAPFirst, new Dictionary<string, object>() LogEvent(EventIAPFirst, new Dictionary<string, object>()
{ {
{ ParameterItemName, itemName }, { ParameterItemName, itemName },
{ ParameterValue, value }, { ParameterValue, value },
@ -597,7 +597,7 @@ namespace Guru
if (productName.Contains(".")) productName = productName.Replace(".", "_"); if (productName.Contains(".")) productName = productName.Replace(".", "_");
string eventName = $"iap_{productName}"; string eventName = $"iap_{productName}";
TrackEvent(eventName, new Dictionary<string, object>() LogEvent(eventName, new Dictionary<string, object>()
{ {
{ ParameterItemName, itemName }, { ParameterItemName, itemName },
{ ParameterValue, value }, { ParameterValue, value },
@ -724,8 +724,10 @@ namespace Guru
["sandbox"] = isSandbox? "true": "false" ["sandbox"] = isSandbox? "true": "false"
}; };
// 上报Firebase + 自打点 // 上报Firebase + 自打点
TrackEvent(eventName, dict, new EventSetting() { EnableFirebaseAnalytics = true }); LogEvent(eventName, dict, new EventSetting() { EnableFirebaseAnalytics = true });
// 上报 Adjust 支付事件 // 上报 Adjust 支付事件
LogAdjustRevenueEvent(eventName, value, productId, orderId, purchaseToken, receipt, dict); LogAdjustRevenueEvent(eventName, value, productId, orderId, purchaseToken, receipt, dict);
@ -744,7 +746,7 @@ namespace Guru
if (data == null) return; if (data == null) return;
data["country"] = IPMConfig.IPM_COUNTRY_CODE; data["country"] = IPMConfig.IPM_COUNTRY_CODE;
data["network"] = Application.internetReachability.ToString(); data["network"] = Application.internetReachability.ToString();
TrackEvent(EventDevAudit, data, new EventSetting() { EnableFirebaseAnalytics = true }); LogEvent(EventDevAudit, data, new EventSetting() { EnableFirebaseAnalytics = true });
} }
#endregion #endregion

351
Runtime/GuruCore/Runtime/Analytics/Analytics.cs
View File

@ -1,7 +1,5 @@
using System.Threading;
namespace Guru namespace Guru
{ {
using System; using System;
@ -18,131 +16,97 @@ namespace Guru
{ {
public class EventSetting public class EventSetting
{ {
public bool EnableFirebaseAnalytics; public bool EnableFirebaseAnalytics = false;
public bool EnableAdjustAnalytics; public bool EnableAdjustAnalytics = false;
public bool EnableFacebookAnalytics; public bool EnableFacebookAnalytics = false;
public bool EnableGuruAnalytics;
public override string ToString()
{
return $"EvenSetting: firebase:{EnableFirebaseAnalytics}, adjust:{EnableAdjustAnalytics}, facebook:{EnableFacebookAnalytics}, guru:{EnableGuruAnalytics}";
} }
public static EventSetting GetDefaultSetting() private static EventSetting _defaultEventSetting;
{
return new EventSetting()
{
EnableFirebaseAnalytics = true,
EnableFacebookAnalytics = true,
EnableAdjustAnalytics = true,
EnableGuruAnalytics = true
};
}
}
private static EventSetting DefaultEventSetting => EventSetting.GetDefaultSetting(); private static bool _isInited; //Analytics是否初始化完成
private static bool _isInitOnce; //Analytics是否初始化完成
public static bool EnableDebugAnalytics; //允许Debug包上报打点 public static bool EnableDebugAnalytics; //允许Debug包上报打点
public static bool IsDebugMode => PlatformUtil.IsDebug(); public static bool IsDebugMode => PlatformUtil.IsDebug();
private static bool IsFirebaseReady => FirebaseUtil.IsFirebaseInitialized;
private static bool IsReady private static bool IsEnable
{ {
get get
{ {
//Analytics没有初始化不上报打点
if (!_isInitOnce) return false;
//Firebase服务没有初始化完成不上报打点 //Firebase服务没有初始化完成不上报打点
if (!IsFirebaseReady) return false; if (!FirebaseUtil.IsFirebaseInitialized)
return false;
//Analytics没有初始化不上报打点
if (!_isInited)
return false;
#if !UNITY_EDITOR
//开发环境打点不上报 //开发环境打点不上报
if (IsDebugMode && !EnableDebugAnalytics) if (IsDebugMode && !EnableDebugAnalytics)
return false; return false;
#endif
return true; return true;
} }
} }
private static AdjustEventDriver _adjustEventDriver;
private static FBEventDriver _fbEventDriver;
private static FirebaseEventDriver _firebaseEventDriver;
private static GuruEventDriver _guruEventDriver;
#region 初始化 #region 初始化
public static void InitAnalytics() public static void InitAnalytics()
{ {
if (_isInitOnce) return; if (_isInited) return;
_isInitOnce = true; _isInited = true;
_adjustEventDriver = new AdjustEventDriver(); // -------- 初始化 Exception ----------
_fbEventDriver = new FBEventDriver(); CrashlyticsAgent.Install();
_firebaseEventDriver = new FirebaseEventDriver();
_guruEventDriver = new GuruEventDriver();
// ------- 初始化自打点 ---------- // ------- 初始化自打点 ----------
InstallGuruAnalytics(IsDebug); InstallGuruAnalytics(IsDebug);
if (_defaultEventSetting == null)
{
var analyticsSetting = GuruSettings.Instance.AnalyticsSetting;
_defaultEventSetting = new EventSetting
{
EnableFirebaseAnalytics = analyticsSetting.EnalbeFirebaseAnalytics,
EnableFacebookAnalytics = analyticsSetting.EnalbeFacebookAnalytics,
EnableAdjustAnalytics = analyticsSetting.EnalbeAdjustAnalytics
};
} }
FirebaseUtil.onInitComplete += OnFirebaseCompleted;
}
private static void OnFirebaseCompleted(bool success)
public static void OnFirebaseInitCompleted()
{ {
Debug.Log($"[SDK] --- Analytics Init After FirebaseReady:{IsFirebaseReady}"); FirebaseUtil.onInitComplete -= OnFirebaseCompleted;
// -------- 初始化 Crashlytics ---------- if (success)
CrashlyticsAgent.Init(); {
Crashlytics.IsCrashlyticsCollectionEnabled = true;
if (_defaultEventSetting.EnableFirebaseAnalytics)
{
FirebaseAnalytics.SetAnalyticsCollectionEnabled(true); FirebaseAnalytics.SetAnalyticsCollectionEnabled(true);
FirebaseAnalytics.SetSessionTimeoutDuration(new TimeSpan(0, 30, 0)); FirebaseAnalytics.SetSessionTimeoutDuration(new TimeSpan(0, 30, 0));
SetUserProperty(FirebaseAnalytics.UserPropertySignUpMethod, "Google"); SetUserProperty(FirebaseAnalytics.UserPropertySignUpMethod, "Google");
SetUserProperty(PropertyDeviceID, IPMConfig.IPM_DEVICE_ID); SetUserProperty(PropertyDeviceID, IPMConfig.IPM_DEVICE_ID);
// SetUserProperty(PropertyFirstOpenTime, FirstOpenTime); // SetUserProperty(PropertyFirstOpenTime, FirstOpenTime);
_firebaseEventDriver.TriggerFlush();
} }
public static void OnFBInitComplete()
{
_fbEventDriver.TriggerFlush();
} }
public static void OnAdjustInitComplete()
{
_adjustEventDriver.TriggerFlush();
} }
private static void OnGuruAnalyticsInitComplete()
{
_guruEventDriver.TriggerFlush();
}
#endregion #endregion
#region 屏幕(场景)名称 #region 屏幕(场景)名称
public static void SetCurrentScreen(string screenName, string className) public static void SetCurrentScreen(string screenName, string className)
{ {
if (!_isInitOnce)
{
return;
}
Log.I(TAG,$"SetCurrentScreen -> screenName:{screenName}, className:{className}"); Log.I(TAG,$"SetCurrentScreen -> screenName:{screenName}, className:{className}");
GuruAnalytics.Instance.SetScreen(screenName); GuruAnalytics.SetScreen(screenName);
TrackEvent(EventScreenView, new Dictionary<string, dynamic>() if (!IsEnable) return;
{ FirebaseAnalytics.LogEvent(FirebaseAnalytics.EventScreenView,
[ParameterScreenName] = screenName, new Parameter(FirebaseAnalytics.ParameterScreenClass, className),
[ParameterScreenClass] = className, new Parameter(FirebaseAnalytics.ParameterScreenName, screenName)
}); );
} }
#endregion #endregion
@ -156,7 +120,7 @@ namespace Guru
public static void SetUserIDProperty(string userID) public static void SetUserIDProperty(string userID)
{ {
Log.I(TAG,$"SetUserIDProperty -> userID:{userID}"); Log.I(TAG,$"SetUserIDProperty -> userID:{userID}");
if (!IsReady) return; if (!IsEnable) return;
FirebaseAnalytics.SetUserId(userID); FirebaseAnalytics.SetUserId(userID);
} }
@ -164,107 +128,126 @@ namespace Guru
/// <summary> /// <summary>
/// Firebase上报用户属性 /// Firebase上报用户属性
/// </summary> /// </summary>
public static void SetUserProperty(string key, string value) public static void SetUserProperty(string propertyName, string propertyValue)
{ {
if (!_isInitOnce) Log.I(TAG,$"SetUserProperty -> propertyName:{propertyName}, propertyValue:{propertyValue}");
{
throw new Exception($"[{TAG}][SDK] Analytics did not initialized, Call <Analytics.{nameof(InitAnalytics)}()> first!");
}
if (IsDebug && !EnableDebugAnalytics) if (!IsEnable)
{
Debug.LogWarning($"[{TAG}][SDK] --- SetProperty {key}:{value} can not send int Debug mode. Set <InitConfig.EnableDebugAnalytics> with `true`");
return; return;
}
try
{
// 填充相关的追踪事件
_guruEventDriver.AddProperty(key, value);
_firebaseEventDriver.AddProperty(key, value);
Debug.Log($"{TAG} --- SetUserProperty -> propertyName:{key}, propertyValue:{value}");
}
catch (Exception ex)
{
if (FirebaseUtil.IsReady)
{
Crashlytics.LogException(ex);
}
else
{
Debug.Log($"Catch Error: {ex}");
}
}
FirebaseAnalytics.SetUserProperty(propertyName, propertyValue);
CustomSetUserProperty(propertyName, propertyValue);
} }
#endregion #endregion
#region 打点上报 #region 打点上报
/// <summary>
/// 打点上报
/// </summary>
/// <param name="eventName"></param>
/// <param name="eventSetting"></param>
internal static void LogEvent(string eventName, EventSetting eventSetting = null, int priority = -1)
{
Log.I(TAG, $"eventName:{eventName}");
CustomLogEvent(eventName, null, priority); // 自定义打点上报
CheckLogCache(eventName, null, eventSetting); // log缓存和消费
if (!IsEnable) return;
eventSetting ??= _defaultEventSetting;
if (eventSetting.EnableFirebaseAnalytics)
{
FirebaseAnalytics.LogEvent(eventName);
}
if (eventSetting.EnableAdjustAnalytics)
{
Adjust.trackEvent(CreateAdjustEvent(eventName));
}
if (eventSetting.EnableFacebookAnalytics)
{
FBService.LogEvent(eventName);
}
}
/// <summary> /// <summary>
/// 打点上报 (带参数) /// 打点上报 (带参数)
/// </summary> /// </summary>
/// <param name="eventName"></param> /// <param name="eventName"></param>
/// <param name="data"></param> /// <param name="extras"></param>
/// <param name="eventSetting"></param> /// <param name="eventSetting"></param>
/// <param name="priority"></param> /// <param name="priority"></param>
internal static void TrackEvent(string eventName, Dictionary<string, dynamic> data, internal static void LogEvent(string eventName, Dictionary<string, dynamic> extras, EventSetting eventSetting = null, int priority = -1)
EventSetting eventSetting = null, int priority = -1)
{ {
if (!_isInitOnce) CustomLogEvent(eventName, extras, priority); // 自定义打点上报
{ CheckLogCache(eventName, extras, eventSetting); // log缓存和消费
throw new Exception($"[{TAG}][SDK] Analytics did not initialized, Call <Analytics.{nameof(InitAnalytics)}()> first!");
}
if (IsDebug && !EnableDebugAnalytics) if (!IsEnable) return;
if (extras == null)
{ {
Debug.LogWarning($"[{TAG}][SDK] --- LogEvent [{eventName}] can not send int Debug mode. Set <InitConfig.EnableDebugAnalytics> with `true`"); LogEvent(eventName, eventSetting, priority); // 防空判定
return; return;
} }
if (eventSetting == null) eventSetting = DefaultEventSetting; string paramStr = string.Join(",", extras);
Log.I(TAG, $"eventName:{eventName}, params:{paramStr}");
var dataStr = ""; if (eventSetting == null) eventSetting = _defaultEventSetting;
if (data != null) dataStr = JsonParser.ToJson(data);
Debug.Log($"[{TAG}] --- [SDK] TrackEvent: {eventName} | priority: {priority} | data:{dataStr} | eventSetting: {eventSetting}");
try
{
// 填充相关的追踪事件
if (eventSetting.EnableGuruAnalytics)
{
_guruEventDriver.AddEvent(eventName, data, eventSetting, priority);
}
if (eventSetting.EnableFirebaseAnalytics) if (eventSetting.EnableFirebaseAnalytics)
{ {
_firebaseEventDriver.AddEvent(eventName, data, eventSetting, priority); List<Parameter> parameters = new List<Parameter>();
foreach (var kv in extras)
{
if(kv.Value is string strValue)
parameters.Add(new Parameter(kv.Key, strValue));
else if (kv.Value is bool boolValue)
parameters.Add(new Parameter(kv.Key, boolValue ? "true" : "false"));
else if (kv.Value is int intValue)
parameters.Add(new Parameter(kv.Key, intValue));
else if (kv.Value is long longValue)
parameters.Add(new Parameter(kv.Key, longValue));
else if (kv.Value is float floatValue)
parameters.Add(new Parameter(kv.Key, floatValue));
else if (kv.Value is double doubleValue)
parameters.Add(new Parameter(kv.Key, doubleValue));
else if (kv.Value is decimal decimalValue)
parameters.Add(new Parameter(kv.Key, decimal.ToDouble(decimalValue)));
else
parameters.Add(new Parameter(kv.Key, kv.Value.ToString()));
} }
FirebaseAnalytics.LogEvent(eventName, parameters.ToArray());
}
Dictionary<string, object> dict = new Dictionary<string, object>();
GuruSDKUtils.MergeDictionary(dict, extras);
if (eventSetting.EnableAdjustAnalytics) if (eventSetting.EnableAdjustAnalytics)
{ {
_adjustEventDriver.AddEvent(eventName, data, eventSetting, priority); AdjustEvent adjustEvent = Analytics.CreateAdjustEvent(eventName);
} if (adjustEvent != null)
if (eventSetting.EnableFacebookAnalytics)
{ {
_fbEventDriver.AddEvent(eventName, data, eventSetting, priority); if (dict.Count > 0)
}
}
catch (Exception ex)
{ {
if (FirebaseUtil.IsReady) foreach (var kv in dict)
{ {
Crashlytics.LogException(ex); adjustEvent.AddEventParameter(kv.Key, kv.Value.ToString());
} }
else
{
Debug.Log($"Catch Error: {ex}");
} }
Adjust.trackEvent(adjustEvent);
} }
} }
if (eventSetting.EnableFacebookAnalytics)
{
FBService.LogEvent(eventName, null, dict);
}
}
/// <summary> /// <summary>
/// 上报 Adjust 事件 /// 上报 Adjust 事件
@ -317,7 +300,14 @@ namespace Guru
/// <param name="priority"></param> /// <param name="priority"></param>
public static void Track(string key, Dictionary<string, dynamic> data = null, EventSetting setting = null, int priority = -1) public static void Track(string key, Dictionary<string, dynamic> data = null, EventSetting setting = null, int priority = -1)
{ {
TrackEvent(key, data, setting, priority); if (null != data)
{
LogEvent(key, data, setting, priority);
}
else
{
LogEvent(key, setting, priority);
}
} }
@ -328,7 +318,7 @@ namespace Guru
/// <param name="isException"></param> /// <param name="isException"></param>
public static void LogCrashlytics(string msg, bool isException = true) public static void LogCrashlytics(string msg, bool isException = true)
{ {
if (!_isInitOnce) return; if (!_isInited) return;
if (isException) if (isException)
{ {
LogCrashlytics(new Exception(msg)); LogCrashlytics(new Exception(msg));
@ -342,15 +332,84 @@ namespace Guru
public static void LogCrashlytics(Exception exp) public static void LogCrashlytics(Exception exp)
{ {
if (!_isInitOnce) return; if (!_isInited) return;
CrashlyticsAgent.LogException(exp); CrashlyticsAgent.LogException(exp);
} }
#endregion #endregion
#region 打点缓存
private static Queue<SavedLog> _savedLogs;
internal static Queue<SavedLog> SavedLogs
{
get
{
if (_savedLogs == null) _savedLogs = new Queue<SavedLog>(20);
return _savedLogs;
}
} }
private static void CheckLogCache(string key, Dictionary<string, dynamic> data = null, EventSetting setting = null, int priority = -1)
{
try
{
if (!_isInited)
{
if (data == null) data = new Dictionary<string, dynamic>();
data["log_stamp"] = TimeUtil.GetCurrentTimeStamp().ToString();
SavedLogs.Enqueue(new SavedLog(key, data, setting, priority));
}
else
{
int len = SavedLogs.Count;
if (len > 0)
{
while (SavedLogs.Count > 0)
{
var log = SavedLogs.Dequeue();
LogEvent(log.key, log.data, log.setting, log.priority);
}
}
}
}
catch (Exception ex)
{
Crashlytics.LogException(ex);
}
}
#endregion
}
internal class SavedLog
{
public string key;
public int priority;
public Dictionary<string, dynamic> data;
public Analytics.EventSetting setting;
public SavedLog()
{
}
/// <summary>
/// 保存打点信息
/// </summary>
/// <param name="_key"></param>
/// <param name="_data"></param>
/// <param name="_setting"></param>
/// <param name="_priority"></param>
public SavedLog(string _key, Dictionary<string, dynamic> _data = null, Analytics.EventSetting _setting = null, int _priority = -1)
{
key = _key;
data = _data;
setting = _setting;
priority = _priority;
}
}
} }

3
Runtime/GuruCore/Runtime/Analytics/Events.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: d13f245a2ea24c8ebdb957ad4ba79ca4
timeCreated: 1721908201

106
Runtime/GuruCore/Runtime/Analytics/Events/AbstractEventDriver.cs
View File

@ -1,106 +0,0 @@
using System.Collections.Generic;
namespace Guru
{
public interface IEventDriver
{
void TriggerFlush();
void AddEvent(TrackingEvent trackingEvent);
}
public interface IPropertyCollecter
{
void AddProperty(string key, string value);
}
public abstract class AbstractEventDriver: IEventDriver, IPropertyCollecter
{
private GuruEventBuffer<TrackingEvent> _eventBuffer = new GuruEventBuffer<TrackingEvent>();
private GuruEventBuffer<TrackingProperty> _propertyBuffer = new GuruEventBuffer<TrackingProperty>();
// Firebase 是否可用
private bool _isDriverReady = false;
public void TriggerFlush()
{
_isDriverReady = true;
FlushAll();
}
public void AddEvent(string eventName, Dictionary<string, dynamic> data = null,
Analytics.EventSetting setting = null, int priority = -1)
{
var trackingEvent= new TrackingEvent(eventName, data, setting, priority);
AddEvent(trackingEvent);
}
/// <summary>
/// 添加事件
/// </summary>
/// <param name="trackingEvent"></param>
public void AddEvent(TrackingEvent trackingEvent)
{
if (_isDriverReady)
{
FlushTrackingEvent(trackingEvent);
}
else
{
_eventBuffer.Push(trackingEvent);
}
}
/// <summary>
/// 添加属性
/// </summary>
/// <param name="key"></param>
/// <param name="value"></param>
public void AddProperty(string key, string value)
{
var property = new TrackingProperty(key, value);
if (_isDriverReady)
{
FlushProperty(property);
}
else
{
_propertyBuffer.Push(property);
}
}
/// <summary>
/// 写入所有
/// </summary>
private void FlushAll()
{
while(_eventBuffer.Pop(out var trackingEvent))
{
FlushTrackingEvent(trackingEvent);
}
while (_propertyBuffer.Pop(out var property))
{
FlushProperty(property);
}
}
/// <summary>
/// 发送事件
/// </summary>
/// <param name="trackEvent"></param>
protected abstract void FlushTrackingEvent(TrackingEvent trackEvent);
protected abstract void FlushProperty(TrackingProperty property);
}
}

3
Runtime/GuruCore/Runtime/Analytics/Events/AbstractEventDriver.cs.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: fe02e66845f64aafa94654814822930a
timeCreated: 1721916181

39
Runtime/GuruCore/Runtime/Analytics/Events/AdjustEventDriver.cs
View File

@ -1,39 +0,0 @@
using System.Collections.Generic;
namespace Guru
{
using com.adjust.sdk;
public class AdjustEventDriver : AbstractEventDriver
{
/// <summary>
/// 发送事件
/// </summary>
/// <param name="trackingEvent"></param>
protected override void FlushTrackingEvent(TrackingEvent trackingEvent)
{
var eventName = trackingEvent.eventName;
var data = trackingEvent.data;
AdjustEvent adjustEvent = Analytics.CreateAdjustEvent(eventName);
if (adjustEvent != null)
{
UnityEngine.Debug.Log($"[SDK] --- Adjust logEvent: {trackingEvent}");
if (data != null && data.Count > 0)
{
foreach (var kv in data)
{
adjustEvent.AddEventParameter(kv.Key, ((object)kv.Value).ToString());
}
}
Adjust.trackEvent(adjustEvent);
}
}
protected override void FlushProperty(TrackingProperty property)
{
}
}
}

3
Runtime/GuruCore/Runtime/Analytics/Events/AdjustEventDriver.cs.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: f064544085c8401d988b9eae91bd79b1
timeCreated: 1721910840

26
Runtime/GuruCore/Runtime/Analytics/Events/FBEventDriver.cs
View File

@ -1,26 +0,0 @@
using System;
using UnityEngine;
namespace Guru
{
public class FBEventDriver: AbstractEventDriver
{
/// <summary>
/// 发送事件
/// </summary>
/// <param name="trackingEvent"></param>
protected override void FlushTrackingEvent(TrackingEvent trackingEvent)
{
var eventName = trackingEvent.eventName;
var data = trackingEvent.data;
Debug.Log($"[SDK] --- FB logEvent: {trackingEvent}");
FBService.LogEvent(eventName, null, data);
}
protected override void FlushProperty(TrackingProperty property)
{
}
}
}

3
Runtime/GuruCore/Runtime/Analytics/Events/FBEventDriver.cs.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 305a62f1c0fe4a16b7c9101264be523b
timeCreated: 1721910530

64
Runtime/GuruCore/Runtime/Analytics/Events/FirebaseEventDriver.cs
View File

@ -1,64 +0,0 @@
namespace Guru
{
using Firebase.Analytics;
using System.Collections.Generic;
using UnityEngine;
/// <summary>
/// Firebase 专用
/// </summary>
internal class FirebaseEventDriver : AbstractEventDriver
{
protected override void FlushTrackingEvent(TrackingEvent trackingEvent)
{
var eventName = trackingEvent.eventName;
var data = trackingEvent.data;
Debug.Log($"[SDK] --- Firebase logEvent: {trackingEvent}");
if (data != null)
{
List<Parameter> parameters = new List<Parameter>();
foreach (var kv in data)
{
if(kv.Value is string strValue)
parameters.Add(new Parameter(kv.Key, strValue));
else if (kv.Value is bool boolValue)
parameters.Add(new Parameter(kv.Key, boolValue ? "true" : "false"));
else if (kv.Value is int intValue)
parameters.Add(new Parameter(kv.Key, intValue));
else if (kv.Value is long longValue)
parameters.Add(new Parameter(kv.Key, longValue));
else if (kv.Value is float floatValue)
parameters.Add(new Parameter(kv.Key, floatValue));
else if (kv.Value is double doubleValue)
parameters.Add(new Parameter(kv.Key, doubleValue));
else if (kv.Value is decimal decimalValue)
parameters.Add(new Parameter(kv.Key, decimal.ToDouble(decimalValue)));
else
parameters.Add(new Parameter(kv.Key, kv.Value.ToString()));
}
FirebaseAnalytics.LogEvent(eventName, parameters.ToArray());
}
else
{
FirebaseAnalytics.LogEvent(eventName);
}
}
/// <summary>
/// 输出属性
/// </summary>
/// <param name="property"></param>
protected override void FlushProperty(TrackingProperty property)
{
FirebaseAnalytics.SetUserProperty(property.key, property.value);
}
}
}

3
Runtime/GuruCore/Runtime/Analytics/Events/FirebaseEventDriver.cs.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 7a4c2262ab86431ba6d5961e7453d60f
timeCreated: 1721905429

44
Runtime/GuruCore/Runtime/Analytics/Events/GuruEventBuffer.cs
View File

@ -1,44 +0,0 @@
namespace Guru
{
using System.Collections.Concurrent;
public class GuruEventBuffer<T>
{
private ConcurrentQueue<T> _buffer;
/// <summary>
/// 构造函数
/// </summary>
public GuruEventBuffer()
{
_buffer = new ConcurrentQueue<T>();
}
/// <summary>
/// 入栈
/// </summary>
/// <param name="item"></param>
public void Push(T item)
{
_buffer.Enqueue(item);
}
/// <summary>
/// 出栈
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
public bool Pop(out T item)
{
return _buffer.TryDequeue(out item);
}
}
}

3
Runtime/GuruCore/Runtime/Analytics/Events/GuruEventBuffer.cs.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: f6dd65ae849944c59be2182eb64db34a
timeCreated: 1721899117

20
Runtime/GuruCore/Runtime/Analytics/Events/GuruEventDriver.cs
View File

@ -1,20 +0,0 @@
namespace Guru
{
public class GuruEventDriver: AbstractEventDriver
{
protected override void FlushTrackingEvent(TrackingEvent trackingEvent)
{
GuruAnalytics.Instance.LogEvent(trackingEvent.eventName, trackingEvent.data, trackingEvent.priority);
}
/// <summary>
/// 输出属性
/// </summary>
/// <param name="property"></param>
protected override void FlushProperty(TrackingProperty property)
{
GuruAnalytics.Instance.SetUserProperty(property.key, property.value);
}
}
}

3
Runtime/GuruCore/Runtime/Analytics/Events/GuruEventDriver.cs.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: d3fee5c262ca43c387ce76d52fb149c8
timeCreated: 1721908696

12
Runtime/GuruCore/Runtime/Analytics/Events/GuruPropertyBuffer.cs
View File

@ -1,12 +0,0 @@
namespace Guru
{
using System.Collections.Concurrent;
public class GuruPropertyBuffer
{
private ConcurrentQueue<TrackingEvent> _propertyQueue;
}
}

3
Runtime/GuruCore/Runtime/Analytics/Events/GuruPropertyBuffer.cs.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 38faf6b8af864e829144d9de91c4b0a5
timeCreated: 1721983424

65
Runtime/GuruCore/Runtime/Analytics/Events/TrackingEvent.cs
View File

@ -1,65 +0,0 @@
namespace Guru
{
using System.Collections.Generic;
/// <summary>
/// 追踪事件
/// </summary>
public class TrackingEvent
{
public string eventName;
public int priority;
public Dictionary<string, dynamic> data;
public Analytics.EventSetting setting;
public TrackingEvent()
{
}
/// <summary>
/// 保存打点信息
/// </summary>
/// <param name="eventName"></param>
/// <param name="_data"></param>
/// <param name="_setting"></param>
/// <param name="_priority"></param>
public TrackingEvent(string eventName, Dictionary<string, dynamic> data = null, Analytics.EventSetting setting = null, int priority = -1)
{
this.eventName = eventName;
this.data = data;
this.setting = setting;
this.priority = priority;
}
public override string ToString()
{
return $"eventName: {eventName}, data: {data}, setting: {setting}, priority: {priority}";
}
}
/// <summary>
/// 追踪用户属性
/// </summary>
public class TrackingProperty
{
public string key;
public string value;
public TrackingProperty(string key, string value)
{
this.key = key;
this.value = value;
}
public override string ToString()
{
return $"property: {key}：{value}";
}
}
}

3
Runtime/GuruCore/Runtime/Analytics/Events/TrackingEvent.cs.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 6b9532ec20444115a888ffc89276172a
timeCreated: 1721983520

6
Runtime/GuruCore/Runtime/Data/StandardProperties.cs
View File

@ -58,7 +58,7 @@ namespace Guru
if (!string.IsNullOrEmpty(value)) if (!string.IsNullOrEmpty(value))
{ {
PlayerPrefs.SetString(nameof(FirebaseId), value); PlayerPrefs.SetString(nameof(FirebaseId), value);
GuruAnalytics.Instance.SetFirebaseId(value); GuruAnalytics.SetFirebaseId(value);
} }
} }
} }
@ -73,7 +73,7 @@ namespace Guru
if (!string.IsNullOrEmpty(value)) if (!string.IsNullOrEmpty(value))
{ {
PlayerPrefs.SetString(nameof(AdjustId), value); PlayerPrefs.SetString(nameof(AdjustId), value);
GuruAnalytics.Instance.SetAdjustId(value); GuruAnalytics.SetAdjustId(value);
} }
} }
} }
@ -88,7 +88,7 @@ namespace Guru
if (!string.IsNullOrEmpty(value)) if (!string.IsNullOrEmpty(value))
{ {
PlayerPrefs.SetString(nameof(GoogleAdId), value); PlayerPrefs.SetString(nameof(GoogleAdId), value);
GuruAnalytics.Instance.SetAdId(value); GuruAnalytics.SetAdId(value);
} }
} }
} }

40
Runtime/GuruCore/Runtime/FB/FBService.cs
View File

@ -1,30 +1,32 @@
using System.Collections.Generic;
using Facebook.Unity;
using UnityEngine;
namespace Guru namespace Guru
{ {
using System;
using System.Collections.Generic;
using Facebook.Unity;
using UnityEngine;
[MonoSingleton(EMonoSingletonType.CreateOnNewGameObject, false)] [MonoSingleton(EMonoSingletonType.CreateOnNewGameObject, false)]
public class FBService : MonoSingleton<FBService> public class FBService : MonoSingleton<FBService>
{ {
private const string Tag = "[FB]"; public static readonly string LOG_TAG = "FB";
private bool _isInitOnce;
private Action _onInitComplete;
public void StartService(Action onInitComplete = null) public void StartService()
{
if (!FB.IsInitialized)
{ {
if(_isInitOnce) return;
_isInitOnce = true;
_onInitComplete = onInitComplete;
// Initialize the Facebook SDK // Initialize the Facebook SDK
FB.Init(InitCallback, OnHideUnity); FB.Init(InitCallback, OnHideUnity);
} }
else
{
// Already initialized, signal an app activation App Event
FB.ActivateApp();
}
}
private void InitCallback() private void InitCallback()
{ {
if (FB.IsInitialized)
{
// Signal an app activation App Event // Signal an app activation App Event
FB.ActivateApp(); FB.ActivateApp();
FB.Mobile.SetAdvertiserIDCollectionEnabled(true); FB.Mobile.SetAdvertiserIDCollectionEnabled(true);
@ -32,7 +34,11 @@ namespace Guru
#if UNITY_IOS #if UNITY_IOS
FB.Mobile.SetAdvertiserTrackingEnabled(true); FB.Mobile.SetAdvertiserTrackingEnabled(true);
#endif #endif
_onInitComplete?.Invoke(); }
else
{
Log.E(LOG_TAG, "Failed to Initialize the Facebook SDK");
}
} }
private void OnHideUnity(bool isGameShown) private void OnHideUnity(bool isGameShown)
@ -75,13 +81,13 @@ namespace Guru
} }
public static bool IsAvailable private static bool IsAvailable
{ {
get get
{ {
if (!FB.IsInitialized) if (!FB.IsInitialized)
{ {
Debug.LogError($"{Tag} FB is not initialized, please call <FBService.StartService> first."); Debug.LogError("[FB] FB is not initialized, please call <FBService.StartService> first.");
return false; return false;
} }
return true; return true;

21
Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.Message.cs
View File

@ -8,31 +8,14 @@ namespace Guru
public static partial class FirebaseUtil public static partial class FirebaseUtil
{ {
private static int _messageRetry = 5; private static int _messageRetry = 5;
// public static bool? IsInitMessage; public static bool? IsInitMessage;
private static bool _isAutoFetchFcmToken = true;
private static bool _isFetchOnce = false;
public static void SetAutoFetchFcmToken(bool value)
{
_isAutoFetchFcmToken = value;
}
public static void InitializeMessage() public static void InitializeMessage()
{ {
if (_isAutoFetchFcmToken)
{
StartFetchFcmToken();
}
}
public static void StartFetchFcmToken()
{
if (_isFetchOnce) return;
_isFetchOnce = true;
FirebaseMessaging.TokenReceived += OnTokenReceived; FirebaseMessaging.TokenReceived += OnTokenReceived;
FirebaseMessaging.MessageReceived += OnMessageReceived; FirebaseMessaging.MessageReceived += OnMessageReceived;
GetFCMToken(); GetFCMToken();
IsInitMessage = true;
} }
private static void GetFCMToken() private static void GetFCMToken()

19
Runtime/GuruCore/Runtime/Firebase/FirebaseUtil.cs
View File

@ -9,6 +9,7 @@ namespace Guru
public static partial class FirebaseUtil public static partial class FirebaseUtil
{ {
private static readonly string LOG_TAG = "Firebase"; private static readonly string LOG_TAG = "Firebase";
private static bool _isDebug = false;
private static bool _isReady = false; private static bool _isReady = false;
public static bool IsReady => _isReady; public static bool IsReady => _isReady;
@ -18,13 +19,14 @@ namespace Guru
public static Action<bool> OnFirebaseAuthResult; public static Action<bool> OnFirebaseAuthResult;
public static Action<bool> OnUserAuthResult; public static Action<bool> OnUserAuthResult;
public static Action<string> OnAdjustDeeplinkCallback = null;
public static void InitFirebase(Action callback)
public static void InitFirebase(Action callback, bool isDebug = false)
{ {
_isReady = false; _isReady = false;
// Analytics.InitAnalytics(); // 打点提前初始化 _isDebug = isDebug;
Analytics.InitAnalytics(); // 打点提前初始化
// Loom.StartUp(); // 确保主线程开启 // Loom.StartUp(); // 确保主线程开启
@ -101,7 +103,6 @@ namespace Guru
FirebaseAnalytics.GetAnalyticsInstanceIdAsync() FirebaseAnalytics.GetAnalyticsInstanceIdAsync()
.ContinueWithOnMainThread(task => .ContinueWithOnMainThread(task =>
{ {
if (task.IsCompleted && !string.IsNullOrEmpty(task.Result)) if (task.IsCompleted && !string.IsNullOrEmpty(task.Result))
{ {
// 保存本地ID备份 // 保存本地ID备份
@ -118,14 +119,11 @@ namespace Guru
string fbAppId = GuruSettings.Instance.IPMSetting.FacebookAppId; string fbAppId = GuruSettings.Instance.IPMSetting.FacebookAppId;
if (!string.IsNullOrEmpty(IPMConfig.ADJUST_ID)) if (!string.IsNullOrEmpty(IPMConfig.ADJUST_ID))
{
ReportAdjustId(IPMConfig.ADJUST_ID); // 二次启动后，若有值则立即上报属性 ReportAdjustId(IPMConfig.ADJUST_ID); // 二次启动后，若有值则立即上报属性
AdjustService.StartService(appToken, fbAppId, OnGetAdjustId, OnAdjustDeeplinkCallback);
});
} }
private static void OnGetAdjustId(string adjustId) AdjustService.StartService(appToken, fbAppId, adjustId =>
{ {
// 获取 ADID // 获取 ADID
if (string.IsNullOrEmpty(adjustId)) if (string.IsNullOrEmpty(adjustId))
@ -137,8 +135,9 @@ namespace Guru
IPMConfig.ADJUST_ID = adjustId; IPMConfig.ADJUST_ID = adjustId;
} }
ReportAdjustId(adjustId); ReportAdjustId(adjustId);
});
Analytics.OnAdjustInitComplete(); });
} }

47
Runtime/GuruCore/Runtime/Reporter/CrashlyticsAgent.cs
View File

@ -9,8 +9,9 @@ namespace Guru
public static class CrashlyticsAgent public static class CrashlyticsAgent
{ {
private static bool _initOnce; private static bool _initOnce;
private static bool IsFirebaseReady => FirebaseUtil.IsFirebaseInitialized; private static bool _isReady;
private static Queue<Exception> _expCache;
private static bool _hasSetUser = false; private static bool _hasSetUser = false;
/// <summary> /// <summary>
@ -31,18 +32,45 @@ namespace Guru
LogType.Assert, LogType.Assert,
}; };
public static void Init() public static void Install()
{ {
if (_initOnce) return; if (_initOnce) return;
_initOnce = true; _initOnce = true;
_expCache = new Queue<Exception>(20);
Application.logMessageReceived -= OnReceivedMessage; Application.logMessageReceived -= OnReceivedMessage;
Application.logMessageReceived += OnReceivedMessage; Application.logMessageReceived += OnReceivedMessage;
Crashlytics.IsCrashlyticsCollectionEnabled = true; // Application.logMessageReceivedThreaded -= OnReceivedMessage;
// Application.logMessageReceivedThreaded += OnReceivedMessage;
if (FirebaseUtil.IsReady)
{
OnFirebaseComplete(true);
return;
} }
FirebaseUtil.onInitComplete -= OnFirebaseComplete;
FirebaseUtil.onInitComplete += OnFirebaseComplete;
}
private static void OnFirebaseComplete(bool success)
{
FirebaseUtil.onInitComplete -= OnFirebaseComplete;
if (success)
{
_isReady = true;
Crashlytics.IsCrashlyticsCollectionEnabled = true;
if (_expCache != null && _expCache.Count > 0)
{
while (_expCache.Count > 0)
{
LogException(_expCache.Dequeue());
}
_expCache.Clear();
}
}
}
private static string ToLogTypeString(LogType type) private static string ToLogTypeString(LogType type)
{ {
@ -73,8 +101,14 @@ namespace Guru
public static void LogException(Exception ex) public static void LogException(Exception ex)
{ {
if (!IsFirebaseReady) return; if (!_isReady)
{
Install();
_expCache.Enqueue(ex);
return;
}
Crashlytics.LogException(ex); Crashlytics.LogException(ex);
// CheckSetUser();
} }
public static void LogException(string msg) public static void LogException(string msg)
@ -84,14 +118,15 @@ namespace Guru
public static void Log(string msg) public static void Log(string msg)
{ {
if (!IsFirebaseReady) return; if (!_isReady) return;
Crashlytics.Log(msg); Crashlytics.Log(msg);
// CheckSetUser();
} }
public static void SetCustomKey(string key, string value) public static void SetCustomKey(string key, string value)
{ {
if (!IsFirebaseReady) return; if (!_isReady) return;
Crashlytics.SetCustomKey(key, value); Crashlytics.SetCustomKey(key, value);
} }

4
Runtime/GuruCore/Runtime/Settings/GuruSettings.cs
View File

@ -140,13 +140,9 @@ namespace Guru
public class AnalyticsSetting public class AnalyticsSetting
{ {
[SerializeField] private int levelEndSuccessNum = 50; [SerializeField] private int levelEndSuccessNum = 50;
[Obsolete("Will not use in next version", false)]
[SerializeField] private bool enalbeFirebaseAnalytics = true; [SerializeField] private bool enalbeFirebaseAnalytics = true;
[Obsolete("Will not use in next version", false)]
[SerializeField] private bool enalbeFacebookAnalytics = true; [SerializeField] private bool enalbeFacebookAnalytics = true;
[Obsolete("Will not use in next version", false)]
[SerializeField] private bool enalbeAdjustAnalytics = true; [SerializeField] private bool enalbeAdjustAnalytics = true;
[SerializeField] internal List<AdjustEvent> adjustEventList; [SerializeField] internal List<AdjustEvent> adjustEventList;
public int LevelEndSuccessNum => levelEndSuccessNum; public int LevelEndSuccessNum => levelEndSuccessNum;

3
Runtime/GuruDebugger/Runtime/AdsStatus/MVP/AdStatusPresenter.Ads.cs
View File

@ -65,7 +65,6 @@ namespace Guru
private void OnStatueChanged(AdStatusInfo info) private void OnStatueChanged(AdStatusInfo info)
{ {
if (_model == null) return;
_model.monitorInfo = CreateMonitorInfo(); _model.monitorInfo = CreateMonitorInfo();
if (info != null) if (info != null)
@ -107,7 +106,7 @@ namespace Guru
string msg = ""; string msg = "";
bool loaded = false; bool loaded = false;
if (ADService.Instance == null || !ADService.Instance.IsInitialized) if (!ADService.Instance.IsInitialized)
{ {
msg = ColoredText("AdService not initialized...", Consts.ColorRed); msg = ColoredText("AdService not initialized...", Consts.ColorRed);
return msg; return msg;

4
Runtime/GuruIAP/Runtime/Code/IAPServiceBase.cs
View File

@ -1132,7 +1132,7 @@ namespace Guru
private void ReportGoogleOrderLost(GoogleOrderData data) private void ReportGoogleOrderLost(GoogleOrderData data)
{ {
Analytics.TrackEvent("google_order_lost", new Dictionary<string, dynamic>() Analytics.LogEvent("google_order_lost", new Dictionary<string, dynamic>()
{ {
["data"] = data.ToString(), ["data"] = data.ToString(),
}, new Analytics.EventSetting() }, new Analytics.EventSetting()
@ -1144,7 +1144,7 @@ namespace Guru
private void ReportAppleOrderLost(AppleOrderData data) private void ReportAppleOrderLost(AppleOrderData data)
{ {
Analytics.TrackEvent("apple_order_lost", new Dictionary<string, dynamic>() Analytics.LogEvent("apple_order_lost", new Dictionary<string, dynamic>()
{ {
["data"] = data.ToString(), ["data"] = data.ToString(),
}, new Analytics.EventSetting() }, new Analytics.EventSetting()

8
Runtime/GuruNetworkMonitor.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 10f8491dbf6264bc393cb7578397ec7f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Runtime/GuruNetworkMonitor/Plugins.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: bc0062a7d36f144beabfdea9e3a8e2c7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Runtime/GuruNetworkMonitor/Plugins/Android.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 4725a71a48aec4a5083c37f5ff09a550
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Runtime/GuruNetworkMonitor/Plugins/Android/connectivity-1.0.0.aar
View File

Binary file not shown.

32
Runtime/GuruNetworkMonitor/Plugins/Android/connectivity-1.0.0.aar.meta
View File

@ -1,32 +0,0 @@
fileFormatVersion: 2
guid: 05a3c5d94488c454ea77722fc8f0a80c
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Android: Android
second:
enabled: 1
settings: {}
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:

3
Runtime/GuruNetworkMonitor/Plugins/Android/proguard-user.txt
View File

@ -1,3 +0,0 @@
-keep class com.facebook.unity.* { *; }
-keepattributes Signature
-keep class com.guru.unity.monitor.** { *; }

7
Runtime/GuruNetworkMonitor/Plugins/Android/proguard-user.txt.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: d0ac28ef06c604f789bb32b31225c157
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Runtime/GuruNetworkMonitor/Plugins/IOS.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: e5d09fde296334b46844a972d0289dcc
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

80
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework.meta
View File

@ -1,80 +0,0 @@
fileFormatVersion: 2
guid: 18c322abb3a1e4d9eaea5e395dab1377
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
: Any
second:
enabled: 0
settings:
Exclude Android: 1
Exclude Editor: 1
Exclude Linux64: 1
Exclude OSXUniversal: 1
Exclude Win: 1
Exclude Win64: 1
Exclude iOS: 0
- first:
Android: Android
second:
enabled: 0
settings:
CPU: ARMv7
- first:
Any:
second:
enabled: 0
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
CPU: AnyCPU
DefaultValueInitialized: true
OS: AnyOS
- first:
Standalone: Linux64
second:
enabled: 0
settings:
CPU: None
- first:
Standalone: OSXUniversal
second:
enabled: 0
settings:
CPU: None
- first:
Standalone: Win
second:
enabled: 0
settings:
CPU: None
- first:
Standalone: Win64
second:
enabled: 0
settings:
CPU: None
- first:
iPhone: iOS
second:
enabled: 1
settings:
AddToEmbeddedBinaries: true
CPU: AnyCPU
CompileFlags:
FrameworkDependencies:
userData:
assetBundleName:
assetBundleVariant:

BIN
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Connectivity
View File

Binary file not shown.

7
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Connectivity.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: ec7317011341a40a1a0ee7ae5f38f270
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Headers.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: a4ccb52ed7f6b4dff8731e9e93293ccb
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

337
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Headers/Connectivity-Swift.h
View File

@ -1,337 +0,0 @@
#if 0
#elif defined(__arm64__) && __arm64__
// Generated by Apple Swift version 5.9.2 effective-4.1.50 (swiftlang-5.9.2.2.56 clang-1500.1.0.2.5)
#ifndef CONNECTIVITY_SWIFT_H
#define CONNECTIVITY_SWIFT_H
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wgcc-compat"
#if !defined(__has_include)
# define __has_include(x) 0
#endif
#if !defined(__has_attribute)
# define __has_attribute(x) 0
#endif
#if !defined(__has_feature)
# define __has_feature(x) 0
#endif
#if !defined(__has_warning)
# define __has_warning(x) 0
#endif
#if __has_include(<swift/objc-prologue.h>)
# include <swift/objc-prologue.h>
#endif
#pragma clang diagnostic ignored "-Wauto-import"
#if defined(__OBJC__)
#include <Foundation/Foundation.h>
#endif
#if defined(__cplusplus)
#include <cstdint>
#include <cstddef>
#include <cstdbool>
#include <cstring>
#include <stdlib.h>
#include <new>
#include <type_traits>
#else
#include <stdint.h>
#include <stddef.h>
#include <stdbool.h>
#include <string.h>
#endif
#if defined(__cplusplus)
#if defined(__arm64e__) && __has_include(<ptrauth.h>)
# include <ptrauth.h>
#else
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wreserved-macro-identifier"
# ifndef __ptrauth_swift_value_witness_function_pointer
# define __ptrauth_swift_value_witness_function_pointer(x)
# endif
# ifndef __ptrauth_swift_class_method_pointer
# define __ptrauth_swift_class_method_pointer(x)
# endif
#pragma clang diagnostic pop
#endif
#endif
#if !defined(SWIFT_TYPEDEFS)
# define SWIFT_TYPEDEFS 1
# if __has_include(<uchar.h>)
# include <uchar.h>
# elif !defined(__cplusplus)
typedef uint_least16_t char16_t;
typedef uint_least32_t char32_t;
# endif
typedef float swift_float2 __attribute__((__ext_vector_type__(2)));
typedef float swift_float3 __attribute__((__ext_vector_type__(3)));
typedef float swift_float4 __attribute__((__ext_vector_type__(4)));
typedef double swift_double2 __attribute__((__ext_vector_type__(2)));
typedef double swift_double3 __attribute__((__ext_vector_type__(3)));
typedef double swift_double4 __attribute__((__ext_vector_type__(4)));
typedef int swift_int2 __attribute__((__ext_vector_type__(2)));
typedef int swift_int3 __attribute__((__ext_vector_type__(3)));
typedef int swift_int4 __attribute__((__ext_vector_type__(4)));
typedef unsigned int swift_uint2 __attribute__((__ext_vector_type__(2)));
typedef unsigned int swift_uint3 __attribute__((__ext_vector_type__(3)));
typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4)));
#endif
#if !defined(SWIFT_PASTE)
# define SWIFT_PASTE_HELPER(x, y) x##y
# define SWIFT_PASTE(x, y) SWIFT_PASTE_HELPER(x, y)
#endif
#if !defined(SWIFT_METATYPE)
# define SWIFT_METATYPE(X) Class
#endif
#if !defined(SWIFT_CLASS_PROPERTY)
# if __has_feature(objc_class_property)
# define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__
# else
# define SWIFT_CLASS_PROPERTY(...)
# endif
#endif
#if !defined(SWIFT_RUNTIME_NAME)
# if __has_attribute(objc_runtime_name)
# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X)))
# else
# define SWIFT_RUNTIME_NAME(X)
# endif
#endif
#if !defined(SWIFT_COMPILE_NAME)
# if __has_attribute(swift_name)
# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X)))
# else
# define SWIFT_COMPILE_NAME(X)
# endif
#endif
#if !defined(SWIFT_METHOD_FAMILY)
# if __has_attribute(objc_method_family)
# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X)))
# else
# define SWIFT_METHOD_FAMILY(X)
# endif
#endif
#if !defined(SWIFT_NOESCAPE)
# if __has_attribute(noescape)
# define SWIFT_NOESCAPE __attribute__((noescape))
# else
# define SWIFT_NOESCAPE
# endif
#endif
#if !defined(SWIFT_RELEASES_ARGUMENT)
# if __has_attribute(ns_consumed)
# define SWIFT_RELEASES_ARGUMENT __attribute__((ns_consumed))
# else
# define SWIFT_RELEASES_ARGUMENT
# endif
#endif
#if !defined(SWIFT_WARN_UNUSED_RESULT)
# if __has_attribute(warn_unused_result)
# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
# else
# define SWIFT_WARN_UNUSED_RESULT
# endif
#endif
#if !defined(SWIFT_NORETURN)
# if __has_attribute(noreturn)
# define SWIFT_NORETURN __attribute__((noreturn))
# else
# define SWIFT_NORETURN
# endif
#endif
#if !defined(SWIFT_CLASS_EXTRA)
# define SWIFT_CLASS_EXTRA
#endif
#if !defined(SWIFT_PROTOCOL_EXTRA)
# define SWIFT_PROTOCOL_EXTRA
#endif
#if !defined(SWIFT_ENUM_EXTRA)
# define SWIFT_ENUM_EXTRA
#endif
#if !defined(SWIFT_CLASS)
# if __has_attribute(objc_subclassing_restricted)
# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_CLASS_EXTRA
# define SWIFT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_subclassing_restricted)) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
# else
# define SWIFT_CLASS(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
# define SWIFT_CLASS_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_CLASS_EXTRA
# endif
#endif
#if !defined(SWIFT_RESILIENT_CLASS)
# if __has_attribute(objc_class_stub)
# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME) __attribute__((objc_class_stub))
# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) __attribute__((objc_class_stub)) SWIFT_CLASS_NAMED(SWIFT_NAME)
# else
# define SWIFT_RESILIENT_CLASS(SWIFT_NAME) SWIFT_CLASS(SWIFT_NAME)
# define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) SWIFT_CLASS_NAMED(SWIFT_NAME)
# endif
#endif
#if !defined(SWIFT_PROTOCOL)
# define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
# define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA
#endif
#if !defined(SWIFT_EXTENSION)
# define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__)
#endif
#if !defined(OBJC_DESIGNATED_INITIALIZER)
# if __has_attribute(objc_designated_initializer)
# define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer))
# else
# define OBJC_DESIGNATED_INITIALIZER
# endif
#endif
#if !defined(SWIFT_ENUM_ATTR)
# if __has_attribute(enum_extensibility)
# define SWIFT_ENUM_ATTR(_extensibility) __attribute__((enum_extensibility(_extensibility)))
# else
# define SWIFT_ENUM_ATTR(_extensibility)
# endif
#endif
#if !defined(SWIFT_ENUM)
# define SWIFT_ENUM(_type, _name, _extensibility) enum _name : _type _name; enum SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type
# if __has_feature(generalized_swift_name)
# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) enum _name : _type _name SWIFT_COMPILE_NAME(SWIFT_NAME); enum SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_ENUM_ATTR(_extensibility) SWIFT_ENUM_EXTRA _name : _type
# else
# define SWIFT_ENUM_NAMED(_type, _name, SWIFT_NAME, _extensibility) SWIFT_ENUM(_type, _name, _extensibility)
# endif
#endif
#if !defined(SWIFT_UNAVAILABLE)
# define SWIFT_UNAVAILABLE __attribute__((unavailable))
#endif
#if !defined(SWIFT_UNAVAILABLE_MSG)
# define SWIFT_UNAVAILABLE_MSG(msg) __attribute__((unavailable(msg)))
#endif
#if !defined(SWIFT_AVAILABILITY)
# define SWIFT_AVAILABILITY(plat, ...) __attribute__((availability(plat, __VA_ARGS__)))
#endif
#if !defined(SWIFT_WEAK_IMPORT)
# define SWIFT_WEAK_IMPORT __attribute__((weak_import))
#endif
#if !defined(SWIFT_DEPRECATED)
# define SWIFT_DEPRECATED __attribute__((deprecated))
#endif
#if !defined(SWIFT_DEPRECATED_MSG)
# define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__)))
#endif
#if !defined(SWIFT_DEPRECATED_OBJC)
# if __has_feature(attribute_diagnose_if_objc)
# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning")))
# else
# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg)
# endif
#endif
#if defined(__OBJC__)
#if !defined(IBSegueAction)
# define IBSegueAction
#endif
#endif
#if !defined(SWIFT_EXTERN)
# if defined(__cplusplus)
# define SWIFT_EXTERN extern "C"
# else
# define SWIFT_EXTERN extern
# endif
#endif
#if !defined(SWIFT_CALL)
# define SWIFT_CALL __attribute__((swiftcall))
#endif
#if !defined(SWIFT_INDIRECT_RESULT)
# define SWIFT_INDIRECT_RESULT __attribute__((swift_indirect_result))
#endif
#if !defined(SWIFT_CONTEXT)
# define SWIFT_CONTEXT __attribute__((swift_context))
#endif
#if !defined(SWIFT_ERROR_RESULT)
# define SWIFT_ERROR_RESULT __attribute__((swift_error_result))
#endif
#if defined(__cplusplus)
# define SWIFT_NOEXCEPT noexcept
#else
# define SWIFT_NOEXCEPT
#endif
#if !defined(SWIFT_C_INLINE_THUNK)
# if __has_attribute(always_inline)
# if __has_attribute(nodebug)
# define SWIFT_C_INLINE_THUNK inline __attribute__((always_inline)) __attribute__((nodebug))
# else
# define SWIFT_C_INLINE_THUNK inline __attribute__((always_inline))
# endif
# else
# define SWIFT_C_INLINE_THUNK inline
# endif
#endif
#if defined(_WIN32)
#if !defined(SWIFT_IMPORT_STDLIB_SYMBOL)
# define SWIFT_IMPORT_STDLIB_SYMBOL __declspec(dllimport)
#endif
#else
#if !defined(SWIFT_IMPORT_STDLIB_SYMBOL)
# define SWIFT_IMPORT_STDLIB_SYMBOL
#endif
#endif
#if defined(__OBJC__)
#if __has_feature(objc_modules)
#if __has_warning("-Watimport-in-framework-header")
#pragma clang diagnostic ignored "-Watimport-in-framework-header"
#endif
@import Foundation;
@import ObjectiveC;
#endif
#endif
#pragma clang diagnostic ignored "-Wproperty-attribute-mismatch"
#pragma clang diagnostic ignored "-Wduplicate-method-arg"
#if __has_warning("-Wpragma-clang-attribute")
# pragma clang diagnostic ignored "-Wpragma-clang-attribute"
#endif
#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wnullability"
#pragma clang diagnostic ignored "-Wdollar-in-identifier-extension"
#if __has_attribute(external_source_symbol)
# pragma push_macro("any")
# undef any
# pragma clang attribute push(__attribute__((external_source_symbol(language="Swift", defined_in="Connectivity",generated_declaration))), apply_to=any(function,enum,objc_interface,objc_category,objc_protocol))
# pragma pop_macro("any")
#endif
#if defined(__OBJC__)
@class NSString;
SWIFT_CLASS("_TtC12Connectivity12Connectivity")
@interface Connectivity : NSObject
SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, strong) Connectivity * _Nonnull shared;)
+ (Connectivity * _Nonnull)shared SWIFT_WARN_UNUSED_RESULT;
SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, copy) NSString * _Nonnull CONNECTIVITY_NONE;)
+ (NSString * _Nonnull)CONNECTIVITY_NONE SWIFT_WARN_UNUSED_RESULT;
SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, copy) NSString * _Nonnull CONNECTIVITY_WIFI;)
+ (NSString * _Nonnull)CONNECTIVITY_WIFI SWIFT_WARN_UNUSED_RESULT;
SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, copy) NSString * _Nonnull CONNECTIVITY_MOBILE;)
+ (NSString * _Nonnull)CONNECTIVITY_MOBILE SWIFT_WARN_UNUSED_RESULT;
SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, copy) NSString * _Nonnull CONNECTIVITY_ETHERNET;)
+ (NSString * _Nonnull)CONNECTIVITY_ETHERNET SWIFT_WARN_UNUSED_RESULT;
SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, copy) NSString * _Nonnull CONNECTIVITY_VPN;)
+ (NSString * _Nonnull)CONNECTIVITY_VPN SWIFT_WARN_UNUSED_RESULT;
SWIFT_CLASS_PROPERTY(@property (nonatomic, class, readonly, copy) NSString * _Nonnull CONNECTIVITY_OTHER;)
+ (NSString * _Nonnull)CONNECTIVITY_OTHER SWIFT_WARN_UNUSED_RESULT;
- (nonnull instancetype)init SWIFT_UNAVAILABLE;
+ (nonnull instancetype)new SWIFT_DEPRECATED_MSG("-init is unavailable");
- (void)initializeWithCompletion:(void (^ _Nonnull)(BOOL))completion;
- (NSArray<NSString *> * _Nonnull)checkConnectionType SWIFT_WARN_UNUSED_RESULT;
@end
#endif
#if __has_attribute(external_source_symbol)
# pragma clang attribute pop
#endif
#if defined(__cplusplus)
#endif
#pragma clang diagnostic pop
#endif
#else
#error unsupported Swift architecture
#endif

27
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Headers/Connectivity-Swift.h.meta
View File

@ -1,27 +0,0 @@
fileFormatVersion: 2
guid: c7072e499221b489e8a171a746c1d381
PluginImporter:
externalObjects: {}
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
Any:
second:
enabled: 1
settings: {}
- first:
Editor: Editor
second:
enabled: 0
settings:
DefaultValueInitialized: true
userData:
assetBundleName:
assetBundleVariant:

BIN
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Info.plist
View File

Binary file not shown.

7
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Info.plist.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: b3be6515c98fc4516b74799d2232851a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Modules.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 009197294dbfe4bd5b64f833fce7277e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Modules/Connectivity.swiftmodule.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: db929fad7809a40a6af254c5262adb3a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Modules/Connectivity.swiftmodule/Project.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: d014052e45f6948db82f9fbecdb02a96
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Modules/Connectivity.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo
View File

Binary file not shown.

7
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Modules/Connectivity.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 5a2b967c5b7f944adb348971a0e13c79
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

9
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Modules/Connectivity.swiftmodule/arm64-apple-ios.abi.json
View File

@ -1,9 +0,0 @@
{
"ABIRoot": {
"kind": "Root",
"name": "TopLevel",
"printedName": "TopLevel",
"json_format_version": 8
},
"ConstValues": []
}

7
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Modules/Connectivity.swiftmodule/arm64-apple-ios.abi.json.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: b8637a4450c6b4ca895cd05427db6ffc
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Modules/Connectivity.swiftmodule/arm64-apple-ios.swiftdoc
View File

Binary file not shown.

7
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Modules/Connectivity.swiftmodule/arm64-apple-ios.swiftdoc.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 2b7b377a06cfe4472ace76077b0d1e24
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Modules/Connectivity.swiftmodule/arm64-apple-ios.swiftmodule
View File

Binary file not shown.

7
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Modules/Connectivity.swiftmodule/arm64-apple-ios.swiftmodule.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: be5b523ba98e649d9938fc7df1e7b55a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

4
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Modules/module.modulemap
View File

@ -1,4 +0,0 @@
framework module Connectivity {
header "Connectivity-Swift.h"
requires objc
}

7
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/Modules/module.modulemap.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 97a465fd6df3b4f72a477ef19bf727a9
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/_CodeSignature.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 1a90376b0826241cf8ed25c4ba2b91fc
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

168
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/_CodeSignature/CodeResources
View File

@ -1,168 +0,0 @@
<?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>
<key>files</key>
<dict>
<key>Headers/Connectivity-Swift.h</key>
<data>
2jZWRNZEB9lWoT02/WI0gpx8bUY=
</data>
<key>Info.plist</key>
<data>
lVs8E6FtUHvDAsoK7zwpgZ+1m84=
</data>
<key>Modules/Connectivity.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo</key>
<data>
3vRjRUNrw8fWaShfTaH+cBfxfLE=
</data>
<key>Modules/Connectivity.swiftmodule/arm64-apple-ios.abi.json</key>
<data>
FSPnLbho3G+LL9smI3XgVOqBIQ4=
</data>
<key>Modules/Connectivity.swiftmodule/arm64-apple-ios.swiftdoc</key>
<data>
HgPMAkcK2+NGvcVfwyFJ9u/nd0k=
</data>
<key>Modules/Connectivity.swiftmodule/arm64-apple-ios.swiftmodule</key>
<data>
nK9APrK3atZTGuid35+A6Dde02M=
</data>
<key>Modules/module.modulemap</key>
<data>
JQ0IhYrWi46ysbcXxnNfARgJPro=
</data>
</dict>
<key>files2</key>
<dict>
<key>Headers/Connectivity-Swift.h</key>
<dict>
<key>hash2</key>
<data>
xwPPIVygOJDaH/CCrDO25Y2645Q/IQYSiJrV3eJJy+M=
</data>
</dict>
<key>Modules/Connectivity.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo</key>
<dict>
<key>hash2</key>
<data>
Qgk/xiutw35xy8VeU5niELPbBEi5gVVuXYai3rhRrbI=
</data>
</dict>
<key>Modules/Connectivity.swiftmodule/arm64-apple-ios.abi.json</key>
<dict>
<key>hash2</key>
<data>
KnRdWE4y6t4QM5zi5JDptPdHFgJy1Tku+7GLkZS2aNM=
</data>
</dict>
<key>Modules/Connectivity.swiftmodule/arm64-apple-ios.swiftdoc</key>
<dict>
<key>hash2</key>
<data>
ZNpy4/pGL15IFXpHTav2UvUYM7kQPN/0eTjxtfLqYq8=
</data>
</dict>
<key>Modules/Connectivity.swiftmodule/arm64-apple-ios.swiftmodule</key>
<dict>
<key>hash2</key>
<data>
Et4EI2nA28WHGnFW0ki2IUjCTs703CjwdRvol0loQGo=
</data>
</dict>
<key>Modules/module.modulemap</key>
<dict>
<key>hash2</key>
<data>
07XGBKw7w58ugYy09lbnsq9IhqStrsOHCKCfwm/MrpU=
</data>
</dict>
</dict>
<key>rules</key>
<dict>
<key>^.*</key>
<true/>
<key>^.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^version.plist$</key>
<true/>
</dict>
<key>rules2</key>
<dict>
<key>.*\.dSYM($|/)</key>
<dict>
<key>weight</key>
<real>11</real>
</dict>
<key>^(.*/)?\.DS_Store$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>2000</real>
</dict>
<key>^.*</key>
<true/>
<key>^.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^Info\.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^PkgInfo$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^embedded\.provisionprofile$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^version\.plist$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
</dict>
</dict>
</plist>

7
Runtime/GuruNetworkMonitor/Plugins/IOS/Connectivity.framework/_CodeSignature/CodeResources.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 158f1aee738db4ad8a07a36e89614060
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

0
Runtime/GuruNetworkMonitor/README.md
View File

7
Runtime/GuruNetworkMonitor/README.md.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: a0a25c648675a494eb50f2dd3159ff81
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Runtime/GuruNetworkMonitor/Runtime.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: d1121778023d64cafad6d7eb947140d0
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

116
Runtime/GuruNetworkMonitor/Runtime/NetworkStatusMonitor.cs
View File

@ -1,116 +0,0 @@
namespace Guru.Network
{
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
public class NetworkStatusMonitor
{
private const string Tag = "[NET]";
private const string NETWORK_STATUS_NONE = "none";
private const string NETWORK_STATUS_MOBILE = "mobile";
private const string NETWORK_STATUS_WIFI = "wifi";
private const string NETWORK_STATUS_ETHERNET = "ethernet";
private const string NETWORK_STATUS_VPN = "vpn";
private const string NETWORK_STATUS_TETHER = "tether";
private const string NETWORK_STATUS_BLUETOOTH = "bluetooth";
private const string NETWORK_STATUS_OTHER = "other";
private bool _isReady = false;
private INetworkStatusProxy _proxy;
private INetworkStatusProxy Proxy
{
get
{
if (_proxy == null)
{
#if UNITY_EDITOR
_proxy = new NetworkStatusEditor();
#elif UNITY_ANDROID
_proxy = new NetworkStatusAndroid();
#elif UNITY_IOS
_proxy = new NetworkStatusIOS();
#endif
}
if (_proxy == null)
{
// 如果未实现则报异常
throw new NotImplementedException("Can't find NetworkStatusProxy instance!!");
}
return _proxy;
}
}
/// <summary>
/// 网络状态列表
/// </summary>
private List<string> _statusNameList = new List<string>()
{
NETWORK_STATUS_VPN,
NETWORK_STATUS_TETHER,
NETWORK_STATUS_MOBILE,
NETWORK_STATUS_WIFI,
NETWORK_STATUS_ETHERNET,
NETWORK_STATUS_BLUETOOTH,
NETWORK_STATUS_OTHER,
NETWORK_STATUS_NONE,
};
public void Init(Action<bool> onInitComplete = null)
{
Proxy.Init(success =>
{
_isReady = success;
onInitComplete?.Invoke(success);
});
}
/// <summary>
/// 获取网络状态
/// </summary>
/// <returns></returns>
public string GetNetworkStatus()
{
if (_isReady)
{
var status = Proxy.GetNetworkStatus();
if (status != null && status.Length > 0)
{
string statusName = "";
for (int i = 0; i < _statusNameList.Count; i++)
{
// 根据名称优先级， 先获取到的优先上报
statusName = _statusNameList[i];
if (status.Contains(statusName))
{
Debug.Log($"{Tag} --- GetNetworkStatus: [{string.Join(",", status)}]");
return statusName;
}
}
}
}
Debug.LogWarning($"{Tag} --- Network Monitor is not ready!");
return NETWORK_STATUS_NONE;
}
// private void OnProxyInitComplete(bool success)
// {
// if (success)
// {
// Debug.Log($"{Tag} --- NetworkStatusMonitor init success");
// }
// else
// {
// Debug.LogError($"{Tag} --- NetworkStatusMonitor init failed");
// }
// }
}
}

3
Runtime/GuruNetworkMonitor/Runtime/NetworkStatusMonitor.cs.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 89389dfafc844651bb8f6a23865edca6
timeCreated: 1721958852

8
Runtime/GuruNetworkMonitor/Runtime/Proxy.meta
View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 1981d1e0510af48ff81cbd4db201318f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

16
Runtime/GuruNetworkMonitor/Runtime/Proxy/INetworkStatusProxy.cs
View File

@ -1,16 +0,0 @@
namespace Guru.Network
{
using System;
/// <summary>
/// 网络状态代理
/// </summary>
public interface INetworkStatusProxy
{
void Init(Action<bool> onInitComplete);
string[] GetNetworkStatus();
}
}

3
Runtime/GuruNetworkMonitor/Runtime/Proxy/INetworkStatusProxy.cs.meta
View File

@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: aeba66b9f9e4413a8475bf5cc363fae1
timeCreated: 1721957685

55
Runtime/GuruNetworkMonitor/Runtime/Proxy/NetworkStatusAndroid.cs
View File

@ -1,55 +0,0 @@
namespace Guru.Network
{
using System;
using UnityEngine;
public class NetworkStatusAndroid: INetworkStatusProxy
{
private const string Tag = "[NET][AND]";
#if UNITY_ANDROID
private const string CONNECTIVITY_ANDROID_CLASS_NAME = "com.guru.unity.monitor.Connectivity";
private AndroidJavaObject _connectivity;
private bool _isReady = false;
#endif
/// <summary>
/// 初始化
/// </summary>
/// <param name="onInitComplete"></param>
public void Init(Action<bool> onInitComplete)
{
#if UNITY_ANDROID
AndroidJavaObject currentActivity = new AndroidJavaObject("com.unity3d.player.UnityPlayer").GetStatic<AndroidJavaObject>("currentActivity");
_connectivity = new AndroidJavaObject(CONNECTIVITY_ANDROID_CLASS_NAME).CallStatic<AndroidJavaObject>("getInstance");
_isReady = _connectivity.Call<bool>("initialize", currentActivity);
// Debug.LogWarning($"{Tag} --- Network status init result:{_isReady}");
// Debug.LogWarning($"{Tag} --- _connectivity:{_connectivity}");
onInitComplete?.Invoke(_isReady); // 调用初始化回调
#endif
}
/// <summary>
/// 获取网络状态
/// </summary>
/// <returns></returns>
public string[] GetNetworkStatus()
{
#if UNITY_ANDROID
if (!_isReady)
{
Debug.LogError($"{Tag} --- GetNetworkStatus :: initialized failed.");
}
else if(_connectivity != null)
{
return _connectivity.Call<string[]>("checkConnectionType");
}
#endif
return new string[] {"none"};
}
}
}

Some files were not shown because too many files have changed in this diff Show More