Merge remote-tracking branch 'origin/wxr-udp修改验证' into Wxr-V2.4.2

wxr

2023-11-16 58ccc89832196860a74609a1c54b40b7c6f7faed

Merge remote-tracking branch 'origin/wxr-udp修改验证' into Wxr-V2.4.2

 HDL-ON_Android/Resources/Resource.designer.cs

@@ -15,7 +15,7 @@
{
    
    
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.1.111")]
    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")]
    public partial class Resource
    {
        

 HDL_ON/Common/ApiUtlis.cs

@@ -535,11 +535,12 @@

                        //======================安防====================
                        GetSecurityList();

                        //===================读取逻辑列表==========================
                        Logic.LogicList.Clear();//主页下拉强制刷新自动化列表
                        MainView.GetLogicList();//读取自动化列表
                    })
                    { IsBackground = true }.Start();

                    //===================读取逻辑列表==========================
                    Logic.LogicList.Clear();//主页下拉强制刷新自动化列表

                    //======================注册推送====================
                    httpRequest.RegisteredPush();

 HDL_ON/DAL/Server/HttpServerRequest.cs

@@ -192,9 +192,8 @@
            {
                if (canRefresh)
                {
                    MainPage.Log($"UserInfo.Current.RefreshToken 1 : " + UserInfo.Current.RefreshToken);
                    UserInfo.Current.RefreshToken = SiriKit.NSUserDefaultsHelper.DataSuite.StringForKey(SiriKit.NSUserDefaultsHelper.StorageKeys.GLOBAL_GAccessToken);
                    MainPage.Log($"UserInfo.Current.RefreshToken 2 : " + UserInfo.Current.RefreshToken);
                    UserInfo.Current.RefreshToken = SiriKit.NSUserDefaultsHelper.DataSuite.StringForKey(SiriKit.NSUserDefaultsHelper.StorageKeys.GLOBAL_GRefreshToken);
                    //UserInfo.Current.AccessToken = SiriKit.NSUserDefaultsHelper.DataSuite.StringForKey(SiriKit.NSUserDefaultsHelper.StorageKeys.GLOBAL_GAccessToken);
                    RefreshToken(false);
                }
            }

 HDL_ON/DAL/Server/HttpUtil.cs

@@ -18,8 +18,8 @@
        /// 固定域名,正式环境
        /// 公共域名就近解析
        /// </summary>
        public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
        public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";
        const string APP_KEY = "HDL-HOME-APP-TEST";
        const string SECRET_KEY = "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss";


 HDL_ON/Entity/Function/Scene.cs

@@ -3,6 +3,7 @@
using HDL_ON.Common;
using HDL_ON.DAL.Server;
using HDL_ON.UI;
using HDL_ON.UI.UI2.Intelligence.Automation;
using Shared;

namespace HDL_ON.Entity
@@ -86,6 +87,14 @@
        /// 是否允许删除
        /// </summary>
        public bool can_delete = true;
        /// <summary>
        /// 是否允许编辑
        /// </summary>
        public bool can_edit = true;
        /// <summary>
        /// 是否是网关本地场景
        /// </summary>
        public bool local = false;

        /// <summary>
        /// 创建该场景的用户ID
@@ -561,12 +570,24 @@
        /// <returns></returns>
        private Function ConvertFunctionObject()
        {
            var localFunction = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
            if(localFunction == null)
            Function temp = null;
            if (type == "7")
            {
                localFunction = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
                var logic = Logic.LogicList.Find((obj) => obj.sid == sid);
                if (logic != null) {
                    temp = new Function();
                    temp.name = logic.name;
                }
            }
            return localFunction;
            else
            {
                temp = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sid);
                if (temp == null)
                {
                    temp = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
                }
            }
            return temp;
        }


