From af9df45ec5321446e37f8b6cb80aa36936136632 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 六月 2021 13:35:17 +0800
Subject: [PATCH] 2021-6-3-1
---
.vs/HDL_APP_Project/xs/UserPrefs.xml | 25 ++++++++++++++++++-------
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs | 13 +++++++++++++
2 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 60283cf..318d5ac 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,8 +1,12 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.FE1D0763-7181-4B0C-AB18-E30AA773A6FA" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs">
<Files>
- <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs" Line="51" Column="27" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs" Line="218" Column="36" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/PirMain.cs" Line="272" Column="51" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/BrandList.cs" Line="12" Column="34" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Pir.cs" Line="75" Column="18" />
+ <File FileName="HDL_ON/Entity/Function/Function.cs" Line="1222" Column="23" />
</Files>
<Pads>
<Pad Id="ProjectPad">
@@ -13,15 +17,22 @@
<Node name="DAL" expanded="True">
<Node name="Mqtt" expanded="True" />
</Node>
- <Node name="Entity" expanded="True" />
+ <Node name="Entity" expanded="True">
+ <Node name="Function" expanded="True" />
+ </Node>
<Node name="UI" expanded="True">
<Node name="UI2" expanded="True">
<Node name="3-Intelligence" expanded="True">
- <Node name="Automation" expanded="True">
- <Node name="Logic.cs" selected="True" />
+ <Node name="Automation" expanded="True" />
+ </Node>
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="PirDevice" expanded="True">
+ <Node name="Matching.cs" selected="True" />
</Node>
</Node>
- <Node name="FuntionControlView" expanded="True" />
+ <Node name="FuntionControlView" expanded="True">
+ <Node name="Video" expanded="True" />
+ </Node>
</Node>
</Node>
</Node>
@@ -40,7 +51,7 @@
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
index cf58a30..ee6fefc 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/Matching.cs
@@ -215,6 +215,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) =>
--
Gitblit v1.8.0