场景使能自动化优化

wxr

2023-11-07 955d02679c2c22bd3debd40a71510d78a8256cc4

场景使能自动化优化

 HDL-ON_iOS/Info.plist

@@ -11,7 +11,7 @@
    <key>CFBundleName</key>
    <string>On Pro</string>
    <key>CFBundleShortVersionString</key>
    <string>2.3.1</string>
    <string>2.3.2</string>
    <key>CFBundleURLTypes</key>
    <array>
        <dict>
@@ -36,7 +36,7 @@
        </dict>
    </array>
    <key>CFBundleVersion</key>
    <string>2.3.1</string>
    <string>2.3.2</string>
    <key>LSApplicationQueriesSchemes</key>
    <array>
        <string>weixinULAPI</string>

 HDL_ON/DAL/Server/NewApiRes.cs

@@ -638,6 +638,23 @@
        /// </summary>
        public bool isSupportGroupControl = false;


        public string linkDriverVersion = "3.0.0";

        /// <summary>
        /// 是否支持场景控制自动化使能
        /// </summary>
        public bool isSupportSceneEnableAutomation {
            get
            {
#if DEBUG
                linkDriverVersion = "V03.08.00";
#endif
                return string.Compare(linkDriverVersion, "V03.07.99", false) == 1 ? true : false;

            }
        }

        ///// <summary>
        ///// 
        ///// </summary>

 HDL_ON/HDL_ON.projitems

@@ -136,7 +136,6 @@
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\GetSupport\QuestionListPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AccountBindInfo\NewBindVerificationCodePage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AccountBindInfo\NewBindAccountPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AccountBindInfo\BindAccountPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AccountBindInfo\AccountBindInfoPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AccountBindInfo\ChangeBindAccountPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AccountBindInfo\ChangeBindVerificationCodePage.cs" />

@@ -173,9 +172,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\MemberManagement\MemberManagementPageBLL.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\MemberManagement\MemberPermissionPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\MemberManagement\ChooseShareMemberTargetListPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\ThirdPartyBrandListPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\AddDevciePage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\AddThirdPartyBrandListpage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\DeviceListPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\BrandListPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\UnlockSetting\AppUnlockGesturePage.cs" />

@@ -510,7 +507,6 @@
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\iot_BindTipPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\Iot_BrandFunctionListPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\Iot_AuthorizedPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\Iot_SupportSpkListPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)DAL\DriverLayer\Control_Tcp.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Entity\Function\InverterInfo.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\H5Page.cs" />

@@ -540,7 +536,6 @@
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\MemberManagement\MemberFaceManagementPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\CombinedDimmingListPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\GroupControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\AddCombineDimmingPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Entity\ResponseEntity\FreeviewMemberInfo.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\GroupChooseRoomPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\CombinedDimming\AddGroupControlPage.cs" />


 HDL_ON/UI/MainPage.cs

@@ -26,7 +26,7 @@
        /// <summary>
        /// 版本号
        /// </summary>
        public static string VersionString = "2.3.1";
        public static string VersionString = "2.3.2";
        ///// <summary>
        ///// 客户端类型
        ///// </summary>

 HDL_ON/UI/UI0-Public/TopViewDiv.cs

@@ -144,7 +144,7 @@
            var btnSetting = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29 + maginY),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
@@ -174,7 +174,7 @@
            var btnSetting = new Button()
            {
                X = Application.GetRealWidth(337-37),
                Y = Application.GetRealHeight(20),
                Y = Application.GetRealHeight(20 + maginY),
                Width = Application.GetMinRealAverage(28+37),
                Height = Application.GetMinRealAverage(28+19),
                TextID = StringId.CombinedDimming,
@@ -201,13 +201,14 @@
        public void LoadTopView_FunctionTop(Function function, Action action,bool locationSet = true)
        {
            backAction = action;
            maginY = 10;

            LoadTopView();

            var btnSetting = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(28),
                Y = Application.GetRealHeight(28 + maginY),
                Width = Application.GetMinRealAverage(32),
                Height = Application.GetMinRealAverage(32),
                UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
@@ -241,7 +242,7 @@
            var btnSetting = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29 + maginY),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
@@ -272,7 +273,7 @@
            var btnSetting = new Button()
            {
                X = Application.GetRealWidth(355-100),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29 + maginY),
                Width = Application.GetMinRealAverage(100),
                Height = Application.GetMinRealAverage(28),
                TextColor = isDelColor ?CSS_Color.WarningColor: CSS_Color.MainColor,
@@ -300,7 +301,7 @@
            var btnAddIcon = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29 + maginY),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/AddIcon.png",
@@ -351,7 +352,7 @@
            var btnAddIcon = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29 + maginY),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/LinkIotIcon.png",
@@ -378,7 +379,7 @@
            var btnAddIcon = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29 + maginY),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/Iot_agreement_icon.png",
