From bfe12076fc6648fc103a384958f8534817fd5a0d Mon Sep 17 00:00:00 2001 From: dabaoji <364453445@qq.com> Date: 星期一, 15 三月 2021 17:02:57 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/snxxz_client --- Assets/Editor/XCodeProjectMod.cs | 79 ++++++++++++++------------------------- 1 files changed, 29 insertions(+), 50 deletions(-) diff --git a/Assets/Editor/XCodeProjectMod.cs b/Assets/Editor/XCodeProjectMod.cs index aa69e1d..6c55676 100644 --- a/Assets/Editor/XCodeProjectMod.cs +++ b/Assets/Editor/XCodeProjectMod.cs @@ -2,12 +2,10 @@ using System.IO; using UnityEditor; using UnityEditor.iOS.Xcode.Custom; -using UnityEditor.iOS.Xcode.Custom.Extensions; using UnityEngine; public class XCodeProjectMod { -#if UNITY_IOS private const string CODE_SIGN_DEVELOPER = ""; private const string CODE_SIGN_DISTRIBUTION = ""; private const string PROVISIONING_DEVELOPER = ""; @@ -24,53 +22,39 @@ string _projectPath = PBXProject.GetPBXProjectPath(path); - PBXProject _project = new PBXProject(); - _project.ReadFromString(File.ReadAllText(_projectPath)); + PBXProject project = new PBXProject(); + project.ReadFromString(File.ReadAllText(_projectPath)); - string _targetGUID = _project.TargetGuidByName(PBXProject.GetUnityTargetName()); - string _fwTargetGUID = _project.TargetGuidByName("UnityFramework"); + string targetGUID = project.TargetGuidByName(PBXProject.GetUnityTargetName()); + string fwTargetGUID = project.TargetGuidByName("UnityFramework"); //var _codeSign = Debug.isDebugBuild ? CODE_SIGN_DEVELOPER : CODE_SIGN_DISTRIBUTION; //var _provision = Debug.isDebugBuild ? PROVISIONING_DEVELOPER : PROVISIONING_DISTRIBUTION; // BuildSetting閲岀殑鐩稿叧璁剧疆 - _project.SetBuildProperty(_targetGUID, "ENABLE_BITCODE", "NO"); - _project.SetBuildProperty(_targetGUID, "DEVELOPMENT_TEAM", TEAM); + project.SetBuildProperty(targetGUID, "ENABLE_BITCODE", "NO"); + project.SetBuildProperty(targetGUID, "DEVELOPMENT_TEAM", TEAM); - _project.AddBuildProperty(_targetGUID, "OTHER_LDFLAGS", "-ObjC"); - _project.AddBuildProperty(_targetGUID, "GCC_GENERATE_DEBUGGING_SYMBOLS", "NO"); + project.AddBuildProperty(targetGUID, "OTHER_LDFLAGS", "-ObjC"); + project.AddBuildProperty(targetGUID, "GCC_GENERATE_DEBUGGING_SYMBOLS", "NO"); - // 澶勭悊 Framework - // FreeSDK - _project.AddFrameworkToProject(_targetGUID, "CoreGraphics.framework", true); - _project.AddFrameworkToProject(_targetGUID, "Security.framework", true); - _project.AddFrameworkToProject(_targetGUID, "CoreTelephony.framework", true); - _project.AddFrameworkToProject(_targetGUID, "StoreKit.framework", true); - _project.AddFrameworkToProject(_targetGUID, "MobileCoreServices.framework", true); - _project.AddFrameworkToProject(_targetGUID, "SystemConfiguration.framework", true); - _project.AddFrameworkToProject(_targetGUID, "AdSupport.framework", true); - - // 鏋佸厜鎺ㄩ�� - // JPush - _project.AddFrameworkToProject(_targetGUID, "CFNetwork.framework", true); - _project.AddFrameworkToProject(_targetGUID, "CoreFoundation.framework", true); - _project.AddFrameworkToProject(_targetGUID, "Foundation.framework", true); - _project.AddFrameworkToProject(_targetGUID, "UIKit.framework", true); - _project.AddFrameworkToProject(_targetGUID, "UserNotifications.framework", true); + //bugly + project.AddFrameworkToProject(fwTargetGUID, "SystemConfiguration.framework", true); + project.AddFrameworkToProject(fwTargetGUID, "Security.framework", true); + project.AddFrameworkToProject(fwTargetGUID, "JavaScriptCore.framework", true); // 澶勭悊 搴撴枃浠� - _project.AddFileToBuild(_targetGUID, _project.AddFile("/usr/lib/libz.tbd", "Frameworks/libz.tbd", PBXSourceTree.Sdk)); - _project.AddFileToBuild(_targetGUID, _project.AddFile("/usr/lib/libsqlite3.tbd", "Frameworks/libsqlite3.tbd", PBXSourceTree.Sdk)); - _project.AddFileToBuild(_targetGUID, _project.AddFile("/usr/lib/libc++.tbd", "Frameworks/libc++.tbd", PBXSourceTree.Sdk)); - _project.AddFileToBuild(_targetGUID, _project.AddFile("/usr/lib/libiconv.tbd", "Frameworks/libiconv.tbd", PBXSourceTree.Sdk)); - _project.AddFileToBuild(_targetGUID, _project.AddFile("/usr/lib/libresolv.tbd", "Frameworks/libresolv.tbd", PBXSourceTree.Sdk)); - + project.AddFileToBuild(fwTargetGUID, project.AddFile("/usr/lib/libz.tbd", "Frameworks/libz.tbd", PBXSourceTree.Sdk)); + project.AddFileToBuild(fwTargetGUID, project.AddFile("/usr/lib/libsqlite3.tbd", "Frameworks/libsqlite3.tbd", PBXSourceTree.Sdk)); + project.AddFileToBuild(fwTargetGUID, project.AddFile("/usr/lib/libc++.tbd", "Frameworks/libc++.tbd", PBXSourceTree.Sdk)); + project.AddFileToBuild(fwTargetGUID, project.AddFile("/usr/lib/libiconv.tbd", "Frameworks/libiconv.tbd", PBXSourceTree.Sdk)); + project.AddFileToBuild(fwTargetGUID, project.AddFile("/usr/lib/libresolv.tbd", "Frameworks/libresolv.tbd", PBXSourceTree.Sdk)); //UnityFramework - _project.AddBuildProperty(_fwTargetGUID, "OTHER_LDFLAGS", "-ObjC"); + project.AddBuildProperty(fwTargetGUID, "OTHER_LDFLAGS", "-ObjC"); - File.WriteAllText(_projectPath, _project.WriteToString()); + File.WriteAllText(_projectPath, project.WriteToString()); //鍔犳帹閫� //var _capabilityMgr = new ProjectCapabilityManager(_projectPath, "game003.entitlements", PBXProject.GetUnityTargetName()); @@ -104,9 +88,6 @@ _rootDict.SetString("NSMicrophoneUsageDescription", "浣跨敤楹﹀厠椋庢潈闄�"); _rootDict.SetString("NSPhotoLibraryAddUsageDescription", "浣跨敤鐩稿唽鏉冮檺,鐢ㄤ互瀛樺偍鎴睆鐨勮处鍙蜂俊鎭�,浠ラ槻蹇樿璐﹀彿瀵嗙爜"); - _rootDict.SetString("YLChannelId", "1000"); - _rootDict.SetString("YLPlatformId", "1000"); - File.WriteAllText(_plistPath, _plist.WriteToString()); } @@ -115,13 +96,13 @@ //淇敼UnityAppController.mm 鏂囦欢 var _xclass = new XClass(projectPath + "/Classes/UnityAppController.mm"); //寮曞叆UniversalSDK - _xclass.WriteBelow("#include \"PluginBase/AppDelegateListener.h\"", "#include \"UniversalSDK.h\""+ "\n#import <SMPCQuickSDK/SMPCQuickSDK.h>"); + _xclass.WriteBelow("#include \"PluginBase/AppDelegateListener.h\"", "#include \"UniversalSDK.h\"" + "\n#import <SMPCQuickSDK/SMPCQuickSDK.h>"); //unity浜や簰璋冪敤鐨勬柟娉� string newCode = "\n" + "extern \"C\" void IOSMessageHandle(const char* jsonString) {\n" + " [GetAppController().universalSDK HandleUnityMessage:[NSString stringWithUTF8String:jsonString]];\n" + "}"; - _xclass.WriteBelow("extern \"C\" ScreenOrientation UnityCurrentOrientation() { return GetAppController().unityView.contentOrientation; }",newCode); + _xclass.WriteBelow("extern \"C\" ScreenOrientation UnityCurrentOrientation() { return GetAppController().unityView.contentOrientation; }", newCode); //鍒濆鍖朥niversalSDK newCode = "\n" + " _universalSDK = [[UniversalSDK alloc] init];\n [_universalSDK QuickSDKInit:application didFinishLaunchingWithOptions:launchOptions];"; @@ -141,7 +122,7 @@ //淇敼UnityAppController.h 鏂囦欢 _xclass = new XClass(projectPath + "/Classes/UnityAppController.h"); - _xclass.WriteBelow("@class DisplayConnection;", "@class UniversalSDK;"); + _xclass.WriteBelow("@class DisplayConnection;", "@class UniversalSDK;"); _xclass.WriteBelow("DisplayConnection* _mainDisplay;", "UniversalSDK* _universalSDK;"); _xclass.WriteBelow("@property (readonly, copy, nonatomic) DisplayConnection* mainDisplay;", "@property (readonly, copy, nonatomic) UniversalSDK* universalSDK;"); @@ -203,18 +184,16 @@ [MenuItem("Build/ipa")] public static void BuildIPA() { - var _p = new System.Diagnostics.Process(); - _p.StartInfo.FileName = "osascript"; - _p.StartInfo.Arguments = string.Format("-e 'tell application \"Terminal\" \n activate \n do script \"cd {0} && sh {1} {2}\" \n end tell'", + var p = new System.Diagnostics.Process(); + p.StartInfo.FileName = "osascript"; + p.StartInfo.Arguments = string.Format("-e 'tell application \"Terminal\" \n activate \n do script \"cd {0} && sh {1} {2}\" \n end tell'", Application.dataPath + "/../", "buildipa.sh", GetBuildPath()); - _p.StartInfo.UseShellExecute = false; - _p.StartInfo.RedirectStandardOutput = false; - _p.Start(); - _p.WaitForExit(); + p.StartInfo.UseShellExecute = false; + p.StartInfo.RedirectStandardOutput = false; + p.Start(); + p.WaitForExit(); } - -#endif } -- Gitblit v1.8.0