fix: API_V2 移除废弃的SystemInfo接口

0oQiaoo0 · 0oQiaoo0 · commit 4fb688037578 · 2024-08-13T17:14:30.000+08:00
diff --git a/Demo/API_V2/Assets/API/Media/WXVideo/WXvideo.cs b/Demo/API_V2/Assets/API/Media/WXVideo/WXvideo.cs
@@ -19,7 +19,7 @@ void Start()
 
     private void AutoPlayVideo()
     {
-        var systemInfo = WX.GetSystemInfoSync();
+        var windowInfo = GameManager.Instance.WindowInfo;
         _video = WX.CreateVideo(
             new WXCreateVideoParam()
             {
@@ -31,8 +31,8 @@ private void AutoPlayVideo()
                 autoplay = true,
                 showCenterPlayBtn = false,
                 underGameView = true,
-                width = ((int)systemInfo.screenWidth),
-                height = ((int)systemInfo.screenHeight),
+                width = ((int)windowInfo.screenWidth),
+                height = ((int)windowInfo.screenHeight),
             }
         );
         _video.OnPlay(() =>
diff --git a/Demo/API_V2/Assets/API/Network/UDPSocket/UDPSocket.cs b/Demo/API_V2/Assets/API/Network/UDPSocket/UDPSocket.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using LitJson;
 using UnityEngine;
 using WeChatWASM;
 
diff --git a/Demo/API_V2/Assets/API/OpenInterface/GameClub/GameClub.cs b/Demo/API_V2/Assets/API/OpenInterface/GameClub/GameClub.cs
@@ -1,8 +1,5 @@
 using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Threading;
-using LitJson;
 using UnityEngine;
 using WeChatWASM;
 
@@ -29,17 +26,17 @@ IEnumerator CreateGameClubButton(float delay)
 
         Vector2 size = GameManager.Instance.detailsController.GetInitialButtonSize();
         Vector2 position = GameManager.Instance.detailsController.GetButtonPosition(0);
-        var systemInfo = WX.GetSystemInfoSync();
+        var windowInfo = GameManager.Instance.WindowInfo;
         _gameClubButton = WX.CreateGameClubButton(
             new WXCreateGameClubButtonParam()
             {
                 type = GameClubButtonType.text,
                 style = new GameClubButtonStyle()
                 {
-                    left = Math.Abs((int)(position.x / systemInfo.pixelRatio)),
-                    top = Math.Abs((int)(position.y / systemInfo.pixelRatio)),
-                    width = (int)(size.x * systemInfo.screenWidth / 1080f),
-                    height = (int)(size.y * systemInfo.screenWidth / 1080f),
+                    left = Math.Abs((int)(position.x / windowInfo.pixelRatio)),
+                    top = Math.Abs((int)(position.y / windowInfo.pixelRatio)),
+                    width = (int)(size.x * windowInfo.screenWidth / 1080f),
+                    height = (int)(size.y * windowInfo.screenWidth / 1080f),
                 }
             }
         );
diff --git a/Demo/API_V2/Assets/API/OpenInterface/SystemButton/SystemButton.cs b/Demo/API_V2/Assets/API/OpenInterface/SystemButton/SystemButton.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Threading;
 using UnityEngine;
 using WeChatWASM;
 
@@ -59,18 +58,18 @@ IEnumerator CreateFeedbackButton(float delay)
 
         Vector2 size = GameManager.Instance.detailsController.GetInitialButtonSize();
         Vector2 position = GameManager.Instance.detailsController.GetButtonPosition(0);
-        var systemInfo = WX.GetSystemInfoSync();
+        var windowInfo = GameManager.Instance.WindowInfo;
         _feedbackButton = WX.CreateFeedbackButton(
             new CreateOpenSettingButtonOption()
             {
                 type = "text",
                 text = "",
                 style = new OptionStyle()
                 {
-                    left = Math.Abs((int)(position.x / systemInfo.pixelRatio)),
-                    top = Math.Abs((int)(position.y / systemInfo.pixelRatio)),
-                    width = (int)(size.x * systemInfo.screenWidth / 1080f),
-                    height = (int)(size.y * systemInfo.screenWidth / 1080f),
+                    left = Math.Abs((int)(position.x / windowInfo.pixelRatio)),
+                    top = Math.Abs((int)(position.y / windowInfo.pixelRatio)),
+                    width = (int)(size.x * windowInfo.screenWidth / 1080f),
+                    height = (int)(size.y * windowInfo.screenWidth / 1080f),
                 }
             }
         );
diff --git a/Demo/API_V2/Assets/API/OpenInterface/UserInfo/UserInfo.cs b/Demo/API_V2/Assets/API/OpenInterface/UserInfo/UserInfo.cs
@@ -30,9 +30,9 @@ IEnumerator SetTimeout(float delay)
         Vector2 position = GameManager.Instance.detailsController.GetButtonPosition(-1);
         Debug.Log(position);
         Debug.Log(size);
-        var systemInfo = WX.GetSystemInfoSync();
-        var canvasWidth = (int)(systemInfo.screenWidth * systemInfo.pixelRatio);
-        var canvasHeight = (int)(systemInfo.screenHeight * systemInfo.pixelRatio);
+        var windowInfo = GameManager.Instance.WindowInfo;
+        var canvasWidth = (int)(windowInfo.screenWidth * windowInfo.pixelRatio);
+        var canvasHeight = (int)(windowInfo.screenHeight * windowInfo.pixelRatio);
         _button = WX.CreateUserInfoButton(
             Math.Abs((int)position.x),
             Math.Abs((int)position.y),
diff --git a/Demo/API_V2/Assets/Scenes/MainScene.unity b/Demo/API_V2/Assets/Scenes/MainScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 170076734}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657886, g: 0.49641275, b: 0.5748176, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -6075,7 +6075,7 @@ LightingSettings:
   m_AlbedoBoost: 1
   m_IndirectOutputScale: 1
   m_UsingShadowmask: 1
-  m_BakeBackend: 1
+  m_BakeBackend: 2
   m_LightmapMaxSize: 512
   m_BakeResolution: 10
   m_Padding: 2
@@ -24723,8 +24723,8 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   detailsController: {fileID: 0}
   font: {fileID: 0}
-  _mainCanvas: {fileID: 0}
-  _detailsCanvas: {fileID: 0}
+  mainCanvas: {fileID: 0}
+  detailsCanvas: {fileID: 0}
 --- !u!4 &1274177269
 Transform:
   m_ObjectHideFlags: 0
diff --git a/Demo/API_V2/Assets/Scripts/APIController.cs b/Demo/API_V2/Assets/Scripts/APIController.cs
@@ -29,7 +29,7 @@ private void Start()
         // 根据系统安全区域调整标题的位置
         title.anchoredPosition = new Vector2(
             title.anchoredPosition.x,
-            -125f - (float)GameManager.Instance.systemInfo.safeArea.top
+            -125f - (float)GameManager.Instance.WindowInfo.safeArea.top
         );
     }
 
diff --git a/Demo/API_V2/Assets/Scripts/DetailsController.cs b/Demo/API_V2/Assets/Scripts/DetailsController.cs
@@ -65,9 +65,9 @@ public class DetailsController : MonoBehaviour
     private void Start()
     {
         var res = WX.GetMenuButtonBoundingClientRect();
-        var info = WX.GetSystemInfoSync();
+        var info = GameManager.Instance.WindowInfo;
         float height = (float)res.height;
-        float safeArea = (float)GameManager.Instance.systemInfo.safeArea.top;
+        float safeArea = (float)GameManager.Instance.WindowInfo.safeArea.top;
         // 根据系统安全区域调整标题和返回按钮的位置
         titleTransform.anchoredPosition = new Vector2(
             titleTransform.anchoredPosition.x,
diff --git a/Demo/API_V2/Assets/Scripts/GameManager.cs b/Demo/API_V2/Assets/Scripts/GameManager.cs
@@ -4,7 +4,6 @@
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using WeChatWASM;
-using SystemInfo = WeChatWASM.SystemInfo;
 
 public class GameManager : MonoBehaviour
 {
@@ -18,20 +17,20 @@ public class GameManager : MonoBehaviour
     // 字体相关
     [Header("Font")]
     public Font font;
-    public Action<Font> onFontLoaded;
+    public Action<Font> OnFontLoaded;
 
     // 用于在 MainCanvas 和 DetailsCanvas 之间切换
     [Header("Canvas Switch")]
     [SerializeField]
-    private GameObject _mainCanvas;
+    private GameObject mainCanvas;
 
     [SerializeField]
-    private GameObject _detailsCanvas;
+    private GameObject detailsCanvas;
     private bool _isMainCanvasActive = true;
 
     // 用于获取微信小游戏的系统信息
     [Header("System Info")]
-    public SystemInfo systemInfo;
+    public WindowInfo WindowInfo;
 
     private void Awake()
     {
@@ -60,34 +59,38 @@ private void Awake()
                 var fallbackFont = Application.streamingAssetsPath + "/Fz.ttf";
                 WX.GetWXFont(
                     fallbackFont,
-                    (font) =>
+                    (wxFont) =>
                     {
-                        if (!font)
+                        if (!wxFont)
                             return;
 
-                        this.font = font;
-                        onFontLoaded?.Invoke(font);
+                        this.font = wxFont;
+                        OnFontLoaded?.Invoke(wxFont);
                     }
                 );
 
                 // 获取微信小游戏的系统信息
-                systemInfo = WX.GetSystemInfoSync();
+#if UNITY_WEBGL && !UNITY_EDITOR
+                WindowInfo = WX.GetWindowInfo();
+#else
+                WindowInfo = new WindowInfo { safeArea = new SafeArea() };
+#endif
             }
         );
     }
 
     private void Start()
     {
-        _mainCanvas.SetActive(true);
-        _detailsCanvas.SetActive(false);
+        mainCanvas.SetActive(true);
+        detailsCanvas.SetActive(false);
     }
 
     // 切换 MainCanvas 和 DetailsCanvas 的显示状态
     public void SwitchCanvas()
     {
         _isMainCanvasActive = !_isMainCanvasActive;
-        _mainCanvas.SetActive(_isMainCanvasActive);
-        _detailsCanvas.SetActive(!_isMainCanvasActive);
+        mainCanvas.SetActive(_isMainCanvasActive);
+        detailsCanvas.SetActive(!_isMainCanvasActive);
     }
 
     // 加载指定名称的场景
@@ -102,7 +105,7 @@ private IEnumerator LoadSceneAsync(string sceneName)
         var asyncOperation = SceneManager.LoadSceneAsync(sceneName);
 
         // 等待场景加载完成
-        while (!asyncOperation.isDone)
+        while (asyncOperation != null && !asyncOperation.isDone)
         {
             yield return null;
         }
@@ -117,17 +120,17 @@ private IEnumerator LoadSceneAsync(string sceneName)
     // 获取场景中的引用
     private void GetReferences()
     {
-        _mainCanvas = GetSceneRootGO("Main Canvas");
-        _detailsCanvas = GetSceneRootGO("Details Canvas");
-        detailsController = _detailsCanvas.GetComponent<DetailsController>();
+        mainCanvas = GetSceneRootGO("Main Canvas");
+        detailsCanvas = GetSceneRootGO("Details Canvas");
+        detailsController = detailsCanvas.GetComponent<DetailsController>();
     }
 
     // 根据名称获取场景中的根游戏对象
-    public GameObject GetSceneRootGO(string name)
+    private GameObject GetSceneRootGO(string goName)
     {
         // 获取当前场景中的所有根物体
         var rootObjects = SceneManager.GetActiveScene().GetRootGameObjects();
         // 遍历所有顶层游戏对象，找到名字为name的游戏对象则返回，否则返回null
-        return rootObjects.FirstOrDefault(obj => obj.name == name);
+        return rootObjects.FirstOrDefault(obj => obj.name == goName);
     }
 }
diff --git a/Demo/API_V2/Assets/Scripts/TextInit.cs b/Demo/API_V2/Assets/Scripts/TextInit.cs
@@ -23,14 +23,14 @@ private void Start()
         else
         {
             // 如果字体还未加载，添加字体加载事件监听器
-            GameManager.Instance.onFontLoaded += OnFontLoaded;
+            GameManager.Instance.OnFontLoaded += OnFontLoaded;
         }
     }
 
     private void OnDestroy()
     {
         // 移除字体加载事件监听器
-        GameManager.Instance.onFontLoaded -= OnFontLoaded;
+        GameManager.Instance.OnFontLoaded -= OnFontLoaded;
     }
 
     // 当字体加载完成时，设置 Text 的字体
