From 882155f064c6cfa8ccd092ec083c4264eb7b3020 Mon Sep 17 00:00:00 2001 From: WJC <wjc@hdlchina.com.cn> Date: 星期二, 10 十二月 2019 17:55:55 +0800 Subject: [PATCH] 2019-12-10-02 --- ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs | 70 +++++++++++++++-------------------- 1 files changed, 30 insertions(+), 40 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs index 62e6cc9..ccfe1f5 100644 --- a/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs +++ b/ZigbeeApp/Shared/Phone/Device/Logic/DeviceStateCondition.cs @@ -23,10 +23,11 @@ FrameLayout clickframeLayout = new FrameLayout(); Button clickbutton = new Button(); Button clicktextcolcrbutton = new Button(); - HorizontalScrolViewLayout devicetypehorizontalScrol1; - public void Show() + + public void Show() { + UserView.HomePage.Instance.ScrollEnabled = false; this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor; #region 鏈�涓婇潰鐨勫竷灞�浠g爜 @@ -48,6 +49,7 @@ Height = Application.GetRealHeight(69), Y = Application.GetRealHeight(92), TextID = MyInternationalizationString.devicestate, + IsBold = true, }; topRowLayout.AddChidren(titleName); @@ -122,15 +124,6 @@ }; this.AddChidren(roomhorizontalScrol); - devicetypehorizontalScrol1 = new HorizontalScrolViewLayout() - { - Width = Application.GetRealWidth(1080 - 58 - 200), - Height = Application.GetRealHeight(280), - Y = roomhorizontalScrol.Bottom, - BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor, - X = Application.GetRealWidth(58 + 200), - }; - this.AddChidren(devicetypehorizontalScrol1); ///璁惧绫诲瀷婊戝姩鎺т欢 var devicetypehorizontalScrol = new HorizontalScrolViewLayout() { @@ -139,19 +132,20 @@ Y = roomhorizontalScrol.Bottom, BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor, X = Application.GetRealWidth(58), - Radius = (uint)Application.GetRealHeight(50), + // Radius = (uint)Application.GetRealHeight(50), }; this.AddChidren(devicetypehorizontalScrol); + devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerBottomLeft); middle = new VerticalScrolViewLayout(); middle.Y = devicetypehorizontalScrol.Bottom + Application.GetRealHeight(40); middle.Height = Application.GetRealHeight(1920 - 40) - devicetypehorizontalScrol.Bottom; middle.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor; middle.X = Application.GetRealWidth(58); - middle.Radius = (uint)Application.GetRealHeight(50); + //middle.Radius = (uint)Application.GetRealHeight(50); this.AddChidren(middle); - + middle.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft); ///鐩墠鏀寔鐨勮澶� var deviceTypeList = new List<DeviceType> { DeviceType.IASZone, @@ -352,13 +346,11 @@ 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; } @@ -396,13 +388,11 @@ 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; } @@ -606,7 +596,7 @@ Height = Application.GetRealHeight(112), X = Application.GetRealWidth(58), Y = Application.GetRealHeight(30 + 9), - Radius = (uint)Application.GetRealHeight(56), + // Radius = (uint)Application.GetRealHeight(56), BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor, }; deviceFramelayout.AddChidren(bjFramelayout); @@ -735,15 +725,6 @@ flMain.RemoveFromParent(); }; - var devicefra1 = new FrameLayout - { - Width = Application.GetRealWidth(1080), - Height = Application.GetRealHeight(100), - Y = Application.GetRealHeight(1920 - 100), - BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor, - }; - flMain.AddChidren(devicefra1); - var devicefra = new FrameLayout { @@ -751,9 +732,10 @@ Height = Application.GetRealHeight(530), Y = Application.GetRealHeight(1920 - 530), BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor, - Radius = (uint)Application.GetRealHeight(60), + // Radius = (uint)Application.GetRealHeight(60), }; flMain.AddChidren(devicefra); + devicefra.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerTopRight); #region -------鍙栨秷 瀹屾垚 var timetype = new RowLayout @@ -1258,6 +1240,7 @@ Width = Application.GetRealWidth(600), TextAlignment = TextAlignment.CenterLeft, TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor, + TextSize = 14, }; timeoutrowlayout.AddChidren(btntimeout); @@ -1472,21 +1455,26 @@ }; devicefra.AddChidren(Btntemperaturevalue); - var horizontalSeekBarVol = new HorizontalSeekBar + var horizontalSeekBarVol = new DiyImageSeekBar { - Width = Application.GetRealWidth(920), - Height = Application.GetRealHeight(80), - Radius = (uint)Application.GetRealHeight(25), Y = timetype.Bottom + Application.GetRealHeight(70 + 60 + 70), X = Application.GetRealWidth(80), - ProgressColor = ZigbeeColor.Current.LogicProgressColorSelected, - Max = 100, - SleepTime = 1000, - ThumbRadius = 9, + Width = Application.GetRealWidth(920), + Height = Application.GetRealHeight(160), + IsProgressTextShow = false,//鏄剧ず鐧惧垎姣� + IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔� + ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉¢鑹� + ThumbImagePath = "ZigeeLogic/progressbtn_2.png",//杩涘害鏉℃寜閽浘鏍� + ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級 + ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,//杩涘害鏉″師棰滆壊 + //ProgressTextSize = 13,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏� + SeekBarViewHeight = Application.GetRealHeight(10),//杩涘害鏉$殑楂樺害 }; devicefra.AddChidren(horizontalSeekBarVol); - horizontalSeekBarVol.MouseUpEventHandler += (sender, e) => + + EventHandler<int> progressclick = (sender, e) => { + SelectedDeviceStatuscondition = "TemperatureSensor"; if (temperatureSensor.SensorDiv == 1) { @@ -1500,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) @@ -1556,7 +1546,7 @@ { var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt), Language.StringByID(MyInternationalizationString.selectdevicestatuscondition), - Language.StringByID(MyInternationalizationString.complete)); + Language.StringByID(MyInternationalizationString.confrim)); alert.Show(); return; } -- Gitblit v1.8.0