From 051738261246e9e9c0efe46debcbbe4f54e9d3de Mon Sep 17 00:00:00 2001
From: CaiYanPeng <caiyanpeng@juze.pro>
Date: Thu, 20 May 2021 20:00:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Apis/ApiBase.cs                  |  2 +-
 Assets/Scripts/App.cs                           |  2 +-
 Assets/Scripts/Scenes/LoginController.cs        |  9 +--------
 .../Scripts/UI/Prefab/Login/QuickLoginUser.cs   |  9 +--------
 Assets/Scripts/UI/Prefab/MapList/MapItem.cs     |  2 ++
 .../Scripts/UI/Prefab/Panel/BigMapController.cs |  2 +-
 .../UI/Prefab/Panel/EditUserController.cs       |  9 +--------
 .../Scripts/UI/Prefab/Panel/HomeController.cs   | 11 ++---------
 .../UI/Prefab/Panel/MapListController.cs        |  2 +-
 .../UI/Prefab/Panel/UserInfoController.cs       | 11 ++---------
 Assets/Scripts/Utils/Utils.cs                   | 11 +++++++++++
 Packages/packages-lock.json                     | 17 ++++++++---------
 12 files changed, 32 insertions(+), 55 deletions(-)

diff --git a/Assets/Scripts/Apis/ApiBase.cs b/Assets/Scripts/Apis/ApiBase.cs
index b5b8851d..8ddd586e 100644
--- a/Assets/Scripts/Apis/ApiBase.cs
+++ b/Assets/Scripts/Apis/ApiBase.cs
@@ -37,7 +37,7 @@ namespace Assets.Scripts.Apis
 
             httpClientHandler = new HttpClientHandler();
             httpClientHandler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
-            httpClientHandler.Proxy = WebRequest.DefaultWebProxy;
+            httpClientHandler.Proxy = WebRequest.GetSystemWebProxy();
             httpClientHandler.CookieContainer = _cookieCollection;
             httpClientHandler.UseCookies = true;
             //httpClientHandler.CookieContainer.Add(new Uri(ConfigHelper.Host), new Cookie("PowerFun.AUTH", "E1F130A03C0C2F01DF465A17AAA4740E9C44FC5F7C5077AF5A09B5ED29F0CF4FABE44329111C0BDBC6D97A28E7C7C188250265B37D2E6A849D7F0CAC606490648F17DC7FB9C8778BE7217991EBB6304BD543CFEE55084E54CCD634B49F26A751","/"));
diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs
index 41ea94f0..217b6e3a 100644
--- a/Assets/Scripts/App.cs
+++ b/Assets/Scripts/App.cs
@@ -54,7 +54,7 @@ public static class App
 //      Host = "http://pf.juze.pro/";
 //      UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000);
 //      TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001);
-        Host = "https://wx.powerfun.com.cn";
+        Host = "https://wx.powerfun.com.cn/";
         UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000);
         TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001);
 #endif
diff --git a/Assets/Scripts/Scenes/LoginController.cs b/Assets/Scripts/Scenes/LoginController.cs
index e709781c..789c7f2a 100644
--- a/Assets/Scripts/Scenes/LoginController.cs
+++ b/Assets/Scripts/Scenes/LoginController.cs
@@ -778,15 +778,8 @@ public class LoginController : MonoBehaviour
     }
     void RefreshWx3(UserResultModel data,int type)
     {
-        if (string.IsNullOrEmpty(data.WxHeadImg))
-        {
-            wxLogin3.Find("Avatar").GetComponent<RawImage>().texture = Resources.Load<Texture>("Images/icon-1024");
-        }
-        else 
-        {
-            Utils.DisplayImage(wxLogin3.Find("Avatar").GetComponent<RawImage>(),
+        Utils.DisplayHead(wxLogin3.Find("Avatar").GetComponent<RawImage>(),
                     data.WxHeadImg);
-        }
         wxLogin3.Find("Wx").gameObject.SetActive(type == 1);
         wxLogin3.Find("NickName").GetComponent<Text>().text = data.Nickname;
         userResult = data;
diff --git a/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs b/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs
index 235b3f90..9143459e 100644
--- a/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs
+++ b/Assets/Scripts/UI/Prefab/Login/QuickLoginUser.cs
@@ -29,14 +29,7 @@ public class QuickLoginUser : MonoBehaviour
         });
         //transform.GetComponent<Button>().onClick.AddListener();
         this.user = user;
