From be95e839f40eb3ddf64706b60cba6dfcf4fad5e5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 03 四月 2020 14:31:44 +0800
Subject: [PATCH] 2020-04-03 1.去掉登录前ping百度域名的网络监测。
---
Crabtree/SmartHome/HDL/Operation/ResponseEntity/Alexa.cs | 134 +++++++++++++++++++++++++++-----------------
1 files changed, 82 insertions(+), 52 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/Alexa.cs b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/Alexa.cs
index 3096573..0040cac 100644
--- a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/Alexa.cs
+++ b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/Alexa.cs
@@ -4,6 +4,63 @@
namespace Shared
{
+ //4銆佽鍙栨寚瀹氫綇瀹呯綉鍏崇殑璁惧鍒楄〃鎺ュ彛锛欴eviceByRegionList
+ // 鍙傛暟锛�
+ // RegionID //褰撳墠浣忓畢ID int
+ [Serializable]
+ public class GetDeviceListObj:BaseNoTokenObj
+ {
+ public string RegionID;
+ }
+
+ //7銆佸垹闄よ澶囨帴鍙ｏ細DelDevice
+ // 鍙傛暟锛�
+ // Id //璁惧ID int
+ [Serializable]
+ public class DelDeviceObj : BaseNoTokenObj
+ {
+ public string Id;
+ }
+
+ public class SceneByRegion
+ {
+ public string SceneId;
+ public string SceneName;
+ }
+
+ //8銆佽幏鍙栧満鏅垪琛ㄦ帴鍙ｏ細 SceneByRegionList
+ // 鍙傛暟锛�
+ // RegionID //褰撳墠浣忓畢ID int
+ [Serializable]
+ public class SceneByRegionListObj : BaseNoTokenObj
+ {
+ public string RegionID;
+ }
+
+
+ //11銆佸垹闄ゅ満鏅帴鍙ｏ細DeleteScene
+ // 鍙傛暟锛�
+ // Id //鍦烘櫙ID int
+ [Serializable]
+ public class DeleteSceneObj : BaseNoTokenObj
+ {
+ public string Id;
+ }
+
+
+
+
+ //14銆佸垹闄ゅ満鏅粦瀹氳澶囨帴鍙ｏ細RemoveBindSceneToDevicesItem
+ //Id 璁惧鐨凣uid
+ [Serializable]
+ public class UnBindSceneObj: BaseNoTokenObj
+ {
+ public string Id;
+ }
+
+
+
+
//1銆佽幏鍙栨煇浣忓畢涓嬬殑缃戝叧鎺ュ彛锛� GatewayByRegionList
// 鍙傛暟锛歊egionID //浣忓畢ID int
@@ -26,22 +83,22 @@
[Serializable]
public class UpdateGatewayObj
{
- public int RegionID;
- public int id;
+ public string RegionID;
+ public string Id;
public string MAC;
public string Password;
public string UserName;
public string ProjectName;
}
- //4銆佽鍙栨寚瀹氫綇瀹呯綉鍏崇殑璁惧鍒楄〃鎺ュ彛锛欴eviceByRegionList
- // 鍙傛暟锛�
- // RegionID //褰撳墠浣忓畢ID int
- [Serializable]
- public class DeviceByRegionListObj
- {
- public int RegionID;
- }
+ ////4銆佽鍙栨寚瀹氫綇瀹呯綉鍏崇殑璁惧鍒楄〃鎺ュ彛锛欴eviceByRegionList
+ //// 鍙傛暟锛�
+ //// RegionID //褰撳墠浣忓畢ID int
+ //[Serializable]
+ //public class GetDeviceListObj:BaseNoTokenObj
+ //{
+ // public string RegionID;
+ //}
//5銆佹坊鍔犺澶囨帴鍙ｏ細UploadDevices
// 鍙傛暟锛�
@@ -72,39 +129,20 @@
[Serializable]
public class UpdateDeviceObj
{
- public int Id;
- public string DeviceName;
+ public string Id;
public string DeviceType;
public int SubnetID;
public int DeviceID;
public int LoopID;
+ public string DeviceName;
public string MAC;
- public int RegionID;
+ public string RegionID;
}
- //7銆佸垹闄よ澶囨帴鍙ｏ細DelDevice
- // 鍙傛暟锛�
- // Id //璁惧ID int
- [Serializable]
- public class DelDeviceObj
- {
- public int Id;
- }
- //8銆佽幏鍙栧満鏅垪琛ㄦ帴鍙ｏ細 SceneByRegionList
- // 鍙傛暟锛�
- // RegionID //褰撳墠浣忓畢ID int
- [Serializable]
- public class SceneByRegionListObj
- {
- public int RegionID;
- }
- public class SceneByRegion
- {
- public int SceneId;
- public string SceneName;
- }
+
+
//9銆佹坊鍔犲満鏅帴鍙ｏ細AddScene
// 鍙傛暟锛�
@@ -113,7 +151,7 @@
[Serializable]
public class AddSceneObj
{
- public int RegionID;
+ public string RegionID;
public string SceneName;
}
@@ -124,19 +162,11 @@
[Serializable]
public class EdiutSceneObj
{
- public int Id;
- public int RegionID;
+ public string Id;
+ public string RegionID;
public string SceneMark;
}
- //11銆佸垹闄ゅ満鏅帴鍙ｏ細DeleteScene
- // 鍙傛暟锛�
- // Id //鍦烘櫙ID int
- [Serializable]
- public class DeleteScene
- {
- public int Id;
- }
//12銆佸叏瑙嗛�氱殑鍦烘櫙鑱斿姩锛欰ddSceneLinkageMode
// 鍙傛暟锛�
@@ -154,7 +184,7 @@
[Serializable]
public class GetBindDeviceBySceneListObj
{
- public int Id;
+ public string Id;
}
//14銆佸垹闄ゅ満鏅粦瀹氳澶囨帴鍙ｏ細RemoveBindSceneToDevicesItem
@@ -194,9 +224,9 @@
/// 娣诲姞鍦烘櫙涓庡満鏅粦瀹氳澶囧垪琛�
/// </summary>
[Serializable]
- public class SceneAndDeviceList
+ public class SceneAndDeviceList:BaseNoTokenObj
{
- public int RegionID;
+ public string RegionID;
public string SceneName;
public string MAC;
@@ -221,7 +251,7 @@
[Serializable]
public class GetUnbindDeviceListObj
{
- public int RegionID;
+ public string RegionID;
}
//17銆佹坊鍔犺澶囧垪琛ㄩ〉鏌ヨ鎺ュ彛锛欴eviceByRegionList
// 鍙傛暟锛�
@@ -251,7 +281,7 @@
public class AddRoomObj
{
public string RoomMark;
- public int RegionID;
+ public string RegionID;
}
//20銆佺紪杈戞埧闂村悕鎺ュ彛锛欵diutRoom
@@ -264,7 +294,7 @@
{
public int Id;
public string RoomMark;
- public int RegionID;
+ public string RegionID;
}
//21銆佸垹闄ゆ埧闂存帴鍙ｏ細DeleteRoom
@@ -290,7 +320,7 @@
[Serializable]
public class GetUnbindSceneToRoomListObj
{
- public int RegionID;
+ public string RegionID;
}
//24銆佹埧闂寸粦瀹氬満鏅帴鍙ｏ細BindDeviceToRoomItems
// 鍙傛暟锛�
--
Gitblit v1.8.0