From cb8589eba61caa52a5cf1b344712fd53610923af Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 31 Aug 2021 15:26:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8C=85=E9=85=8D=E7=BD=AE=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=93=E6=9C=8D=E5=8C=85=E7=9A=84=E6=AF=8D?= =?UTF-8?q?=E5=8C=85=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/AutoPack.cs | 2 +- .../ThinkingAnalytics/ThinkingAnalyticsAPI.cs | 60 +++++++++---------- 2 files changed, 29 insertions(+), 33 deletions(-) diff --git a/Assets/Editor/AutoPack.cs b/Assets/Editor/AutoPack.cs index c70ffbaa31..872b077e16 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -15,7 +15,7 @@ public class AutoPack : EditorWindow // 专服 new string[]{ "C轮v2", "Logo_gm_nosdk", "TCX_TEST_C_V2", "china/zf_test"}, new string[]{ "灵动专服-测试", "Logo_gn_zf_test", "MHT_GN_ZF_TEST" , "china/zf_test"}, - new string[]{ "灵动专服-正式", "Logo_gn_zf_release", "MHT_GN_ZF_RELEASE" , "china/zf_test"}, + new string[]{ "灵动专服-正式", "Logo_gn_zf_release", "MHT_GN_ZF_RELEASE3" , "china/zf_test"}, new string[]{ "喜扑", "Logo_cn_xipu", "MHT_CN_XIPU", "china/zf_test"}, new string[]{ "草花", "Logo_cn_caohua", "MHT_CN_MIDDLE_WARE" , "china/zf_test"}, new string[]{ "游心", "Logo_cn_youxin", "MHT_CN_YOUXIN", "china/zf_test"}, diff --git a/Assets/ThinkingAnalytics/ThinkingAnalyticsAPI.cs b/Assets/ThinkingAnalytics/ThinkingAnalyticsAPI.cs index 2964ad09c6..0cb72dd0ea 100644 --- a/Assets/ThinkingAnalytics/ThinkingAnalyticsAPI.cs +++ b/Assets/ThinkingAnalytics/ThinkingAnalyticsAPI.cs @@ -32,9 +32,7 @@ using UnityEngine; #if UNITY_EDITOR using UnityEditor; using UnityEditor.Callbacks; -#endif -#if UNITY_IOS -using UnityEditor.iOS.Xcode; +//using UnityEditor.iOS.Xcode; #endif using System.IO; using ThinkingAnalytics.TaException; @@ -290,42 +288,40 @@ namespace ThinkingAnalytics [PostProcessBuildAttribute(88)] public static void onPostProcessBuild(BuildTarget target, string targetPath) { -#if EDITOR_IOS - if (target != BuildTarget.iOS) - { - Debug.LogWarning("Target is not iPhone. XCodePostProcess will not run"); - return; - } +// if (target != BuildTarget.iOS) +// { +// Debug.LogWarning("Target is not iPhone. XCodePostProcess will not run"); +// return; +// } - string projPath = Path.GetFullPath(targetPath) + "/Unity-iPhone.xcodeproj/project.pbxproj"; +// string projPath = Path.GetFullPath(targetPath) + "/Unity-iPhone.xcodeproj/project.pbxproj"; - UnityEditor.iOS.Xcode.PBXProject proj = new UnityEditor.iOS.Xcode.PBXProject(); - proj.ReadFromFile(projPath); -#if UNITY_2019_3_OR_NEWER - string targetGuid = proj.GetUnityFrameworkTargetGuid(); -#else - string targetGuid = proj.TargetGuidByName(PBXProject.GetUnityTargetName()); -#endif +// UnityEditor.iOS.Xcode.PBXProject proj = new UnityEditor.iOS.Xcode.PBXProject(); +// proj.ReadFromFile(projPath); +//#if UNITY_2019_3_OR_NEWER +// string targetGuid = proj.GetUnityFrameworkTargetGuid(); +//#else +// string targetGuid = proj.TargetGuidByName(PBXProject.GetUnityTargetName()); +//#endif - //Build Property - proj.SetBuildProperty(targetGuid, "ENABLE_BITCODE", "NO");//BitCode NO - proj.SetBuildProperty(targetGuid, "GCC_ENABLE_OBJC_EXCEPTIONS", "YES");//Enable Objective-C Exceptions +// //Build Property +// proj.SetBuildProperty(targetGuid, "ENABLE_BITCODE", "NO");//BitCode NO +// proj.SetBuildProperty(targetGuid, "GCC_ENABLE_OBJC_EXCEPTIONS", "YES");//Enable Objective-C Exceptions - string[] headerSearchPathsToAdd = { "$(SRCROOT)/Libraries/Plugins/iOS/ThinkingSDK/Source/main", "$(SRCROOT)/Libraries/Plugins/iOS/ThinkingSDK/Source/common" }; - proj.UpdateBuildProperty(targetGuid, "HEADER_SEARCH_PATHS", headerSearchPathsToAdd, null);// Header Search Paths +// string[] headerSearchPathsToAdd = { "$(SRCROOT)/Libraries/Plugins/iOS/ThinkingSDK/Source/main", "$(SRCROOT)/Libraries/Plugins/iOS/ThinkingSDK/Source/common" }; +// proj.UpdateBuildProperty(targetGuid, "HEADER_SEARCH_PATHS", headerSearchPathsToAdd, null);// Header Search Paths - //Add Frameworks - proj.AddFrameworkToProject(targetGuid, "WebKit.framework", true); - proj.AddFrameworkToProject(targetGuid, "CoreTelephony.framework", true); - proj.AddFrameworkToProject(targetGuid, "SystemConfiguration.framework", true); - proj.AddFrameworkToProject(targetGuid, "Security.framework", true); +// //Add Frameworks +// proj.AddFrameworkToProject(targetGuid, "WebKit.framework", true); +// proj.AddFrameworkToProject(targetGuid, "CoreTelephony.framework", true); +// proj.AddFrameworkToProject(targetGuid, "SystemConfiguration.framework", true); +// proj.AddFrameworkToProject(targetGuid, "Security.framework", true); - //Add Lib - proj.AddFileToBuild(targetGuid, proj.AddFile("usr/lib/libsqlite3.tbd", "libsqlite3.tbd", PBXSourceTree.Sdk)); - proj.AddFileToBuild(targetGuid, proj.AddFile("usr/lib/libz.tbd", "libz.tbd", PBXSourceTree.Sdk)); +// //Add Lib +// proj.AddFileToBuild(targetGuid, proj.AddFile("usr/lib/libsqlite3.tbd", "libsqlite3.tbd", PBXSourceTree.Sdk)); +// proj.AddFileToBuild(targetGuid, proj.AddFile("usr/lib/libz.tbd", "libz.tbd", PBXSourceTree.Sdk)); - proj.WriteToFile(projPath); -#endif +// proj.WriteToFile(projPath); } #endif