Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

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

@@ -27,89 +27,6 @@
                //var dev = common as Panel;
            });
        }
        //从门锁读信息
        void ReadDoorLockDeviceUserInfo()
        {
            System.Threading.Tasks.Task.Run(async () =>
            {
                Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
                try
                {
                    var getDoorLockInfo = await doorLock.GetDoorlockUserInfoAsync();
                    if (getDoorLockInfo != null && getDoorLockInfo.doorLockUserDetailData != null)
                    {
                        var dataList = getDoorLockInfo.doorLockUserDetailData.UserObjList;
                        foreach (var doorData in dataList)
                        {
                            var localDoorLockObj1 = new ZigBee.Device.DoorLock.LocaDoorLockObj()
                            {
                                UserID = doorData.UserId,
                                UnlockType = doorData.UserType
                            };
                            if ((doorLock.localDoorLockUserList.ContainsKey(localDoorLockObj1.UserID)) == false)
                            {
                                doorLock.localDoorLockUserList.Add(localDoorLockObj1.UserID, localDoorLockObj1);
                            }
                        }
                    }
                }
                catch { }
                finally
                {
                    Application.RunOnMainThread(() =>
                    {
                        CommonPage.Loading.Hide();
                    });
                }
            });
        }
        //从服务器读信息
        void ReadDoorLockServerUserInfo(Shared.Phone.UserCenter.MemberInfoRes curAccountObj)
        {
            System.Threading.Tasks.Task.Run(async () =>
            {
                Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
                try
                {
                    //  读取云端门锁设备中的信息
                    var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };

                    localDoorLockObj.CloudAccountId = curAccountObj.SubAccountDistributedMark;
                    if (doorLock.DeviceAddr != null)
                    {
                        localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
                    }

                    var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("App/GetDoorLockPager", localDoorLockObj);
                    if (getDoorLockInfoList != null)
                    {
                        foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
                        {
                            if (doorLock.localDoorLockUserList.ContainsKey(int.Parse(curDoorLockUser.DoorLockLocalUserId)))
                            {
                                doorLock.localDoorLockUserList.Remove(int.Parse(curDoorLockUser.DoorLockLocalUserId));
                            }
                            var doorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                            doorLockObj.UserID = int.Parse(curDoorLockUser.DoorLockLocalUserId);
                            doorLockObj.UnlockType = curDoorLockUser.OpenLockMode;
                            doorLockObj.PrimaryId = curDoorLockUser.Id;
                            doorLockObj.EntryTime = curDoorLockUser.EntryTime;
                            doorLockObj.UserName = curDoorLockUser.UserIdRemarks;
                            doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId;
                            doorLock.localDoorLockUserList.Add(int.Parse(curDoorLockUser.DoorLockLocalUserId), doorLockObj);
                        }
                    }
                }
                catch { }
                finally
                {
                    Application.RunOnMainThread(() =>
                    {
                        CommonPage.Loading.Hide();
                    });
                }
            });
        }


        /// 构造函数
@@ -180,7 +97,12 @@

        async void MidFrameLayoutContent()
        {
            var SubAccounList = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
            List<Shared.Phone.UserCenter.MemberInfoRes> SubAccounList = null;
            if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
            {
                SubAccounList = await ZigBee.Device.DoorLock.GetSubAccountByDistributedMark();
            }

            var masterAccount = new Shared.Phone.UserCenter.MemberInfoRes();
            masterAccount.Account = Shared.Common.Config.Instance.Account;
            masterAccount.AccountType = Shared.Common.Config.Instance.AccountType;
@@ -188,6 +110,7 @@
            masterAccount.UserName = UserCenterResourse.UserInfo.UserName;
            localAccountList.Add(masterAccount);
            localAccountList.AddRange(SubAccounList);

            var bodyView = new VerticalScrolViewLayout()
            {
            };
@@ -265,13 +188,6 @@
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(masterManagementPage);
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                        masterManagementPage.Show();
                    }
                    else if (currentIndex == 1)
                    {
                        var userDoorLockPage = new UserDoorLockPage(doorLock, currentAccount);
                        Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
                        Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                        userDoorLockPage.Show();
                    }
                    else
                    {