From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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..b59e237 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
+++ b/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)
+ {
+ //澶囨敞锛氫紵鍗楄姹傚皬绫崇數瑙嗘崲鎺塻pk=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) =>
@@ -304,9 +323,9 @@
value = "on";
}
break;
- case StringId.zhongsu:
+ case StringId.fengsuqiehuan:
{
- key = "middle";
+ key = "speed";
value = "";
}
break;
@@ -513,7 +532,7 @@
break;
case 2:
{
- textValue = StringId.zhongsu;
+ textValue = StringId.fengsuqiehuan;
}
break;
case 3:
--
Gitblit v1.8.0