Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
5a7e0a4dc8
|
@ -442,7 +442,7 @@ public class AutoPack : EditorWindow
|
||||||
string apkFilePath = _MomPackPath + PackConfig[index].project + "/build/outputs/apk/release/" + PackConfig[index].project + "-release.apk";
|
string apkFilePath = _MomPackPath + PackConfig[index].project + "/build/outputs/apk/release/" + PackConfig[index].project + "-release.apk";
|
||||||
if (File.Exists(apkFilePath))
|
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 + ":打包完成");
|
Debug.Log(PackConfig[index].name + ":打包完成");
|
||||||
EditorUtility.ClearProgressBar();
|
EditorUtility.ClearProgressBar();
|
||||||
|
@ -454,6 +454,7 @@ public class AutoPack : EditorWindow
|
||||||
string[] lines = File.ReadAllLines(tpath);
|
string[] lines = File.ReadAllLines(tpath);
|
||||||
string versionCode = "";
|
string versionCode = "";
|
||||||
string versionName = "";
|
string versionName = "";
|
||||||
|
string applicationId = "";
|
||||||
foreach (string l in lines)
|
foreach (string l in lines)
|
||||||
{
|
{
|
||||||
string lt = l.Trim();
|
string lt = l.Trim();
|
||||||
|
@ -464,8 +465,13 @@ public class AutoPack : EditorWindow
|
||||||
{
|
{
|
||||||
versionName = lt.Split('\'')[1];
|
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)
|
private static void GitUpdate(int index)
|
||||||
|
@ -484,8 +490,8 @@ public class AutoPack : EditorWindow
|
||||||
string[] commands = new string[]{
|
string[] commands = new string[]{
|
||||||
"echo git add ." + printlog,
|
"echo git add ." + printlog,
|
||||||
"git add ." + printlog,
|
"git add ." + printlog,
|
||||||
"echo 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 +"_"+ PackConfig[index].project + "_" + versionStr + "_" + PackTime + ".apk'" + printlog,
|
"git commit -m 'AutoPack:" + PackConfig[index].name +"_" + versionStr + "_" + PackTime + ".apk'" + printlog,
|
||||||
"git push",
|
"git push",
|
||||||
};
|
};
|
||||||
ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index].project, commands);
|
ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index].project, commands);
|
||||||
|
|
|
@ -69,7 +69,7 @@ namespace GameLogic
|
||||||
//ThinkingAnalyticsAPI.CalibrateTime(1585555578000);
|
//ThinkingAnalyticsAPI.CalibrateTime(1585555578000);
|
||||||
ThinkingAnalyticsAPI.CalibrateTimeWithNtp("ntp.aliyun.com");
|
ThinkingAnalyticsAPI.CalibrateTimeWithNtp("ntp.aliyun.com");
|
||||||
// 开启自动采集启动和关闭事件
|
// 开启自动采集启动和关闭事件
|
||||||
ThinkingAnalyticsAPI.EnableAutoTrack(AUTO_TRACK_EVENTS.ALL);
|
ThinkingAnalyticsAPI.EnableAutoTrack(AUTO_TRACK_EVENTS.NO_CRASH);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -65,8 +65,8 @@ namespace ThinkingAnalytics
|
||||||
}
|
}
|
||||||
|
|
||||||
public Type? EventType { get; set; }
|
public Type? EventType { get; set; }
|
||||||
public string EventName { get; }
|
public string EventName { get; set; }
|
||||||
public Dictionary<string, object> Properties { get; }
|
public Dictionary<string, object> Properties { get; set; }
|
||||||
|
|
||||||
public DateTime EventTime { get; set; }
|
public DateTime EventTime { get; set; }
|
||||||
public string ExtraId { get; set; }
|
public string ExtraId { get; set; }
|
||||||
|
@ -192,7 +192,8 @@ namespace ThinkingAnalytics
|
||||||
APP_END = 1 << 1, // 当应用进入后台的时候触发上报,对应 ta_app_end
|
APP_END = 1 << 1, // 当应用进入后台的时候触发上报,对应 ta_app_end
|
||||||
APP_CRASH = 1 << 4, // 当出现未捕获异常的时候触发上报,对应 ta_app_crash
|
APP_CRASH = 1 << 4, // 当出现未捕获异常的时候触发上报,对应 ta_app_crash
|
||||||
APP_INSTALL = 1 << 5, // 应用安装后首次打开的时候触发上报,对应 ta_app_install
|
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
|
public class ThinkingAnalyticsAPI : MonoBehaviour, TaExceptionHandler
|
||||||
|
|
Loading…
Reference in New Issue