更新

wxr

2021-12-15 e1a8f2f7e4d850beedeb1469610b878c1427e976

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs

@@ -96,7 +96,7 @@
                //进来不允许左滑
                MainPage.BasePageView.ScrollEnabled = false;
                View.Buttons buttons = new View.Buttons();
                buttons.AddFrameLayout(this, (if_value, view) => 
                buttons.AddFrameLayout(this, (if_value, view) =>
                {
                    //关闭允许左滑
                    MainPage.BasePageView.ScrollEnabled = true;
@@ -106,8 +106,8 @@
                        PirMethod method = new PirMethod();
                        method.AddControl(this, (control) =>
                        {
                           //成功后移除;
                           view.RemoveFromParent();
                            //成功后移除;
                            view.RemoveFromParent();
                            AddButton addButton = new AddButton();
                            MainPage.BasePageView.AddChidren(addButton);
                            addButton.Show(control);
@@ -126,8 +126,8 @@
                            GetDeviceTypeList(true, () =>
                            {
                                DeviceTypeViewClick(if_value);
                               //获取成功之后移除
                               view.RemoveFromParent();
                                    //获取成功之后移除
                                    view.RemoveFromParent();

                            });
                        }
@@ -136,7 +136,6 @@
                            DeviceTypeViewClick(if_value);
                            view.RemoveFromParent();
                        }

                    }
                }, 7);
            };
@@ -198,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;
                //删除点击事件
@@ -237,7 +236,7 @@
                    {
                        //回调更新名字/区域
                        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;
@@ -258,7 +257,6 @@
        /// <param name="if_value">控件索引值</param>
        private void DeviceTypeViewClick(int if_value)
        {
          
            var strings = View.Buttons.GetTypeString(if_value).Split('-');
            var jobDeviceType = DeviceTypeList.Find((c) => c.deviceType == strings[0]);
            if (jobDeviceType == null)
@@ -274,7 +272,6 @@
                });

            });

        }
        /// <summary>
        /// 读取红外设备类型列表
@@ -285,7 +282,6 @@
        {
            PirSend.GetDeviceTypesList(this, (responsePackNew) =>
            {

                if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
                {
                    //清空之前数据