diff --git a/Demo/API_V2/Packages/manifest.json b/Demo/API_V2/Packages/manifest.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.qq.weixin.minigame": "https://github.com/wechat-miniprogram/minigame-tuanjie-transform-sdk.git",
+    "com.qq.weixin.minigame": "https://github.com/wechat-miniprogram/minigame-tuanjie-transform-sdk.git#feat-api3.8.5",
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
     "com.unity.ads": "4.4.2",
diff --git a/Demo/API_V2/Packages/packages-lock.json b/Demo/API_V2/Packages/packages-lock.json
@@ -1,11 +1,11 @@
 {
   "dependencies": {
     "com.qq.weixin.minigame": {
-      "version": "https://github.com/wechat-miniprogram/minigame-tuanjie-transform-sdk.git",
+      "version": "https://github.com/wechat-miniprogram/minigame-tuanjie-transform-sdk.git#feat-api3.8.5",
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "a091b98d7422411a06a68ff6c3229a2eb782bacd"
+      "hash": "ced92496c0880640de01e4883bce0dbc9b3ac485"
     },
     "com.unity.2d.sprite": {
       "version": "1.0.0",
diff --git a/Demo/API_V2/ProjectSettings/QualitySettings.asset b/Demo/API_V2/ProjectSettings/QualitySettings.asset
diff --git a/Demo/API_V2/ProjectSettings/TimelineSettings.asset b/Demo/API_V2/ProjectSettings/TimelineSettings.asset

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ void Start()`
`19`	`19`
`20`	`20`	`private void AutoPlayVideo()`
`21`	`21`	`{`
`22`		`- var systemInfo = WX.GetSystemInfoSync();`
	`22`	`+ var windowInfo = GameManager.Instance.WindowInfo;`
`23`	`23`	`_video = WX.CreateVideo(`
`24`	`24`	`new WXCreateVideoParam()`
`25`	`25`	`{`
`@@ -31,8 +31,8 @@ private void AutoPlayVideo()`
`31`	`31`	`autoplay = true,`
`32`	`32`	`showCenterPlayBtn = false,`
`33`	`33`	`underGameView = true,`
`34`		`- width = ((int)systemInfo.screenWidth),`
`35`		`- height = ((int)systemInfo.screenHeight),`
	`34`	`+ width = ((int)windowInfo.screenWidth),`
	`35`	`+ height = ((int)windowInfo.screenHeight),`
`36`	`36`	`}`
`37`	`37`	`);`
`38`	`38`	`_video.OnPlay(() =>`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ private void Start()`
`29`	`29`	`// 根据系统安全区域调整标题的位置`
`30`	`30`	`title.anchoredPosition = new Vector2(`
`31`	`31`	`title.anchoredPosition.x,`
`32`		`- -125f - (float)GameManager.Instance.systemInfo.safeArea.top`
	`32`	`+ -125f - (float)GameManager.Instance.WindowInfo.safeArea.top`
`33`	`33`	`);`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,14 @@ private void Start()`
`23`	`23`	`else`
`24`	`24`	`{`
`25`	`25`	`// 如果字体还未加载，添加字体加载事件监听器`
`26`		`- GameManager.Instance.onFontLoaded += OnFontLoaded;`
	`26`	`+ GameManager.Instance.OnFontLoaded += OnFontLoaded;`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`private void OnDestroy()`
`31`	`31`	`{`
`32`	`32`	`// 移除字体加载事件监听器`
`33`		`- GameManager.Instance.onFontLoaded -= OnFontLoaded;`
	`33`	`+ GameManager.Instance.OnFontLoaded -= OnFontLoaded;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`// 当字体加载完成时，设置 Text 的字体`