2022年12月08日22:36:36

wjc

2022-12-08 44aa189d9e01f8c0d19e00e44f1ef419ff2cc093

2022年12月08日22:36:36

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

@@ -244,12 +244,20 @@
            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);

            
        }
        /// <summary>
        /// 显示设备的View

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

@@ -2594,7 +2594,7 @@
                        break;
                    case "pm10":
                        {
                            ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm10", StringId.pm25, indexVulae, true, stateValue);
                            ConditionDeviceFunList.Current.PmCo2TvocAction(thisView, device, "pm10", StringId.pm10, indexVulae, true, stateValue);
                        }
                        break;
                    case "pm25":