-        if (!string.IsNullOrEmpty(user.Avatar))
-        {
-            Utils.DisplayImage(transform.Find("Avatar").GetComponent<RawImage>(), user.Avatar);
-        }
-        else 
-        {
-            transform.Find("Avatar").GetComponent<RawImage>().texture = Resources.Load<Texture>("Images/icon-1024");
-        }
+        Utils.DisplayHead(transform.Find("Avatar").GetComponent<RawImage>(), user.Avatar);
         transform.Find("NickNameText").GetComponent<Text>().text = user.NickName;
         UIManager.AddEvent(transform.Find("BtnDelete").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, (e) =>
          {
diff --git a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs
index 2ab1dedc..30368d5f 100644
--- a/Assets/Scripts/UI/Prefab/MapList/MapItem.cs
+++ b/Assets/Scripts/UI/Prefab/MapList/MapItem.cs
@@ -190,6 +190,7 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
     async void Collect() 
     {
         JsonResult<object> r;
+        transform.Find("CollectImg").GetComponent<Button>().enabled = false;
         if (map.IsFavorite)
         {
             r = await ConfigHelper.mapApi.CancelFav(map.Id.ToString());
@@ -198,6 +199,7 @@ public class MapItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandler,
         {
             r = await ConfigHelper.mapApi.AddFav(map.Id.ToString());
         }
+        transform.Find("CollectImg").GetComponent<Button>().enabled = true;
         if (r.result)
         {
             map.IsFavorite = !map.IsFavorite;
diff --git a/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs b/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs
index 4954f0d9..b9ccc4c2 100644
--- a/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/BigMapController.cs
@@ -137,7 +137,7 @@ public class BigMapController : PFUIPanel
         //headImage.material = material;
         SetRounded(headImage.transform, rect.height);
 
-        Utils.DisplayImage(headImage, App.CurrentUser.WxHeadImg);
+        Utils.DisplayHead(headImage, App.CurrentUser.WxHeadImg);
 
         UIManager.AddEvent(headImage.gameObject, EventTriggerType.PointerClick, (e) =>
         {
diff --git a/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs b/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs
index 7815c4ee..c5e054a3 100644
--- a/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/EditUserController.cs
@@ -185,14 +185,7 @@ public class EditUserController : PFUIPanel
 
         //Utils.DisplayImage(StartCoroutine, mHeadImage, currentUser.WxHeadImg);
 
-        if (!string.IsNullOrWhiteSpace(currentUser.WxHeadImg))
-        {
-            Utils.DisplayImage(mHeadImage, currentUser.WxHeadImg);
-        }
-        else 
-        {
-            mHeadImage.texture = Resources.Load<Texture>("Images/icon-1024");
-        }
+        Utils.DisplayHead(mHeadImage, currentUser.WxHeadImg);
         if (currentUser.Sex == 1)
         {
             mSexDropdown.SelectIndex(0);
diff --git a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs
index 34207ca4..987f942c 100644
--- a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs
@@ -149,15 +149,8 @@ public class HomeController : PFUIPanel
         {
             userInfo.Find("SexIcon").GetComponent<Image>().sprite = Resources.Load<Sprite>("Images/man");
         }
-        if (!string.IsNullOrEmpty(App.CurrentUser.WxHeadImg))
-        {
-            Utils.DisplayImage(userInfo.Find("Avatar").GetComponent<RawImage>(), App.CurrentUser.WxHeadImg);
-        }
-        else 
-        {
-            userInfo.Find("Avatar").GetComponent<RawImage>().texture = Resources.Load<Texture>("Images/icon-1024");
-        }
-        
+        Utils.DisplayHead(userInfo.Find("Avatar").GetComponent<RawImage>(), App.CurrentUser.WxHeadImg);
+
         userInfo.Find("Country").GetComponent<RawImage>().texture = UIManager.Instance.loginRegOptions.GetCountryImageByName(App.CurrentUser.Country);
         userInfo.Find("CaloriesContainer").Find("CaloriesValue").GetComponent<Text>().text = double.Parse(summary.Kcal).ToString("0") +" KCAL";
         userInfo.Find("KMContainer").Find("KMValue").GetComponent<Text>().text = summary.TotalDistance.ToString("0") +" KM";
diff --git a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs
index c89eda2c..4d59b18e 100644
--- a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs
@@ -223,7 +223,7 @@ public class MapListController : PFUIPanel
         headImage.material = material;
         //if (App.FromLogin) 
         //{
-            Utils.DisplayImage(headImage, App.CurrentUser.WxHeadImg);
+            Utils.DisplayHead(headImage, App.CurrentUser.WxHeadImg);
         //}
         
 
diff --git a/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs b/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs
index 200ef90c..2f117bde 100644
--- a/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs
+++ b/Assets/Scripts/UI/Prefab/Panel/UserInfoController.cs
@@ -78,15 +78,8 @@ public class UserInfoController : PFUIPanel
         {
             var summary = r.data;
             var user = App.CurrentUser;
-            if (!string.IsNullOrEmpty(user.WxHeadImg))
-            {
-                Utils.DisplayImage(infoPanel.Find("Avatar").GetComponent<RawImage>(), user.WxHeadImg);
-            }
-            else 
-            {
-                infoPanel.Find("Avatar").GetComponent<RawImage>().texture = Resources.Load<Texture>("Images/icon-1024");
-            }
-            
+            Utils.DisplayHead(infoPanel.Find("Avatar").GetComponent<RawImage>(), user.WxHeadImg);
+
             infoPanel.Find("Status").Find("Country").GetComponent<RawImage>().texture
                 = UIManager.Instance.loginRegOptions.GetCountryImageByName(user.Country);
             infoPanel.Find("Status").Find("Wx").gameObject.SetActive(
diff --git a/Assets/Scripts/Utils/Utils.cs b/Assets/Scripts/Utils/Utils.cs
index 42d95df5..4c455d29 100644
--- a/Assets/Scripts/Utils/Utils.cs
+++ b/Assets/Scripts/Utils/Utils.cs
@@ -438,5 +438,16 @@ namespace Assets.Scripts
             }
         }
         /*下载文件*/
+        public static void DisplayHead(RawImage raw, string s) 
+        {
+            if (string.IsNullOrEmpty(s))
+            {
+                raw.texture = Resources.Load<Texture>("Images/icon-1024");
+            }
+            else 
+            {
+                DisplayImage(raw, s);
+            }
+        }
     }
 }
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index b60becf7..866945fa 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -18,21 +18,21 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.collab-proxy": {
       "version": "1.2.16",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
       "version": "1.1.4",
@@ -41,14 +41,14 @@
       "dependencies": {
         "com.unity.test-framework": "1.1.1"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
       "version": "1.2.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
       "version": "1.1.22",
@@ -59,7 +59,7 @@
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
       "version": "1.2.18",
@@ -71,15 +71,14 @@
         "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.particlesystem": "1.0.0"
       },
-      "url": "https://packages.unity.cn"
+      "url": "https://packages.unity.com"
     },
     "com.unity.ugui": {
       "version": "1.0.0",
       "depth": 0,
       "source": "builtin",
       "dependencies": {
-        "com.unity.modules.ui": "1.0.0",
-        "com.unity.modules.imgui": "1.0.0"
+        "com.unity.modules.ui": "1.0.0"
       }
     },
     "com.unity.modules.ai": {