From 365fab22d4c1badc2314272695ca3c0d1b2e1847 Mon Sep 17 00:00:00 2001
From: CaiYanPeng <caiyanpeng@juze.pro>
Date: Fri, 18 Feb 2022 15:48:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/RecommendController.cs                 | 10 +++++++--
 Assets/Scripts/App.cs                         |  3 +++
 Assets/Scripts/Scenes/LoginController.cs      |  4 ++++
 Assets/Scripts/Scenes/MainController.cs       | 21 ++++++++++++-------
 .../UI/Prefab/Activity/ActivityController.cs  |  1 -
 .../UI/Prefab/Activity/AddressController.cs   |  4 ++++
 6 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/Assets/RecommendController.cs b/Assets/RecommendController.cs
index cd903846..ddedbb06 100644
--- a/Assets/RecommendController.cs
+++ b/Assets/RecommendController.cs
@@ -51,8 +51,14 @@ public class RecommendController : MonoBehaviour
                 break;
             case 2:
                 await ConfigHelper.activityApi.JoinActivity(Area.ActivityId ?? 0);
-                UIManager.ShowActivityPanel(Area.Url + "?Token=" + App.CurrentUser.cookie);
-                //Application.OpenURL(Area.Url);
+                if (string.IsNullOrEmpty(App.CurrentUser.Contact) || string.IsNullOrEmpty(App.CurrentUser.ContactPhone) || string.IsNullOrEmpty(App.CurrentUser.ContactAddress))
+                {
+                    UIManager.ShowAddressPanel();
+                }
+                else 
+                {
+                    UIManager.ShowActivityPanel(Area.Url + "?Token=" + App.CurrentUser.cookie);
+                }
                 break;
             case 3:
                 App.RouteIdParam = Area.RouteId;
diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs
index 19d9b78b..26502bf6 100644
--- a/Assets/Scripts/App.cs
+++ b/Assets/Scripts/App.cs
@@ -189,6 +189,9 @@ public static class App
             }
         }
     }
+
+    public static bool CanOpenAd = false;
+
     public static Dictionary<string, string> websiteDict = new Dictionary<string, string>()
     {
         {"https://wx.powerfun.com.cn/","http://www.powerfun.com/" },
diff --git a/Assets/Scripts/Scenes/LoginController.cs b/Assets/Scripts/Scenes/LoginController.cs
index af8d18bb..71ee9b1f 100644
--- a/Assets/Scripts/Scenes/LoginController.cs
+++ b/Assets/Scripts/Scenes/LoginController.cs
@@ -117,6 +117,10 @@ public class LoginController : BaseScene
 
     public Texture avatar;
     // Start is called before the first frame update
+    private void Awake()
+    {
+        App.CanOpenAd = true;
+    }
     void Start()
     {
 #if UNITY_ANDROID || UNITY_IOS
diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs
index b27b13fb..d5401476 100644
--- a/Assets/Scripts/Scenes/MainController.cs
+++ b/Assets/Scripts/Scenes/MainController.cs
@@ -337,17 +337,22 @@ public class MainController : BaseScene
         else
         {
             UIManager.ShowHomePanel();
-            var _r = await ConfigHelper.activityApi.GetCurrentActivityList();
-            if (_r.result && _r.data!=null) 
+            if (App.CanOpenAd) 
             {
-                var adList = _r.data;
-                App.adQueue.Clear();
-                foreach (var _ad in adList) 
+                App.CanOpenAd = false;
+
+                var _r = await ConfigHelper.activityApi.GetCurrentActivityList();
+                if (_r.result && _r.data != null)
                 {
-                    App.adQueue.Enqueue(_ad);
+                    var adList = _r.data;
+                    App.adQueue.Clear();
+                    foreach (var _ad in adList)
+                    {
+                        App.adQueue.Enqueue(_ad);
+                    }
+                    var ad = App.adQueue.Dequeue();
+                    UIManager.ShowActivityAdPanel(ad.Id, ad.DetailUrl, ad.Url + $"?Token={App.CurrentUser.cookie}");
                 }
-                var ad = App.adQueue.Dequeue();
-                UIManager.ShowActivityAdPanel(ad.Id, ad.DetailUrl, ad.Url + $"?Token={App.CurrentUser.cookie}");
             }
             
             //UIManager.ShowNewRouteOverviewPanel();
diff --git a/Assets/Scripts/UI/Prefab/Activity/ActivityController.cs b/Assets/Scripts/UI/Prefab/Activity/ActivityController.cs
index dcd670d0..33a205a3 100644
--- a/Assets/Scripts/UI/Prefab/Activity/ActivityController.cs
+++ b/Assets/Scripts/UI/Prefab/Activity/ActivityController.cs
@@ -15,7 +15,6 @@ public class ActivityController : PFUIPanel
     {
         browser = transform.Find("Browser");
         webView = browser.GetComponent<UniWebView>();
-        //webView.LoadHTMLString("<div style='width:100%;height:100%;background:#000;'></div>", "http://192.168.0.101:3081");
         //webView.Show();
     }
 
diff --git a/Assets/Scripts/UI/Prefab/Activity/AddressController.cs b/Assets/Scripts/UI/Prefab/Activity/AddressController.cs
index eace4ba7..f43bbd4c 100644
--- a/Assets/Scripts/UI/Prefab/Activity/AddressController.cs
+++ b/Assets/Scripts/UI/Prefab/Activity/AddressController.cs
@@ -31,6 +31,10 @@ public class AddressController : PFUIPanel
                  UIManager.ShowActivityPanel(App.ActivityUrl);
              }
          });
+        UIManager.AddEvent(transform.Find("Main/Exit").gameObject, UnityEngine.EventSystems.EventTriggerType.PointerClick, b =>
+        {
+            Close();
+        });
     }
     void Start()
     {