From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
index 50a8d03..290933b 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceCurtainDetailCardForm.cs
@@ -61,7 +61,7 @@
this.ScrollEnabled = false;
this.WcdType = ((Rollershade)this.device).WcdType;
//璁剧疆鐘舵�佹枃瀛�
- this.SetStatuText(HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));
+ this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
if (WcdType == 0)
{
@@ -96,7 +96,7 @@
SeekBarOpenCurtain.Progress = 100;
}
//璁剧疆鐘舵�佹枃瀛�
- this.SetStatuText(HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));
+ this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
return;
}
//鍙戦�佺獥甯樺懡浠�
@@ -145,7 +145,7 @@
SeekBarOpenCurtain.Progress = 0;
}
//璁剧疆鐘舵�佹枃瀛�
- this.SetStatuText(HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));
+ this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
return;
}
//鍙戦�佺獥甯樺懡浠�
@@ -400,7 +400,7 @@
HdlThreadLogic.Current.RunMain(() =>
{
//璁剧疆鐘舵�佹枃瀛�
- this.SetStatuText(HdlDeviceCommonLogic.Current.GetMainPageDeviceStatuText(this.device));
+ this.SetStatuText(HdlDeviceOtherLogic.Current.GetDeviceStatu(this.device));
if (this.isProgressing == false)
{
//褰撹繘搴﹀�煎湪鎵嬪姩鍙樻洿涓椂,涓嶆帴鏀舵帹閫�
--
Gitblit v1.8.0