Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-11-13 a4d525d08da7b6fb985b0069c539c11b06306a9b

 ZigbeeApp/Shared/Phone/Device/Logic/Send.cs

@@ -728,13 +728,13 @@
            var AllUserIfon = await ReadUserListIfon(doorlockMac);
            var currUserIfon = new MembershipIfon();
            currUserIfon.CloudAccountId = Config.Instance.Guid;
            if (string.IsNullOrEmpty(Config.Instance.UserName))
            if (string.IsNullOrEmpty(UserCenter.UserCenterResourse.UserInfo.UserName))
            {
                currUserIfon.UserName = Config.Instance.Account;
                currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.Account;
            }
            else
            {
                currUserIfon.UserName = Config.Instance.UserName;
                currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.UserName;
            }
            foreach (var o in AllUserIfon)
            {