tzy
2021-05-25 65bcedda4d8e3ff6500dbf59a4e607d96e469375
HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs
@@ -203,12 +203,12 @@
            //可以开始使用红外遥控功能!
            var strMsg = Language.StringByID(StringId.AddInfraredRemoteControlMsg7);
            int yy = this.AddListMsgControls(bodyFrameLayout, strMsg, CSS.CSS_FontSize.TextFontSize, CSS.CSS_Color.TextualColor,
            var listContr = this.AddListMsgControls(bodyFrameLayout, strMsg, CSS.CSS_FontSize.TextFontSize, CSS.CSS_Color.TextualColor,
                Application.GetRealHeight(20), btnFail.Bottom + Application.GetRealHeight(8));
            //开始使用
            var btnUse = new BottomClickButton(220);
            btnUse.Y = yy + Application.GetRealHeight(60);
            btnUse.Y = listContr[listContr.Count - 1].Bottom + Application.GetRealHeight(60);
            btnUse.TextID = StringId.StartUse;
            bodyFrameLayout.AddChidren(btnUse);
            btnUse.ButtonClickEvent += (sender, e) =>
@@ -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,()=> { });
                //}
            };
        }
@@ -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);