Evoyo.Home1.1.0120111601_Release

黄学彪

2020-11-19 9ef48d7b2da7c408b53f73be0f6eef3cbac1c84a

 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs

@@ -607,26 +607,28 @@
                    var SubAccounListTemp = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
                    var SubAccounListDictionary = new Dictionary<string, Shared.Phone.UserCenter.MemberInfoRes> { };

                    foreach (var member in SubAccounListTemp)
                    {
                        //判断一个账户绑定了邮箱的情况
                        if (SubAccounListDictionary.ContainsKey(member.DistributedMark) == true
                        || member.Account == UserCenterResourse.UserInfo.Phone
                        || member.Account == UserCenterResourse.UserInfo.Email)
                        {
                            //如果是它自己的话，不显示,账户和绑定的邮箱只显示其中之一
                            continue;
                    if (SubAccounListTemp != null)

                    {

                        foreach (var member in SubAccounListTemp)

                        {

                            //判断一个账户绑定了邮箱的情况

                            if (SubAccounListDictionary.ContainsKey(member.DistributedMark) == true

                            || member.Account == UserCenterResourse.UserInfo.Phone

                            || member.Account == UserCenterResourse.UserInfo.Email)

                            {

                                //如果是它自己的话，不显示,账户和绑定的邮箱只显示其中之一

                                continue;

                            }

                            //去掉子账户中普通成员，留下拥有管理员权限的成员

                            //（因为分配账户给普通成员，普通成员在app中不能进入设备管理那里，所以没发查看主人分配对账户）

                            if (member.AccountType != 1)

                            {

                                continue;

                            }



                            SubAccounListDictionary.Add(member.DistributedMark, member);

                        }
                        //去掉子账户中普通成员，留下拥有管理员权限的成员
                        //（因为分配账户给普通成员，普通成员在app中不能进入设备管理那里，所以没发查看主人分配对账户）
                        if (member.AccountType != 1)
                        {
                            continue;
                        }

                        SubAccounListDictionary.Add(member.DistributedMark, member);
                    }

                    foreach (var addMemberID in SubAccounListDictionary.Keys)
                    {
                        SubAccounList.Add(SubAccounListDictionary[addMemberID]);
@@ -1138,6 +1140,16 @@
            return password;
        }

        //// <summary>
        /// 取得某月的最后一天
        /// </summary>
        /// <param name="datetime">要取得月份最后一天的时间</param>
        /// <returns></returns>
        public static DateTime LastDayOfMonth(DateTime datetime)
        {
            return datetime.AddDays(1 - datetime.Day).AddMonths(1).AddDays(-1);
        }

        /// <summary>
        /// 将UNIX时间戳转换成系统时间(精确到秒)
        /// <returns></returns>