diff --git a/Assets/Firebase/Editor/Firebase.Messaging.Editor.dll b/Assets/Firebase/Editor/Firebase.Messaging.Editor.dll deleted file mode 100644 index 34b86d4..0000000 Binary files a/Assets/Firebase/Editor/Firebase.Messaging.Editor.dll and /dev/null differ diff --git a/Assets/Firebase/Editor/Firebase.Messaging.Editor.dll.meta b/Assets/Firebase/Editor/Firebase.Messaging.Editor.dll.meta deleted file mode 100644 index cfe3c13..0000000 --- a/Assets/Firebase/Editor/Firebase.Messaging.Editor.dll.meta +++ /dev/null @@ -1,118 +0,0 @@ -fileFormatVersion: 2 -guid: 9555198c219241e0b850872f8732192f -labels: -- gvh -- gvh_targets-editor -- gvh_version-13.5.0 -- gvhp_exportpath-Firebase/Editor/Firebase.Messaging.Editor.dll -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - : Linux - second: - enabled: 0 - settings: - CPU: None - - first: - : LinuxUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - : OSXIntel - second: - enabled: 0 - settings: - CPU: None - - first: - : OSXIntel64 - second: - enabled: 0 - settings: - CPU: None - - first: - : Web - second: - enabled: 0 - settings: {} - - first: - : WebStreamed - second: - enabled: 0 - settings: {} - - first: - Android: Android - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - - first: - Standalone: Linux64 - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: OSXUniversal - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win - second: - enabled: 0 - settings: - CPU: None - - first: - Standalone: Win64 - second: - enabled: 0 - settings: - CPU: None - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - - first: - iPhone: iOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - - first: - tvOS: tvOS - second: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/Editor/FirebaseMessaging_version-13.5.0_manifest.txt b/Assets/Firebase/Editor/FirebaseMessaging_version-13.5.0_manifest.txt deleted file mode 100644 index fab4fc8..0000000 --- a/Assets/Firebase/Editor/FirebaseMessaging_version-13.5.0_manifest.txt +++ /dev/null @@ -1,74 +0,0 @@ -Assets/Editor Default Resources/Firebase/fb_analytics.png -Assets/Editor Default Resources/Firebase/fb_analytics_dark.png -Assets/Editor Default Resources/Firebase/fb_auth.png -Assets/Editor Default Resources/Firebase/fb_auth_dark.png -Assets/Editor Default Resources/Firebase/fb_cloud_messaging.png -Assets/Editor Default Resources/Firebase/fb_cloud_messaging_dark.png -Assets/Editor Default Resources/Firebase/fb_config.png -Assets/Editor Default Resources/Firebase/fb_config_dark.png -Assets/Editor Default Resources/Firebase/fb_crashlytics.png -Assets/Editor Default Resources/Firebase/fb_crashlytics_dark.png -Assets/Editor Default Resources/Firebase/fb_database.png -Assets/Editor Default Resources/Firebase/fb_database_dark.png -Assets/Editor Default Resources/Firebase/fb_functions.png -Assets/Editor Default Resources/Firebase/fb_functions_dark.png -Assets/Editor Default Resources/Firebase/fb_storage.png -Assets/Editor Default Resources/Firebase/fb_storage_dark.png -Assets/Editor Default Resources/Firebase/firebase_lockup.png -Assets/Editor Default Resources/Firebase/firebase_lockup_dark.png -Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.186/Google.IOSResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.186/Google.JarResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.dll -Assets/ExternalDependencyManager/Editor/1.2.186/Google.PackageManagerResolver.pdb -Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.dll -Assets/ExternalDependencyManager/Editor/1.2.186/Google.VersionHandlerImpl.pdb -Assets/ExternalDependencyManager/Editor/CHANGELOG.md -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.dll -Assets/ExternalDependencyManager/Editor/Google.VersionHandler.pdb -Assets/ExternalDependencyManager/Editor/LICENSE -Assets/ExternalDependencyManager/Editor/README.md -Assets/ExternalDependencyManager/Editor/external-dependency-manager_version-1.2.186_manifest.txt -Assets/Firebase/Editor/AppDependencies.xml -Assets/Firebase/Editor/Firebase.Editor.dll -Assets/Firebase/Editor/Firebase.Editor.pdb -Assets/Firebase/Editor/Firebase.Messaging.Editor.dll -Assets/Firebase/Editor/Firebase.Messaging.Editor.pdb -Assets/Firebase/Editor/Messaging/FirebaseMessagingActivityGenerator.asmdef -Assets/Firebase/Editor/Messaging/FirebaseMessagingActivityGenerator.cs -Assets/Firebase/Editor/MessagingDependencies.xml -Assets/Firebase/Editor/generate_xml_from_google_services_json.exe -Assets/Firebase/Editor/generate_xml_from_google_services_json.py -Assets/Firebase/Editor/network_request.exe -Assets/Firebase/Editor/network_request.py -Assets/Firebase/Plugins/Android/firebase-messaging-cpp.aar -Assets/Firebase/Plugins/Firebase.App.dll -Assets/Firebase/Plugins/Firebase.App.pdb -Assets/Firebase/Plugins/Firebase.Messaging.dll -Assets/Firebase/Plugins/Firebase.Messaging.pdb -Assets/Firebase/Plugins/Firebase.Platform.dll -Assets/Firebase/Plugins/Firebase.Platform.pdb -Assets/Firebase/Plugins/Firebase.TaskExtension.dll -Assets/Firebase/Plugins/Firebase.TaskExtension.pdb -Assets/Firebase/Plugins/Google.MiniJson.dll -Assets/Firebase/Plugins/iOS/Firebase.App.dll -Assets/Firebase/Plugins/iOS/Firebase.App.pdb -Assets/Firebase/Plugins/iOS/Firebase.Messaging.dll -Assets/Firebase/Plugins/iOS/Firebase.Messaging.pdb -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-13_5_0.bundle -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-13_5_0.dll -Assets/Firebase/Plugins/x86_64/FirebaseCppApp-13_5_0.so -Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.bundle -Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.dll -Assets/Firebase/Plugins/x86_64/FirebaseCppMessaging.so -Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.5.0/firebase-app-unity-13.5.0.pom -Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/13.5.0/firebase-app-unity-13.5.0.srcaar -Assets/Firebase/m2repository/com/google/firebase/firebase-app-unity/maven-metadata.xml -Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.5.0/firebase-messaging-unity-13.5.0.pom -Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/13.5.0/firebase-messaging-unity-13.5.0.srcaar -Assets/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/maven-metadata.xml -Assets/Plugins/iOS/Firebase/libFirebaseCppApp.a -Assets/Plugins/iOS/Firebase/libFirebaseCppMessaging.a -Assets/Plugins/tvOS/Firebase/libFirebaseCppApp.a -Assets/Plugins/tvOS/Firebase/libFirebaseCppMessaging.a diff --git a/Assets/Firebase/Editor/FirebaseMessaging_version-13.5.0_manifest.txt.meta b/Assets/Firebase/Editor/FirebaseMessaging_version-13.5.0_manifest.txt.meta deleted file mode 100644 index eb6d6fa..0000000 --- a/Assets/Firebase/Editor/FirebaseMessaging_version-13.5.0_manifest.txt.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: eddd6106782f4633bbd36ead4f701be1 -labels: -- gvh -- gvh_manifest -- gvh_version-13.5.0 -- gvhp_exportpath-Firebase/Editor/FirebaseMessaging_version-13.5.0_manifest.txt -- gvhp_manifestname-0Firebase Cloud Messaging -- gvhp_manifestname-1FirebaseMessaging -timeCreated: 0 diff --git a/Assets/Firebase/Editor/Messaging.meta b/Assets/Firebase/Editor/Messaging.meta deleted file mode 100644 index 0e319b7..0000000 --- a/Assets/Firebase/Editor/Messaging.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 19dff588a028e1a4ea8d6559ddb7187d -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/Editor/Messaging/FirebaseMessagingActivityGenerator.asmdef b/Assets/Firebase/Editor/Messaging/FirebaseMessagingActivityGenerator.asmdef deleted file mode 100644 index 37fef88..0000000 --- a/Assets/Firebase/Editor/Messaging/FirebaseMessagingActivityGenerator.asmdef +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "FirebaseMessagingActivityGenerator", - "rootNamespace": "", - "references": [], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [], - "noEngineReferences": false -} diff --git a/Assets/Firebase/Editor/Messaging/FirebaseMessagingActivityGenerator.asmdef.meta b/Assets/Firebase/Editor/Messaging/FirebaseMessagingActivityGenerator.asmdef.meta deleted file mode 100644 index 22b3440..0000000 --- a/Assets/Firebase/Editor/Messaging/FirebaseMessagingActivityGenerator.asmdef.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 23dad9d59a474cb6a052bb9322271ae3 -labels: -- gvh -- gvh_version-13.5.0 -- gvhp_exportpath-Firebase/Editor/Messaging/FirebaseMessagingActivityGenerator.asmdef -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/Editor/Messaging/FirebaseMessagingActivityGenerator.cs b/Assets/Firebase/Editor/Messaging/FirebaseMessagingActivityGenerator.cs deleted file mode 100644 index e2b2ea8..0000000 --- a/Assets/Firebase/Editor/Messaging/FirebaseMessagingActivityGenerator.cs +++ /dev/null @@ -1,271 +0,0 @@ -/* - * Copyright 2023 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -using System.IO; -using System.Linq; -using System.Xml; -using UnityEngine; -using UnityEditor; -using UnityEditor.Build; -using UnityEditor.Build.Reporting; - -namespace Firebase.Messaging.Editor { - - // Handles the generation of the MessagingUnityPlayerActivity java file. - // Note this regenerates the file every time an Android build occurs, - // but local changes can be preserved by using the PreserveTag below. - // This is needed because the source code needs to be present to work across - // different Unity versions, due to changes in mUnityPlayer. - // It also adjusts the base class of the file based on if GameActivity is being - // used (a new feature in Unity 2023). - public class FirebaseMessagingActivityGenerator : IPreprocessBuildWithReport { - // TODO: Ideally this should use a template file, the tricky part is locating - // the template file when it is either in the Assets path, or the Packages path. - // There are some similar cases in EDM4U, so a solution might be to use that. - private readonly string[] ActivityClassContents = new string[]{ -"/*", -" * This file is generated by the FirebaseMessagingActivityGenerator script.", -" * Refer to that script for more information.", -" */", -"", -"package com.google.firebase;", -"", -"import android.content.Intent;", -"import android.os.Bundle;", -"import com.google.firebase.messaging.MessageForwardingService;", -"import com.unity3d.player.{0};", -"", -"/**", -" * MessagingUnityPlayerActivity is a {0} that updates its intent when new intents", -" * are sent to it.", -" *", -" * This is a workaround for a known issue that prevents Firebase Cloud Messaging from responding to", -" * data payloads when both a data and notification payload are sent to the app while it is in the", -" * background.", -" */", -"public class MessagingUnityPlayerActivity extends {0} {{", -" // The key in the intent's extras that maps to the incoming message's message ID. Only sent by", -" // the server, GmsCore sends EXTRA_MESSAGE_ID_KEY below. Server can't send that as it would get", -" // stripped by the client.", -" private static final String EXTRA_MESSAGE_ID_KEY_SERVER = \"message_id\";", -"", -" // An alternate key value in the intent's extras that also maps to the incoming message's message", -" // ID. Used by upstream, and set by GmsCore.", -" private static final String EXTRA_MESSAGE_ID_KEY = \"google.message_id\";", -"", -" // The key in the intent's extras that maps to the incoming message's sender value.", -" private static final String EXTRA_FROM = \"google.message_id\";", -"", -" /**", -" * Workaround for when a message is sent containing both a Data and Notification payload.", -" *", -" *

When the app is in the background, if a message with both a data and notification payload is", -" * received the data payload is stored on the Intent passed to onNewIntent. By default, that", -" * intent does not get set as the Intent that started the app, so when the app comes back online", -" * it doesn't see a new FCM message to respond to. As a workaround, we override onNewIntent so", -" * that it sends the intent to the MessageForwardingService which forwards the message to the", -" * FirebaseMessagingService which in turn sends the message to the application.", -" */", -" @Override", -" protected void onNewIntent(Intent intent) {{", -" super.onNewIntent(intent);", -"", -" // If we do not have a 'from' field this intent was not a message and should not be handled. It", -" // probably means this intent was fired by tapping on the app icon.", -" Bundle extras = intent.getExtras();", -" if (extras == null) {{", -" return;", -" }}", -" String from = extras.getString(EXTRA_FROM);", -" String messageId = extras.getString(EXTRA_MESSAGE_ID_KEY);", -" if (messageId == null) {{", -" messageId = extras.getString(EXTRA_MESSAGE_ID_KEY_SERVER);", -" }}", -" if (from != null && messageId != null) {{", -" Intent message = new Intent(this, MessageForwardingService.class);", -" message.setAction(MessageForwardingService.ACTION_REMOTE_INTENT);", -" message.putExtras(intent);", -" message.setData(intent.getData());", -" MessageForwardingService.enqueueWork(this, message);", -" }}", -" setIntent(intent);", -" }}", -"", -" /**", -" * Dispose of the mUnityPlayer when restarting the app.", -" *", -" *

This ensures that when the app starts up again it does not start with stale data.", -" */", -" @Override", -" protected void onCreate(Bundle savedInstanceState) {{", -" if (mUnityPlayer != null) {{", -" mUnityPlayer.{1}();", -" mUnityPlayer = null;", -" }}", -" super.onCreate(savedInstanceState);", -" }}", -"}}" - }; - private readonly string BaseActivityClass = "UnityPlayerActivity"; -#if UNITY_2023_1_OR_NEWER - private readonly string BaseGameActivityClass = "UnityPlayerGameActivity"; -#endif - -#if UNITY_2023_1_OR_NEWER - private readonly string UnityPlayerQuitFunction = "destroy"; -#else - private readonly string UnityPlayerQuitFunction = "quit"; -#endif - - private readonly string GeneratedFileTag = "FirebaseMessagingActivityGenerated"; - // If this tag is present on the generated file, it will not be replaced. - private readonly string PreserveTag = "FirebasePreserve"; - - private readonly string OutputPath = Path.Combine("Plugins", "Android"); - private readonly string OutputFilename = "MessagingUnityPlayerActivity.java"; - - public int callbackOrder { get { return 0; } } - public void OnPreprocessBuild(BuildReport report) { - // Only run this logic when building for Android. - if (EditorUserBuildSettings.activeBuildTarget != BuildTarget.Android) { - return; - } - - // Determine what the contents of the generated file should be. - string baseClass = BaseActivityClass; -#if UNITY_2023_1_OR_NEWER - // If using the new GameActivity logic, we want to generate with that base class. - if (PlayerSettings.Android.applicationEntry.HasFlag(AndroidApplicationEntry.GameActivity)) { - baseClass = BaseGameActivityClass; - } -#endif - string fileContents = System.String.Format(System.String.Join("\n", ActivityClassContents), - baseClass, UnityPlayerQuitFunction); - - // Check if the file has already been generated. - string[] oldAssetGuids = AssetDatabase.FindAssets("l:" + GeneratedFileTag); - if (oldAssetGuids != null && oldAssetGuids.Length > 0) { - if (oldAssetGuids.Length != 1) { - Debug.LogWarning("FirebaseMessagingActivityEditor found multiple generated files with the label: " + - GeneratedFileTag + " \n" + - "No changes will be made, but this can potentially cause problems on Android with duplicate classes.\n" + - "Please check for duplicate classes, and remove any unnecessary uses of the label."); - return; - } - string oldAssetPath = AssetDatabase.GUIDToAssetPath(oldAssetGuids[0]); - Object oldAsset = AssetDatabase.LoadMainAssetAtPath(oldAssetPath); - if (oldAsset != null) { - string oldAssetFullPath = Path.Combine(Application.dataPath, "..", oldAssetPath); - string oldFileContents = System.IO.File.ReadAllText(oldAssetFullPath); - // If the old file matches what we would generate, exit early. - if (oldFileContents == fileContents) { - return; - } - // If the generated file has been tagged to be preserved, don't change it. - string[] labelList = AssetDatabase.GetLabels(oldAsset); - if (labelList.Contains(PreserveTag)) { - return; - } - // Delete the old asset. - Debug.Log("Changes detected, regenerating " + oldAssetPath + "\n" + - "To preserve local changes to that file, add the label: " + PreserveTag); - AssetDatabase.DeleteAsset(oldAssetPath); - } - } - - // Generate the new file. - string newAssetFullDirectory = Path.Combine(Application.dataPath, OutputPath); - System.IO.Directory.CreateDirectory(newAssetFullDirectory); - System.IO.File.WriteAllText(Path.Combine(newAssetFullDirectory, OutputFilename), fileContents); - string newAssetLocalPath = Path.Combine("Assets", OutputPath, OutputFilename); - AssetDatabase.ImportAsset(newAssetLocalPath); - Object newAsset = AssetDatabase.LoadMainAssetAtPath(newAssetLocalPath); - AssetDatabase.SetLabels(newAsset, new[]{GeneratedFileTag}); - } - } - - // Handles adding the android:theme to the AndroidManifest file if it isn't present, - // and swaps it on Unity versions that support GameActivity, which uses a different theme - // by default. - public class FirebaseMessagingAndroidManifestModifier : IPreprocessBuildWithReport { - // Hard coded directories and file names. - private static readonly string ANDROID_MANIFEST_DIRECTORY = - Path.Combine(Path.Combine("Assets", "Plugins"), "Android"); - private static readonly string ANDROID_MANIFEST_FILE = "AndroidManifest.xml"; - private static readonly string ANDROID_MANIFEST_PATH = - Path.Combine(ANDROID_MANIFEST_DIRECTORY, ANDROID_MANIFEST_FILE); - - private static readonly string MESSAGING_ACTIVITY = "com.google.firebase.MessagingUnityPlayerActivity"; - - private static readonly string DEFAULT_THEME = "@style/UnityThemeSelector"; -#if UNITY_2023_1_OR_NEWER - private static readonly string DEFAULT_GAME_THEME = "@style/BaseUnityGameActivityTheme"; -#endif - - public int callbackOrder { get { return 0; } } - public void OnPreprocessBuild(BuildReport report) { - string projectDir = Path.Combine(Application.dataPath, ".."); - string manifestFile = Path.Combine(projectDir, ANDROID_MANIFEST_PATH); - - if (!File.Exists(manifestFile)) { - // Unable to locate the file, so exit early. - return; - } - - var manifest = new XmlDocument(); - manifest.Load(manifestFile); - - CheckTheme(manifest); - - manifest.Save(manifestFile); - } - - private void CheckTheme(XmlDocument manifest) { - // Create a NamespaceManager with the 'android' namespace. - var nsManager = new XmlNamespaceManager(manifest.NameTable); - var androidNamespace = manifest.DocumentElement.GetNamespaceOfPrefix("android"); - if (string.IsNullOrEmpty(androidNamespace)) { - // If unable to find the android namespace, just exit out early, since we depend on it - return; - } - nsManager.AddNamespace("android", androidNamespace); - - // Find the activity node - XmlNode activityNode = manifest.SelectSingleNode( - $"//application/activity[@android:name='{MESSAGING_ACTIVITY}']", - nsManager); - - if (activityNode != null && activityNode is XmlElement activityElement) { - string existingTheme = activityElement.GetAttribute("theme", androidNamespace); - - string defaultTheme = DEFAULT_THEME; - bool setTheme = string.IsNullOrEmpty(existingTheme); -#if UNITY_2023_1_OR_NEWER - string otherTheme = DEFAULT_GAME_THEME; - // If using the new GameActivity logic, we want to use the default game theme. - if (PlayerSettings.Android.applicationEntry.HasFlag(AndroidApplicationEntry.GameActivity)) { - defaultTheme = DEFAULT_GAME_THEME; - otherTheme = DEFAULT_THEME; - } - // We also want to change the theme if is is using the other default. - setTheme |= existingTheme == otherTheme; -#endif - if (setTheme) { - activityElement.SetAttribute("theme", androidNamespace, defaultTheme); - } - } - } - } -} // namespace Firebase.Messaging.Editor diff --git a/Assets/Firebase/Editor/Messaging/FirebaseMessagingActivityGenerator.cs.meta b/Assets/Firebase/Editor/Messaging/FirebaseMessagingActivityGenerator.cs.meta deleted file mode 100644 index 87685be..0000000 --- a/Assets/Firebase/Editor/Messaging/FirebaseMessagingActivityGenerator.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 38cf8316372e4943aee735c624262e05 -labels: -- gvh -- gvh_version-13.5.0 -- gvhp_exportpath-Firebase/Editor/Messaging/FirebaseMessagingActivityGenerator.cs -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Firebase/Editor/MessagingDependencies.xml b/Assets/Firebase/Editor/MessagingDependencies.xml deleted file mode 100644 index ba98554..0000000 --- a/Assets/Firebase/Editor/MessagingDependencies.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - Assets/Firebase/m2repository - - - - diff --git a/Assets/Firebase/Editor/MessagingDependencies.xml.meta b/Assets/Firebase/Editor/MessagingDependencies.xml.meta deleted file mode 100644 index e8d638c..0000000 --- a/Assets/Firebase/Editor/MessagingDependencies.xml.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 992fedef98ac42209a9d26d5bf364adf -labels: -- gvh -- gvh_version-13.5.0 -- gvhp_exportpath-Firebase/Editor/MessagingDependencies.xml -timeCreated: 1480838400 -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle index 0a18731..e9453e1 100644 --- a/Assets/Plugins/Android/mainTemplate.gradle +++ b/Assets/Plugins/Android/mainTemplate.gradle @@ -5,7 +5,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // Android Resolver Dependencies Start implementation 'com.google.android.gms:play-services-base:18.10.0' // Assets/Firebase/Editor/DatabaseDependencies.xml:20 - // implementation 'com.google.firebase:firebase-analytics:23.0.0' // Assets/Firebase/Editor/MessagingDependencies.xml:15 + // implementation 'com.google.firebase:firebase-analytics:23.0.0' // Assets/Firebase/Editor/AnalyticsDependencies.xml:13 implementation 'com.google.firebase:firebase-analytics:23.2.0' // Assets/Firebase/Editor/DatabaseDependencies.xml:18 implementation 'com.google.firebase:firebase-analytics-unity:13.5.0' // Assets/Firebase/Editor/AnalyticsDependencies.xml:18 implementation 'com.google.firebase:firebase-app-unity:13.12.0' // Assets/Firebase/Editor/AppDependencies.xml:25 @@ -14,10 +14,6 @@ dependencies { implementation 'com.google.firebase:firebase-common:22.0.1' // Assets/Firebase/Editor/AppDependencies.xml:16 implementation 'com.google.firebase:firebase-database:22.0.1' // Assets/Firebase/Editor/DatabaseDependencies.xml:16 implementation 'com.google.firebase:firebase-database-unity:13.12.0' // Assets/Firebase/Editor/DatabaseDependencies.xml:25 - implementation 'com.google.firebase:firebase-iid:21.1.0' // Assets/Firebase/Editor/MessagingDependencies.xml:17 - implementation 'com.google.firebase:firebase-messaging:25.0.1' // Assets/Firebase/Editor/MessagingDependencies.xml:13 - implementation 'com.google.firebase:firebase-messaging-unity:13.5.0' // Assets/Firebase/Editor/MessagingDependencies.xml:24 - implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0' // Assets/Firebase/Editor/MessagingDependencies.xml:19 // Android Resolver Dependencies End **DEPS**} diff --git a/Assets/Plugins/Android/settingsTemplate.gradle b/Assets/Plugins/Android/settingsTemplate.gradle index b8ba93c..8399e55 100644 --- a/Assets/Plugins/Android/settingsTemplate.gradle +++ b/Assets/Plugins/Android/settingsTemplate.gradle @@ -19,7 +19,7 @@ dependencyResolutionManagement { // Android Resolver Repos Start def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/") maven { - url (unityProjectPath + "/Assets/GeneratedLocalRepo/Firebase/m2repository") // Assets/Firebase/Editor/AnalyticsDependencies.xml:18, Assets/Firebase/Editor/AppDependencies.xml:25, Assets/Firebase/Editor/AuthDependencies.xml:23, Assets/Firebase/Editor/DatabaseDependencies.xml:25, Assets/Firebase/Editor/MessagingDependencies.xml:24 + url (unityProjectPath + "/Assets/GeneratedLocalRepo/Firebase/m2repository") // Assets/Firebase/Editor/AnalyticsDependencies.xml:18, Assets/Firebase/Editor/AppDependencies.xml:25, Assets/Firebase/Editor/AuthDependencies.xml:23, Assets/Firebase/Editor/DatabaseDependencies.xml:25 } mavenLocal() // Android Resolver Repos End diff --git a/Assets/Plugins/BluetoothDeviceScript.cs b/Assets/Plugins/BluetoothDeviceScript.cs index fd0cf93..d510a1c 100644 --- a/Assets/Plugins/BluetoothDeviceScript.cs +++ b/Assets/Plugins/BluetoothDeviceScript.cs @@ -311,6 +311,8 @@ public class BluetoothDeviceScript : MonoBehaviour #if UNITY_IOS if (BLEStandardUUIDs.ContainsKey(characteristic)) characteristic = BLEStandardUUIDs[characteristic]; + // iOS 通常返回 16-bit 短 UUID (如 FFE1)，而 C# 层订阅时使用的是完整 128-bit UUID + characteristic = BluetoothLEHardwareInterface.FullUUID(characteristic).ToUpper(); #endif BluetoothLEHardwareInterface.Log ("Device: " + deviceAddress + " Characteristic Received: " + characteristic); diff --git a/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml index ac5b3b7..024bb9d 100644 --- a/ProjectSettings/AndroidResolverDependencies.xml +++ b/ProjectSettings/AndroidResolverDependencies.xml @@ -10,10 +10,6 @@ com.google.firebase:firebase-common:22.0.1 com.google.firebase:firebase-database:22.0.1 com.google.firebase:firebase-database-unity:13.12.0 - com.google.firebase:firebase-iid:21.1.0 - com.google.firebase:firebase-messaging:25.0.1 - com.google.firebase:firebase-messaging-unity:13.5.0 - com.google.flatbuffers:flatbuffers-java:1.12.0 Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-analytics-unity/13.5.0/firebase-analytics-unity-13.5.0.aar