From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/DAL/Server/NewApiRes.cs | 69 ++++++++++++++++++++++++++++++----
1 files changed, 61 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 21f66ff..055a093 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -49,6 +49,17 @@
public string regionUrl;
}
+ /// <summary>
+ /// 鍒嗛〉
+ /// </summary>
+ public class BasePagingObj
+ {
+ public int totalCount = 0;
+ public int totalPage = 0;
+ public int pageNo = 0;
+ public int pageSize = 0;
+ }
+
#endregion
#region 鈻� 鐧诲綍 ____________________________
@@ -449,7 +460,7 @@
/// <summary>
/// 浣忓畢鍦板潃
/// </summary>
- public string Address;
+ public string homeAddress;
}
@@ -1056,6 +1067,15 @@
/// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
/// </summary>
public string software = SoftwareType.ON_Plus.ToString();
+ /// <summary>
+ /// 灏忓尯codes锛堜笉浼狅紝榛樿缁戝畾鎵�鏈変綇瀹呭拰灏忓尯鐨勬帹閫侊級
+ /// </summary>
+ public List<string> communityCodes;
+ /// <summary>
+ /// 鎸囧畾鎺ㄩ�佽瑷� 锛堢洰鍓嶈鍙傛暟杩樻病鐢級
+ /// 2021-09-13 澧炲姞褰撳墠APP浣跨敤鐨勮瑷�鍙傛暟锛� 鐩墠浜戠鎺ュ彛杩樻病鏀寔
+ /// </summary>
+ public string languageType;
}
/// <summary>
@@ -1085,6 +1105,14 @@
/// ""锛氬叏閮紱Default锛氬垎浜笌鍔熻兘锛汚larm锛氭姤璀︾被锛汸rompt锛氱郴缁熸秷鎭�
/// </summary>
public string pushType;
+ /// <summary>
+ /// 椤甸潰澶у皬
+ /// </summary>
+ public int pageSize = 100;
+ /// <summary>
+ /// 椤甸潰搴忓彿
+ /// </summary>
+ public int pageNo = 1;
}
/// <summary>
@@ -1097,6 +1125,10 @@
/// 娑堟伅璁板綍Id
/// </summary>
public string msgId;
+ /// <summary>
+ /// 鍒犻櫎鐗╀笟鍏憡瑕佽繖涓�
+ /// </summary>
+ public string pushType;
}
@@ -1419,6 +1451,10 @@
public class JPushMessageInfo
{
/// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string HomeId;
+ /// <summary>
/// 鎺ㄩ�佹爣棰�
/// </summary>
public string Title;
@@ -1461,6 +1497,10 @@
[System.Serializable]
public class ExpandData
{
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string homeId;
/// <summary>
/// 闄勫姞鍐呭
/// </summary>
@@ -1546,10 +1586,10 @@
}
/// <summary>
- ///
+ /// 閰嶇疆鐨勮闊宠澶囧拰鍦烘櫙鏁版嵁
/// </summary>
[System.Serializable]
- public class TargetInfo
+ public class SpeakerTargetInfo
{
/// <summary>
/// 鎺у埗鐨勭洰鏍嘔d锛屼簯绔殑璁惧Id鎴栬�呭満鏅疘d
@@ -1563,19 +1603,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