全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

@@ -715,176 +715,7 @@
        #endregion

        #region  ----获取门锁
        #region ---第1种
        public static List<LogicLock> ReadDoorLockIfon(string doorlockMac)
        {
            List<LogicLock> list = new List<LogicLock>();
            string url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager";//子账号和主账号可能链接不同
            System.Net.WebClient webClient = new System.Net.WebClient();
            System.Collections.Specialized.NameValueCollection postValues = new System.Collections.Specialized.NameValueCollection();
            postValues.Add("RequestVersion", CommonPage.RequestVersion);
            postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);
            System.Threading.Tasks.Task.Run(() =>

            {
                try

                {



                    byte[] responseArray = webClient.UploadValues(url, postValues);

                    var str = System.Text.Encoding.UTF8.GetString(responseArray);

                    var jObject = JObject.Parse(str);

                    if (jObject == null || jObject["StateCode"].ToString() != "Success")

                    {

                        return;

                    }

                    var pageData = jObject["ResponseData"]["PageData"].ToString();

                    var datalist = JArray.Parse(pageData);

                    for (int i = 0; i < datalist.Count; i++)

                    {

                        var data = JObject.Parse(datalist[i].ToString());

                        if (Config.Instance.HomeId == data["Id"].ToString())

                        {

                            Residential residential = new Residential();



                            if (Convert.ToBoolean(data["IsOthreShare"].ToString()))

                            {
                                //分享者ID
                                residential.Id = data["Id"].ToString();
                                //是否是分享账号[true(是分享);false;(不是分享)];
                                residential.IsOthreShare = Convert.ToBoolean(data["IsOthreShare"].ToString());
                                //分享者住宅ID
                                residential.MainUserDistributedMark = data["MainUserDistributedMark"].ToString();

                                residential.IsOtherAccountCtrl = true;

                                residential.doorlockmac = doorlockMac;

                                list = ReadToken(residential);

                            }

                            else

                            {

                                residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/DoorLock/GetDoorLockPager";

                                residential.Token = Config.Instance.Token;

                                residential.Id = Config.Instance.HomeId;

                                residential.IsOtherAccountCtrl = false;

                                residential.doorlockmac = doorlockMac;

                                list = ReadDoorLock(residential);



                            }

                        }



                    }

                }

                catch { }

            });
            var datetime = DateTime.Now;
            while ((DateTime.Now - datetime).TotalMilliseconds < 3 * 1000)
            {
                if (list.Count != 0)
                {
                    break;
                }
            }
            return list;

        }

        public static List<LogicLock> ReadToken(Residential residential)
        {
            List<LogicLock> list = new List<LogicLock>();
            string url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSharedHomeApiControl";
            System.Net.WebClient webClient = new System.Net.WebClient();
            System.Collections.Specialized.NameValueCollection postValues = new System.Collections.Specialized.NameValueCollection();
            postValues.Add("RequestVersion", CommonPage.RequestVersion);
            postValues.Add("LoginAccessToken", Config.Instance.Token);
            postValues.Add("MainAccountId", residential.MainUserDistributedMark);
            postValues.Add("SharedHid", residential.Id);
            System.Threading.Tasks.Task.Run(() =>
            {
                try
                {
                    byte[] responseArray = webClient.UploadValues(url, postValues);
                    var str = System.Text.Encoding.UTF8.GetString(responseArray);
                    var jObject = JObject.Parse(str);
                    if (jObject == null || jObject["StateCode"].ToString() != "Success")
                    {
                        return;
                    }
                    var RequestBaseUrl = jObject["ResponseData"]["RequestBaseUrl"].ToString();
                    var RequestToken = jObject["ResponseData"]["RequestToken"].ToString();
                    Residential lockifon = new Residential();
                    lockifon.Url = RequestBaseUrl + "/DoorLock/GetDoorLockPager";
                    lockifon.Token = RequestToken;
                    lockifon.Id = Config.Instance.HomeId;
                    lockifon.IsOtherAccountCtrl = true;
                    lockifon.doorlockmac = residential.doorlockmac;
                    list = ReadDoorLock(lockifon);

                }
                catch { }
            });
            var datetime = DateTime.Now;
            while ((DateTime.Now - datetime).TotalMilliseconds < 3 * 1000)
            {
                if (list.Count != 0)
                {
                    break;
                }
            }
            return list;
        }

        public static List<LogicLock> ReadDoorLock(Residential lockifon)
        {
            List<LogicLock> list = new List<LogicLock>();
            System.Net.WebClient webClient = new System.Net.WebClient();

            System.Collections.Specialized.NameValueCollection postValues = new System.Collections.Specialized.NameValueCollection();
            postValues.Add("RequestVersion", CommonPage.RequestVersion);
            postValues.Add("LoginAccessToken", lockifon.Token);
            postValues.Add("HomeId", lockifon.Id);
            postValues.Add("DoorLockId", lockifon.doorlockmac);//门锁Mac19091
            postValues.Add("IsOtherAccountCtrl", lockifon.IsOtherAccountCtrl.ToString());
            System.Threading.Tasks.Task.Run(() =>
            {
                try
                {

                    byte[] responseArray = webClient.UploadValues(lockifon.Url, postValues);
                    var str = System.Text.Encoding.UTF8.GetString(responseArray);
                    var jObject = JObject.Parse(str);
                    if (jObject == null || jObject["StateCode"].ToString() != "Success")
                    {
                        return;
                    }
                    var pageData = jObject["ResponseData"]["PageData"].ToString();
                    var datalist = JArray.Parse(pageData);
                    for (int i = 0; i < datalist.Count; i++)
                    {
                        var data = JObject.Parse(datalist[i].ToString());
                        LogicLock doorLock = new LogicLock();
                        doorLock.DoorLockLocalUserId = data["DoorLockLocalUserId"].ToString();
                        doorLock.OpenLockMode = int.Parse(data["OpenLockMode"].ToString());
                        doorLock.CloudAccountId = data["CloudAccountId"].ToString();
                        list.Add(doorLock);
                    }

                }
                catch (Exception e)
                {
                    var s = e.Message;
                }

            });
            var datetime = DateTime.Now;
            while ((DateTime.Now - datetime).TotalMilliseconds < 3 * 1000)
            {
                if (list.Count != 0)
                {
                    break;
                }
            }
            return list;
        }

        #endregion

        #region ---第2种
        /// <summary>
        /// 获取自己+其他成员信息
        /// </summary>
