From d4ff2cb026bfa348c62651c0547511eede9f94f3 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 21 七月 2021 13:45:50 +0800
Subject: [PATCH] Merge branch 'wxr7-ez' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into wxr7-ez
---
HDL_ON/DAL/Server/NewApiRes.cs | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 21f66ff..4d5cf58 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -449,7 +449,7 @@
/// <summary>
/// 浣忓畢鍦板潃
/// </summary>
- public string Address;
+ public string homeAddress;
}
@@ -1419,6 +1419,10 @@
public class JPushMessageInfo
{
/// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string HomeId;
+ /// <summary>
/// 鎺ㄩ�佹爣棰�
/// </summary>
public string Title;
@@ -1461,6 +1465,10 @@
[System.Serializable]
public class ExpandData
{
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string homeId;
/// <summary>
/// 闄勫姞鍐呭
/// </summary>
@@ -1546,10 +1554,10 @@
}
/// <summary>
- ///
+ /// 閰嶇疆鐨勮闊宠澶囧拰鍦烘櫙鏁版嵁
/// </summary>
[System.Serializable]
- public class TargetInfo
+ public class SpeakerTargetInfo
{
/// <summary>
/// 鎺у埗鐨勭洰鏍嘔d锛屼簯绔殑璁惧Id鎴栬�呭満鏅疘d
@@ -1563,19 +1571,32 @@
/// 鐩爣鍚嶇О
/// </summary>
public string targetName;
+ /// <summary>
+ /// 鎵╁睍鍙傛暟褰撳墠rowview鏄惁閫変腑
+ /// </summary>
+ public bool IsSelect;
}
+ //[System.Serializable]
+ //public class SpeakerTargetInfoRow: SpeakerTargetInfo
+ //{
+ // /// <summary>
+ // /// 褰撳墠rowview鏄惁閫変腑
+ // /// </summary>
+ // public bool isSelect;
+ //}
- /// <summary>
- /// 鏇存柊闊崇鎺у埗鐨勮澶囧拰鍦烘櫙鐩爣
- /// </summary>
- [System.Serializable]
+
+ /// <summary>
+ /// 鏇存柊闊崇鎺у埗鐨勮澶囧拰鍦烘櫙鐩爣
+ /// </summary>
+ [System.Serializable]
public class UpdateSpeakerDeviceListObj : SpeakerObj
{
/// <summary>
/// 澶囨敞
/// </summary>
- public List<TargetInfo> targetInfos;
+ public List<SpeakerTargetInfo> targetInfos;
}
/// <summary>
--
Gitblit v1.8.0