2019-12-10-02

WJC

2019-12-10 882155f064c6cfa8ccd092ec083c4264eb7b3020

2019-12-10-02

最新代码，请合并代码；

 ZigbeeApp/Shared/Phone/Device/Category/Category.cs

@@ -1960,7 +1960,7 @@
                var logicRowlayout = new RowLayout
                {
                    Height = Application.GetRealHeight(190 + 30),
                    Width = Application.GetRealWidth(1080),
                    Width = Application.GetRealWidth(1080-58),
                    LineColor = ZigbeeColor.Current.LogicBackgroundColor,
                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                };

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

@@ -1471,8 +1471,10 @@
                            SeekBarViewHeight = Application.GetRealHeight(10),//进度条的高度
                        };
                        devicefra.AddChidren(horizontalSeekBarVol);
                        horizontalSeekBarVol.OnProgressChangedEvent += (sender, e) =>

                        EventHandler<int> progressclick = (sender, e) =>
                        {

                            SelectedDeviceStatuscondition = "TemperatureSensor";
                            if (temperatureSensor.SensorDiv == 1)
                            {
@@ -1486,8 +1488,10 @@
                                Btntemperaturevalue.Text = current + "<" + horizontalSeekBarVol.Progress.ToString() + "%";
                                dictionary(deviceConditionsInfo, "AttriButeData1", horizontalSeekBarVol.Progress.ToString());//温度值
                            }
                        };

                        };
                        horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
                        horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;


                        if (temperatureSensor.SensorDiv == 1)

 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddDevice.cs

@@ -1141,7 +1141,7 @@
                        #endregion

                        int Progressvalue = 100;
                        horizontalSeekBarVol.OnProgressChangedEvent += (sender, e) =>
                      EventHandler<int> progressclick = (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            Progressvalue = horizontalSeekBarVol.Progress;
@@ -1159,6 +1159,8 @@
                            switchdictionary.Add("Data1", lightbrightnessvalue.ToString());

                        };
                        horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
                        horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
                        ///确认事件
                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
                        {
@@ -1406,7 +1408,7 @@

                        #endregion
                        int Progressvalue = 100;
                        horizontalSeekBarVol.OnProgressChangedEvent += (sender, e) =>
                        EventHandler<int> progressclick = (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            Progressvalue = horizontalSeekBarVol.Progress;
@@ -1422,6 +1424,8 @@
                            switchdictionary.Add("Data2", horizontalSeekBarVol.Progress.ToString());

                        };
                        horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
                        horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
                        ///确认事件
                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
                        {

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

@@ -1138,24 +1138,26 @@
                        #endregion

                        int Progressvalue = 100;
                        horizontalSeekBarVol.OnProgressChangedEvent += (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            Progressvalue = horizontalSeekBarVol.Progress;
                            if (switchdictionary.ContainsKey("TaskType"))
                            {
                                switchdictionary.Remove("TaskType");
                            }
                            if (switchdictionary.ContainsKey("Data1"))
                            {
                                switchdictionary.Remove("Data1");
                            }
                            switchdictionary.Add("TaskType", "3");
                        EventHandler<int> progressclick = (sender, e) =>
                         {
                             SelectedDeviceStatusaction = "yes";
                             Progressvalue = horizontalSeekBarVol.Progress;
                             if (switchdictionary.ContainsKey("TaskType"))
                             {
                                 switchdictionary.Remove("TaskType");
                             }
                             if (switchdictionary.ContainsKey("Data1"))
                             {
                                 switchdictionary.Remove("Data1");
                             }
                             switchdictionary.Add("TaskType", "3");
                            //最大亮度值是254需要转换；
                            var lightbrightnessvalue = (254 * horizontalSeekBarVol.Progress) / 100;
                            switchdictionary.Add("Data1", lightbrightnessvalue.ToString());
                             switchdictionary.Add("Data1", lightbrightnessvalue.ToString());

                        };
                         };
                        horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
                        horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
                        ///确认事件
                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
                        {
@@ -1403,7 +1405,8 @@

                        #endregion
                        int Progressvalue = 100;
                        horizontalSeekBarVol.OnProgressChangedEvent += (sender, e) =>

                        EventHandler<int> progressclick = (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            Progressvalue = horizontalSeekBarVol.Progress;
@@ -1419,8 +1422,10 @@
                            switchdictionary.Add("Data2", horizontalSeekBarVol.Progress.ToString());

                        };
                        horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
                        horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
                        ///确认事件
                        EventHandler<MouseEventArgs> openclick = (sender, e) =>
                        EventHandler <MouseEventArgs> openclick = (sender, e) =>
                        {
                            SelectedDeviceStatusaction = "yes";
                            horizontalSeekBarVol.IsClickable = true;

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

@@ -254,6 +254,7 @@
                TextAlignment = TextAlignment.CenterRight,
                TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                Tag = "0",
                TextSize = 14,
            };
            timeendrow.AddChidren(btnendtime);