blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
hxb
2022-09-22 39cf2411b59772d56ee731f229f09ff472889bad 
 HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs


@@ -77,7 +77,7 @@


                    Width = Application.GetRealWidth(144),


                    Height = Application.GetRealHeight(44 * 5),


                };


                var roomList = LogicMethod.CurrLogicMethod.GetGatewayRoomList(Language.StringByID(StringId.allAreas));


                var roomList = LogicMethod.Current.GetGatewayRoomList(Language.StringByID(StringId.allAreas));




                if (roomList.Count > 5)


                {


@@ -121,7 +121,7 @@


                        ///切换房间默认:全部功能


                        UserInfo.Current.logicselectedFunction = Language.StringByID(StringId.allFun);


                        ///获取显示设备列表


                        var list = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(areaView.btnClick.Tag as Entity.Room, if_Type);


                        var list = LogicMethod.Current.GetFunctionDeviceList(areaView.btnClick.Tag as Entity.Room, if_Type);




                        this.LoadingDeviceListView(vv, list);


                    };


@@ -139,9 +139,9 @@


            {




                //获取最终显示列表


                var functionList = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(UserInfo.Current.logicselectedRoom, if_Type);


                var functionList = LogicMethod.Current.GetFunctionDeviceList(UserInfo.Current.logicselectedRoom, if_Type);


                //获取设备列表的类型（例如：灯光类，窗帘类。。。）


                var deviceTypeList = LogicMethod.CurrLogicMethod.GetDeviceTypeList(functionList);


                var deviceTypeList = LogicMethod.Current.GetDeviceTypeList(functionList);


                if (deviceTypeList.Count == 0)


                {


                    //没有类型直接返回去;


@@ -223,9 +223,9 @@


                        funAllAreaView.btnText2.Text = clickText;


                        UserInfo.Current.logicselectedFunction = clickText;


                        ///获取设备单个大类spk列表（例如:灯光类,空调类...）


                        var typeFunctionList2 = LogicMethod.CurrLogicMethod.GetDeviceTypeFunctionList(clickText);


                        var typeFunctionList2 = LogicMethod.Current.GetDeviceTypeFunctionList(clickText);


                        ///获取设备单个小类列表（例如：灯光1,灯光2...）


                        var lists2 = LogicMethod.CurrLogicMethod.GetShowDeviceList(typeFunctionList2, functionList);


                        var lists2 = LogicMethod.Current.GetShowDeviceList(typeFunctionList2, functionList);


                       this.LoadingDeviceListView(vv, lists2);




                    };


@@ -239,11 +239,11 @@


            funAllAreaView.btnText2.MouseUpEventHandler += funClick;


            funAllAreaView.btnIcon2.MouseUpEventHandler += funClick;


            ///获取房间支持的设备列表


            var deviceList = LogicMethod.CurrLogicMethod.GetFunctionDeviceList(UserInfo.Current.logicselectedRoom, if_Type);


            var deviceList = LogicMethod.Current.GetFunctionDeviceList(UserInfo.Current.logicselectedRoom, if_Type);


            ///获取设备单个大类spk列表（例如:灯光类,空调类...）


            var typeFunctionList = LogicMethod.CurrLogicMethod.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction);


            var typeFunctionList = LogicMethod.Current.GetDeviceTypeFunctionList(UserInfo.Current.logicselectedFunction);


            ///获取设备单个小类列表（例如：灯光1,灯光2...）


            var lists = LogicMethod.CurrLogicMethod.GetShowDeviceList(typeFunctionList, deviceList);


            var lists = LogicMethod.Current.GetShowDeviceList(typeFunctionList, deviceList);


            ///房间名称


            funAllAreaView.btnText1.Text = UserInfo.Current.logicselectedRoom.roomName;


            ///设备大类名称<灯光类。。。。。>


@@ -275,7 +275,7 @@


                        funView.btnLine.X = Application.GetRealWidth(16);


                        funView.btnLine.Width = Application.GetRealWidth(343);


                        verticalScrolView.AddChidren(funView.FLayoutView());


                        funView.btnIcon.UnSelectedImagePath = LogicMethod.CurrLogicMethod.GetIconPath(dev.spk);


                        funView.btnIcon.UnSelectedImagePath = LogicMethod.Current.GetIconPath(dev.spk);


                        funView.btnDeviceName.Text = dev.name;


                        funView.btnRoomName.Text = dev.GetRoomListName();


                        funView.btnClick.MouseUpEventHandler += (sen, e) =>