From 80faceb86399017851f9f72feaaef868a37ff23f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 26 三月 2021 10:50:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/lss' into temp-wxr
---
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs
index cf821e1..ef4bf84 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs
@@ -220,22 +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璧锋潵
- new UI2.PersonalCenter.PirDevice.Method().MainView(this, newDevice,()=> { });
- }
+ //else
+ //{
+ // //浠ｈ〃杩欏苟涓嶆槸鐢辨俯鎬荤殑鐣岄潰璋冪敤鐨�,鍒欏叧闂帀鍏ㄩ儴鐨勭晫闈�
+ // HdlFormLogic.Current.CloseAllOpenForm();
+ // //鐒跺悗鍐嶆妸娓╂�荤殑鐣岄潰new璧锋潵
+ // new UI2.PersonalCenter.PirDevice.Method().MainView(this, newDevice,()=> { });
+ //}
};
}
--
Gitblit v1.8.0