Merge branch 'wxr4' into temp-wxr

wxr

2021-04-19 bbcd6c2017762f9a0e6cf0ac6466bbf78f593b14

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs

@@ -58,7 +58,7 @@
                        var library = Newtonsoft.Json.JsonConvert.DeserializeObject<Library>(str);
                        if (library != null)
                        {
                            if (libraryList.Count < 20)
                            if (libraryList.Count < 40)
                            {
                                libraryList.Add(library);
                            }