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/UI0-Public/TopViewDivBLL.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
index c2f6a6c..4620b7a 100644
--- a/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
+++ b/HDL_ON/UI/UI0-Public/TopViewDivBLL.cs
@@ -44,18 +44,18 @@
                         callBack("add", floorName);
                     };
                     string newFloorName = "1F";
-                    for (int i = 0; i < DB_ResidenceData.residenceData.floors.Count + 1; )
+                    for (int i = 0; i < SpatialInfo.CurrentSpatial.FloorList.Count + 1; )
                     {
                         newFloorName = ++i + "F";
-                        if (null == DB_ResidenceData.residenceData.floors.Find((obj)=>obj.name ==  newFloorName))
+                        if (null == SpatialInfo.CurrentSpatial.FloorList.Find((obj)=>obj.roomName ==  newFloorName))
                         {
                             break;
                         }
                     }
                     var fs = new List<string>();
-                    foreach(var f in DB_ResidenceData.residenceData.floors)
+                    foreach(var f in SpatialInfo.CurrentSpatial.FloorList)
                     {
-                        fs.Add(f.name);
+                        fs.Add(f.roomName);
                     }
                     new PublicAssmebly().LoadDialog_EditParater(StringId.AddFloors,newFloorName , callBackAction,StringId.FloorNameCannotBeEmpty,
                         StringId.AddFloorFailed_FloorAlreadyExist,fs);

--
Gitblit v1.8.0