Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs

@@ -1,4 +1,5 @@
using System;

using Shared.Common;

using System;

using System.Collections.Generic;



namespace Shared.Phone.UserCenter

@@ -59,7 +60,17 @@
        /// <summary>

        /// 用户图标文件

        /// </summary>

        [Newtonsoft.Json.JsonIgnore]

        public string UserIconFile = string.Empty;

        /// <summary>

        /// 用户图标文件是否改变

        /// </summary>

        [Newtonsoft.Json.JsonIgnore]

        public bool UserIconFileChanged = false;

        /// <summary>

        /// 用户头像数据

        /// </summary>

        public byte[] HeadImage = null;

    }



    /// <summary>

@@ -169,7 +180,7 @@
        /// <summary>
        /// 房间名称
        /// </summary>
        public List<string> listRoomName = new List<string>();

        public string RoomName = string.Empty;

        /// <summary>
        /// 设备的打开状态
        /// </summary>