Merge branch 'wxr6' into MergeFL

wxr

2021-07-05 5f1fdf638033a87980b84689fb6f29f70cf68c6e

 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -152,6 +152,10 @@
                        var clothesHangerpage = new ClothesHangerPage();
                        clothesHangerpage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.FanIr:
                        var fanIr = new IrFanPage();
                        fanIr.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.AcIr:
                    case SPK.AcStandard:
                        var acPage = new AcControlPage();