@@ -577,91 +598,109 @@
        public string GetFunctionScnenInfo()
        {
            var sceneFunctionInfo = "";
            foreach (var sfs in status)
            if (type == "7")
            {
                if (sfs.key == FunctionAttributeKey.OnOff)
                foreach (var sfs in status)
                {
                    if (sfs.value == "off")
                    if (sfs.key == "enable")
                    {
                        return Language.StringByID(StringId.Close);
                        if (sfs.value == "true")
                            return Language.StringByID(StringId.OpenArm);
                        else
                        {
                            return Language.StringByID(StringId.Close);
                        }
                    }
                }
            }
            sceneFunctionInfo += Language.StringByID(StringId.Open) + " ";
            else
            {
                foreach (var sfs in status)
                {
                    if (sfs.key == FunctionAttributeKey.OnOff)
                    {
                        if (sfs.value == "off")
                        {
                            return Language.StringByID(StringId.Close);
                        }
                    }
                }
                sceneFunctionInfo += Language.StringByID(StringId.Open) + " ";

            var modeState = status.Find((obj) => obj.key == FunctionAttributeKey.Mode);
            var tempState = status.Find((obj) => obj.key == FunctionAttributeKey.SetTemp);
            var fanState = status.Find((obj) => obj.key == FunctionAttributeKey.FanSpeed);
            ////海信电视状态
            //var hisenseTvState = status.Find((obj) => obj.key == "wol");
            //if(hisenseTvState != null)
            //{
            //}
            if (modeState != null)
            {
                sceneFunctionInfo += modeState.GetValueText() + " ";
            }
            if (tempState != null)
            {
                sceneFunctionInfo += tempState.GetValueText();
                sceneFunctionInfo += tempState.GetUintString() + " ";
            }
            if (fanState != null)
            {
                sceneFunctionInfo += fanState.GetValueText() + " ";
            }
            var briState = status.Find((obj) => obj.key == FunctionAttributeKey.Brightness);
            if (briState != null)
            {
                sceneFunctionInfo += briState.value + "%" + " ";
            }
            var perState = status.Find((obj) => obj.key == FunctionAttributeKey.Percent);
            if (perState != null)
            {
                sceneFunctionInfo += perState.value + "%" + " ";
            }
            var cctState = status.Find((obj) => obj.key == FunctionAttributeKey.CCT);
            if (cctState != null)
            {
                sceneFunctionInfo += cctState.value + "K" + " ";
            }
            var rgbState = status.Find((obj) => obj.key == FunctionAttributeKey.RGB);
            if (rgbState != null)
            {
                //sceneFunctionInfo += new  cctState.value + "%" + " ";
            }
                var modeState = status.Find((obj) => obj.key == FunctionAttributeKey.Mode);
                var tempState = status.Find((obj) => obj.key == FunctionAttributeKey.SetTemp);
                var fanState = status.Find((obj) => obj.key == FunctionAttributeKey.FanSpeed);
                ////海信电视状态
                //var hisenseTvState = status.Find((obj) => obj.key == "wol");
                //if(hisenseTvState != null)
                //{
                //}
                if (modeState != null)
                {
                    sceneFunctionInfo += modeState.GetValueText() + " ";
                }
                if (tempState != null)
                {
                    sceneFunctionInfo += tempState.GetValueText();
                    sceneFunctionInfo += tempState.GetUintString() + " ";
                }
                if (fanState != null)
                {
                    sceneFunctionInfo += fanState.GetValueText() + " ";
                }
                var briState = status.Find((obj) => obj.key == FunctionAttributeKey.Brightness);
                if (briState != null)
                {
                    sceneFunctionInfo += briState.value + "%" + " ";
                }
                var perState = status.Find((obj) => obj.key == FunctionAttributeKey.Percent);
                if (perState != null)
                {
                    sceneFunctionInfo += perState.value + "%" + " ";
                }
                var cctState = status.Find((obj) => obj.key == FunctionAttributeKey.CCT);
                if (cctState != null)
                {
                    sceneFunctionInfo += cctState.value + "K" + " ";
                }
                var rgbState = status.Find((obj) => obj.key == FunctionAttributeKey.RGB);
                if (rgbState != null)
                {
                    //sceneFunctionInfo += new  cctState.value + "%" + " ";
                }


            var perAngle = status.Find((obj) => obj.key == FunctionAttributeKey.Angle);
            if (perAngle != null)
            {
                sceneFunctionInfo += " " + perAngle.value + "°";
            }
                var perAngle = status.Find((obj) => obj.key == FunctionAttributeKey.Angle);
                if (perAngle != null)
                {
                    sceneFunctionInfo += " " + perAngle.value + "°";
                }

            var perSetVolume = status.Find((obj) => obj.key == FunctionAttributeKey.SetVolume);
            if (perSetVolume != null)
            {
                sceneFunctionInfo += " " + perSetVolume.value;
            }
                var perSetVolume = status.Find((obj) => obj.key == FunctionAttributeKey.SetVolume);
                if (perSetVolume != null)
                {
                    sceneFunctionInfo += " " + perSetVolume.value;
                }

            var perSignal = status.Find((obj) => obj.key == FunctionAttributeKey.Signal);
            if (perSignal != null)
            {
                var p = new HDL_ON.UI.UI2.Intelligence.Automation.PublicInterface();
                string key = p.GetKey(p.GetHisenseSignalSourceDic(), perSignal.value);
                sceneFunctionInfo += " " + key;
            }
                var perSignal = status.Find((obj) => obj.key == FunctionAttributeKey.Signal);
                if (perSignal != null)
                {
                    var p = new HDL_ON.UI.UI2.Intelligence.Automation.PublicInterface();
                    string key = p.GetKey(p.GetHisenseSignalSourceDic(), perSignal.value);
                    sceneFunctionInfo += " " + key;
                }

            var perVolume =status.Find((obj) => obj.key == FunctionAttributeKey.Volume);
            if (perVolume != null)
            {
                sceneFunctionInfo += " " + perVolume.value;
            }
                var perVolume = status.Find((obj) => obj.key == FunctionAttributeKey.Volume);
                if (perVolume != null)
                {
                    sceneFunctionInfo += " " + perVolume.value;
                }

            var perSongName =status.Find((obj) => obj.key == FunctionAttributeKey.SongName);
            if (perSongName != null)
            {
                sceneFunctionInfo += " " + perSongName.value;
                var perSongName = status.Find((obj) => obj.key == FunctionAttributeKey.SongName);
                if (perSongName != null)
                {
                    sceneFunctionInfo += " " + perSongName.value;
                }
            }
            return sceneFunctionInfo;
        }
@@ -670,6 +709,8 @@
        /// 设备
        /// 场景 =scene
        /// 群控=5
        /// 自动化=7
        /// 
        /// </summary>
        public string type = "0";
    }

 HDL_ON/Entity/FunctionList.cs

