上传一个版本

黄学彪

2020-03-11 06802250b4b9041d39d568c1dbe77684075006b2

 ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs

@@ -83,7 +83,7 @@
                        //是否为当前设备
                        if ((temperDevice?.DeviceEpoint != common.DeviceEpoint || temperDevice?.DeviceAddr != common.DeviceAddr) && (humidDevice?.DeviceEpoint != common.DeviceEpoint || humidDevice?.DeviceAddr != common.DeviceAddr) )
                        {
                            //return;
                            return;
                        }

                        //if (common.Type == DeviceType.TemperatureSensor)
@@ -189,7 +189,8 @@
            var roomBackView = new FrameLayout()
            {
                Width = Application.GetRealWidth(717),
                Height = Application.GetRealHeight(478)
                Height = Application.GetRealHeight(478),
                Radius = (uint)Application.GetRealHeight(17)
            };
            AddChidren(roomBackView);

@@ -199,6 +200,14 @@
                Radius = (uint)Application.GetRealHeight(17)
            };
            roomBackView.AddChidren(roomImg);

            //加个特殊的遮罩
            var frameBackGroudTemp = new FrameLayout();
            frameBackGroudTemp.Width = roomBackView.Width;
            frameBackGroudTemp.Height = roomBackView.Height;
            frameBackGroudTemp.Radius = roomBackView.Radius;
            frameBackGroudTemp.BackgroundColor = 0x12000000;
            roomBackView.AddChidren(frameBackGroudTemp);

            roomNameBackground = new FrameLayout
            {
@@ -250,10 +259,14 @@
            {
                X = Application.GetRealWidth(69),
                Width = Application.GetRealWidth(120),
                Text = room.Temperatrue == 0 ? "--℃" : $"{room.Temperatrue}℃",
                Text = "--℃",
                TextSize = 14,
                TextAlignment=TextAlignment.CenterLeft
            };
            if (string.IsNullOrEmpty(room.TemperatrueDevice) == false)
            {

                temperatureText.Text = room.Temperatrue == 0 ? "0.0℃" : room.Temperatrue.ToString() + "℃";
            }
            roomTemperatureBackground.AddChidren(temperatureText);
            temperatureText.Width = temperatureText.GetTextWidth() + Application.GetRealWidth(60);

@@ -271,16 +284,20 @@
            {
                X = humidityIcon.Right,
                Width = Application.GetRealWidth(120),
                Text = room.Humidity == 0 ? "--%" : $"{room.Humidity}%",
                Text = "--%",
                TextSize = 14,
                TextAlignment = TextAlignment.CenterLeft
            };
            if (string.IsNullOrEmpty(room.HumidityDevice) == false)
            {

                humidityText.Text = room.Humidity == 0 ? "0.0%" : room.Humidity.ToString() + "%";
            }
            roomTemperatureBackground.AddChidren(humidityText);
            humidityText.Width = humidityText.GetTextWidth() + Application.GetRealWidth(60);
            roomTemperatureBackground.Width = (humidityText.Width + temperatureText.Width + Application.GetRealWidth(150)) > Application.GetRealWidth(600) ? Application.GetRealWidth(600) : (humidityText.Width + temperatureText.Width + Application.GetRealWidth(150));

            if (string.IsNullOrEmpty(room.TemperatrueDevice) == false)
            {
            {

                //发送获取温度的命令
                var dev = Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
                ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(dev);
@@ -305,13 +322,12 @@
            roomListBtn.MouseUpEventHandler += (send, e) =>
            {
                CommonPage.Instance.IsDrawerLockMode = true;
                var editRoom = new Device.Room.EditRoom();
                HomePage.Instance.AddChidren(editRoom);
                HomePage.Instance.PageIndex += 1;
                editRoom.Show(room);
                editRoom.action += () =>
                {
                    action?.Invoke();

                var form = new UserCenter.Residence.EditorRoomInforForm();
                form.AddForm(room);
                form.FinishEditorEvent += (roomName2) =>

                {

                    action?.Invoke();

                };
            };
        }