@@ -444,7 +445,7 @@
            var btnAddIcon = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29 + maginY),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/AddIcon.png",
@@ -494,7 +495,7 @@
            var btnAddIcon = new Button()
            {
                X = Application.GetRealWidth(337),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29+maginY),
                Width = Application.GetMinRealAverage(28),
                Height = Application.GetMinRealAverage(28),
                UnSelectedImagePath = "Public/AddIcon.png",

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

@@ -73,7 +73,9 @@
        public void LoadPage(Action backAction)
        {
            this.backAction = backAction;
            new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.MessageCenter));
            topView.maginY = 10;
            topView.LoadTopView();

            AddTopMenuView();
            AddMessageView();
@@ -92,7 +94,7 @@

            menuView = new HorizontalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealWidth(117),
                BackgroundColor = CSS_Color.MainBackgroundColor,
                HorizontalScrollBarEnabled = false//隐藏滚动条

 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAddPage.cs

@@ -878,11 +878,22 @@
        void LoadEvent_ChangeFunctionList()
        {
            btnAddFunctionTitle.MouseUpEventHandler = (sender, e) => {
                if (DB_ResidenceData.Instance.HomeGateway.isSupportSceneEnableAutomation)
                {
                //var sefp = new SceneFunctionListChoosePage(scene, refreshFunctionRowAction);
                var sefp = new SceneTargetTypeChoosePage(scene, refreshFunctionRowAction);
                MainPage.BasePageView.AddChidren(sefp);
                sefp.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                }
                else
                {
                    var sefp = new SceneFunctionListChoosePage(scene, refreshFunctionRowAction);
                    //var sefp = new SceneTargetTypeChoosePage(scene, refreshFunctionRowAction);
                    MainPage.BasePageView.AddChidren(sefp);
                    sefp.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                }
            };
        }


 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneAutomationListChoosePage.cs

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using HDL_ON.UI.UI2.Intelligence.Automation;
@@ -35,6 +36,7 @@
            {
                Y = Application.GetRealHeight(74),
                Height = Application.GetRealHeight(667-80),
                ScrollEnabled = false,
            };
            bodyView.AddChidren(contentView);

@@ -192,21 +194,71 @@
                var temp = scene.functions.Find((obj) => obj.sid == logicSid);
                if (temp != null)
                {
                    temp.status.Clear();
                    var kv = temp.status.Find((obj) => obj.key == "enable");
                    if (kv != null)
                    {
                        kv.value = "true";
                    }
                    else
                    {
                        temp.status.Add(new SceneFunctionStatus()
                        {
                            key = "enable",
                            value = "true",
                        });
                    }
                }
                else
                {
                    temp = new SceneFunction();
                    temp.type = "7";
                    temp.sid = logicSid;
                    scene.functions.Add(temp);
                }
                temp.status.Add(new SceneFunctionStatus()
                {
                    key = "enable",
                    value = "true"
                });
                    scene.functions.Add(temp);
                }
                if (scene.userSceneId != null)
                {
                    var waitPage = new Loading();
                    bodyView.AddChidren(waitPage);
                    waitPage.Start("");
                    new System.Threading.Thread(() => {
                        try
                        {
                            var code = scene.EditScene();
                            Application.RunOnMainThread(() =>
                            {
                                if (code == "0")
                                {
                refreshAction();
                                }
                                else
                                {
                                    IMessageCommon.Current.ShowErrorInfoAlter(code);
                                }
                            });
                        }
                        catch { }
                        finally
                        {
                            Application.RunOnMainThread(() => {
                                if (waitPage != null)
                                {
                                    waitPage.RemoveFromParent();
                                    waitPage = null;
                                }
                            });
                        }
                    })
                    { IsBackground = true }.Start();
                }
                else
                {
                    refreshAction();
                }
            };
            btnOff.MouseUpEventHandler = (sender, e) =>
            {
@@ -214,21 +266,72 @@
                var temp = scene.functions.Find((obj) => obj.sid == logicSid);
                if (temp != null)
                {
                    temp.status.Clear();
                    var kv = temp.status.Find((obj) => obj.key == "enable");
                    if (kv != null)
                    {
                        kv.value = "false";
                    }
                    else
                    {
                        temp.status.Add(new SceneFunctionStatus()
                        {
                            key = "enable",
                            value = "false",
                        });
                    }
                }
                else
                {
                    temp = new SceneFunction();
                    temp.type = "7";
                    temp.sid = logicSid;
                    scene.functions.Add(temp);
                }
                temp.status.Add(new SceneFunctionStatus()
                {
                    key = "enable",
                    value = "false"
                });
                    scene.functions.Add(temp);
                }

                if (scene.userSceneId != null)
                {
                    var waitPage = new Loading();
                    bodyView.AddChidren(waitPage);
                    waitPage.Start("");
                    new System.Threading.Thread(() => {
                        try
                        {
                            var code = scene.EditScene();
                            Application.RunOnMainThread(() =>
                            {
                                if (code == "0")
                                {
                refreshAction();
                                }
                                else
                                {
                                    IMessageCommon.Current.ShowErrorInfoAlter(code);
                                }
                            });
                        }
                        catch { }
                        finally
                        {
                            Application.RunOnMainThread(() => {
                                if (waitPage != null)
                                {
                                    waitPage.RemoveFromParent();
                                    waitPage = null;
                                }
                            });
                        }
                    })
                    { IsBackground = true }.Start();
                }
                else
                {
                    refreshAction();
                }
            };

        }

 HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs

