Merge branch 'lss' of http://172.16.1.23:6688/r/~xm/HomeApp into lss

lss

2020-06-10 b4912454b001d3287932463b9119dcdfb68e8ba4

Merge branch 'lss' of http://172.16.1.23:6688/r/~xm/HomeApp into lss

 ZigbeeApp/.vs/GateWay/xs/.DS_Store

Binary files differ

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

File was deleted

 ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs

@@ -2,7 +2,6 @@
//------------------------------------------------------------------------------
// <auto-generated>
//     This code was generated by a tool.
//     Runtime Version:4.0.30319.42000
//
//     Changes to this file may cause incorrect behavior and will be lost if
//     the code is regenerated.

 ZigbeeApp/Shared/Phone/UserCenter/SmartSound/Forms/SmartSoundListForm.cs

File was deleted

 ZigbeeApp/Shared/Phone/UserCenter/SmartSound/SmartSoundInfo.cs

@@ -13,6 +13,7 @@
        {
        }

<<<<<<< HEAD
        public string StateCode { get; set; }
        public string ErrorInfo { get; set; }
        public Info ResponseData { get; set; }
@@ -24,10 +25,24 @@
            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; }
@@ -49,13 +64,43 @@
            /// 智能音箱的用户名（小度：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()