全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

 ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs

@@ -23,6 +23,7 @@
        FrameLayout clickframeLayout = new FrameLayout();
        Button clickbutton = new Button();
        Button clicktextcolcrbutton = new Button();
        HorizontalScrolViewLayout devicetypehorizontalScrol1;
        public void Show()
        {

@@ -108,7 +109,7 @@
            ///没有房间直接返回去；
            if (Common.Room.Lists.Count == 0)
            {
                return; 
                return;
            }
            ///房间滑动控件
            var roomhorizontalScrol = new HorizontalScrolViewLayout()
@@ -120,7 +121,7 @@
            };
            this.AddChidren(roomhorizontalScrol);

            var devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
            devicetypehorizontalScrol1 = new HorizontalScrolViewLayout()
            {
                Width = Application.GetRealWidth(1080 - 58 - 200),
                Height = Application.GetRealHeight(280),
@@ -345,6 +346,18 @@
                        }
                        list.Add(device);
                    }
                    if (list.Count == 0)
                    {
                        devicetypehorizontalScrol.Height = 0;
                        devicetypehorizontalScrol1.Height = 0;
                        middle.Height = 0;
                    }
                    else
                    {
                        devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
                        devicetypehorizontalScrol1.Height = Application.GetRealHeight(280);
                        middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
                    }

                    AllDeviceTypeView(list, devicetypehorizontalScrol);

@@ -377,6 +390,19 @@
                        list.Add(device);
                    }

                    if (list.Count == 0)
                    {
                        devicetypehorizontalScrol.Height = 0;
                        devicetypehorizontalScrol1.Height = 0;
                        middle.Height = 0;
                    }
                    else
                    {
                        devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
                        devicetypehorizontalScrol1.Height = Application.GetRealHeight(280);
                        middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom;
                    }

                    AllDeviceTypeView(list, devicetypehorizontalScrol);