@@ -821,13 +821,21 @@
            btnOn.MouseUpEventHandler = (sender, e) =>
            {
                dialog.Close();
                temp = new SceneFunction();
                temp.type = "7";
                var kv = temp.status.Find((obj) => obj.key == "enable");
                if (kv != null)
                {
                    kv.value = "true";
                }
                else
                {
                temp.status.Add(new SceneFunctionStatus()
                {
                    key = "enable",
                    value = "true"
                        value = "true",
                });
                }

                var waitPage = new Loading();
                bodyView.AddChidren(waitPage);
                waitPage.Start("");
@@ -840,6 +848,10 @@
                            if (code == "0")
                            {
                                btnTipText.TextID = StringId.OpenArm;
                            }
                            else
                            {
                                IMessageCommon.Current.ShowErrorInfoAlter(code);
                            }
                        });
                    }
@@ -860,13 +872,21 @@
            btnOff.MouseUpEventHandler = (sender, e) =>
            {
                dialog.Close();
                temp = new SceneFunction();
                temp.type = "7";

                var kv = temp.status.Find((obj) => obj.key == "enable");
                if (kv != null)
                {
                    kv.value = "false";
                }
                else
                {
                temp.status.Add(new SceneFunctionStatus()
                {
                    key = "enable",
                    value = "false"
                        value = "false",
                });
                }

                var waitPage = new Loading();
                bodyView.AddChidren(waitPage);
@@ -880,6 +900,10 @@
                            if (code == "0")
                            {
                                btnTipText.TextID = StringId.Close;
                            }
                            else
                            {
                                IMessageCommon.Current.ShowErrorInfoAlter(code);
                            }
                        });
                    }
@@ -948,11 +972,22 @@
        void LoadEvent_ChangeFunctionList()
        {
            btnAddFunctionTitle.MouseUpEventHandler = (sender, e) => {
                if (DB_ResidenceData.Instance.HomeGateway.isSupportSceneEnableAutomation)
                {
                //var sefp =new SceneFunctionListChoosePage(scene,refreshFunctionRowAction);
                var sefp = new SceneTargetTypeChoosePage(scene, refreshFunctionRowAction);
                MainPage.BasePageView.AddChidren(sefp);
                sefp.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                }
                else
                {
                    var sefp = new SceneFunctionListChoosePage(scene,refreshFunctionRowAction);
                    //var sefp = new SceneTargetTypeChoosePage(scene, refreshFunctionRowAction);
                    MainPage.BasePageView.AddChidren(sefp);
                    sefp.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                }
            };
        }


 HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/AboutOnPage.cs

@@ -46,13 +46,15 @@
        /// </summary>
        public void LoadPage()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.About)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.About));
            topView.maginY = 10;
            topView.LoadTopView();
            this.BackgroundColor = CSS_Color.MainBackgroundColor;

            Button btnOnIcon = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealWidth(106),
                Y = Application.GetRealWidth(106+10),
                Width = Application.GetRealWidth(58),
                Height = Application.GetRealWidth(58),
                UnSelectedImagePath = "OnIcon.png",

 HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs

@@ -47,11 +47,13 @@
            optionType = ot;
            titleId = tId;
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
            topView.maginY = 10;
            topView.LoadTopView();

            FrameLayout rowView = new FrameLayout()
            {
                Y = Application.GetRealHeight(72),
                Y = Application.GetRealHeight(72+10),
                Height = Application.GetRealHeight(50),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };

 HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/BindAccountPage.cs

File was deleted

 HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindAccountPage.cs

