From dc840e2d67654781ebc9c7640e6c44a63a6d04d0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 11 十二月 2020 09:44:37 +0800
Subject: [PATCH] 2020-12-11 1.注册、忘记密码、重置密码、点击返回到时候屏蔽检测错误提示。底部按钮使能效果优化修改。邮箱变密码输入问题修复。2.网络请求底层增加token过期检测刷新方法。3.更新控件库,iOS EditText取消默认密码输入方式。

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
index 6eeaa59..86ebc92 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -196,7 +196,7 @@
         /// <returns></returns>
         public static HDL_ON.Entity.Function GetDevice(string sid)
         {
-            HDL_ON.Entity.Function device = new Entity.Function() { name= "Unknown",sid="璁惧涓嶅瓨鍦�"};
+            HDL_ON.Entity.Function device = new Entity.Function() { name= "Unknown"};
             List<HDL_ON.Entity.Function> deviceLists = GetGatewayDeviceList();
             foreach (var dev in deviceLists)
             {
@@ -216,7 +216,7 @@
         /// <returns></returns>
         public static HDL_ON.Entity.Scene GetSecne(string sid)
         {
-            HDL_ON.Entity.Scene scene = new Entity.Scene() { name = "Unknown", sid = "鍦烘櫙涓嶅瓨鍦�" };
+            HDL_ON.Entity.Scene scene = new Entity.Scene() { name = "Unknown"};
             List<HDL_ON.Entity.Scene> sceneLists = GetSceneList();
             foreach (var sce in sceneLists)
             {
@@ -316,7 +316,7 @@
                 deviceStrTypeList.Add(Language.StringByID(StringId.AC));
             }
             var floorHeating = deviceList.Find((device) => device.functionType == FunctionType.FloorHeating);
-            if (ac != null)
+            if (floorHeating != null)
             {
                 deviceStrTypeList.Add(Language.StringByID(StringId.FloorHeating));
             }

--
Gitblit v1.8.0