From cb20b108eca5dca69866ad741f35c612fc648a3a Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期二, 06 七月 2021 10:24:36 +0800 Subject: [PATCH] 代码合并 --- HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs index 6f9eee0..38b713e 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs @@ -38,7 +38,7 @@ this.AddChidren(topView.FLayoutView()); topView.clickBackBtn.MouseUpEventHandler += (sender, e) => { - + RemoveFromParent(); }; @@ -57,30 +57,30 @@ Width = Application.GetRealWidth(82), Height = Application.GetRealWidth(84), UnSelectedImagePath = "PirIcon/add.png", - Visible = false, + Visible=false, }; middFLayout.AddChidren(addDevice); - + #endregion #region 鐣岄潰鐐瑰嚮浜嬩欢 ///涓嬫媺鍒锋柊鐣岄潰浜嬩欢 vv.BeginHeaderRefreshingAction += () => - { - ////鍏抽棴鍒锋柊View锛� - vv.EndHeaderRefreshing(); - - PirMethod.GetControlList(this, () => { - Application.RunOnMainThread(() => - { - //鍒锋柊鐣岄潰 - UIView(vv); - }); - }, Pir.currPir); + ////鍏抽棴鍒锋柊View锛� + vv.EndHeaderRefreshing(); - }; + PirMethod.GetControlList(this, () => + { + Application.RunOnMainThread(() => + { + //鍒锋柊鐣岄潰 + UIView(vv); + }); + }, Pir.currPir); + + }; ///璁剧疆鍥炬爣鐐瑰嚮浜嬩欢 topView.clickSetBtn.MouseUpEventHandler += (sender, e) => { @@ -126,8 +126,8 @@ GetDeviceTypeList(true, () => { DeviceTypeViewClick(if_value); - //鑾峰彇鎴愬姛涔嬪悗绉婚櫎 - view.RemoveFromParent(); + //鑾峰彇鎴愬姛涔嬪悗绉婚櫎 + view.RemoveFromParent(); }); } @@ -197,7 +197,7 @@ //閬ユ帶鍣ㄥ悕绉� controlView.nameBtn.Text = control.name; //閬ユ帶鍣ㄥ瓨鏀惧尯鍩� - controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control); + controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control); //鏍囪閬ユ帶鍣� controlView.delBtn.Tag = control; //鍒犻櫎鐐瑰嚮浜嬩欢 @@ -208,7 +208,7 @@ TipPopView tipPopView = new TipPopView(); tipPopView.TipBox(StringId.tip, text, (dialog) => { - PirMethod.ThreadSend(new Control { deviceId = control.deviceId }, (responsePackNew) => + PirMethod.ThreadSend(new Control { deviceId=control.deviceId}, (responsePackNew) => { dialog.Close(); var function = Pir.currPir.FunctioList.Find((c) => c.sid == Function.sid); @@ -232,11 +232,11 @@ { EditControl editControl = new EditControl(); MainPage.BasePageView.AddChidren(editControl); - editControl.Show(control, (device) => + editControl.Show(control,(device) => { //鍥炶皟鏇存柊鍚嶅瓧/鍖哄煙 controlView.nameBtn.Text = device.name; - controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(device); + controlView.areaBtn.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(device); }); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; -- Gitblit v1.8.0