备份

xm

2020-07-10 acb2b278663952ce555b06a2e821f359225f15e0

 ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs

File was renamed from Home0630/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -54,9 +54,9 @@
        public void ShowForm()

        {

            this.FormID = "HomeMainPageForm";

            Instance = this;

            
            //先初始化左滑房间列表界面(在反射里面初始化)

            Instance = this;

            //先初始化左滑房间列表界面(在反射里面初始化)
            if (ListRoomViewFrom.Instance == null) { }



            //整个背景的上下滑动控件

@@ -90,7 +90,7 @@
        private void InitTopFrameLayoutControl()

        {

            //头部容器

            base.topFrameLayout = new FrameLayout();

            base.topFrameLayout = new NormalFrameLayout();

            topFrameLayout.Y = Application.GetRealHeight(60);

            topFrameLayout.Height = Application.GetRealHeight(127);

            topFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;

@@ -255,7 +255,7 @@
            }



            //功能和场景bodyView

            this.bodyFrameLayout = new FrameLayout();

            this.bodyFrameLayout = new NormalFrameLayout();

            bodyFrameLayout.Y = functionSceneView.Bottom;

            bodyFrameLayout.Height = this.listBodyContr.frameTable.Height - functionSceneView.Bottom;

            bodyFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;

@@ -543,8 +543,9 @@


            var listDevice = new List<CommonDevice>();

            foreach (var mainkeys in HdlRoomLogic.Current.NowMainPageRoom.ListDevice)

            {

            {
                var device = LocalDevice.Current.GetDevice(mainkeys);



                //判断该设备能否显示在主页

                if (LocalDevice.Current.CanShowInHomeHomeMainPage(device) == false)

                {