@@ -282,6 +282,8 @@
                SPK.SensorSmoke,
                SPK.SensorWater,
                SPK.SensorGas,
                SPK.SensorDryContact,
                SPK.SensorDryContact2,
            };

            return Functions.FindAll((obj) => spkList.Contains(obj.spk));

 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/UI0-Public/TopViewDiv.cs

@@ -42,6 +42,8 @@
        /// </summary>
        Action backAction;

        public int maginY = 0;

        public TopViewDiv(FrameLayout frame, string str)
        {
            baseView = frame;
@@ -84,7 +86,7 @@
        {
            contentView = new FrameLayout()
            {
                Height = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(64+ maginY),
                BackgroundColor = color,
            };
            baseView.AddChidren(contentView);
@@ -92,7 +94,7 @@
            Button btnBackIcon = new Button()
            {
                X = Application.GetRealWidth(10),
                Y = Application.GetRealHeight(29),
                Y = Application.GetRealHeight(29 + maginY),
                Width = Application.GetRealWidth(40),
                Height = Application.GetRealWidth(28),
                UnSelectedImagePath = "Public/BackIcon.png",
@@ -102,7 +104,7 @@
            btnTilte = new Button()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(30),
                Y = Application.GetRealHeight(30 + maginY),
                Width = Application.GetRealWidth(270),
                Height = Application.GetRealHeight(25),
                TextAlignment = TextAlignment.Center,
@@ -142,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",
@@ -172,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,
@@ -199,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",
@@ -239,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",
@@ -270,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,
@@ -298,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",
@@ -349,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",
@@ -376,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",
@@ -442,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",
@@ -492,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/UI0-Public/Widget/WebViewDialog.cs

@@ -45,12 +45,14 @@
        {
            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
            this.AddChidren(bodyView);
            new TopViewDiv(this, bodyView, titleStr).LoadTopView(closeAction);
            var topView = new TopViewDiv(this, bodyView, titleStr);
            topView.maginY = 10;
            topView.LoadTopView(closeAction);
            //WebView
            mWebView = new WebView()
            {
                Y = Application.GetRealHeight(64),
                Height = bodyView.Height - Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = bodyView.Height - Application.GetRealHeight(64+10),
                X = Application.GetRealWidth(16),
                Width = bodyView.Width - Application.GetRealWidth(32)
            };

 HDL_ON/UI/UI0-Stan/Form/Base/EditorCommonForm.cs

@@ -95,7 +95,7 @@
            //返回键
            var btnBack = new PicViewControl(40, 28);
            btnBack.X = Application.GetRealWidth(10);
            btnBack.Y = Application.GetRealHeight(9);

            btnBack.Y = Application.GetRealHeight(19);

            btnBack.UnSelectedImagePath = "Public/BackIcon.png";
            topFrameLayout.AddChidren(btnBack);

            topFrameLayout.AddTag("btnBack", btnBack);
@@ -119,7 +119,7 @@
            //标题

            var btnTilte = new NormalViewControl(270, 25, true);

            btnTilte.Gravity = Gravity.CenterHorizontal;

            btnTilte.Y = Application.GetRealHeight(10);

            btnTilte.Y = Application.GetRealHeight(20);

            btnTilte.TextAlignment = TextAlignment.Center;

            btnTilte.TextSize = UI.CSS.CSS_FontSize.HeadlineFontSize;

            btnTilte.TextColor = UI.CSS.CSS_Color.FirstLevelTitleColor;


 HDL_ON/UI/UI0-Stan/Form/DeviceFunctionCardCommonForm.cs

@@ -302,12 +302,20 @@
        /// <param name="btnHigherCollection">上一级界面的收藏控件(原来on的框架太坑)</param>

        /// <param name="btnHigherDeviceName">上一级界面的设备名字控件(原来on的框架太坑)</param>

        private void AddTopSettingIcon(Button btnHigherDeviceName, Button btnHigherRoom)

        {

            //设置图标(门锁界面需要借用这个图标的X轴和Y轴,所以加进来)

            var btnSetting = new PicViewControl(28, 28);

            btnSetting.X = Application.GetRealWidth(337);

            btnSetting.Y = Application.GetRealHeight(9);

            btnSetting.UnSelectedImagePath = "Public/FuncInfoSetIcon.png";

        {
            //设置图标(门锁界面需要借用这个图标的X轴和Y轴,所以加进来)
            var btnSetting = new Button()
            {
                X = Application.GetRealWidth(337),

                Y = Application.GetRealHeight(19),

                Width = Application.GetMinRealAverage(32),

                Height = Application.GetMinRealAverage(32),

                UnSelectedImagePath = "Public/FuncInfoSetIcon.png",
            };

            //var btnSetting = new PicViewControl(28, 28);

            //btnSetting.X = Application.GetRealWidth(337);

            //btnSetting.Y = Application.GetRealHeight(9);

            //btnSetting.UnSelectedImagePath = "Public/FuncInfoSetIcon.png";

            btnSetting.Name = "btnSetting";

            topFrameLayout.AddChidren(btnSetting);



@@ -317,7 +325,7 @@
                btnSetting.Visible = false;

            }



            btnSetting.ButtonClickEvent += (sender, e) =>

            btnSetting.MouseUpEventHandler += (sender, e) =>

            {

                var infoView = new UI.FunctionBaseInfoSetPage(this.device, () =>

                {


 HDL_ON/UI/UI0-Stan/Resourse/HdlControlResourse.cs

@@ -17,7 +17,7 @@
        /// <summary>

        /// 画面TopFrameLayout的高度(高度：44)

        /// </summary>

        public static int TopFrameHeight = Application.GetRealHeight(44);

        public static int TopFrameHeight = Application.GetRealHeight(44 + 10);

        /// <summary>

        /// 画面BodyFrameLayout的高度(不能直接指定数值,不然有可能会出现误差,导致无法铺满)

        /// </summary>


 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/2-Classification/FunctionPage.cs

@@ -84,50 +84,24 @@
                    skipView.LoadPage();
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                };
                new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView_LightFunction(action);
                var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
                topView.maginY = 10;
                topView.LoadTopView_LightFunction(action);
            }
            else
            {
                new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
                var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
                topView.maginY = 10;
                topView.LoadTopView();
            }



#if DEBUG
            //Button testBtn = new Button()
            //{
            //    X = Application.GetRealWidth(80),
            //    Height = Application.GetRealHeight(64),
            //    BackgroundColor = 0xFFFF0000
            //};
            //bodyView.AddChidren(testBtn);
            //int ddd = 0;
            //testBtn.MouseUpEventHandler = (sender, e) => {
            //    ddd++;
            
            //        Function function_online = FunctionList.List.GetLightList().Find((obj) => obj.sid == "0001017DB92D2602020100010101");
            //    if (ddd % 2 == 0)
            //    {
            //        function_online.online = true;
            //    }
            //    else
            //    {
            //        function_online.online = false;
            //    }
            //    HomePage.LoadEvent_RefreshDevcieOnline(function_online);
            //    FunctionPage.UpdataOnline(function_online);
            //    RoomPage.UpdataOnline(function_online);


            //};
#endif

            /// <summary>
            /// 房间内容显示区域
            /// </summary>
            var roomFloorChangeView = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(52),
            };
            bodyView.AddChidren(roomFloorChangeView);
@@ -158,8 +132,8 @@

            functionListView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64 + 52),
                Height = Application.GetRealHeight(603 - 12 - 52),
                Y = Application.GetRealHeight(64 + 52 +10),
                Height = Application.GetRealHeight(603 - 12 - 52-10),
            };
            bodyView.AddChidren(functionListView);


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

@@ -25,6 +25,7 @@
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.NewScene));
            topView.maginY = 10;
            topView.LoadTopView();

            #region 添加场景

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

@@ -98,6 +98,7 @@
        public void LoadPage()
        {
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.NewScene));
            topView.maginY = 10;
            topView.LoadTopView();
     
            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;

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

