合并乐橙代码

wei

2021-07-06 533735b4bbaea0f7a87ccd3d1781ea7d469f75b5

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

@@ -11,7 +11,7 @@
        {
            Tag = "PirView";
        }
        public void Show(Entity.Function control,Action<Entity.Function> action)
        public void Show(Entity.Function control, Action<Entity.Function> action)
        {
            #region 界面布局
            this.BackgroundColor = CSS.CSS_Color.viewMiddle;
@@ -33,7 +33,7 @@
            };
            this.AddChidren(viewLayout);
            //遥控器名称:
            FrameLayout50 editNameFLayout = new FrameLayout50(); 
            FrameLayout50 editNameFLayout = new FrameLayout50();
            editNameFLayout.btnText.Text = Language.StringByID(StringId.yaokongqimingcheng) + ":";
            editNameFLayout.btnEditText.Text = control.name;
            editNameFLayout.btnNextIcon.Height = Application.GetRealWidth(28);
@@ -41,9 +41,9 @@
            editNameFLayout.btnNextIcon.UnSelectedImagePath = "LogicIcon/editname.png";
            viewLayout.AddChidren(editNameFLayout.FLayoutView());
            //遥控器所属区域:
            FrameLayout50 areaFLayout = new FrameLayout50(); 
            FrameLayout50 areaFLayout = new FrameLayout50();
            areaFLayout.btnText.Text = Language.StringByID(StringId.yaokongqiquyu);
            areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control);
            areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control);
            areaFLayout.frameLayout.Y = editNameFLayout.frameLayout.Bottom;
            viewLayout.AddChidren(areaFLayout.FLayoutView());
            #endregion
@@ -58,7 +58,7 @@
                    list.Add(Pir.currPir.FunctioList[i].name);
                }
                PirMethod method = new PirMethod();
                method.EditControlName(StringId.editName,list, control.name, (name, dialog) =>
                method.EditControlName(StringId.editName, list, control.name, (name, dialog) =>
                {
                    PirMethod.ThreadSend(new Control { deviceId = control.deviceId, name = name }, (responsePackNew) =>
                    {
@@ -67,8 +67,8 @@
                        control.name = name;

                    }, "修改名称", "dialog", null, dialog);
                   
                },()=> { });

                }, () => { });
            };
            //遥控器所属区域选中事件
            areaFLayout.btnClick.MouseUpEventHandler += (sender, e) =>
@@ -77,7 +77,7 @@
                method.ManagementPosition(control, () =>
                {
                    //更新区域
                    areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control);
                    areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.GetGetRoomName(control);
                });
            };
            #endregion