diff --git a/Assets/Editor/AutoPack.cs b/Assets/Editor/AutoPack.cs index 3f16f85a3e..57b69f4d85 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -442,7 +442,7 @@ public class AutoPack : EditorWindow string apkFilePath = _MomPackPath + PackConfig[index].project + "/build/outputs/apk/release/" + PackConfig[index].project + "-release.apk"; if (File.Exists(apkFilePath)) { - File.Copy(apkFilePath, APKPath + "/" + PackConfig[index].name +"_"+ PackConfig[index].project + "_" + versionStr + "_" + PackTime + ".apk"); + File.Copy(apkFilePath, APKPath + "/" + PackConfig[index].name +"_" + versionStr + "_" + PackTime + ".apk"); } Debug.Log(PackConfig[index].name + ":打包完成"); EditorUtility.ClearProgressBar(); @@ -454,6 +454,7 @@ public class AutoPack : EditorWindow string[] lines = File.ReadAllLines(tpath); string versionCode = ""; string versionName = ""; + string applicationId = ""; foreach (string l in lines) { string lt = l.Trim(); @@ -464,8 +465,13 @@ public class AutoPack : EditorWindow { versionName = lt.Split('\'')[1]; } + else if (lt.StartsWith("applicationId")) + { + applicationId = lt.Split('\'')[1]; + } + } - return string.Format("{0}({1})", versionName, versionCode); + return string.Format("{0}_{1}({2})", applicationId, versionName, versionCode); } private static void GitUpdate(int index) @@ -484,8 +490,8 @@ public class AutoPack : EditorWindow string[] commands = new string[]{ "echo git add ." + printlog, "git add ." + printlog, - "echo git commit -m 'AutoPack:" + PackConfig[index].name +"_"+ PackConfig[index].project + "_" + versionStr + "_" + PackTime + ".apk'" + printlog, - "git commit -m 'AutoPack:" + PackConfig[index].name +"_"+ PackConfig[index].project + "_" + versionStr + "_" + PackTime + ".apk'" + printlog, + "echo git commit -m 'AutoPack:" + PackConfig[index].name +"_" + versionStr + "_" + PackTime + ".apk'" + printlog, + "git commit -m 'AutoPack:" + PackConfig[index].name +"_" + versionStr + "_" + PackTime + ".apk'" + printlog, "git push", }; ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index].project, commands); diff --git a/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs b/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs index 0d9d15210a..601826e2b2 100644 --- a/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs +++ b/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs @@ -69,7 +69,7 @@ namespace GameLogic //ThinkingAnalyticsAPI.CalibrateTime(1585555578000); ThinkingAnalyticsAPI.CalibrateTimeWithNtp("ntp.aliyun.com"); // 开启自动采集启动和关闭事件 - ThinkingAnalyticsAPI.EnableAutoTrack(AUTO_TRACK_EVENTS.ALL); + ThinkingAnalyticsAPI.EnableAutoTrack(AUTO_TRACK_EVENTS.NO_CRASH); } } diff --git a/Assets/ThinkingAnalytics/ThinkingAnalyticsAPI.cs b/Assets/ThinkingAnalytics/ThinkingAnalyticsAPI.cs index 0cb72dd0ea..34fbea92dc 100644 --- a/Assets/ThinkingAnalytics/ThinkingAnalyticsAPI.cs +++ b/Assets/ThinkingAnalytics/ThinkingAnalyticsAPI.cs @@ -65,8 +65,8 @@ namespace ThinkingAnalytics } public Type? EventType { get; set; } - public string EventName { get; } - public Dictionary Properties { get; } + public string EventName { get; set; } + public Dictionary Properties { get; set; } public DateTime EventTime { get; set; } public string ExtraId { get; set; } @@ -192,7 +192,8 @@ namespace ThinkingAnalytics APP_END = 1 << 1, // 当应用进入后台的时候触发上报,对应 ta_app_end APP_CRASH = 1 << 4, // 当出现未捕获异常的时候触发上报,对应 ta_app_crash APP_INSTALL = 1 << 5, // 应用安装后首次打开的时候触发上报,对应 ta_app_install - ALL = APP_START | APP_END | APP_INSTALL | APP_CRASH + ALL = APP_START | APP_END | APP_INSTALL | APP_CRASH, + NO_CRASH = APP_START | APP_END | APP_INSTALL } public class ThinkingAnalyticsAPI : MonoBehaviour, TaExceptionHandler