@@ -29,12 +29,13 @@
        {
            this.bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
            var topView = new TopViewDiv(bodyView,Language.StringByID( StringId.SelectAutomation));
            topView.maginY = 10;
            topView.LoadTopView();

            var contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64),
                Height = Application.GetRealHeight(667-70),
                Y = Application.GetRealHeight(74),
                Height = Application.GetRealHeight(667-80),
                ScrollEnabled = false,
            };
            bodyView.AddChidren(contentView);

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

@@ -99,6 +99,7 @@
        public void LoadPage(Action backRefresh)
        {
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.EditScene));
            topView.maginY = 10;
            topView.LoadTopView(backRefresh);

            initPage();

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

@@ -58,6 +58,7 @@
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddFunction));
            topView.maginY = 10;
            topView.LoadTopView();

            #region 显示的功能类型切换区域

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

@@ -40,6 +40,7 @@
                BackgroundColor = CSS_Color.BackgroundColor
            });
            var topView = new TopViewDiv(bodyView,Language.StringByID(StringId.AddExecutionAction));
            topView.maginY = 10;
            topView.LoadTopView();



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

@@ -54,6 +54,7 @@
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;

            var topView = new TopViewDiv(bodyView, sceneFunction.localFunction.name);
            topView.maginY = 10;
            topView.LoadTopView();

            contentView = new VerticalScrolViewLayout()

 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/AboutOn/ComplaintsPage.cs

