From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1

---
 HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs |  430 ++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 320 insertions(+), 110 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index e2b77f0..91a1d58 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -1,9 +1,11 @@
 锘縰sing System;
+using System.Collections.Generic;
+using HDL_ON.DriverLayer;
 using HDL_ON.Entity;
 using HDL_ON.UI.CSS;
 using Shared;
 
-namespace HDL_ON.UI 
+namespace HDL_ON.UI
 {
     public partial class IntelligencePage : FrameLayout
     {
@@ -12,17 +14,21 @@
         /// 鍦烘櫙/鑷姩鍖栧垎椤靛尯鍩�
         /// </summary>
         PageLayout contentPageView;
+        Button btnAutomationTitle;
         #region 鍦烘櫙鍖哄煙
         FrameLayout scenePageView;
         /// <summary>
         /// 鍦烘櫙鍐呭鏄剧ず鍖哄煙
         /// </summary>
         FrameLayout floorChangeView;
-        #region 鍦烘櫙搴曢儴鍒囨崲鏄剧ず鍖哄煙
         /// <summary>
-        /// 鍦烘櫙鍖哄煙锛岄《閮ㄥ尯鍩�
+        /// 妤煎眰鎴块棿閫夋嫨鐨勪笅鎷夊璞�
         /// </summary>
-        FrameLayout sceneTopView;
+        FloorRoomSelectPopupView floorRoomSelectView = null;
+        Button btnSceneTilte;
+
+        #region 鍦烘櫙搴曢儴鍒囨崲鏄剧ず鍖哄煙
+        FrameLayout topView;
         /// <summary>
         /// 妤煎眰閫夋嫨涓嬫媺鍥炬爣
         /// </summary>
@@ -42,7 +48,12 @@
         /// </summary>
         VerticalScrolViewLayout sceneFunctionView;
         #endregion
-
+        #region 鑷姩鍖栧尯鍩�
+        /// <summary>
+        /// 鑷姩鍖栧唴瀹规樉绀哄尯鍩�
+        /// </summary>
+        FrameLayout automationPage;
+        #endregion
         public IntelligencePage()
         {
             bodyView = this;
@@ -50,50 +61,81 @@
 
         public void LoadPage()
         {
+            MainPage.CurPageIndex = 2;
             bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
             #region top
-            FrameLayout topView = new FrameLayout()
+            topView = new FrameLayout()
             {
                 Height = Application.GetRealHeight(64),
                 BackgroundColor = CSS_Color.TopViewColor,
             };
             bodyView.AddChidren(topView);
 
-            Button btnSceneTilte = new Button()
+            //涓嶆槸A缃戝叧鎴栬�呮槸鎴愬憳 鍙厑璁告坊鍔犲満鏅殣钘忚嚜鍔ㄥ寲
+            var HideAutoPage = DB_ResidenceData.Instance.CurrentRegion.isOtherShare;
+            //鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
+            if (HideAutoPage)
             {
-                Y = Application.GetRealHeight(30),
-                Width = Application.GetRealWidth(170),
-                Height = Application.GetRealHeight(25),
-                TextAlignment = TextAlignment.CenterRight,
-                TextSize = CSS_FontSize.HeadlineFontSize,
-                TextColor = CSS_Color.PromptingColor1,
-                SelectedTextColor = CSS_Color.MainColor,
-                TextID = StringId.Scenes,
-                IsSelected = true
-            };
-            topView.AddChidren(btnSceneTilte);
-
-            Button btnAutomationTitle = new Button()
+                btnSceneTilte = new Button()
+                {
+                    Y = Application.GetRealHeight(30),
+                    //Width = Application.GetRealWidth(170),
+                    Height = Application.GetRealHeight(25),
+                    TextAlignment = TextAlignment.Center,
+                    TextSize = CSS_FontSize.HeadlineFontSize,
+                    TextColor = CSS_Color.PromptingColor1,
+                    SelectedTextColor = CSS_Color.MainColor,
+                    TextID = StringId.Scenes,
+                    IsSelected = true
+                };
+                topView.AddChidren(btnSceneTilte);
+                btnAutomationTitle = new Button();
+            }
+            else
             {
-                X = Application.GetRealWidth(209),
-                Y = Application.GetRealHeight(30),
-                Width = Application.GetRealWidth(170),
-                Height = Application.GetRealHeight(25),
-                TextAlignment = TextAlignment.CenterLeft,
-                TextSize = CSS_FontSize.TextFontSize,
-                TextColor = CSS_Color.PromptingColor1,
-                SelectedTextColor = CSS_Color.MainColor,
-                TextID = StringId.Automation,
-            };
-            topView.AddChidren(btnAutomationTitle);
 
-            btnAddIcon = new Button()
+                btnSceneTilte = new Button()
+                {
+                    Y = Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(170),
+                    Height = Application.GetRealHeight(25),
+                    TextAlignment = TextAlignment.CenterRight,
+                    TextSize = CSS_FontSize.HeadlineFontSize,
+                    TextColor = CSS_Color.PromptingColor1,
+                    SelectedTextColor = CSS_Color.MainColor,
+                    TextID = StringId.Scenes,
+                    IsSelected = true
+                };
+                topView.AddChidren(btnSceneTilte);
+
+                btnAutomationTitle = new Button()
+                {
+                    X = Application.GetRealWidth(209),
+                    Y = Application.GetRealHeight(30),
+                    Width = Application.GetRealWidth(170),
+                    Height = Application.GetRealHeight(25),
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextSize = CSS_FontSize.TextFontSize,
+                    TextColor = CSS_Color.PromptingColor1,
+                    SelectedTextColor = CSS_Color.MainColor,
+                    TextID = StringId.Automation,
+                };
+                topView.AddChidren(btnAutomationTitle);
+            }
+            var btnAddIconBg = new Button()
             {
                 X = Application.GetRealWidth(337),
                 Y = Application.GetRealHeight(29),
                 Width = Application.GetMinRealAverage(28),
                 Height = Application.GetMinRealAverage(28),
                 UnSelectedImagePath = "Public/AddIcon.png",
+            };
+            topView.AddChidren(btnAddIconBg);
+            btnAddIcon = new Button()
+            {
+                X = Application.GetRealWidth(337 - 20),
+                Width = Application.GetMinRealAverage(28 + 30),
+                Height = Application.GetMinRealAverage(28 + 29),
             };
             topView.AddChidren(btnAddIcon);
             #endregion
@@ -108,9 +150,15 @@
             bodyView.AddChidren(contentPageView);
 
             LoadScenePageView();
-            //LoadFunctionPageView();
+            //鍒ゆ柇鏄惁闇�瑕侀殣钘忚嚜鍔ㄥ寲
+            if (!HideAutoPage)
+            {
+                LoadAutomationPageView();
+            }
             LoadEventList();
+
         }
+        #region 鍦烘櫙閮ㄥ垎
         /// <summary>
         /// 鍔犺浇鍦烘櫙鍒楄〃鐣岄潰
         /// </summary>
@@ -123,18 +171,10 @@
             /// </summary>
             floorChangeView = new FrameLayout()
             {
-                Height = Application.GetRealHeight(52),
+                Height = Application.GetRealHeight(53),
             };
             scenePageView.AddChidren(floorChangeView);
             #region 鍦烘櫙搴曢儴鍒囨崲鏄剧ず鍖哄煙
-            /// <summary>
-            /// 鍦烘櫙鍖哄煙锛岄《閮ㄥ尯鍩�
-            /// </summary>
-            sceneTopView = new FrameLayout()
-            {
-                Height = Application.GetRealHeight(53),
-            };
-            floorChangeView.AddChidren(sceneTopView);
             /// <summary>
             /// 妤煎眰閫夋嫨涓嬫媺鍥炬爣
             /// </summary>
@@ -143,7 +183,7 @@
                 Width = Application.GetMinRealAverage(16),
                 Height = Application.GetMinRealAverage(16),
                 X = Application.GetRealWidth(16),
-                Y = Application.GetRealHeight(18),
+                Gravity = Gravity.CenterVertical,
                 UnSelectedImagePath = "Public/DownIcon.png",
             };
             floorChangeView.AddChidren(btnFloorDownIcon);
