From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/AC/ACControlBase.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/AC/ACControlBase.cs b/ZigbeeApp/Shared/Phone/Device/AC/ACControlBase.cs
old mode 100755
new mode 100644
index 73a886b..9ea6cbb
--- a/ZigbeeApp/Shared/Phone/Device/AC/ACControlBase.cs
+++ b/ZigbeeApp/Shared/Phone/Device/AC/ACControlBase.cs
@@ -391,7 +391,7 @@
/// <param name="ac">Ac.</param>
public static bool IsOpen(ZigBee.Device.AC ac)
{
- if(ac.currentSystemMode==0)
+ if (ac.currentSystemMode == 0)
{
return false;
}
@@ -409,8 +409,8 @@
Application.RunOnMainThread(() =>
{
string msg = Language.StringByID(R.MyInternationalizationString.TheACIsClose);
- var tip = new Phone.UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Tip, msg);
- tip.Show();
+ //var tip = new Phone.UserCenter.TipViewControl(msg, 1000, 1);
+ //tip.ShowView();
});
}
--
Gitblit v1.8.0