@@ -67,11 +67,13 @@
                account =  UserInfo.Current.userMobileInfo;
            }
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
            topView.maginY = 10;
            topView.LoadTopView();

            FrameLayout rowView = new FrameLayout()
            {
                Y = Application.GetRealHeight(72),
                Y = Application.GetRealHeight(72+10),
                Height = Application.GetRealHeight(50),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
@@ -100,7 +102,7 @@

            Button btnChangeBind = new Button()
            {
                Y = Application.GetRealHeight(213),
                Y = Application.GetRealHeight(213+10),
                Gravity = Gravity.CenterHorizontal,
                Width = Application.GetRealWidth(220),
                Height = Application.GetRealWidth(44),

 HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/ChangeBindVerificationCodePage.cs

@@ -88,11 +88,13 @@
                Application.HideSoftInput();
                BackConfirmAction();
            };
            new TopViewDiv(bodyView, Language.StringByID(tId), false).LoadTopView(backAction);
            var topView = new TopViewDiv(bodyView, Language.StringByID(tId), false);
            topView.maginY = 10;
            topView.LoadTopView(backAction);

            btnTip = new Button()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(84),
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.TextFontSize,

 HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindAccountPage.cs

@@ -70,7 +70,9 @@
         

            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
            topView.maginY = 10;
            topView.LoadTopView();

            if (isPhone)
            {
@@ -93,7 +95,7 @@
            #region 如果是手机
            //手机国家区号选择按钮
            ListCellView codeView = new ListCellView() {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
            };
            bodyView.AddChidren(codeView);
            //跳转国家区号选择界面
@@ -170,7 +172,7 @@
            #region 如果是邮箱
            FrameLayout rowView = new FrameLayout()
            {
                Y = Application.GetRealHeight(72),
                Y = Application.GetRealHeight(72+10),
                Height = Application.GetRealHeight(50),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };

 HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/NewBindVerificationCodePage.cs

@@ -94,11 +94,13 @@
                Application.HideSoftInput();
                BackConfirmAction();
            };
            new TopViewDiv(bodyView, Language.StringByID(tId), false).LoadTopView(backAction);
            var topView = new TopViewDiv(bodyView, Language.StringByID(tId), false);
            topView.maginY = 10;
            topView.LoadTopView(backAction);

            btnTip = new Button()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64=10),
                Height = Application.GetRealHeight(84),
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.TextFontSize,

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs

@@ -55,13 +55,15 @@
        public void LoadPage(VerticalRefreshLayout refreshView)
        {

            new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddDevice));
            topView.maginY = 10;
            topView.LoadTopView();
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;

            contentView = new VerticalRefreshLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(667 - 64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(667 - 64-10),
                VerticalScrollBarEnabled = false,
            };
            bodyView.AddChidren(contentView);

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs

File was deleted

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/BrandListPage.cs

@@ -26,21 +26,23 @@

            };

            new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand)).LoadTopView_Add3tyIot(action);
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.FunctionBrand));
            topView.maginY = 10;
            topView.LoadTopView_Add3tyIot(action);

            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;

            bodyView.AddChidren(new Button
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(1),
                BackgroundColor = CSS_Color.DividingLineColor,
            });

            contentView = new VerticalRefreshLayout()
            {
                Y = Application.GetRealHeight(65),
                Height = Application.GetRealHeight(603),
                Y = Application.GetRealHeight(65+10),
                Height = Application.GetRealHeight(603-10),
            };
            bodyView.AddChidren(contentView);


 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/DeviceListPage.cs

@@ -34,13 +34,15 @@
                page.LoadPage(contentView);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            new TopViewDiv(bodyView, Language.StringByID(StringId.Devices)).LoadTopView_AddIcon("3ty", action);
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Devices));
            topView.maginY = 10;
            topView.LoadTopView_AddIcon("3ty", action);
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;

            contentView = new VerticalRefreshLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(667 - 64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(667 - 64-10),
                VerticalScrollBarEnabled = false,
            };
            bodyView.AddChidren(contentView);

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs

@@ -39,21 +39,23 @@
                page.LoadPage(brand_Iot);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            }; 
            new TopViewDiv(bodyView, brand_Iot.brandName).LoadTopView_3tyIot(action);
            var topView = new TopViewDiv(bodyView, brand_Iot.brandName);
            topView.maginY = 10;
            topView.LoadTopView_3tyIot(action);

            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;


            bodyView.AddChidren(new Button
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(1),
                BackgroundColor = CSS_Color.DividingLineColor,
            });

            Button btnTipText = new Button()
            {
                Y = Application.GetRealHeight(80),
                Y = Application.GetRealHeight(80+10),
                Width = Application.GetRealWidth(347),
                Height = Application.GetRealHeight(65),
                Gravity = Gravity.CenterHorizontal,
@@ -74,8 +76,8 @@

            contentView = new FrameLayout()
            {
                Y = Application.GetRealHeight(150),
                Height = Application.GetRealHeight(573),
                Y = Application.GetRealHeight(150+10),
                Height = Application.GetRealHeight(573-10),
            };
            bodyView.AddChidren(contentView);

@@ -353,7 +355,7 @@
            var btnTip = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(180),
                Height = Application.GetRealWidth(180),
                UnSelectedImagePath = "TipNot.png",

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandListPage.cs

@@ -28,20 +28,22 @@
        {
           

            new TopViewDiv(bodyView, Language.StringByID(StringId.Bind3thIotAccount)).LoadTopView(CSS_Color.MainBackgroundColor);
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Bind3thIotAccount));
            topView.maginY = 10;
            topView.LoadTopView(CSS_Color.MainBackgroundColor);

            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;

            bodyView.AddChidren(new Button
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(1),
                BackgroundColor = CSS_Color.DividingLineColor,
            });

            Button btnTipText = new Button()
            {
                Y = Application.GetRealHeight(80),
                Y = Application.GetRealHeight(80+10),
                Width = Application.GetRealWidth(347),
                Height = Application.GetRealHeight(65),
                Gravity = Gravity.CenterHorizontal,
@@ -63,8 +65,8 @@

            contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(150),
                Height = Application.GetRealHeight(573),
                Y = Application.GetRealHeight(150+10),
                Height = Application.GetRealHeight(573-10),
            };
            bodyView.AddChidren(contentView);


 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_SupportSpkListPage.cs

