Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

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

@@ -43,7 +43,7 @@
            //遥控器所属区域:
            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.Current.GetGetRoomName(control);
            areaFLayout.frameLayout.Y = editNameFLayout.frameLayout.Bottom;
            viewLayout.AddChidren(areaFLayout.FLayoutView());
            #endregion
@@ -77,7 +77,7 @@
                method.ManagementPosition(control, () =>
                {
                    //更新区域
                    areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.CurrLogicMethod.GetGetRoomName(control);
                    areaFLayout.btnEditText.Text = Intelligence.Automation.LogicMethod.Current.GetGetRoomName(control);
                });
            };
            #endregion