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/Entity/Function/Scene.cs |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 362a245..3f388c9 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -24,6 +24,11 @@
 
     public class Scene 
     {
+        public Scene()
+        {
+            sid = NewSid();
+            gatewayId = DB_ResidenceData.residenceData.HomeGateway.gatewayId;
+        }
         /// <summary>
         /// 浜戠鍞竴ID
         /// </summary>
@@ -202,7 +207,7 @@
             string roomNameList = "";
             foreach (var roomId in roomIds)
             {
-                var findRoom = DB_ResidenceData.residenceData.Rooms.Find(obj => obj.uid == roomId);
+                var findRoom = DB_ResidenceData.residenceData.Rooms.Find(obj => obj.roomId == roomId);
                 if (findRoom == null)
                 {
                     continue;
@@ -241,9 +246,12 @@
             {
                 UploadScene();
             }
-            var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
-            FileUtils.WriteFileByBytes(savePath, ssd);
-            MainPage.Log($"Save Scene Data : {savePath}");
+            else
+            {
+                var ssd = System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this));
+                FileUtils.WriteFileByBytes(savePath, ssd);
+                MainPage.Log($"Save Scene Data : {savePath}");
+            }
         }
 
         /// <summary>

--
Gitblit v1.8.0