From cda315b3a19919cae922bdbe96bc20eab4e29fcc Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 18:03:24 +0800
Subject: [PATCH] 版本合并冲突修改
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs
index df3ecc3..af53681 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaFanPage.cs
@@ -99,7 +99,7 @@
//妗�
var strView = Language.StringByID(StringId.Gear);
- if (device.online)
+ //if (device.online)
{
seekBarContr.ProgressChangedEvent += (div, value) =>
{
@@ -179,16 +179,16 @@
/// </summary>
private void SendSwitchComand()
{
- if (!device.online)
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
- Direction = AMPopTipDirection.None,
- }.Show(MainPage.BaseView);
- return;
- }
+ //if (!device.online)
+ //{
+ // new Tip()
+ // {
+ // CloseTime = 1,
+ // Text = Language.StringByID(StringId.DeviceOfflineCannotOption),
+ // Direction = AMPopTipDirection.None,
+ // }.Show(MainPage.BaseView);
+ // return;
+ //}
this.btnSwitch.CanClick = false;
string statu = this.btnSwitch.IsSelected == true ? "off" : "on";
--
Gitblit v1.8.0