From 1293fea19c6a2b558986856e301d5218c1979692 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:08:43 +0800
Subject: [PATCH] Revert "20201127 接受bus数据修改完成，搜索网关、一端口修改完成"

---
 HDL_ON/DAL/Server/NewApiRes.cs |   86 ++++++++++---------------------------------
 1 files changed, 20 insertions(+), 66 deletions(-)

diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index da473ed..6703451 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -944,8 +944,16 @@
     /// 鏌ヨ鏌愪綇瀹呮煇瀛愯处鍙风殑鍒嗕韩鏂囦欢淇℃伅
     /// </summary>
     [System.Serializable]
-    public class HomeShareFindAll : ChildBaseObj
+    public class HomeShareFindAll
     {
+        /// <summary>
+        /// 浣忓畢ID
+        /// </summary>
+        public string homeId;
+        /// <summary>
+        /// 瀛愯处鍙穒d
+        /// </summary>
+        public string childAccountId;
 
     }
 
@@ -1024,7 +1032,7 @@
         /// </summary>
         public string deviceName;
         /// <summary>
-        /// Android銆両OS銆乄inPhone
+        /// 
         /// </summary>
         public string deviceType;
         /// <summary>
@@ -1034,50 +1042,23 @@
         /// <summary>
         /// 鎺ㄩ�両D
         /// </summary>
-        public string pushToken;
+        public string pushid;
         /// <summary>
-        /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
+        /// 1鏄疕DL_ON銆�2HDL_Zigbee 
         /// </summary>
-        public string software = "ON_Plus";
+        //public string software = MainPage.RequestSource;
+        public string software = "HDL_ON";
     }
 
-    /// <summary>
-    /// 
-    /// </summary>
+
     [System.Serializable]
-    public class PushIdObj
+    public class PushserivceIdObj
     {
         /// <summary>
         /// 
         /// </summary>
-        public string pushId;
+        public string id;
     }
-
-    /// <summary>
-    /// 
-    /// </summary>
-    [System.Serializable]
-    public class GetMessageListObj: PushIdObj
-    {
-        /// <summary>
-        /// 浣忓畢涓婚敭id
-        /// 1銆佷紶绌烘煡璇㈠叏閮紙闇�瑕佹牴鎹敤鎴峰煙鍚嶆煡璇級 2銆佷紶鎸囧畾浣忓畢ID鏌ヨ鎸囧畾璁板綍 锛堥渶瑕佹牴鎹綇瀹呭煙鍚嶆煡璇級
-        /// </summary>
-        public string homeId;
-    }
-
-    /// <summary>
-    /// 娑堟伅璁板綍Id
-    /// </summary>
-    [System.Serializable]
-    public class PushMsgIdObj
-    {
-        /// <summary>
-        /// 娑堟伅璁板綍Id
-        /// </summary>
-        public string msgId;
-    }
-    
 
     ///// <summary>
     ///// 鎺ㄩ�佹秷鎭垪琛�
@@ -1151,11 +1132,11 @@
         /// <summary>
         /// 
         /// </summary>
-        public string requestVersion = MainPage.VersionString;
+        public string RequestVersion = MainPage.VersionString;
         /// <summary>
-        /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
+        /// 
         /// </summary>
-        public string software = "ON_Plus";
+        public string RequestSource = MainPage.ClientType;
         /// <summary>
         /// 璇█
         /// </summary>
@@ -1212,33 +1193,6 @@
 
     }
 
-    /// <summary>
-    /// 妫�娴婣PP鐗堟湰
-    /// </summary>
-    public class APPVersion
-    {
-
-        /// <summary>
-        /// 鏂扮増鏈琲OS App Store涓嬭浇鍦板潃
-        /// </summary>
-        public string IosUrl;
-
-        /// <summary>
-        /// 鏂扮増鏈珹ndroid搴旂敤甯傚満涓嬭浇鍦板潃
-        /// </summary>
-        public string AndroidUrl;
-
-        /// <summary>
-        /// 褰撳墠iOS鏈�鏂扮増鏈彿
-        /// </summary>
-        public string IosVersion;
-
-        /// <summary>
-        /// 褰撳墠Android鏈�鏂扮増鏈彿
-        /// </summary>
-        public string AndroidVersion;
-
-    }
     #endregion
 
     #endregion

--
Gitblit v1.8.0