From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4
---
HDL_ON/DAL/Server/NewApiRes.cs | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 21f66ff..10f6844 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;
}
@@ -1546,10 +1546,10 @@
}
/// <summary>
- ///
+ /// 閰嶇疆鐨勮闊宠澶囧拰鍦烘櫙鏁版嵁
/// </summary>
[System.Serializable]
- public class TargetInfo
+ public class SpeakerTargetInfo
{
/// <summary>
/// 鎺у埗鐨勭洰鏍嘔d锛屼簯绔殑璁惧Id鎴栬�呭満鏅疘d
@@ -1563,19 +1563,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