From 34e965100d635346e2d4cd6e6013bdaed66b3004 Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期四, 02 一月 2020 19:52:13 +0800 Subject: [PATCH] 2019.1.2-3 --- ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs index cef40e7..cfc08c8 100644 --- a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs +++ b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs @@ -94,7 +94,7 @@ InitData(); AddTop(); AddBodyView(); - + } /// <summary> @@ -250,7 +250,7 @@ public void RefreshBodyView() { functionSceneBodyView.RemoveAll(); - + if (functionBtn.IsSelected) { ShowFunction(); @@ -305,7 +305,7 @@ Width = Application.GetRealWidth(1028) }; functionSceneBodyView.AddChidren(functionTypeScrowView); - + deviceListScrolView = new VerticalScrolViewLayout { X = Application.GetRealWidth(CommonFormResouce.X_Left), @@ -334,7 +334,7 @@ }; string imgPath=string.Empty; string imgSeletedPath=string.Empty; - Common.LocalDevice.Current.GetDeviceBeloneIcon(deviceType.Value, ref imgPath ,ref imgSeletedPath); + Common.LocalDevice.Current.GetDeviceObjectIcon(deviceType.Value, ref imgPath ,ref imgSeletedPath); functionTypeIMG.Init(imgPath,imgSeletedPath); functionTypeIMG.SetTitle(deviceType.Key); typeRowLayout.AddChidren(functionTypeIMG); @@ -468,7 +468,7 @@ add.MouseUpEventHandler += (sender, e) => { var selectZone = new SelectZone(); - AddChidren(selectZone); + //AddChidren(selectZone); selectZone.Init(); selectZone.ZoneAction = (r) => { @@ -477,7 +477,7 @@ r.AddDevice(d.CommonDevice, true); deviceListScrolView.RemoveViewByTag(d); } - + if (sameTypeList.Count == selectedList.Count) { RefreshData(); @@ -536,7 +536,7 @@ ShowNoSceneTip(); } else - { + { var sceneScrolView = new VerticalScrolViewLayout { Y = Application.GetRealHeight(22), @@ -656,7 +656,7 @@ var frame = sceneScrolView.GetChildren(i) as FrameLayout; (frame.GetChildren(1) as Button).IsSelected = (sender as Button).IsSelected; } - + if ((sender as Button).IsSelected) { (sender as Button).TextID = R.MyInternationalizationString.Cancel; @@ -699,7 +699,7 @@ add.MouseUpEventHandler += (sender, e) => { var selectZone = new SelectZone(); - CommonPage.Instance.AddChidren(selectZone); + //CommonPage.Instance.AddChidren(selectZone); selectZone.Init(); selectZone.ZoneAction = (r) => { -- Gitblit v1.8.0