From 263401d40b2d9d2c1b36a24f33d45c5cb7192518 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 15:51:54 +0800
Subject: [PATCH] 20201223-6

---
 HDL_ON/UI/UI2/1-HomePage/HomePage.cs |  118 +++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 79 insertions(+), 39 deletions(-)

diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 03653ee..608fa42 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -129,21 +129,9 @@
                     Radius = (uint)Application.GetRealWidth(3),
                 };
                 topView.AddChidren(btnLinkStateTip);
-                if (Control.Ins.GatewayOnline)
-                {
-                    if (Control.Ins.IsRemote)
-                    {
-                        bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipRemote;
-                    }
-                    else
-                    {
-                        bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.MainColor;
-                    }
-                }
-                else
-                {
-                    bodyView.btnLinkStateTip.BackgroundColor = CSS.CSS_Color.LinkTipFail;
-                }
+                //鏇存柊閾炬帴鐘舵�乮con棰滆壊
+                CheckLinkStatus();//2020-12-22
+                //LoadEvent_CheckLinkStatus();
 
                 btnResidenceName = new Button()
                 {
@@ -264,7 +252,7 @@
                 };
                 msgView.AddChidren(btnMsgBg);
 
-              
+
                 btnMsgIcon = new Button()
                 {
                     X = Application.GetRealWidth(12),
@@ -276,7 +264,7 @@
                 };
                 msgView.AddChidren(btnMsgIcon);
 
-               
+
                 btnMsg = new Button()
                 {
                     X = Application.GetRealWidth(10) + btnMsgIcon.Right,
@@ -288,7 +276,7 @@
                 };
                 msgView.AddChidren(btnMsg);
 
-             
+
                 btnMsgTime = new Button()
                 {
                     X = Application.GetRealWidth(299),
@@ -355,39 +343,75 @@
                 #region ContextView
                 contentView = new PageLayout()
                 {
-                    Y = changeView.Bottom ,
+                    Y = changeView.Bottom,
                     Height = Application.GetRealHeight(310 + 30 + 10), //20涓鸿秴鍑洪儴鍒�
                 };
                 bodyView.AddChidren(contentView);
 
                 functionViews = new List<FrameLayout>();
 
-                deviceFunctionView = new VerticalScrolViewLayout();
-                contentView.AddChidren(deviceFunctionView);
-                LoadDeviceFunctionControlZone();
-                sceneFunctionView = new VerticalScrolViewLayout();
-                contentView.AddChidren(sceneFunctionView);
-                LoadSceneFunctionControlZone();
-                contentView.PageIndex = 0;
 
+                if (!Common.ApiUtlis.Ins.DownloadDataComplete)
+                {
+                    var waitPage = new Loading();
+                    MainPage.BaseView.AddChidren(waitPage);
+                    waitPage.Start(Language.StringByID(StringId.PleaseWait));
+
+                    new System.Threading.Thread(() =>
+                    {
+                        while (!Common.ApiUtlis.Ins.DownloadDataComplete)
+                        {
+                            System.Threading.Thread.Sleep(400);
+                        }
+                        Application.RunOnMainThread(() =>
+                        {
+
+                            deviceFunctionView = new VerticalScrolViewLayout();
+                            contentView.AddChidren(deviceFunctionView);
+                            LoadDeviceFunctionControlZone();
+                            sceneFunctionView = new VerticalScrolViewLayout();
+                            contentView.AddChidren(sceneFunctionView);
+                            LoadSceneFunctionControlZone();
+                            contentView.PageIndex = 0;
+
+
+                            LoadEvent_ChangeShowedFunctionType();
+
+                            // 鏌ヨ鏈娑堟伅骞舵樉绀�
+                            GetUnreadPushMessages();
+                            RegisterGetPushMessageAction();
+
+                            waitPage.Hide();
+                        });
+                    })
+                    { IsBackground = true }.Start();
+                }
+                else
+                {
+
+                    deviceFunctionView = new VerticalScrolViewLayout();
+                    contentView.AddChidren(deviceFunctionView);
+                    LoadDeviceFunctionControlZone();
+                    sceneFunctionView = new VerticalScrolViewLayout();
+                    contentView.AddChidren(sceneFunctionView);
+                    LoadSceneFunctionControlZone();
+                    contentView.PageIndex = 0;
+
+
+                    LoadEvent_ChangeShowedFunctionType();
+
+                    // 鏌ヨ鏈娑堟伅骞舵樉绀�
+                    GetUnreadPushMessages();
+                    RegisterGetPushMessageAction();
+
+                }
                 #endregion
-
-                LoadEvent_ChangeShowedFunctionType();
-
-                // 鏌ヨ鏈娑堟伅骞舵樉绀�
-                GetUnreadPushMessages();
-                RegisterGetPushMessageAction();
             }
             catch (Exception ex)
             {
                 MainPage.Log($"HomePage LoadPage Error : {ex.Message}");
             }
 
-
-            System.Threading.Tasks.Task.Run(() =>
-            {
-                //DriverLayer.Control.Ins.SearchLoaclGateway();
-            });
         }
 
         /// <summary>
@@ -395,6 +419,7 @@
         /// </summary>
         void LoadDeviceFunctionControlZone()
         {
+         
             #region ContextView
             deviceFunctionView.RemoveAll();
             functionViews.Clear();
@@ -868,6 +893,19 @@
                 };
                 view.AddChidren(btnCoverd);
 
+                Button btnShowDelay;
+                btnShowDelay = new Button()
+                {
+                    X = Application.GetRealWidth(40),
+                    Y = Application.GetRealWidth(4),
+                    Height = Application.GetRealWidth(32),
+                    Width = Application.GetRealWidth(100),
+                    TextColor = CSS_Color.AuxiliaryColor1,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                };
+                view.AddChidren(btnShowDelay);
+
                 Button btnSettingIcon;
                 btnSettingIcon = new Button()
                 {
@@ -927,8 +965,8 @@
                 }
 
                 LoadEvent_SceneCollection(btnCollection, scene);
-              
-                LoadEvent_ControlScene(btnCoverd,btnName,btnZone, scene);
+
+                LoadEvent_ControlScene(btnCoverd, btnName, btnZone, btnShowDelay, scene);
 
                 btnSettingIcon.MouseUpEventHandler = (sender, e) => {
                     Action backAction = () => {
@@ -946,6 +984,8 @@
                     aep.LoadPage( refreshAction);
                     MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                 };
+                //鍦烘櫙姝e湪鍊掕鏃舵墽琛屼腑
+                scene.SceneCountDown(btnShowDelay);
             }
             catch (Exception ex)
             {

--
Gitblit v1.8.0