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 | 43 ++++++++-----------------------------------
1 files changed, 8 insertions(+), 35 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 024c220..6703451 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -1032,7 +1032,7 @@
/// </summary>
public string deviceName;
/// <summary>
- /// Android銆両OS銆乄inPhone
+ ///
/// </summary>
public string deviceType;
/// <summary>
@@ -1042,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>
///// 鎺ㄩ�佹秷鎭垪琛�
--
Gitblit v1.8.0