@@ -29,12 +29,14 @@
        /// </summary>
        public void LoadPage()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.Complaints)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.Complaints));
            topView.maginY = 10;
            topView.LoadTopView();

            #region 投诉联系
            FrameLayout phoneRow = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealWidth(50),
            };
            bodyView.AddChidren(phoneRow);

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

@@ -14,12 +14,14 @@

        public void ShowPage()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.FirmwareUpdate)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.FirmwareUpdate));
            topView.maginY = 10;
            topView.LoadTopView();

            var contentView = new VerticalScrolViewLayout()
            {
                X = Application.GetRealWidth(12),
                Y = Application.GetRealHeight(90),
                Y = Application.GetRealHeight(100),
                Height = bodyView.Height,
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };

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

@@ -14,12 +14,14 @@
        }
        public void ShowPage()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.SupportHomeKitNotes)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.SupportHomeKitNotes));
            topView.maginY = 10;
            topView.LoadTopView();

            var contentView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(90),
                Height = bodyView.Height ,
                Y = Application.GetRealHeight(100),
                Height = Application.GetRealHeight(490) ,
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
            bodyView.AddChidren(contentView);

 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

@@ -38,22 +38,24 @@
                };
                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

@@ -26,22 +26,24 @@

        public void LoadPage()
        {
           

            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/CombinedDimming/AddGroupControlPage.cs

@@ -92,11 +92,15 @@
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            if (isAdd)
            {
                new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl)).LoadTopView();
                var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl));
                topView.maginY = 10;
                topView.LoadTopView();
            }
            else
            {
                new TopViewDiv(bodyView, "").LoadTopView_SettingText(()=> {
                var topView = new TopViewDiv(bodyView, "");
                topView.maginY = 10;
                topView.LoadTopView_SettingText(()=> {

                    Action action = () => {
                        var waitPage = new Loading();
@@ -158,8 +162,8 @@
            }
            var 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);

@@ -371,7 +375,7 @@
            functionListView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(220),
                Height = Application.GetRealHeight(640 - 12 - 52 - 100 -100),
                Height = Application.GetRealHeight(640 - 12 - 52 - 100 -100-10),
            };
            bodyView.AddChidren(functionListView);


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

@@ -22,7 +22,9 @@
        public void LoadPage()
        {

            new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl)).LoadTopView_AddIcon("CombinedDimming",
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl));
            topView.maginY = 10;
            topView.LoadTopView_AddIcon("CombinedDimming",
                (s, c) =>
                {
                    try
@@ -44,8 +46,8 @@

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

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

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

            contentView = new VerticalScrolViewLayout()
            {
                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/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/AddMemberScanPage.cs

@@ -34,11 +34,13 @@
        public void LoadPage()
        {
            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.AddMember)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddMember));
            topView.maginY = 10;
            topView.LoadTopView();

            var btnMemberName = new Button()
            {
                Y = Application.GetRealHeight(70),
                Y = Application.GetRealHeight(70+10),
                X = Application.GetRealWidth(16),
                Height = Application.GetRealHeight(32),
                TextColor = CSS_Color.FirstLevelTitleColor,

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

File was deleted

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

@@ -29,12 +29,14 @@
        public void LoadPage()
        {
            bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
            new TopViewDiv(bodyView, memberInfo.nickName).LoadTopView();
            var topView = new TopViewDiv(bodyView, memberInfo.nickName);
            topView.maginY = 10;
            topView.LoadTopView();

            #region 人脸管理
            var btnMemberFaceTitle = new Button()
            {
                Y = Application.GetRealHeight(80),
                Y = Application.GetRealHeight(80+10),
                X = Application.GetRealWidth(16),
                Height = Application.GetRealHeight(32),
                TextColor = CSS_Color.FirstLevelTitleColor,

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

@@ -84,11 +84,13 @@
        public void LoadPage(int tId)
        {
            titleId = tId;
            new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(titleId));
            topView.maginY = 10;
            topView.LoadTopView();

            allRoomView = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(50),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };
@@ -128,8 +130,8 @@

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


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

@@ -29,24 +29,6 @@
                //是否需要保存
                new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.IfNeedToSave, action);

                //if (titleId == StringId.PermissionToUse)//从个人中心进入单独分享
                //{
                //    Action action = () =>
                //    {
                //        UploadShareDeviceList();
                //    };
                //    //是否需要保存
                //    new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.IfNeedToSave, action);
                //}
                //else
                //{
                //    //var sharedBytes = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(funs_New));
                //    //2020-12-01 屏蔽页面
                //    //var page = new ChooseShareMemberTargetListPage(funs_New, memberInfo);
                //    //MainPage.BasePageView.AddChidren(page);
                //    //page.LoadPage();
                //    //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                //}
            };
        }


 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/MemberManagement/MemberPermissionPage.cs

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

            FrameLayout headPortraitView = new FrameLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                Height = Application.GetRealHeight(66),
                BackgroundColor = CSS_Color.MainBackgroundColor,
            };

 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/PersonalCenterPageBLL.cs