File was deleted

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/ThirdPartyBrandListPage.cs

File was deleted

 HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/iot_BindTipPage.cs

@@ -27,15 +27,17 @@
        public void LoadPage(IntegratedBrand_Iot brand_Iot)
        {

            new TopViewDiv(bodyView, brand_Iot.brandName).LoadTopView(CSS_Color.MainBackgroundColor);
            var topView = new TopViewDiv(bodyView, brand_Iot.brandName);
            topView.maginY = 10;
            topView.LoadTopView(CSS_Color.MainBackgroundColor);

            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;

            var contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                BackgroundColor = CSS_Color.BackgroundColor,
                Height = Application.GetRealHeight(667 - 124)
                Height = Application.GetRealHeight(667 - 124 - 10)
            };
            bodyView.AddChidren(contentView);


 HDL_ON/UI/UI2/4-PersonalCenter/CancelAccountPage.cs

@@ -87,7 +87,10 @@

        public void InitView_PreRelease()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.CancelAccount)).LoadTopView(CSS_Color.MainBackgroundColor);
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.CancelAccount));
            topView.maginY = 10;
            topView.LoadTopView(CSS_Color.MainBackgroundColor);

            bodyView.BackgroundColor = CSS_Color.BackgroundColor;

            var textView = new Button()

 HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddCombineDimmingPage.cs

File was deleted

 HDL_ON/UI/UI2/4-PersonalCenter/FaceManagement/FacePassagePage.cs

@@ -66,14 +66,17 @@

        public void LoadPage()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.FacePassage)).LoadTopView();
            var topNavView = new TopViewDiv(bodyView, Language.StringByID(StringId.FacePassage));
            topNavView.maginY = 10;
            topNavView.LoadTopView();

            bodyView.BackgroundColor = CSS_Color.BackgroundColor;


            contentView = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(667 - 64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(667 - 64 - 10),
            };
            bodyView.AddChidren(contentView);


 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs

@@ -53,7 +53,9 @@
                mmp.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement)).LoadTopView_MemberTopView(refreshAction, backAction);
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement));
            topView.maginY = 10;
            topView.LoadTopView_MemberTopView(refreshAction, backAction);

            contentView = new VerticalScrolViewLayout()
            {

 HDL_ON/UI/UI2/4-PersonalCenter/MyQRCodePage.cs

@@ -24,7 +24,9 @@
        public void LoadPage(bool isStartCheckResidenceThread = false)
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.MyQRcode)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.MyQRcode));
            topView.maginY = 10;
            topView.LoadTopView();

            int backViewHeight = Application.GetRealHeight(132) + Application.GetRealWidth(266);
            FrameLayout backView = new FrameLayout()

 HDL_ON/UI/UI2/4-PersonalCenter/MyServerInfoPage.cs

@@ -21,11 +21,13 @@
        {
            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
            //服务器信息
            new TopViewDiv(bodyView, Language.StringByID(StringId.ServerInformation)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.ServerInformation));
            topView.maginY = 10;
            topView.LoadTopView();

            ImageView imageView = new ImageView()
            {
                Y = Application.GetMinRealAverage(88),
                Y = Application.GetMinRealAverage(88+10),
                Width = Application.GetMinRealAverage(200),
                Height = Application.GetMinRealAverage(180),
                ImagePath = "PersonalCenter/ServerInfo.png",

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs

@@ -228,13 +228,15 @@
        public void LoadView()
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.PersonalCenter)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.PersonalCenter));
            topView.maginY = 10;
            topView.LoadTopView();

            bodyScrolView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                VerticalScrollBarEnabled = false,
                Height = Application.GetRealHeight(551),
                Height = Application.GetRealHeight(551-10),
            };
            bodyView.AddChidren(bodyScrolView);

@@ -856,6 +858,13 @@

