From 692a20fc80688bfa4b20eaca513470f2c3135ec9 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期三, 09 六月 2021 10:47:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wxr4' into dev-tzy
---
HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/Buttons.cs | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/Buttons.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/Buttons.cs
index 6a79288..139d2a6 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/Buttons.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/View/Buttons.cs
@@ -265,14 +265,14 @@
break;
case 5:
{
- iconPath = "PirIcon/dvd.png";
- deviceNameIndex = StringId.dvd;
+ iconPath = "PirIcon/projector.png";
+ deviceNameIndex = StringId.touyingyi;
}
break;
case 6:
{
- iconPath = "PirIcon/projector.png";
- deviceNameIndex = StringId.touyingyi;
+ iconPath = "PirIcon/dvd.png";
+ deviceNameIndex = StringId.dvd;
}
break;
case 7:
@@ -310,29 +310,28 @@
case 3:
{
//椋庢墖
- // type = "fan-" + SPK.ElectricFan;
+ type = "fan-" + SPK.FanIr;
}
break;
case 4:
{
//鏈洪《鐩�
- // type = "set_top_box-" + SPK.ElectricTV;
+ type = "set_top_box-" + SPK.StbIr;
}
break;
case 5:
{
- //褰辩鏈�
- // type = "dvd-" + SPK.ElectricTV;
+ //鎶曞奖浠�
+ type = "projector-" + SPK.PjtIr;
}
break;
case 6:
{
- //鎶曞奖浠�
- // type = "projector-" + SPK.ElectricTV;
+ //褰辩鏈�
+ type = "dvd-" + SPK.DvDIr;
+
}
break;
-
-
}
return type;
}
--
Gitblit v1.8.0