合并嘉乐lc代码

wxr

2021-07-01 adc150efb13a0506f45a3c344c3ee2ef2dba8e90

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

@@ -148,6 +148,7 @@
            };
            fLayout.AddChidren(succeedBtn);
            #endregion

            #region 点击事件
            //表示库列表索引值(目前只20个库)
            int index = 1; 
@@ -179,6 +180,7 @@
            //测试Text
            testBtn.MouseUpEventHandler += (sender, e) =>
            {
               // testBtn.BackgroundColor = CSS.CSS_Color.viewMiddle;
                var library = libraryList[index - 1];
                var control = GetControl(spk, testBtn.TextID, library);
                //发送测试码命令
@@ -187,6 +189,10 @@
                    //标记最后那个码
                    if_bool = true;
                }
            };
            testBtn.MouseDownEventHandler += (sender, e) =>
            {
                //testBtn.BackgroundColor = CSS.CSS_Color.textConfirmColor;
            };
            //控制失败
            failedBtn.MouseUpEventHandler += (sender, e) =>
@@ -215,6 +221,19 @@
                {
                    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) =>