合并嘉乐lc代码

wxr

2021-07-01 adc150efb13a0506f45a3c344c3ee2ef2dba8e90

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

@@ -14,7 +14,7 @@
        /// <summary>
        /// 默认选中是房间时：全部区域
        /// </summary>
        private Entity.Room selectedRoom = new Entity.Room { uid = Language.StringByID(StringId.allAreas) };
        private Entity.Room selectedRoom = new Entity.Room { roomId ="6688" };
        /// <summary>
        /// 表示是(条件/目标)
        /// </summary>
@@ -82,6 +82,7 @@
                    Height = Application.GetRealHeight(44 * 5),
                };
                var roomList = LogicMethod.GetGatewayRoomList(Language.StringByID(StringId.allAreas));
               
                if (roomList.Count > 5)
                {
                    bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * 5);
@@ -94,7 +95,7 @@
                    bghFrameLyout.AddChidren(areaBgh);
                    bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * roomList.Count);
                    areaBgh.Height = Application.GetRealHeight(44 * roomList.Count);
                    bghFrameLyout.BackgroundImagePath = $"LogicIcon/bjicon{roomList.Count+1}.png";
                    bghFrameLyout.BackgroundImagePath = $"LogicIcon/bjicon{roomList.Count}.png";
                }
                #endregion

@@ -135,6 +136,15 @@
            funAllAreaView.btnIcon1.MouseUpEventHandler += roomClick;
            //功能点击事件
            EventHandler<MouseEventArgs> funClick = (sender3, e3) =>{

                //获取最终显示列表
                var functionList = LogicMethod.GetFunctionDeviceList(selectedRoom, if_type);
                //获取设备列表的类型（例如：灯光类，窗帘类。。。）
                var deviceTypeList = LogicMethod.GetDeviceTypeList(functionList);
                if (deviceTypeList.Count==0) {
                    //没有类型直接返回去;
                    return;
                }
                #region 区域弹框界面
                FrameLayout fLayout = new FrameLayout
                {
@@ -148,7 +158,7 @@

                FrameLayout bghFrameLyout = new FrameLayout
                {
                    X = Application.GetRealWidth(10),
                    X = Application.GetRealWidth(118),
                    Y = Application.GetRealHeight(103),
                    Width = Application.GetRealWidth(160),
                    Height = Application.GetRealHeight(21 + 44),
@@ -171,10 +181,7 @@
                    Height = Application.GetRealHeight(44 * 5),
                };

                //获取最终显示列表
                var functionList = LogicMethod.GetFunctionDeviceList(selectedRoom, if_type);
                //获取设备列表的类型（例如：灯光类，窗帘类。。。）
                var deviceTypeList = LogicMethod.GetDeviceTypeList(functionList);
           


                if (deviceTypeList.Count > 5)
@@ -188,7 +195,7 @@
                    bghFrameLyout.AddChidren(areaBgh);
                    bghFrameLyout.Height = Application.GetRealHeight(21 + 44 * deviceTypeList.Count);
                    areaBgh.Height = Application.GetRealHeight(44 * deviceTypeList.Count);
                    bghFrameLyout.BackgroundImagePath = $"LogicIcon/bjicon{deviceTypeList.Count+1}.png";
                    bghFrameLyout.BackgroundImagePath = $"LogicIcon/bjicon{deviceTypeList.Count}.png";
                }
                #endregion

@@ -213,7 +220,7 @@
                        funAllAreaView.btnText2.Text = areaView.btnClick.Tag.ToString();
                        ///获取单个类型（例如：灯光类。。）设备FunctionType列表
                        var typeFunctionList = LogicMethod.GetDeviceTypeFunctionList(areaView.btnClick.Tag.ToString());
                        ///获取单个类型（例如：灯光类。。）显示设备列表
                        ///获取单个灯光类型（例如：灯光1,灯光2。。）显示设备列表
                        var lists = LogicMethod.GetShowDeviceList(typeFunctionList, functionList);
                        DeviceListView(vv, lists);
                    };
@@ -248,7 +255,7 @@
                funView.btnLine.X = Application.GetRealWidth(16);
                funView.btnLine.Width = Application.GetRealWidth(343);
                verticalScrolView.AddChidren(funView.FLayoutView());
                funView.btnIcon.UnSelectedImagePath = LogicMethod.GetIconPath(dev.functionType);
                funView.btnIcon.UnSelectedImagePath = LogicMethod.GetIconPath(dev.spk);
                funView.btnDeviceName.Text = dev.name;
                funView.btnRoomName.Text = dev.GetRoomListName();
                funView.btnClick.MouseUpEventHandler += (sen,e) => {