~xm/HomeApp.git

old mode 100755 new mode 100644

			@@ -22,116 +22,23 @@
			FrameLayout bottomFrameLayout;
			string currentType = string.Empty;
			List<Shared.Phone.UserCenter.MemberInfoRes> localAccountList;
			VerticalScrolViewLayout bodyView;
			VerticalRefreshLayout bodyView;
			#endregion

			void ReadDoorLockUserInfo()
			{
			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);
			}
			}

			// 读取云端门锁设备中的信息
			var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };

			foreach (var curAccountObj in doorLock.localAllAccountList)
			{
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			{
			localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			localDoorLockObj.IsOtherAccountCtrl = true;
			}
			localDoorLockObj.CloudAccountId = curAccountObj.SubAccountDistributedMark;
			if (doorLock.DeviceAddr != null)
			{
			localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			}
			var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj);
			if (getDoorLockInfoList != null)
			{
			foreach (var curDoorLockUser in getDoorLockInfoList.PageData)
			{
			if (curDoorLockUser.DoorLockLocalUserId == null \|\| curDoorLockUser.DoorLockLocalUserId == "")
			{
			continue;
			}
			if (doorLock.localDoorLockUserList.ContainsKey(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[int.Parse(curDoorLockUser.DoorLockLocalUserId)] = doorLockObj;
			}
			else
			{
			if (curDoorLockUser.DoorLockLocalUserId != null)
			{
			//门锁中没有，云端有用户ID，后台删除云端这些ID
			var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			{
			deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			deleteDoorLockData.IsOtherAccountCtrl = true;
			}
			if (doorLock.DeviceAddr != null)
			{
			deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
			}
			deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.DoorLockLocalUserId;
			deleteDoorLockData.PrimaryId = curDoorLockUser.Id;
			deleteDoorLockData.DelDoorLockDelType = 2;
			var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
			int i = 0;
			}
			}
			}
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			return;
			});
			}
			}
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			});
			}
			var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
			}
			catch { }
			finally
			{
			Application.RunOnMainThread(() =>
			{
			MidFrameLayoutContent();
			RefreshList();
			CommonPage.Loading.Hide();
			});
			}
			@@ -148,12 +55,20 @@
			EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
			{
			RemoveFromParent();
			};
			};
			this.btnBack.MouseUpEventHandler += eHandlerBack;
			this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
			this.MidFrameLayout(this);

			ReadDoorLockUserInfo();
			MidFrameLayoutContent();
			if (doorLock.localDoorLockUserList.Count == 0)
			{
			CommonPage.Loading.Start("Loading...");
			ReadDoorLockUserInfo();
			}
			else
			{
			RefreshList();
			}
			}

			public void MidFrameLayoutContent()
			@@ -201,14 +116,18 @@
			};
			this.midFrameLayout.AddChidren(btnLine);

			bodyView = new VerticalScrolViewLayout()
			bodyView = new VerticalRefreshLayout()
			{
			Y = midTopFrameLayout.Bottom,
			Y = btnLine.Bottom,
			Height = Application.GetRealHeight(1921 - 184 - 115 - 1),
			};
			this.midFrameLayout.AddChidren(bodyView);

			RefreshList();
			bodyView.BeginHeaderRefreshingAction += () =>
			{
			bodyView.BeginHeaderRefreshing();
			ReadDoorLockUserInfo();
			bodyView.EndHeaderRefreshing();
			};
			}

			void RefreshList()