#endregion

            bodyView.AddChidren(new Button()
            {
                Y = Application.GetRealHeight(622),
                Height = 1,
                BackgroundColor = CSS_Color.DividingLineColor,
            });

            btnLogout = new Button()
            {
                Y = Application.GetRealHeight(623),

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPageBLL.cs

@@ -41,111 +41,6 @@
            };
        }

        ///// <summary>
        ///// 退出登录操作
        ///// </summary>
        //void Logout()
        //{
        //    #region 保存本地数据至文件夹
        //    string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
        //    new System.Threading.Thread(() =>
        //    {
        //        try
        //        {
        //            var backuplist = FileUtils.ReadFiles();
        //            //移动文件
        //            foreach (var fileName in backuplist)
        //            {
        //                System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
        //                if (fileInfo.Exists)
        //                {
        //                    fileInfo.MoveTo(oldRegionRootPath + fileName);
        //                    MainPage.Log("move file : " + fileName);
        //                }
        //            }
        //            FileUtils.DeleteRegionFiles(oldRegionRootPath);
        //        }
        //        catch (Exception ex)
        //        {
        //            MainPage.Log($"xxx:{ex.Message}");
        //        }
        //        finally
        //        {
        //            FileUtils.DeleteAllFile();
        //        }
        //    }).Start();
        //    #endregion

        //    //2.注销推送
        //    new HttpServerRequest().SignOutPush();
        //    //3.跳转登录页面
        //    UserInfo.Current.LastTime = DateTime.MinValue;
        //    UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//重置用户头像
        //    UserInfo.Current.SaveUserInfo();
        //    MainPage.GoLoginPage(UserInfo.Current);
        //    DB_ResidenceData.residenceData.EixtAccount();
        //}

        ///// <summary>
        ///// 退出登录操作
        ///// </summary>
        //public void LogoutNew()
        //{
        //    //加载Loading效果
        //    var waitPage = new Loading();
        //    bodyView.AddChidren(waitPage);
        //    waitPage.Start(Language.StringByID(StringId.PleaseWait));

        //    new Thread(() =>
        //    {
        //        try
        //        {
        //            #region 保存本地数据至文件夹
        //            //string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
        //            ////清空之前的住宅文件
        //            //FileUtils.DeleteRegionFiles(oldRegionRootPath);
        //            //var backuplist = FileUtils.ReadFiles();
        //            ////移动文件
        //            //foreach (var fileName in backuplist)
        //            //{
        //            //    System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
        //            //    if (fileInfo.Exists)
        //            //    {
        //            //        fileInfo.MoveTo(oldRegionRootPath + fileName);
        //            //        MainPage.Log("move file : " + fileName);
        //            //    }
        //            //}
        //            #endregion
        //        }
        //        catch (Exception ex)
        //        {
        //            MainPage.Log($"xxx:{ex.Message}");
        //        }
        //        finally
        //        {
        //            //FileUtils.DeleteAllFile();
        //            //2.注销推送
        //            new HttpServerRequest().SignOutPush();
        //            //3.跳转登录页面
        //            UserInfo.Current.LastTime = DateTime.MinValue;
        //            UserInfo.Current.headImagePagePath = "LoginIcon/2.png";//重置用户头像
        //            UserInfo.Current.SaveUserInfo();
        //            Shared.Application.RunOnMainThread(() =>
        //            {
        //                if (waitPage != null)
        //                {
        //                    waitPage.RemoveFromParent();
        //                    waitPage = null;
        //                }

        //                MainPage.GoLoginPage(UserInfo.Current);
        //                DB_ResidenceData.residenceData.EixtAccount();

        //            });
        //        }
        //    }).Start();
        //}

        /// <summary>
        /// 退出账号登录事件
        /// </summary>

 HDL_ON/UI/UI2/4-PersonalCenter/ResetAccountPassword/ResetPasswordPage.cs

@@ -67,13 +67,15 @@
                isHitBack = true;
            };

            new TopViewDiv(bodyView, Language.StringByID(StringId.ModifyPassword)).LoadTopView(backAction);
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.ModifyPassword));
            topView.maginY = 10;
            topView.LoadTopView();


            #region 原密码
            FrameLayout oldPwdView = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(50),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
@@ -132,7 +134,6 @@
                TextSize = CSS_FontSize.TextFontSize,
                SecureTextEntry = true,
                TextAlignment = TextAlignment.CenterRight,
                Foucs = true
            };
            rowView.AddChidren(etPassword);
            var lineView = new LineView(rowView.Height);

 HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs

@@ -99,12 +99,14 @@
        public void LoadPage()
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.ResidenceManage)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.ResidenceManage));
            topView.maginY = 10;
            topView.LoadTopView();

            VerticalScrolViewLayout contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(667 - 64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(667 - 64-10),
                ScrollEnabled = false,
            };
            bodyView.AddChidren(contentView);

 HDL_ON/UI/UI2/4-PersonalCenter/SmartSpeaker/SmartSpeakerListPage.cs

