From ddb46a700775aacfb6cc82d9586302a38c8fa0a7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 23 十二月 2019 09:13:37 +0800
Subject: [PATCH] 2019.12.23

---
 ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs b/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs
index 74a7512..c789c3e 100644
--- a/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Category/SelectScene.cs
@@ -23,7 +23,7 @@
         /// <summary>
         /// BeforesceneTargetDeviceUIs
         /// </summary>
-        public List<SceneTargetDeviceUI> beforeSceneTargetDeviceUIs=new List<SceneTargetDeviceUI> { };
+        public List<SceneTargetDeviceUI> beforeSceneTargetDeviceUIs = new List<SceneTargetDeviceUI> { };
         /// <summary>
         /// 妤煎眰
         /// </summary>
@@ -96,6 +96,8 @@
                 Gravity = Gravity.CenterVertical,
                 TextAlignment = TextAlignment.CenterRight,
                 TextColor = ZigbeeColor.Current.GXCTextBlackColor,
+                TextSize = 14,
+                IsBold = true
             };
 
             selectFloorBtn = new Button()
@@ -151,7 +153,7 @@
             confirmBtn.SetTitle(R.MyInternationalizationString.Save);
             confirmBtn.MouseUpEventHandler += (sender, e) =>
             {
-                sceneTargetDevice.ElseScenesId = sceneUI.Id ;
+                sceneTargetDevice.ElseScenesId = sceneUI.Id;
                 sceneTargetDevice.SceneUI = sceneUI;
                 sceneTargetDevice.SceneName = sceneUI.Name;
                 selectedAction?.Invoke(sceneTargetDevice);
@@ -187,7 +189,7 @@
             functionSceneBodyView = new FrameLayout()
             {
                 Y = roomFL.Bottom,
-                Height = Application.GetRealHeight(910+622),
+                Height = Application.GetRealHeight(1080 + 452),
                 BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor
             };
             bodyFrameLayout.AddChidren(functionSceneBodyView);
@@ -260,9 +262,11 @@
                 {
                     //Y = Application.GetRealHeight(58)
                 };
+
                 functionSceneBodyView.AddChidren(sceneScrolView);
                 SelectSceneRow tempSceneRow = new SelectSceneRow();
-                EventHandler<MouseEventArgs> selectScene = (sender, e) => {
+                EventHandler<MouseEventArgs> selectScene = (sender, e) =>
+                {
                     tempSceneRow.IsSelected = false;
                     tempSceneRow = ((sender as Button).Parent as SelectSceneRow);
                     ((sender as Button).Parent as SelectSceneRow).IsSelected = true;
@@ -311,11 +315,22 @@
                             sceneRowLayout.IsSelected = true;
                         }
                     }
-                    
+
                     sceneRowLayout.ClickButton.MouseUpEventHandler += selectScene;
                 }
+
+                if (sceneList.Count > 8)
+                {
+                    var frame = new FrameLayout
+                    {
+                        Height = Application.GetRealHeight(300)
+                    };
+                    sceneScrolView.AddChidren(frame);
+                }
+
             }
         }
+    
 
         /// <summary>
         /// 鏄剧ず娌℃湁鍦烘櫙
@@ -338,7 +353,7 @@
                 Height = Application.GetRealHeight(200),
                 Width = Application.GetRealWidth(700),
                 Gravity = Gravity.CenterHorizontal,
-                Text = Language.StringByID(R.MyInternationalizationString.NoScene).Replace("{\\r\\n}", "\r\n"),
+                Text = Language.StringByID(R.MyInternationalizationString.NoScene_Tip).Replace("{\\r\\n}", "\r\n"),
                 TextColor = ZigbeeColor.Current.GXCPlaceHolderTextColor,
                 TextAlignment = TextAlignment.Center,
                 IsMoreLines = true

--
Gitblit v1.8.0