From d8545fbd1b36a6766c57c987e5d89862b470fed9 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 九月 2020 09:46:29 +0800
Subject: [PATCH] 2020-09-03 1.修改风扇默认为关状态。2.Alexa添加设备时,去掉空调和通用开关选择添加支持。 3.场景增加通用开关添加和发送控制支持,Alexa 的场景同样增加通用开关的支持。

---
 Crabtree/SmartHome/HDL/Operation/ResponseEntity/UserLoginRes.cs |   48 ++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/UserLoginRes.cs b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/UserLoginRes.cs
old mode 100755
new mode 100644
index b3c82f4..d48d23e
--- a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/UserLoginRes.cs
+++ b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/UserLoginRes.cs
@@ -6,11 +6,11 @@
     [Serializable]
     public class UserLoginRes
     {
-        public string Token;
+        public string Token;
 
         public string TimeStamp;
 
-        public int UserId;
+        public string UserId;
 
         public string Account;
 
@@ -18,12 +18,52 @@
 
         public int UserType;
 
-        public int MainUserId;
+        public string MainUserId;
 
         public bool IsProxyAllVisionRegister;  //<!--鏄惁鍦ㄥ叏瑙嗛�氫腑浠g悊娉ㄥ唽浜�-->
         public bool IsAllVisionRoomBind;     //<!-- 鏄惁鍦ㄧ粦瀹氫簡浣忔埧浜�,濡傛灉杩欎袱涓瓧娈礗sProxyAllVisionRegister+IsProxyAllVisionRegister閮戒负true鐨勮瘽锛屽垯App绔樉绀哄叏瑙嗛�氳烦杞殑鍔熻兘 -->
         public string AllVisionRegisterDevUserNameGuid;//7D1fb999-20b6-4363-b731-732d9171071f" ,  <!--SIP 甯愬彿-->         
         public string TenantCode;// "TXXXX",
-        public string DevelopCode;//": "abc-51f5-123-982c-def"
+        public string DevelopCode;//": "abc-51f5-123-982c-def"
+
+        public string Guid;
+        public string MD5PWD;
+    }
+
+    /// <summary>
+    /// 鎴愬憳绠$悊鍛樻潈闄愭搷浣滅被
+    /// </summary>
+    ///  [Serializable]
+    public class MemberAdministratorResult
+    {
+        /// <summary>
+        /// 璇锋眰鎺у埗涓诲笎鍙锋浣忓畢鏃惰姹傚熀鍦板潃
+        /// </summary>
+        public string RequestBaseUrl = string.Empty;
+        /// <summary>
+        /// 璇锋眰鎺у埗涓诲笎鍙锋浣忓畢鏃惰姹傚熀鍦板潃鐨凩oginAccessToken鐨勫��
+        /// </summary>
+        public string RequestToken = string.Empty;
     }
 }
+
+        //"Token": "NGpIWWJSMk01akdXR3JOQUUrK3hMbU5yVGN1Y1FFMDlKYmZRYndnZmxyYnc4MjBQNVp4WkRxaDg0d21XcTV1eWxlLzVYcFVFNTBkVm0xNTJHdDBtbXhCQkErdERpbmVoM2oyS095VE53R0F3MmpoRjZIS1g3QT09",
+        //"Account": "721343314@qq.com",
+        //"Guid": "29061",
+        //"MD5PWD": "YJWQ6ZKVR0+MMVNJPCY28EYWKZGKUF6C0ZL6LTOLS5QYD9JI27RYXQ==**",
+        //"HdlOnMqttKey": "39dea90f-3e0c-47",
+        //"ConnectMqttBrokerLoadSubDomain": "tcp://hangzhouregionmqttpenetrate.hdlcontrol.com:6699",
+        //"ConnectMqttClientId": "721343314@qq.com",
+        //"ConnectMqttBrokerUserName": "721343314@qq.com",
+        //"ConnectMqttBrokerPwd": "0068e1c8-8c2b-451c-bb2f-fd741671c140",
+        //"CurrentMqttClientIpAndPort": "",
+        //"AccountType": 0,
+        //"UserType": 0,
+        //"MainUserID": 29061,
+        //"UserID": 29061,
+        //"Contact": null,
+        //"IsProxyAllVisionRegister": false,
+        //"IsAllVisionRoomBind": false,
+        //"AllVisionRegisterDevUserNameGuid": null,
+        //"TenantCode": null,
+        //"DevelopCode": null
\ No newline at end of file

--
Gitblit v1.8.0