From a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 06 三月 2020 15:31:36 +0800
Subject: [PATCH] 删除了郭雪城的 DeviceUi 这个类

---
 ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs
index b838838..0aa4040 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockAddScene.cs
@@ -37,7 +37,7 @@
 
             var titleName = new Button
             {
-                TextSize = 16,
+                TextSize = 17,
                 TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                 TextAlignment = TextAlignment.CenterLeft,
                 X = Application.GetRealWidth(160),
@@ -45,6 +45,7 @@
                 Height = Application.GetRealHeight(69),
                 Y = Application.GetRealHeight(92),
                 TextID = MyInternationalizationString.addscene,
+                IsBold = true,
             };
             topRowLayout.AddChidren(titleName);
 
@@ -86,6 +87,7 @@
                 Y = Application.GetRealHeight(92),
                 //TextID = MyInternationalizationString.customroom,
                 Text = Config.Instance.Home.GetCurrentFloorName,
+                TextSize = 14,
             };
             topRowLayout.AddChidren(foolrname);
             var dropdown = new Button
@@ -102,7 +104,8 @@
             #endregion
 
             ///娌℃湁鎴块棿鐩存帴杩斿洖鍘伙紱
-            if (Common.Room.Lists.Count == 0)
+            var listAllRoom = UserCenter.HdlRoomLogic.Current.GetAllListRooms();
+            if (listAllRoom.Count == 0)
             {
                 return;
             }
@@ -141,6 +144,7 @@
                 BackgroundColor = ZigbeeColor.Current.LogicBtnSaveBackgroundColor,
                 TextID = MyInternationalizationString.Save,
                 TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
+                TextSize = 16,
             };
             saveframeLayout.AddChidren(btnsave);
 
@@ -148,9 +152,9 @@
             {
                 if (clickTag == "no" || tempScene == null)
                 {
-                    var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
-                                              Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
-                                              Language.StringByID(MyInternationalizationString.complete));
+                    var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+           Language.StringByID(MyInternationalizationString.scenetip),
+           Language.StringByID(MyInternationalizationString.confrim));
                     alert.Show();
                     return;
                 }
@@ -196,6 +200,7 @@
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                     X = Application.GetRealWidth(80),
                     TextID = MyInternationalizationString.selecfoolr,
+                    TextSize = 14,
                 };
                 foolrbjicon.AddChidren(btnfoolrtext);
 
@@ -237,6 +242,7 @@
                         TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
                         Tag = foolr.Key,
                         X = btnfoolricon.Right + Application.GetRealWidth(12),
+                        TextSize = 14,
                     };
                     foolrRowLayout.AddChidren(btnfoolrname);
                     if (foolrname.Text == foolr.Value)
@@ -274,7 +280,7 @@
                 dropdown.Visible = false;
                 if (Config.Instance.Home.FloorDics.Count == 0)
                 {
-                    roomlists.AddRange(Common.Room.Lists);
+                    roomlists.AddRange(listAllRoom);
                 }
                 else
                 {
@@ -341,7 +347,7 @@
                     roomTextButton.IsSelected = false;
                     roomTextButton = roomnameBtn;
                     roomnameBtn.IsSelected = true;
-                    SceneView(room.SceneUIList);
+                    SceneView(room.ListSceneId);
 
                 }
 
@@ -360,7 +366,7 @@
                     roomTextButton.IsSelected = false;
                     roomTextButton = roomnameBtn;
                     roomnameBtn.IsSelected = true;
-                    SceneView(room.SceneUIList);
+                    SceneView(room.ListSceneId);
                 };
                 roomnameBtn.MouseUpEventHandler += roomclick;
                 roombjBtn.MouseUpEventHandler += roomclick;
@@ -371,11 +377,16 @@
         /// 鏄剧ず鎵�鏈夌殑鍦烘櫙鐨勬柟娉�
         /// </summary>
         /// <param name="scenelist"></param>
-        void SceneView(List<SceneUI> scenelist)
+        void SceneView(List<int> scenelist)
         {
-            middle.RemoveAll();
-            foreach (var scene in scenelist)
+            middle.RemoveAll();
+            foreach (var sceneId in scenelist)
             {
+                var scene = UserCenter.HdlSceneLogic.Current.GetSceneUIBySceneId(sceneId);
+                if (scene == null)
+                {
+                    continue;
+                }
                 var sceneFramelayout = new FrameLayout
                 {
                     Height = Application.GetRealHeight(160),
@@ -412,6 +423,7 @@
                     TextAlignment = TextAlignment.CenterLeft,
                     TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                     SelectedTextColor = ZigbeeColor.Current.LogicAddColor,
+                    TextSize = 14,
                 };
                 sceneRow.AddChidren(scenename);
 

--
Gitblit v1.8.0