blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
陈嘉乐
2020-07-24 f270cd68364fad5766ec9060d7ce835fe6b456b3 
 ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs


@@ -264,7 +264,7 @@


                    roomTextButton = roomClickView.roomnameBtn;


                    roomClickView.roomnameBtn.IsSelected = true;




                    var list = Method.GetDeviceUIList(room, deviceTypeList);


                    var list = Method.GetDeviceUIList(room, deviceTypeList, IfType);


                    AllDeviceTypeView(list);


                }




@@ -297,7 +297,7 @@


                    roomTextButton = roomClickView.roomnameBtn;


                    roomClickView.roomnameBtn.IsSelected = true;




                    var list = Method.GetDeviceUIList(room, deviceTypeList);


                    var list = Method.GetDeviceUIList(room, deviceTypeList, IfType);


                    AllDeviceTypeView(list);


                };


                roomClickView.roomnameBtn.MouseUpEventHandler += roomclick;


@@ -414,13 +414,6 @@


                if (deviceTypelist.Count != 0 && !deviceTypelist.Contains(common.Type))


                {


                    continue;


                }


                if (IfType == "condition_mould")


                {


                    if (common.IasDeviceType != 13)


                    {//自动化模板只支持红外传感器


                        continue;


                    }


                }


                var deviceFramelayout = new FrameLayout


                {