Merge branch 'wxr4' into temp-wxr

wxr

2021-06-06 d7e25d6a5960b3495cd4d8a67545410e03ca7962

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

@@ -215,6 +215,22 @@
                {
                    var library = libraryList[index-1];
                    var control = GetControl(spk, testBtn.TextID, library);

                    if (spk == SPK.TvIr)
                    {
                        //备注：伟南要求小米电视换掉spk=ir.tvxm（听说是临时解决方案）
                        var brand = brandList.Find((c) => c.id == library.brandId);
                        if (brand != null)
                        {
                            if (brand.brandName.Contains("小米") || brand.brandName.Contains("Xiaomi"))
                            {
                                //更换spk
                                control.spk = "ir.tvxm";
                            }
                        }
                    }


                    PirMethod method = new PirMethod();
                    //发送库添加遥控器命令
                    method.ThreadAddControl(control, this, (device) =>