From a6766708559674ed15299bc6d1f6347a1c16ddd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9C=E8=99=9E=E6=B8=A0=E6=88=90=E2=80=9D?=
 <“yuqucheng2006@qq.com”>
Date: Mon, 3 Aug 2026 09:02:33 +0800
Subject: [PATCH] =?UTF-8?q?build(android):=20=E6=9B=B4=E6=96=B0=E5=AE=89?=
 =?UTF-8?q?=E5=8D=93=E7=89=88=E6=9C=AC=E5=8F=B7=E4=B8=8E=E8=B0=B7=E6=AD=8C?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.  将安卓版本号从1升级到2
2.  新增调试用的谷歌服务客户端配置
3.  添加权限移除规则屏蔽广告ID相关权限
---
 Assets/Plugins/Android/AndroidManifest.xml  | 7 ++++++-
 Assets/Plugins/Android/google-services.json | 8 ++++++++
 ProjectSettings/ProjectSettings.asset       | 2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml
index 5ca2966..e85a95c 100644
--- a/Assets/Plugins/Android/AndroidManifest.xml
+++ b/Assets/Plugins/Android/AndroidManifest.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.photonmatrix.photonmatrix">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.photonmatrix.photonmatrix">
   <!-- 网络权限 -->
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -12,6 +14,9 @@
   <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
   <!-- 相机权限 -->
   <uses-permission android:name="android.permission.CAMERA" />
+  <!-- 移除 SDK 库合并进来的广告 ID 相关权限（本应用不使用广告 ID） -->
+  <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove" />
+  <uses-permission android:name="android.permission.ACCESS_ADSERVICES_AD_ID" tools:node="remove" />
   <uses-feature android:name="android.hardware.camera" android:required="true" />
   <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
   <!-- Android 12+ 蓝牙权限 -->
diff --git a/Assets/Plugins/Android/google-services.json b/Assets/Plugins/Android/google-services.json
index fe105b2..cbfd778 100644
--- a/Assets/Plugins/Android/google-services.json
+++ b/Assets/Plugins/Android/google-services.json
@@ -21,6 +21,14 @@
             "certificate_hash": "57eec536956e93404a93e6c0548ce312a2fb25ff"
           }
         },
+        {
+          "client_id": "785438724947-jsuope3gbgoam94gil5bj3vu1re2ltdn.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.photonmatrix.photonmatrix",
+            "certificate_hash": "786f44f3c0560d4317619e900faf8ccb7c8970be"
+          }
+        },
         {
           "client_id": "785438724947-tn234msinh5t30d8j4hjm330rb0tkqnd.apps.googleusercontent.com",
           "client_type": 1,
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index a22480f..e3f3e65 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -177,7 +177,7 @@ PlayerSettings:
     iPhone: 3
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 1
+  AndroidBundleVersionCode: 2
   AndroidMinSdkVersion: 33
   AndroidTargetSdkVersion: 36
   AndroidPreferredInstallLocation: 0