@@ -49,9 +49,11 @@
        /// </summary>
        public void LoadPage()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.SmartSpeaker)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.SmartSpeaker));
            topView.maginY = 10;
            topView.LoadTopView();

            int bodyY = Application.GetRealHeight(64);
            int bodyY = Application.GetRealHeight(64+10);
            bodyScrolView = new VerticalScrolViewLayout()
            {
                Y = bodyY,

 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/TvControlPage.cs

@@ -53,7 +53,7 @@
            FrameLayout controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",
@@ -76,7 +76,7 @@
            #region 轮盘控制区域
            topMenuView = new FrameLayout()
            {
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Gravity = Gravity.CenterHorizontal,
                Width = Application.GetRealWidth(199),
                Height = Application.GetRealWidth(199),

 HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs

@@ -92,7 +92,7 @@
            FrameLayout controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",

 HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddAlarmDeploymentPage.cs

@@ -41,14 +41,16 @@

            contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(527),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(527-10),
            };
            bodyView.AddChidren(contentView);

            if (string.IsNullOrEmpty(title))
            {
                new TopViewDiv(bodyView, Language.StringByID(StringId.AddSecurity)).LoadTopView();
                var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddSecurity));
                topView.maginY = 10;
                topView.LoadTopView();
                #region 布防信息
                var deploymentTitleRow = new FrameLayout()
                {
@@ -166,7 +168,9 @@
            }
            else
            {
                new TopViewDiv(bodyView, title).LoadTopView();
                var topView = new TopViewDiv(bodyView, title);
                topView.maginY = 10;
                topView.LoadTopView();
                securityAlarm.status = "enable";
            }


 HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs

@@ -29,12 +29,14 @@
        public void LoadPage()
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.AddDefenseFunction)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddDefenseFunction));
            topView.maginY = 10;
            topView.LoadTopView();

            #region 显示的功能类型切换区域
            var showdFunctionTypeRow = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(53),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
@@ -81,13 +83,19 @@
                }, nowSelectId);
            };

            showdFunctionTypeRow.AddChidren(new Button() {
                Height = 1,
                Y = Application.GetRealHeight(52),
                BackgroundColor = CSS_Color.DividingLineColor
            });


            #endregion

            functionListView = new VerticalScrolViewLayout()
            {
                Y = showdFunctionTypeRow.Bottom,
                Height = Application.GetRealHeight(530-60),
                Height = Application.GetRealHeight(530-60-10),
                BackgroundColor = CSS_Color.BackgroundColor,
            };
            bodyView.AddChidren(functionListView);

 HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs

@@ -51,13 +51,15 @@
        public void LoadPage()
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.AddFunction)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddFunction));
            topView.maginY = 10;
            topView.LoadTopView();

            #region 显示的功能类型切换区域
            showdFunctionTypeRow = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(62),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(53),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            bodyView.AddChidren(showdFunctionTypeRow);
@@ -87,12 +89,21 @@
            showdFunctionTypeRow.AddChidren(btnFloor);
            LoadDialog_ChangeFloor();


            showdFunctionTypeRow.AddChidren(new Button()
            {
                Height = 1,
                Y = Application.GetRealHeight(52),
                BackgroundColor = CSS_Color.DividingLineColor
            });


            #endregion

            functionListView = new VerticalScrolViewLayout()
            {
                Y = showdFunctionTypeRow.Bottom,
                Height = Application.GetRealHeight(530 - 100),
                Height = Application.GetRealHeight(530-60-10),
                BackgroundColor = CSS_Color.BackgroundColor,
            };
            bodyView.AddChidren(functionListView);

 HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs

@@ -65,12 +65,14 @@
            };
            if (addNav)
            {
                new TopViewDiv(bodyView, Language.StringByID(StringId.SecurityCenter)).LoadTopView_ArmCenter(skipAction);
                var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.SecurityCenter));
                topView.maginY = 10;
                topView.LoadTopView_ArmCenter(skipAction);
            }
            VerticalScrolViewLayout contentView = new VerticalScrolViewLayout()
            {
                Y = addNav? Application.GetRealHeight(64):0,
                Height = Application.GetRealHeight(667 - 64),
                Y = addNav? Application.GetRealHeight(64+10):0,
                Height = Application.GetRealHeight(667 - 64-10),
                BackgroundColor = CSS_Color.MainBackgroundColor,
                ScrollEnabled = false,
            };

 HDL_ON/UI/UI2/FuntionControlView/ArmCenter/PushConfigPage.cs

