From e13a9980ce617db1394a76944186c5d5bd595d5d Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 02 六月 2021 14:37:12 +0800
Subject: [PATCH] 5月需求bug修复
---
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs
index ef5b20c..2c7f627 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();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- });
- });
- }
+ //else
+ //{
+ // //浠ｈ〃杩欏苟涓嶆槸鐢辨俯鎬荤殑鐣岄潰璋冪敤鐨�,鍒欏叧闂帀鍏ㄩ儴鐨勭晫闈�
+ // HdlFormLogic.Current.CloseAllOpenForm();
+ // //鐒跺悗鍐嶆妸娓╂�荤殑鐣岄潰new璧锋潵
+ // new UI2.PersonalCenter.PirDevice.Method().MainView(this, newDevice,()=> { });
+ //}
};
}
@@ -359,7 +350,7 @@
private void RefreshMiniRemoteControlInfo(Action<Entity.Function> successEvent)
{
var pra = new Dictionary<string, object>();
- pra.Add("homeId", Entity.DB_ResidenceData.Instance.CurrentRegion.RegionID);
+ pra.Add("homeId", Entity.DB_ResidenceData.Instance.CurrentRegion.id);
pra.Add("spk", Entity.SPK.IrModule);
var requestJson = DAL.Server.HttpUtil.GetSignRequestJson(pra);
--
Gitblit v1.8.0