From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 06 六月 2023 11:51:12 +0800 Subject: [PATCH] Merge branch 'Dev-Branch' --- HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs | 53 +++++++++++++++-------------------------------------- 1 files changed, 15 insertions(+), 38 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs index 3f89126..11c271d 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockListPage.cs @@ -27,10 +27,20 @@ /// 鍒楄〃鎺т欢 /// </summary> private VerticalListControl listView = null; + /// <summary> + /// 鍒犻櫎璁惧鍚庨渶瑕佹洿鏂扮晫闈㈢殑鍥炶皟 + /// </summary> + public Action action; + #endregion #region 鈻� 鍒濆鍖朹____________________________ + + public VideoDoorLockListPage(Action action) { + this.action = action; + } + /// <summary> /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓) @@ -41,8 +51,6 @@ this.listDevice.AddRange(i_listDevice); //鏅鸿兘闂ㄩ攣 base.SetTitleText(Language.StringByID(StringId.shipinmensuo)); - //鍒濆鍖栧ご閮ㄥ巻鍙茶褰曟帶浠� - //this.InitTopHistoryControl(); //鍒濆鍖栦腑閮ㄤ俊鎭� this.InitMiddleFrame(); @@ -171,15 +179,15 @@ this.dicBatteryContr[i_device.sid] = btnBattery; frameBack.ButtonClickEvent += (sender, e) => { - var form = new VideoDoorLockPage(i_device, btnName, btnRoom,Comerom.function,()=> { + + var form = new VideoDoorLockPage(i_device, btnName, btnRoom, CommonMethod.Comerom.function,()=> { this.CloseForm(); + this.action?.Invoke(); }); MainPage.BasePageView.AddChidren(form); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; form.Show(); - - //var form = new VideoDoorLockPage(); - //form.AddForm(i_device, new Button(), btnName, btnRoom); + }; //搴曢儴鍐嶅姞涓棿璺� @@ -190,35 +198,6 @@ #endregion - - public void SkipViewPage(Comerom comerom) { - //var form = new VideoDoorLockPage(i_device, btnName, btnRoom, Comerom.function); - //MainPage.BasePageView.AddChidren(form); - //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; - //form.Show(); - } - - #region 鈻� 鍒濆鍖栧ご閮ㄥ巻鍙茶褰曞浘鏍嘷____________ - - /// <summary> - /// 鍒濆鍖栧ご閮ㄥ巻鍙茶褰曟帶浠� - /// </summary> - private void InitTopHistoryControl() - { - //鍘嗗彶璁板綍鍥炬爣 - var btnIcon = new IconViewControl(28); - btnIcon.X = Application.GetRealWidth(337); - btnIcon.Y = Application.GetRealHeight(9); - btnIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/History.png"; - topFrameLayout.AddChidren(btnIcon); - btnIcon.ButtonClickEvent += (sender, e) => - { - var form = new DoorLockHistoryInfoPage(); - form.AddForm(this.listDevice); - }; - } - - #endregion #region 鈻� 璁惧鐘舵�佹帹閫乢______________________ @@ -238,8 +217,6 @@ #endregion - #region 鈻� 涓�鑸柟娉昣__________________________ - - #endregion + } } -- Gitblit v1.8.0