Merge branch 'master' into RLRuntime

lwb

2021-01-14 ef08be49ccd8cf61e93d8921cbeb09100e663b48

 Assets/Editor/XCodeProjectMod.cs

@@ -111,12 +111,24 @@

    private static void ModifyFile(string projectPath)
    {
        bool _isMr = false;
        string _mrPlistPath = Application.dataPath + "/Plugins/iOS/MyMRSDK/MRSDKInfo.plist";
        if (File.Exists(_mrPlistPath))
        {
            _isMr = true;
        }

        // -------------- UnityAppController.mm
        //读取UnityAppController.mm文件
        var _xclass = new XClass(projectPath + "/Classes/UnityAppController.mm");

        //在指定代码后面增加一行代码
        _xclass.WriteBelow("#include \"PluginBase/AppDelegateListener.h\"", "#include \"UniversalSDK.h\"\n#include \"JPushService.h\"\n#include \"IAPManager.h\"");
        _xclass.WriteBelow("#include \"PluginBase/AppDelegateListener.h\"", "#include \"UniversalSDK.h\"\n#include \"JPushService.h\"\n");

        if (_isMr)
        {
            _xclass.WriteBelow("#include \"PluginBase/AppDelegateListener.h\"", "#include \"IAPManager.h\"\n");
        }

        string newCode = "\n" +
                         "extern \"C\" void IOSMessageHandle(const char* jsonString) {\n" +
@@ -126,15 +138,23 @@
                           newCode);

        newCode = "\n" +
                   "    [[IAPManager shared] startManager];\n" +
                   "    _universalSDK = [[UniversalSDK alloc] init];\n" +
                   "    [_universalSDK JPushInit:launchOptions];";

        //在指定代码后面增加一大行代码
        _xclass.WriteBelow("[KeyboardDelegate Initialize];", newCode);

        if (_isMr)
        {
            _xclass.WriteBelow("[KeyboardDelegate Initialize];", "    [[IAPManager shared] startManager];\n");
        }

        _xclass.WriteBelow("UnitySendDeviceToken(deviceToken);", "    [JPUSHService registerDeviceToken:deviceToken];");
        _xclass.WriteBelow("SensorsCleanup();", "    [[IAPManager shared] startManager];");

        if (_isMr)
        {
            _xclass.WriteBelow("SensorsCleanup();", "    [[IAPManager shared] stopManager];");
        }

        newCode = "UnitySendRemoteNotification(userInfo);\n" +
            "    [JPUSHService handleRemoteNotification:userInfo];\n";
@@ -233,14 +253,15 @@
        }

        s_IsAppend = true;

        BuildPipeline.BuildPlayer(ClientPackage.baseLevels, _buildPath, BuildTarget.iOS, BuildOptions.Il2CPP | BuildOptions.AcceptExternalModificationsToPlayer);
        PlayerSettings.SetScriptingBackend(BuildTargetGroup.iOS, ScriptingImplementation.IL2CPP);
        BuildPipeline.BuildPlayer(ClientPackage.baseLevels, _buildPath, BuildTarget.iOS, BuildOptions.AcceptExternalModificationsToPlayer);
    }

    public static void BuildIOSProject_Replace()
    {
        s_IsAppend = false;
        BuildPipeline.BuildPlayer(ClientPackage.baseLevels, GetBuildPath(), BuildTarget.iOS, BuildOptions.Il2CPP);
        PlayerSettings.SetScriptingBackend(BuildTargetGroup.iOS, ScriptingImplementation.IL2CPP);
        BuildPipeline.BuildPlayer(ClientPackage.baseLevels, GetBuildPath(), BuildTarget.iOS, BuildOptions.None);
    }

    [MenuItem("Build/ipa")]