20201223-6

wei

2020-12-23 263401d40b2d9d2c1b36a24f33d45c5cb7192518

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -252,7 +252,7 @@
                };
                msgView.AddChidren(btnMsgBg);

              

                btnMsgIcon = new Button()
                {
                    X = Application.GetRealWidth(12),
@@ -264,7 +264,7 @@
                };
                msgView.AddChidren(btnMsgIcon);

               

                btnMsg = new Button()
                {
                    X = Application.GetRealWidth(10) + btnMsgIcon.Right,
@@ -276,7 +276,7 @@
                };
                msgView.AddChidren(btnMsg);

             

                btnMsgTime = new Button()
                {
                    X = Application.GetRealWidth(299),
@@ -343,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>
@@ -383,6 +419,7 @@
        /// </summary>
        void LoadDeviceFunctionControlZone()
        {
         
            #region ContextView
            deviceFunctionView.RemoveAll();
            functionViews.Clear();