@@ -270,6 +270,7 @@
                        BorderColor = CSS.CSS_Color.DividingLineColor,
                        BorderWidth = 3,
                        TextColor = CSS.CSS_Color.TextualColor,
                        Radius = 1,
                    };
                    searchView.AddChidren(searchTv);


 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);

@@ -262,7 +264,7 @@
            };
            headPortraitView.AddChidren(userHeadImageView);

#region 个人信息选项区域
            #region 个人信息选项区域
            var topPaddingView = new FrameLayout()
            {
                Height = Application.GetRealHeight(8)
@@ -296,7 +298,7 @@
            optionListView.Height = Application.GetRealHeight(51 * (6 + addRow));


#region 个人选项-名字区域
            #region 个人选项-名字区域
            /// <summary>
            /// 个人选项-名字区域
            /// </summary>
@@ -344,8 +346,8 @@
            };
            userNameView.AddChidren(btnEditUserNameIcon);
            optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
#endregion
#region 个人选项-二维码区域
            #endregion
            #region 个人选项-二维码区域
            /// <summary>
            /// 个人选项-二维码区域
            /// </summary>
@@ -392,8 +394,8 @@
                UnSelectedImagePath = "Public/Right.png",
            };
            _QRcodeView.AddChidren(btnQRcodeRight);