@@ -153,70 +193,65 @@
             btnFloor = new Button()
             {
                 X = btnFloorDownIcon.Right,
-                Y = Application.GetRealHeight(18),
+                Gravity = Gravity.CenterVertical,
                 Width = Application.GetRealWidth(200),
                 Height = Application.GetMinRealAverage(16),
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                 TextAlignment = TextAlignment.CenterLeft,
-                Text = OnAppConfig.Instance.CurFoor,
+                Text = DB_ResidenceData.Instance.CurFloor.roomName,
             };
             floorChangeView.AddChidren(btnFloor);
 
+            string nowSelectId = null;
+            btnFloor.MouseUpEventHandler += (sender, e) =>
+            {
+                if (this.floorRoomSelectView == null)
+                {
+                    //鍏堝垵濮嬪寲
+                    this.floorRoomSelectView = new FloorRoomSelectPopupView();
+                }
+                //鏄剧ず涓嬫媺鍒楄〃
+                this.floorRoomSelectView.ShowSceneView(btnFloor, (selectId, listScene) =>
+                {
+                    nowSelectId = selectId;
+                    //閲嶆柊鍒锋柊鍦烘櫙鍒楄〃
+                    this.LoadSceneFunctionControlZone(listScene);
+                }, nowSelectId);
+            };
+
             #endregion
 