@@ -16,13 +16,15 @@
        public void Show(Entity.SecurityAlarm alarm)
        {
      
            new TopViewDiv(bodyView, Language.StringByID(StringId.fasongtongzhi)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.fasongtongzhi));
            topView.maginY = 10;
            topView.LoadTopView();

            this.BackgroundColor = CSS.CSS_Color.BackgroundColor;

            var viewLayout = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(527),
            };
            bodyView.AddChidren(viewLayout);

 HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainDreamPage.cs

@@ -95,7 +95,7 @@
            FrameLayout controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",

 HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs

@@ -66,7 +66,7 @@
            FrameLayout controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",

 HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs

@@ -90,7 +90,7 @@
            FrameLayout controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",

 HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs

@@ -88,7 +88,7 @@
            FrameLayout controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",

 HDL_ON/UI/UI2/FuntionControlView/Curtain/VenetianBlindsPage.cs

@@ -90,7 +90,7 @@
            FrameLayout controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",

 HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs

@@ -85,7 +85,7 @@
            controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",

 HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchPage.cs

@@ -85,7 +85,7 @@
            controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",

 HDL_ON/UI/UI2/FuntionControlView/Electrical/DvdPage.cs

@@ -72,7 +72,7 @@
            FrameLayout controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",
@@ -127,7 +127,7 @@
            #region 轮盘控制区域
            topMenuView = new FrameLayout()
            {
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Gravity = Gravity.CenterHorizontal,
                Width = Application.GetRealWidth(199),
                Height = Application.GetRealWidth(199),

 HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPage.cs

@@ -59,7 +59,7 @@
            FrameLayout controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",

 HDL_ON/UI/UI2/FuntionControlView/Electrical/IrFanPage.cs

@@ -42,7 +42,7 @@
            btnIcon = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(134),
                Height = Application.GetRealWidth(134),
                UnSelectedImagePath = "FunctionIcon/IrFan/FanIcon.png",

 HDL_ON/UI/UI2/FuntionControlView/Electrical/PjtPage.cs

@@ -74,7 +74,7 @@
            FrameLayout controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",
@@ -129,7 +129,7 @@
            #region 轮盘控制区域
            topMenuView = new FrameLayout()
            {
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Gravity = Gravity.CenterHorizontal,
                Width = Application.GetRealWidth(199),
                Height = Application.GetRealWidth(199),

 HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs

@@ -59,7 +59,7 @@
            FrameLayout controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",

 HDL_ON/UI/UI2/FuntionControlView/Electrical/StbPage.cs

@@ -73,7 +73,7 @@
            FrameLayout controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",
@@ -128,7 +128,7 @@
            #region 轮盘控制区域
            topMenuView = new FrameLayout()
            {
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Gravity = Gravity.CenterHorizontal,
                Width = Application.GetRealWidth(199),
                Height = Application.GetRealWidth(199),

 HDL_ON/UI/UI2/FuntionControlView/Electrical/TVPage.cs

@@ -74,7 +74,7 @@
            FrameLayout controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",
@@ -129,7 +129,7 @@
            #region 轮盘控制区域
            topMenuView = new FrameLayout()
            {
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Gravity = Gravity.CenterHorizontal,
                Width = Application.GetRealWidth(199),
                Height = Application.GetRealWidth(199),

 HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs

@@ -106,7 +106,7 @@
            FrameLayout controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",

 HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPage.cs

@@ -72,11 +72,14 @@
        public void LoadPage(bool locationSetting = true)
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.Setting)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Setting));
            topView.maginY = 10;
            topView.LoadTopView();


            var contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(600),
                ScrollEnabled = false,
            };

 HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs

@@ -87,7 +87,7 @@
            controlView = new FrameLayout()

            {

                Gravity = Gravity.CenterHorizontal,

                Y = Application.GetRealHeight(88),

                Y = Application.GetRealHeight(88 + 10),

                Width = Application.GetRealWidth(327),

                Height = Application.GetRealHeight(526),

                BackgroundImagePath = "Public/Fragmentbg.png",


 HDL_ON/UI/UI2/FuntionControlView/Light/DimmerPage.cs

@@ -81,7 +81,7 @@
            controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",

 HDL_ON/UI/UI2/FuntionControlView/Light/GroupControlPage_V2.cs

@@ -48,7 +48,7 @@
            controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",

 HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs

@@ -100,7 +100,7 @@
            FrameLayout controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",

 HDL_ON/UI/UI2/FuntionControlView/Light/RGBWPage.cs

@@ -88,7 +88,7 @@
            FrameLayout controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",

 HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs

@@ -80,7 +80,7 @@
            controlView = new FrameLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(88),
                Y = Application.GetRealHeight(88 + 10),
                Width = Application.GetRealWidth(327),
                Height = Application.GetRealHeight(526),
                BackgroundImagePath = "Public/Fragmentbg.png",