#endregion
#region 个人选项-邮箱信息区域
            #endregion
            #region 个人选项-邮箱信息区域
            /// <summary>
            /// 个人选项-邮箱信息区域
            /// </summary>
@@ -441,7 +443,7 @@
            };
            userEmailInfoView.AddChidren(btnUserEmailRight);
            optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
#endregion
            #endregion
#region 个人选项-手机信息区域
            /// <summary>
            /// 个人选项-手机信息区域
@@ -854,7 +856,14 @@
            logOffView.BtnTilte.Text = Language.StringByID(StringId.CancelAccount);
            logOffView.LineView.RemoveFromParent();

#endregion
            #endregion

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

            btnLogout = new Button()
            {

 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>
@@ -452,7 +347,7 @@
            btnQRcodeRight.MouseUpEventHandler = eventHandler;
        }

#region 修改绑定邮箱
        #region 修改绑定邮箱
        /// <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/4-PersonalCenter/SmartSpeaker/SmartSpeakerRoomListPage.cs

@@ -44,9 +44,11 @@
        /// </summary>
        public void LoadPage()
        {
            new TopViewDiv(bodyView, Language.StringByID(StringId.DataManagement)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.DataManagement));
            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

@@ -15,14 +15,16 @@
        }
        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/ChooseRoomPage.cs

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

            contentView = new VerticalScrolViewLayout()
            {
                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/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",