-            sceneFunctionView = new VerticalScrolViewLayout() {
-                Y = floorChangeView.Bottom,
+            sceneFunctionView = new VerticalScrolViewLayout()
+            {
+                Y = Application.GetRealHeight(53),
                 Height = Application.GetRealHeight(667 - 64 - 49 - 52 + 30),
             };
             scenePageView.AddChidren(sceneFunctionView);
-            LoadSceneFunctionControlZone();
+            LoadSceneFunctionControlZone(null);
         }
 
         /// <summary>
         /// 鍔犺浇鍦烘櫙鍔熻兘鏄剧ず鍖哄煙
         /// </summary>
-        void LoadSceneFunctionControlZone()
+        void LoadSceneFunctionControlZone(List<Scene> listScene)
         {
             sceneFunctionView.RemoveAll();
-            var rowView = new FrameLayout();
             try
             {
                 int index = 0;
-                foreach (var function in DB_ResidenceData.functionList.scenes)
+                //鑾峰彇鑳藉鏄剧ず鐨勫満鏅�
+                if (listScene == null)
                 {
-                    if (function.roomIdList.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
+                    //鍒濆鍊�
+                    if (this.floorRoomSelectView == null)
                     {
-                        function.collection = false;
-                        continue;
+                        //鍏堝垵濮嬪寲
+                        this.floorRoomSelectView = new FloorRoomSelectPopupView();
                     }
-                    if (index % 2 == 0)
-                    {
-                        sceneFunctionView.AddChidren(new Button() { Height = Application.GetRealHeight(7) });
-                        rowView = new FrameLayout()
-                        {
-                            Height = Application.GetRealWidth(122),
-                        };
-                        sceneFunctionView.AddChidren(rowView);
-                        sceneFunctionView.AddChidren(new Button() { Height = Application.GetRealHeight(7) });
-                    }
-                    var functionView_X = Application.GetRealWidth((16 + 164) * (index % 2) + 16);
-
-                    var functionView = new FrameLayout()
-                    {
-                        X = functionView_X,
-                        Width = Application.GetRealWidth(164),
-                        Height = Application.GetRealWidth(122),
-                        Tag = function.sid,
-                        BackgroundImagePath = (function as Scene).ImagePath,
-                    };
-                    rowView.AddChidren(functionView);
-
-                    LoadSceneFunctionDiv(functionView, function);
-                    index++;
+                    listScene = this.floorRoomSelectView.GetCanShowListScene();
                 }
-
-                if (index == 0)
+                if (listScene.Count == 0)
                 {
                     var view = new FrameLayout();
                     sceneFunctionView.AddChidren(view);
@@ -242,6 +277,38 @@
                     };
                     view.AddChidren(btnNoCollectionTip);
                 }
+                else
+                {
+                    var rowView = new FrameLayout();
+                    new System.Threading.Thread(() =>
+                    {
+                        foreach (var scene in listScene)
+                        {
+                            System.Threading.Thread.Sleep(10);
+                            Application.RunOnMainThread(() =>
+                            {
+                                if (index % 2 == 0)
+                                {
+                                    rowView = new FrameLayout()
+                                    {
+                                        Height = Application.GetRealWidth(122),
+                                    };
+                                    sceneFunctionView.AddChidren(rowView);
+                                    sceneFunctionView.AddChidren(new Button()
+                                    {
+                                        Height = Application.GetRealHeight(7 + 7),
+                                    });
+                                }
+                                var functionView_X = Application.GetRealWidth((16 + 164) * (index % 2) + 16);
+
+                                var functionView = LoadSceneFunctionDiv(functionView_X, scene);
+                                rowView.AddChidren(functionView);
+                                index++;
+                            });
+                        }
+                    })
+                    { IsBackground = true }.Start();
+                }
             }
             catch (Exception ex)
             {
@@ -254,8 +321,19 @@
         /// <summary>
         /// 鍔犺浇鍦烘櫙鎺у埗鍗$墖
         /// </summary>
-        void LoadSceneFunctionDiv(FrameLayout view, Function function)
+        //FrameLayout LoadSceneFunctionDiv(FrameLayout view, Scene scene)
+        FrameLayout LoadSceneFunctionDiv(int functionView_X, Scene scene)
         {
+            var view = new FrameLayout()
+            {
+                X = functionView_X,
+                Width = Application.GetRealWidth(164),
+                Height = Application.GetRealWidth(122),
+                Tag = scene.sid,
+            };
+            //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+            ImageUtlis.Current.LoadLocalOrNetworkImages(scene.ImagePath, view);
+
             try
             {
                 Button btnCoverd = new Button()
@@ -264,6 +342,19 @@
                 };
                 view.AddChidren(btnCoverd);
 
+                Button btnShowDelay;
+                btnShowDelay = new Button()
+                {
+                    X = Application.GetRealWidth(40),
+                    Y = Application.GetRealWidth(4),
+                    Height = Application.GetRealWidth(32),
+                    Width = Application.GetRealWidth(100),
+                    TextColor = CSS_Color.AuxiliaryColor1,
+                    TextAlignment = TextAlignment.CenterLeft,
+                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+                };
+                view.AddChidren(btnShowDelay);
+
                 Button btnName;
                 btnName = new Button()
                 {
@@ -271,7 +362,7 @@
                     Y = Application.GetRealWidth(68),
                     Width = Application.GetRealWidth(150),
                     Height = Application.GetRealHeight(24),
-                    Text = function.name,
+                    Text = scene.name,
                     TextSize = CSS_FontSize.TextFontSize,
                     TextColor = CSS_Color.MainBackgroundColor,
                     TextAlignment = TextAlignment.CenterLeft,
@@ -282,17 +373,16 @@
                 btnZone = new Button()
                 {
                     X = Application.GetRealWidth(12),
-                    Y = btnName.Bottom,
+                    Y = Application.GetRealWidth(68+24),
                     Height = Application.GetRealWidth(18),
                     Width = Application.GetRealWidth(113),
                     TextColor = CSS_Color.MainBackgroundColor,
                     TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
                     TextAlignment = TextAlignment.CenterLeft,
                     SelectedTextColor = CSS_Color.MainBackgroundColor,
-                    Text = function.GetRoomListName(),
+                    Text = scene.GetRoomListName(),
                 };
                 view.AddChidren(btnZone);
-
 
                 Button btnSettingIcon;
                 btnSettingIcon = new Button()
@@ -303,7 +393,10 @@
                     Width = Application.GetRealWidth(32),
                     UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
                 };
-                view.AddChidren(btnSettingIcon);
+                if (scene.userId == UserInfo.Current.ID)
+                {
+                    view.AddChidren(btnSettingIcon);
+                }
 
                 Button btnCollection;
                 btnCollection = new Button()
@@ -314,35 +407,61 @@
                     Height = Application.GetMinRealAverage(32),
                     UnSelectedImagePath = "Collection/CollectionWhiteIcon.png",
                     SelectedImagePath = "Collection/CollectionIcon.png",
-                    IsSelected = function.collection,
+                    IsSelected = scene.collect,
                 };
                 view.AddChidren(btnCollection);
-                btnCollection.MouseUpEventHandler = (sender, e) => {
-                    function.collection = btnCollection.IsSelected = !btnCollection.IsSelected;
-                    function.SaveFunctionData();
+                btnCollection.MouseUpEventHandler = (sender, e) =>
+                {
+                    scene.collect = btnCollection.IsSelected = !btnCollection.IsSelected;
+                    scene.CollectScene();
                 };
-                LoadEvent_ControlScene(btnCoverd,btnName,btnZone, function);
-                btnSettingIcon.MouseUpEventHandler = (sender, e) => {
-                    Action backAction = () => {
-                        LoadSceneFunctionControlZone();
+                LoadEvent_ControlScene(btnCoverd, btnName, btnZone, btnShowDelay, scene);
+                btnSettingIcon.MouseUpEventHandler = (sender, e) =>
+                {
+                    Action backAction = () =>
+                    {
+                        LoadSceneFunctionControlZone(null);
                     };
-                    Action refreshAction = () => {
-                        btnName.Text = function.name;
-                        btnZone.Text = function.GetRoomListName();
-                        view.BackgroundImagePath = (function as Scene).ImagePath;
+                    Action refreshAction = () =>
+                    {
+                        btnName.Text = scene.name;
+                        btnZone.Text = scene.GetRoomListName();
+                        //2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
+                        ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, view);
                     };
-                    var aep = new SceneEditPage(function as Scene, backAction);
+                    var aep = new SceneEditPage(scene, backAction);
                     MainPage.BasePageView.AddChidren(aep);
-                    aep.LoadPage(StringId.EditScene, refreshAction);
+                    aep.LoadPage(refreshAction);
                     MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                 };
+                //鍦烘櫙姝e湪鍊掕鏃舵墽琛屼腑
+                scene.SceneCountDown(btnShowDelay);
+
+                return view;
             }
             catch (Exception ex)
             {
                 MainPage.Log("homepage LoadControlView error : " + ex.Message);
+                return view;
+            }
+            finally
+            {
             }
         }
+        #endregion
 
+        #region 鑷姩鍖栭儴鍒�
+        /// <summary>
+        /// 鍔犺浇鑷姩鍖栧垪琛ㄧ晫闈�
+        /// </summary>
+        void LoadAutomationPageView()
+        {
+            automationPage = new FrameLayout();
+            contentPageView.AddChidren(automationPage);
+            UI2.Intelligence.Automation.MainView.automationPage = automationPage;
+            UI2.Intelligence.Automation.MainView.MainShow();
+        }
+        #endregion
     }
 
 
@@ -352,7 +471,65 @@
         void LoadEventList()
         {
             LoadEvent_SkipAddScenePage();
+            LoadEvent_ShowedChange();
         }
+
+        #region 椤堕儴瀵艰埅鏍忎簨浠�
+        /// <summary>
+        /// 鏄剧ず鐣岄潰鍒囨崲
+        /// </summary>
+        void LoadEvent_ShowedChange()
+        {
+            contentPageView.PageChange = (sender, e) =>
+            {
+                if (contentPageView.PageIndex == 0)
+                {
+                    btnSceneTilte.IsSelected = true;
+                    btnSceneTilte.TextSize = CSS_FontSize.HeadlineFontSize;
+                    btnSceneTilte.IsBold = true;
+                    btnAutomationTitle.IsSelected = false;
+                    btnAutomationTitle.TextSize = CSS_FontSize.TextFontSize;
+                    btnAutomationTitle.IsBold = false;
+                }
+                else
+                {
+                    btnAutomationTitle.IsSelected = true;
+                    btnAutomationTitle.TextSize = CSS_FontSize.HeadlineFontSize;
+                    btnAutomationTitle.IsBold = true;
+                    btnSceneTilte.IsSelected = false;
+                    btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
+                    btnSceneTilte.IsBold = false;
+                }
+            };
+
+            btnSceneTilte.MouseUpEventHandler = (sender, e) =>
+            {
+                if (btnSceneTilte.IsSelected)
+                {
+                    return;
+                }
+                btnSceneTilte.IsSelected = true;
+                btnSceneTilte.TextSize = CSS_FontSize.HeadlineFontSize;
+                btnAutomationTitle.IsSelected = false;
+                btnAutomationTitle.TextSize = CSS_FontSize.TextFontSize;
+                contentPageView.PageIndex = 0;
+            };
+            //閫昏緫鐐瑰嚮浜嬩欢
+            btnAutomationTitle.MouseUpEventHandler = (sender, e) => {
+                if (btnAutomationTitle.IsSelected)
+                {
+                    return;
+                }
+                btnAutomationTitle.IsSelected = true;
+                btnAutomationTitle.TextSize = CSS_FontSize.HeadlineFontSize;
+                btnSceneTilte.IsSelected = false;
+                btnSceneTilte.TextSize = CSS_FontSize.TextFontSize;
+                contentPageView.PageIndex = 1;
+
+            };
+        }
+        #endregion
+
         /// <summary>
         /// 璺宠浆鑷虫坊鍔犲満鏅殑鐣岄潰
         /// </summary>
@@ -360,13 +537,35 @@
         {
             btnAddIcon.MouseUpEventHandler = (sender, e) =>
             {
-                Action action = () => {
-                    LoadSceneFunctionControlZone();
-                };
-                var aep = new NewSceneMenuListPage(action);
-                MainPage.BasePageView.AddChidren(aep);
-                aep.LoadPage();
-                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                if (!btnAutomationTitle.IsSelected)
+                {
+                    //濡傛灉鏄垚鍛�
+                    if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+                    {
+                        //濡傛灉娌℃湁鍦烘櫙鏉冮檺
+                        if (!DB_ResidenceData.Instance.CurrentRegion.isAllowCreateScene)
+                        {
+                            //鎻愮ず娌℃湁鍦烘櫙鐨勫垱寤烘潈闄�
+                            Utlis.ShowTip(Language.StringByID(StringId.PermissionDenied));
+                            return;
+                        }
+                    }
+
+                    Action action = () =>
+                    {
+                        LoadSceneFunctionControlZone(null);
+                    };
+                    var aep = new NewSceneMenuListPage(action);
+                    MainPage.BasePageView.AddChidren(aep);
+                    aep.LoadPage();
+                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                }
+                else
+                {
+                    //璺宠浆鍒伴�昏緫鐣岄潰
+                    UI2.Intelligence.Automation.MainView logicMainView = new UI2.Intelligence.Automation.MainView();
+                    logicMainView.SkipAddLogicPage();
+                }
             };
         }
 
@@ -374,19 +573,30 @@
         /// <summary>
         /// 鍔犺浇鍦烘櫙鎺у埗浜嬩欢
         /// </summary>
-        void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone, Function function)
+        void LoadEvent_ControlScene(Button btnCoverd, Button btnName, Button btnZone, Button btnShowDelay, Scene scene)
         {
 
             EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
             {
-                string msg = function.name + Language.StringByID(StringId.AlreadyOpened);
+                //鍦烘櫙姝e湪鍊掕鏃舵墽琛屼腑锛屼笉鍏佽鍐嶇偣鍑�
+                if (scene.LastExecutionTime == "" || Convert.ToDouble(scene.LastExecutionTime) + Convert.ToDouble(scene.delay) < Convert.ToDouble(Utlis.GetTimestamp(false)))
+                {
+                    scene.LastExecutionTime = Utlis.GetTimestamp(false);
+                }
+                else
+                {
+                    return;
+                }
+                string msg = scene.name + Language.StringByID(StringId.AlreadyOpened);
                 new PublicAssmebly().TipMsgAutoClose(msg, true);
-                Control.Send(function);
+                Control.Ins.ControlScene(scene);
+                scene.SceneCountDown(btnShowDelay);
             };
             btnCoverd.MouseUpEventHandler = eventHandler;
             btnName.MouseUpEventHandler = eventHandler;
             btnZone.MouseUpEventHandler = eventHandler;
         }
+
     }
 
 }

--
Gitblit v1.8.0