Merge branch 'Dev-Wxr'

wxr

2023-02-15 7ff70bc7c9460c395b59952d55df6e5d6a12a718

 HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs

@@ -30,7 +30,7 @@
            VerticalScrolViewLayout vv = new VerticalScrolViewLayout
            {
                Y = funAllAreaView.frameLayout.Bottom,
                Height = Application.GetRealHeight(667 - 64 - 50 * funCount - 8),
                Height = Application.GetRealHeight(667 - 64 - 50 * funCount - 8-50),
            };
            viewLayout.AddChidren(vv);
            if (!MainView.IsGatewayType)
@@ -244,8 +244,16 @@
            var typeFunctionList = LogicMethod.Current.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction);
            ///获取设备单个小类列表（例如：灯光1,灯光2...）
            var lists = LogicMethod.Current.GetShowDeviceList(typeFunctionList, deviceList);
            if (string.IsNullOrEmpty(UserInfo.Current.logicselectedRoom.roomName))
            {
                UserInfo.Current.logicselectedRoom.roomName = Language.StringByID(StringId.allAreas);
            }
            ///房间名称
            funAllAreaView.btnText1.Text = UserInfo.Current.logicselectedRoom.roomName;
            if (string.IsNullOrEmpty(UserInfo.Current.logicselectedFunction))
            {
                UserInfo.Current.logicselectedFunction = Language.StringByID(StringId.allFun);
            }
            ///设备大类名称<灯光类。。。。。>
            funAllAreaView.btnText2.Text = UserInfo.Current.logicselectedFunction;
            this.LoadingDeviceListView(vv, lists);
@@ -275,9 +283,10 @@
                        funView.btnLine.X = Application.GetRealWidth(16);
                        funView.btnLine.Width = Application.GetRealWidth(343);
                        verticalScrolView.AddChidren(funView.FLayoutView());
                        funView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetIconPath(dev.spk);
                        funView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetDeviceIconPath(dev);
                        funView.btnDeviceName.Text = dev.name;
                        funView.btnRoomName.Text = dev.GetRoomListName();

                        funView.btnClick.MouseUpEventHandler += (sen, e) =>
                        {
                            if (if_Type == LogicMethod.condition_if)