From 6c70a72d6f3d11baa65be466d4023b2f2ca79e39 Mon Sep 17 00:00:00 2001 From: lss <316519258@qq.com> Date: 星期三, 03 六月 2020 11:04:41 +0800 Subject: [PATCH] 2020.06.03.1 --- ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs | 127 +++++++++++++++++++++++++++++++++++------- 1 files changed, 105 insertions(+), 22 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs index ae5ce99..01b4b40 100644 --- a/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs @@ -1,4 +1,6 @@ 锘縰sing System; +using System.Collections.Generic; + namespace Shared.Phone.UserCenter.SmartSound { /// <summary> @@ -6,30 +8,111 @@ /// </summary> public class SmartSoundInfo { + public SmartSoundInfo() { } - public string UserID = ""; - public string AuthCode = ""; - public string Token = ""; - public string RefreshToken = ""; - /// <summary> - /// Baidu - /// </summary> - public string Platform = "Baidu"; - public string HomeID = ""; - public string OpenUID = ""; - /// <summary> - /// 鏅鸿兘闊崇澶囨敞 - /// </summary> - public string Remark = ""; - public string Id = ""; - public bool IsDeleted =false; - public string CreatedOnUtc = ""; - /// <summary> - /// 鏅鸿兘闊崇鐨勭敤鎴峰悕锛堝皬搴︼細123456@qq.com锛� - /// </summary> - public string UserName; +<<<<<<< HEAD + public string StateCode { get; set; } + public string ErrorInfo { get; set; } + public Info ResponseData { get; set; } + + public class Info + { + public int PageSize { get; set; } + public int PageIndex { get; set; } + public int RowCount { get; set; } + public int PageTotal { get; set; } + public List<SoundInfo> Data { get; set; } +======= + public string StateCode = ""; + public string ErrorInfo = ""; + public Info ResponseData = new Info(); + + public class Info + { + public int PageSize = 0; + public int PageIndex = 0; + public int RowCount = 0; + public int PageTotal = 0; + public List<SoundInfo> Data = new List<SoundInfo>(); +>>>>>>> b5b3f2bf5b04de190acea40790537b9e96649188 + } + + public class SoundInfo + { +<<<<<<< HEAD + public string UserID { get; set; } + public string AuthCode { get; set; } + public string Token { get; set; } + public string RefreshToken { get; set; } + /// <summary> + /// Baidu + /// </summary> + public string Platform { get; set; } + public string HomeID { get; set; } + public string OpenUID { get; set; } + /// <summary> + /// 鏅鸿兘闊崇澶囨敞 + /// </summary> + public string Remark { get; set; } + public string Id { get; set; } + public bool IsDeleted { get; set; } + public string CreatedOnUtc { get; set; } + /// <summary> + /// 鏅鸿兘闊崇鐨勭敤鎴峰悕锛堝皬搴︼細123456@qq.com锛� + /// </summary> + public string UserName { get; set; } = "123456@qq.com"; +======= + + public string UserID = ""; + public string AuthCode = ""; + public string Token = ""; + public string RefreshToken = ""; + /// <summary> + /// Baidu + /// </summary> + public string Platform = "Baidu"; + public string HomeID = ""; + public string OpenUID = ""; + /// <summary> + /// 鏅鸿兘闊崇澶囨敞 + /// </summary> + public string Remark = ""; + public string Id = ""; + public bool IsDeleted = false; + public string CreatedOnUtc = ""; + /// <summary> + /// 鏅鸿兘闊崇鐨勭敤鎴峰悕锛堝皬搴︼細123456@qq.com锛� + /// </summary> + public string UserName; +>>>>>>> b5b3f2bf5b04de190acea40790537b9e96649188 + } + + public class Auth + { +<<<<<<< HEAD + public string Platform { get; set; } + public string UserID { get; set; } + public string HomeID { get; set; } +======= + public string Platform = ""; + public string UserID = ""; + public string HomeID = ""; +>>>>>>> b5b3f2bf5b04de190acea40790537b9e96649188 + + public PageSetting PageSetting { get; set; } + public Auth() + { + this.PageSetting = new PageSetting(); + } + + } + public class PageSetting + { + public int PageSize { get; set; } = 100; + public int PageIndex { get; set; } = 1; + } } -} +} \ No newline at end of file -- Gitblit v1.8.0