From b94f318b1cb5c3618dd53b5240c1d999c8427b71 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 29 十一月 2019 13:09:25 +0800
Subject: [PATCH] 2019.11.29

---
 ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
index 2c934c4..f47744d 100644
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/SceneMainView.cs
@@ -100,15 +100,17 @@
                 Gravity = Gravity.CenterHorizontal
             };
             AddChidren(SceneIcon);
+            SceneIcon.SetViewShadow(true);
 
-            sceneBG = new Button
-            {
-                Width = Application.GetMinRealAverage(487),
-                Height = Application.GetMinRealAverage(348),
-                UnSelectedImagePath = "Item/SceneCard.png",
-                Gravity = Gravity.CenterHorizontal
-            };
-            AddChidren(sceneBG);
+
+            //sceneBG = new Button
+            //{
+            //    Width = Application.GetMinRealAverage(487),
+            //    Height = Application.GetMinRealAverage(348),
+            //    UnSelectedImagePath = "Item/SceneCard.png",
+            //    Gravity = Gravity.CenterHorizontal
+            //};
+            //AddChidren(sceneBG);
 
             TimeButton = new Button()
             {
@@ -150,7 +152,7 @@
         /// </summary>
         private void InitStatu()
         {
-            SetIimeByDelayTime(scene.SceneDelayTime);
+            SetTimeByDelayTime(scene.SceneDelayTime);
             SetSceneNameText(scene.Name);
             SetIcon(scene.IconPath);
             SetCollect(Common.Room.CurrentRoom.GetLoveRoom().SceneUIFilePathList.Contains(scene.FileName));
@@ -158,7 +160,6 @@
             TimeButton.MouseUpEventHandler += SetTimeEvents;
             CollectButton.MouseUpEventHandler += CollectionEvent;
             SceneIcon.MouseUpEventHandler += SceneUpHandler;
-            sceneBG.MouseUpEventHandler += SceneUpHandler;
             SceneNameButton.MouseUpEventHandler += SceneUpHandler;
         }
 
@@ -189,7 +190,7 @@
         /// SetIimeByDelayTime
         /// </summary>
         /// <param name="time"></param>
-        public void SetIimeByDelayTime(int time)
+        public void SetTimeByDelayTime(int time)
         {
             if (time > 0)
             {
@@ -216,7 +217,14 @@
         /// <param name="iconPath"></param>
         public void SetIcon(string iconPath)
         {
-            SceneIcon.UnSelectedImagePath = iconPath;
+            if (scene.IconPathType == 0)
+            {
+                SceneIcon.UnSelectedImagePath = iconPath;
+            }
+            else
+            {
+                SceneIcon.UnSelectedImagePath = System.IO.Path.Combine(Config.Instance.FullPath, iconPath);
+            }
         }
 
         /// <summary>
@@ -322,7 +330,7 @@
             timeSelect.TimeAction = (t) =>
             {
                 scene.SceneDelayTime = t;
-                SetIimeByDelayTime(t);
+                SetTimeByDelayTime(t);
             };
         }
 

--
Gitblit v1.8.0