From df237b08cf97c27a2526b8f523f852f298a8b9b1 Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期一, 01 六月 2020 09:30:47 +0800
Subject: [PATCH] 0000
---
ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs
index 4c3c4d2..01b4b40 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs
@@ -8,10 +8,24 @@
/// </summary>
public class SmartSoundInfo
{
+
public SmartSoundInfo()
{
}
+<<<<<<< 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();
@@ -23,10 +37,34 @@
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 = "";
@@ -49,13 +87,20 @@
/// 鏅鸿兘闊崇鐨勭敤鎴峰悕锛堝皬搴︼細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()
@@ -70,4 +115,4 @@
public int PageIndex { get; set; } = 1;
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0