From d7e25d6a5960b3495cd4d8a67545410e03ca7962 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 06 六月 2021 16:42:08 +0800
Subject: [PATCH] Merge branch 'wxr4' into temp-wxr

---
 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
index cf58a30..a56be68 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
+++ b/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)
+                    {
+                        //澶囨敞锛氫紵鍗楄姹傚皬绫崇數瑙嗘崲鎺塻pk=ir.tvxm锛堝惉璇存槸涓存椂瑙e喅鏂规锛�
+                        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) =>  

--
Gitblit v1.8.0