Merge branch 'master' into NewFilePath

wei

2020-12-16 227bd88c1c8e41366c4bbffc54ee2b1fcbe35065

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

@@ -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);