From 0c1e29166e6b188939c092d16f87ce2a27662c5f Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 26 三月 2021 10:11:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs
index 85cc423..ef4bf84 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs
@@ -220,31 +220,22 @@
return;
}
var form = HdlFormLogic.Current.GetFormByName("AddMiniRemoteControlDirection1Page") as AddMiniRemoteControlDirection1Page;
- if (form.AddDeviceEvent != null)
+ //if (form.AddDeviceEvent != null)
{
//浠ｈ〃杩欎釜鏄敱娓╂�婚偅杈硅皟鐢ㄧ殑,鐩存帴鍥炶皟鍑芥暟
- form.AddDeviceEvent.Invoke(newDevice);
+ form.AddDeviceEvent?.Invoke(newDevice);
//鍏抽棴鎺夎繖涓晫闈�
this.CloseForm();
//鍐嶆妸AddMiniRemoteControlDirection1Page鐣岄潰鍏充簡
HdlFormLogic.Current.CloseFormByFormName("AddMiniRemoteControlDirection1Page");
}
- else
- {
- //浠ｈ〃杩欏苟涓嶆槸鐢辨俯鎬荤殑鐣岄潰璋冪敤鐨�,鍒欏叧闂帀鍏ㄩ儴鐨勭晫闈�
- HdlFormLogic.Current.CloseAllOpenForm();
- //鐒跺悗鍐嶆妸娓╂�荤殑鐣岄潰new璧锋潵
- HDL_ON.UI.UI2.PersonalCenter.PirDevice.Method.GetPirDeviceList(this, () =>
- {
- Application.RunOnMainThread(() =>
- {
- var page = new UI2.PersonalCenter.PirDevice.PirMain();
- MainPage.BasePageView.AddChidren(page);
- page.Show(null);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- });
- });
- }
+ //else
+ //{
+ // //浠ｈ〃杩欏苟涓嶆槸鐢辨俯鎬荤殑鐣岄潰璋冪敤鐨�,鍒欏叧闂帀鍏ㄩ儴鐨勭晫闈�
+ // HdlFormLogic.Current.CloseAllOpenForm();
+ // //鐒跺悗鍐嶆妸娓╂�荤殑鐣岄潰new璧锋潵
+ // new UI2.PersonalCenter.PirDevice.Method().MainView(this, newDevice,()=> { });
+ //}
};
}
--
Gitblit v1.8.0