Merge branch 'Dev-Branch' into dev--wxr

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacHistoryChoosePage.cs

@@ -60,7 +60,7 @@
            };
            tempView.AddChidren(btnTempName);
            btnTempName.MouseUpEventHandler = (sender, e) => {
                var page = new CacWeekHistoryPage(device,"temp");
                var page = new CacWeekHistoryPage(device, "room_temp");
                MainPage.BasePageView.AddChidren(page);
                page.InitView();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -96,7 +96,7 @@
            };
            humidityView.AddChidren(btnHumidityName);
            btnHumidityName.MouseUpEventHandler = (sender, e) => {
                var page = new CacWeekHistoryPage(device, "humidity");
                var page = new CacWeekHistoryPage(device, "room_humidity");
                MainPage.BasePageView.AddChidren(page);
                page.InitView();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;