@@ -894,30 +725,35 @@
        {
            var userlist = new List<MembershipIfon>();
            ///判断APP登录进来用户身份(主人，管理员，成员)
            var doorlockifonlist = await ReadUserListIfon(doorlockMac);
            var membershipIfon = new MembershipIfon();
            membershipIfon.MembershipId = Config.Instance.Guid;
            if (string.IsNullOrEmpty(Config.Instance.Name))
            var AllUserIfon = await ReadUserListIfon(doorlockMac);
            var currUserIfon = new MembershipIfon();
            currUserIfon.CloudAccountId = Config.Instance.Guid;
            if (string.IsNullOrEmpty(UserCenter.UserCenterResourse.UserInfo.UserName))
            {
                membershipIfon.MembershipName = Config.Instance.Account;
                currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.Account;
            }
            else
            {
                membershipIfon.MembershipName = Config.Instance.Name;
                currUserIfon.UserName = UserCenter.UserCenterResourse.UserInfo.UserName;
            }
            foreach (var o in doorlockifonlist)
            foreach (var o in AllUserIfon)
            {
                if (string.IsNullOrEmpty(currUserIfon.DoorLockMacPort))
                {
                    currUserIfon.DoorLockMacPort = o.DoorLockMacPort;
                }
                if (o.CloudAccountId == Config.Instance.Guid)
                {
                    LockMode lockMode = new LockMode();
                    lockMode.OpenMode = o.OpenLockMode;
                    lockMode.UserId = o.DoorLockLocalUserId;
                    membershipIfon.UserIdMode.Add(lockMode);
                    UnlockingMode unlockingMode = new UnlockingMode();
                    unlockingMode.OpenMode = o.OpenMode;
                    unlockingMode.UserId = o.UserId;
                    unlockingMode.ModeName = o.ModeName;
                    currUserIfon.UserIdMode.Add(unlockingMode);
                }
            }
            if (membershipIfon.UserIdMode.Count != 0)
            if (currUserIfon.UserIdMode.Count != 0)
            {
                userlist.Add(membershipIfon);
                userlist.Add(currUserIfon);
            }

            if (UserCenter.UserCenterResourse.UserInfo.AuthorityNo != 3)
@@ -928,37 +764,43 @@
                for (int i = 0; i < listInfo.Count; i++)
                {

                    var membership = new MembershipIfon();
                    var membershipifon = listInfo[i];
                    membership.MembershipId = membershipifon.SubAccountDistributedMark;
                    if (string.IsNullOrEmpty(membershipifon.UserName))
                    var userIfon = new MembershipIfon();
                    var user = listInfo[i];
                    userIfon.CloudAccountId = user.SubAccountDistributedMark;
                    if (string.IsNullOrEmpty(user.UserName))
                    {
                        membership.MembershipName = membershipifon.Account;
                        userIfon.UserName = user.Account;

                    }
                    else
                    {
                        membership.MembershipName = membershipifon.UserName;
                        userIfon.UserName = user.UserName;

                    }
                    for (int j = 0; j < doorlockifonlist.Count; j++)
                    for (int j = 0; j < AllUserIfon.Count; j++)
                    {
                        ///查找成员以及成员门锁触发源(1按键/3卡/15指纹)
                        if (membershipifon.SubAccountDistributedMark == doorlockifonlist[j].CloudAccountId)
                        if (string.IsNullOrEmpty(userIfon.DoorLockMacPort))
                        {
                            LockMode lockMode = new LockMode();
                            lockMode.OpenMode = doorlockifonlist[j].OpenLockMode;
                            lockMode.UserId = doorlockifonlist[j].DoorLockLocalUserId;
                            membership.UserIdMode.Add(lockMode);
                            userIfon.DoorLockMacPort = AllUserIfon[j].DoorLockMacPort;
                        }
                        ///查找成员以及成员门锁触发源(1按键/3卡/15指纹)
                        if (user.SubAccountDistributedMark == AllUserIfon[j].CloudAccountId)
                        {
                            UnlockingMode unlockingMode = new UnlockingMode();
                            unlockingMode.OpenMode = AllUserIfon[j].OpenMode;
                            unlockingMode.UserId = AllUserIfon[j].UserId;
                            unlockingMode.ModeName = AllUserIfon[j].ModeName;
                            userIfon.UserIdMode.Add(unlockingMode);
                        }

                    }
                    if (membership.UserIdMode.Count != 0)
                    if (userIfon.UserIdMode.Count != 0)
                    {
                        ///过滤掉重复数据；
                        var str = userlist.Find((c) => { return c.MembershipId == membershipifon.SubAccountDistributedMark; });
                        var str = userlist.Find((c) => { return c.CloudAccountId == user.SubAccountDistributedMark; });
                        if (str == null)
                        {
                            userlist.Add(membership);
                            userlist.Add(userIfon);
                        }
                    }

@@ -972,9 +814,9 @@
        /// </summary>
        /// <param name="doorlockMac">门锁Mac</param>
        /// <returns></returns>
        public static async System.Threading.Tasks.Task<List<LogicLock>> ReadUserListIfon(string doorlockMac)
        public static async System.Threading.Tasks.Task<List<User>> ReadUserListIfon(string doorlockMac)
        {
            List<LogicLock> list = new List<LogicLock>();
            var list = new List<User>();
            var s = await ReadUserList(doorlockMac);
            var jObject = JObject.Parse(s);
            if (jObject == null || jObject["StateCode"].ToString() != "Success")
@@ -986,19 +828,22 @@
            for (int i = 0; i < datalist.Count; i++)
            {
                var data = JObject.Parse(datalist[i].ToString());
                LogicLock doorLock = new LogicLock();
                doorLock.DoorLockLocalUserId = data["DoorLockLocalUserId"].ToString();
                doorLock.OpenLockMode = int.Parse(data["OpenLockMode"].ToString());
                doorLock.CloudAccountId = data["CloudAccountId"].ToString();
                list.Add(doorLock);
                var user = new User();
                user.UserId = data["DoorLockLocalUserId"].ToString();
                user.OpenMode = int.Parse(data["OpenLockMode"].ToString());
                user.CloudAccountId = data["CloudAccountId"].ToString();
                user.DoorLockMacPort = data["DoorLockId"].ToString();
                user.ModeName = data["UserIdRemarks"].ToString();
                list.Add(user);
            }
            return list;
        }

        public static async System.Threading.Tasks.Task<string> ReadUserList(string doorlockMac)
        {
            string s = null;
            var str = await WebClientAsync(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager");
            string s = null; 
            var str = await WebClientAsync(0, CommonPage.RequestHttpsHost+"/App/GetHomePager");//不同区域域名前缀不一样
           // var str = await WebClientAsync(0, "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetHomePager");
            var jObject = JObject.Parse(str);
            if (jObject == null || jObject["StateCode"].ToString() != "Success")
            {
@@ -1022,12 +867,14 @@
                        residential.MainUserDistributedMark = data["MainUserDistributedMark"].ToString();
                        residential.IsOtherAccountCtrl = true;
                        residential.doorlockmac = doorlockMac;
                        residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSharedHomeApiControl";
                        residential.Url = CommonPage.RequestHttpsHost + "/App/GetSharedHomeApiControl";
                        //residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/App/GetSharedHomeApiControl";
                        s = await ReadUserDoorLock(residential);
                    }
                    else
                    {
                        residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/DoorLock/GetDoorLockPager";
                        residential.Url = CommonPage.RequestHttpsHost + "/DoorLock/GetDoorLockPager";
                        //residential.Url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/DoorLock/GetDoorLockPager";
                        residential.Token = Config.Instance.Token;
                        residential.Id = Config.Instance.HomeId;
                        residential.IsOtherAccountCtrl = false;
@@ -1039,7 +886,7 @@
            }
            return s;
        }

     
        public static async System.Threading.Tasks.Task<string> ReadUserDoorLock(Residential residential)
        {

@@ -1071,10 +918,12 @@
        {

            NameValueCollection postValues = new NameValueCollection();

            if (value == 0)
            {
                postValues.Add("RequestVersion", CommonPage.RequestVersion);
                postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);
                postValues.Add("ReqDto.LoginAccessToken", Config.Instance.Token);

                postValues.Add("ReqDto.PageSetting.PageSize", Int32.MaxValue.ToString());//

            }
            else if (value == 1)
@@ -1082,7 +931,7 @@
                postValues.Add("RequestVersion", CommonPage.RequestVersion);
                postValues.Add("LoginAccessToken", Config.Instance.Token);
                postValues.Add("MainAccountId", residential.MainUserDistributedMark);
                postValues.Add("SharedHid", residential.Id);
                postValues.Add("SharedHid", residential.Id);

            }
            else if (value == 2)
            {
@@ -1090,16 +939,15 @@
                postValues.Add("LoginAccessToken", residential.Token);
                postValues.Add("HomeId", residential.Id);
                postValues.Add("DoorLockId", residential.doorlockmac);//门锁Mac
                postValues.Add("IsOtherAccountCtrl", residential.IsOtherAccountCtrl.ToString());
                postValues.Add("IsOtherAccountCtrl", residential.IsOtherAccountCtrl.ToString());

                postValues.Add("PageSetting.PageSize", Int32.MaxValue.ToString());
            }
            System.Net.WebClient webClient = new System.Net.WebClient();
            byte[] responseArray = webClient.UploadValues(url, postValues);
            return System.Text.Encoding.UTF8.GetString(responseArray);
            var s = System.Text.Encoding.UTF8.GetString(responseArray);
            return s;

        }



        #endregion

        public class Residential
        {
@@ -1124,39 +972,29 @@
            public string doorlockmac;
        }

        public class LogicLock
        public class MembershipIfon 
        {
            /// <summary>
            /// 触发源ID
            /// </summary>
            public string DoorLockLocalUserId = string.Empty;
            /// <summary>
            /// 触发源模式(0:密码;3:卡;15:指纹;)
            /// </summary>
            public int OpenLockMode;
            /// <summary>
            /// 识别用户身份
            /// </summary>
            public string CloudAccountId = string.Empty;
        }

        public class MembershipIfon
        {
            /// <summary>
            /// 识别用户身份
            /// 门锁Mac+Port,识别门锁；
            /// </summary>
            public string MembershipId = string.Empty;
            public string DoorLockMacPort = string.Empty;
            /// <summary>
            /// 触发源ID+模式(0:密码;3:卡;15:指纹;)
            /// 触发源列表
            /// </summary>
            public List<LockMode> UserIdMode = new List<LockMode>();
            public List<UnlockingMode> UserIdMode = new List<UnlockingMode>();
            /// <summary>
            /// 用户昵称
            /// </summary>
            public string MembershipName = string.Empty;
            public string UserName = string.Empty;


        }

        public class LockMode
        public class UnlockingMode
        {
            /// <summary>
            /// 触发源ID
@@ -1166,16 +1004,43 @@
            /// 触发源模式(0:密码;3:卡;15:指纹;)
            /// </summary>
            public int OpenMode;
            /// <summary>
            /// 自定义触发源名称
            /// </summary>
            public string ModeName = string.Empty;

        }

        public class User
        {
            /// <summary>
            /// 识别用户身份
            /// </summary>
            public string CloudAccountId = string.Empty;
            /// <summary>
            /// 触发源ID
            /// </summary>
            public string UserId = string.Empty;
            /// <summary>
            /// 触发源模式(0:密码;3:卡;15:指纹;)
            /// </summary>
            public int OpenMode;
            /// <summary>
            /// 自定义触发源名称
            /// </summary>
            public string ModeName = string.Empty;
            /// <summary>
            /// 门锁Mac+Port,识别门锁；
            /// </summary>
            public string DoorLockMacPort = string.Empty;

        }


        /// <summary>
        /// 自动化门锁成员信息作为条件列表
        /// 门锁列表
        /// </summary>
        public static List<MembershipIfon> UserList = new List<MembershipIfon>();
        /// <summary>
        ///联动事件门锁成员信息作为条件的列表
        /// </summary>
        public static List<MembershipIfon> LinkageventLockList = new List<MembershipIfon>();
        public static List<MembershipIfon> LockList = new List<MembershipIfon>();

        /// <summary>
        /// 当前门锁