~xm/HomeApp.git

old mode 100755 new mode 100644

			@@ -22,90 +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 (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);
			}
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
			});
			}
			}
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
			});
			}
			var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
			}
			catch { }
			finally
			{
			Application.RunOnMainThread(() =>
			{
			MidFrameLayoutContent();
			RefreshList();
			CommonPage.Loading.Hide();
			});
			}
			@@ -122,13 +55,20 @@
			EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
			{
			RemoveFromParent();
			this.btnTip.Visible = false;
			};
			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()
			@@ -146,8 +86,8 @@
			Width = Application.GetRealWidth(141 + 100),
			Y = Application.GetRealHeight(35),
			X = Application.GetRealWidth(812 - 100),
			TextAlignment = TextAlignment.Center,
			Text = Language.StringByID(R.MyInternationalizationString.LockMethod),
			TextAlignment = TextAlignment.CenterRight,
			Text = Language.StringByID(R.MyInternationalizationString.AllMethod),
			TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
			TextSize = 12,
			};
			@@ -168,18 +108,33 @@
			SideslipFramelayout();
			};

			bodyView = new VerticalScrolViewLayout()
			var btnLine = new Button
			{
			Y = midTopFrameLayout.Bottom,
			Height = 1,
			BackgroundColor = Shared.Common.ZigbeeColor.Current.XMTitleLine,
			};
			this.midFrameLayout.AddChidren(btnLine);

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

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

			void RefreshList()
			{
			bodyView.RemoveAll();
			var curLocalDoorLockUserList = new Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj>();

			foreach (var curUserId in doorLock.localDoorLockUserList.Keys)
			{
			var curDoorLockUser = doorLock.localDoorLockUserList[curUserId];
			@@ -191,12 +146,19 @@
			{
			continue;
			}
			var RowView = new FrameLayout()
			curLocalDoorLockUserList.Add(curUserId, curDoorLockUser);
			}

			int i = 0;
			foreach (var curUserId in curLocalDoorLockUserList.Keys)
			{
			var curDoorLockUser = curLocalDoorLockUserList[curUserId];
			var rowFrameLayout = new FrameLayout()
			{
			Height = Application.GetRealHeight(161),
			Height = Application.GetRealHeight(127 + 23),
			BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
			};
			bodyView.AddChidren(RowView);
			bodyView.AddChidren(rowFrameLayout);

			var btnDistributeUnlockIconFrameLayout = new FrameLayout()
			{
			@@ -205,7 +167,7 @@
			X = Application.GetRealWidth(58),
			Y = Application.GetRealHeight(43),
			};
			RowView.AddChidren(btnDistributeUnlockIconFrameLayout);
			rowFrameLayout.AddChidren(btnDistributeUnlockIconFrameLayout);

			var btnDistributeUnlockIcon = new Button()
			{
			@@ -224,19 +186,24 @@
			TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
			Gravity = Gravity.CenterVertical,
			};
			RowView.AddChidren(btnText);
			rowFrameLayout.AddChidren(btnText);

			var line2 = new Button()
			{
			Y = RowView.Height - 1,
			Y = rowFrameLayout.Height - 1,
			X = Application.GetRealWidth(58),
			Width = Application.GetRealWidth(965),
			Height = 1,
			BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
			};
			RowView.AddChidren(line2);
			rowFrameLayout.AddChidren(line2);

			#region 数据处理
			int currentIndex = i;
			if (currentIndex == curLocalDoorLockUserList.Keys.Count - 1)
			{
			line2.Visible = false;
			}
			switch (curDoorLockUser.UnlockType)
			{
			case 0:
			@@ -277,9 +244,10 @@
			};
			btnDistributeUnlockIcon.MouseUpEventHandler += eHandler;
			btnDistributeUnlockIconFrameLayout.MouseUpEventHandler += eHandler;
			RowView.MouseUpEventHandler += eHandler;
			rowFrameLayout.MouseUpEventHandler += eHandler;
			btnText.MouseUpEventHandler += eHandler;
			#endregion
			i++;
			}
			}

			@@ -441,7 +409,7 @@
			if (doorLock.IsFreezeAccount[currentAccount.SubAccountDistributedMark] == true)
			{

			new Tip() { MaxWidth = 150, Text = btnUserName.Text + Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
			new Tip() { MaxWidth = 150, Text = btnUserName.Text + Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			return;
			}

			@@ -537,35 +505,42 @@

			addLockInfo.EntryTime = curDoorLockUser.EntryTime;
			var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
			if (result != null && result.StateCode == "Success")
			if (result != null)
			{
			//存账户信息
			//var resultList1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalAccountlist(doorLock, curAccountId);
			//存门锁信息
			var resultList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalDoorLocklist(doorLock, curAccountId);
			var uList = new List<int> { };
			if (resultList != null)
			if (result.StateCode == "Success")
			{
			foreach (var a in resultList.Keys)
			//存门锁信息
			var resultList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalDoorLocklist(doorLock, curAccountId);
			var uList = new List<int> { };
			if (resultList != null)
			{
			uList.Add(a);
			foreach (var a in resultList.Keys)
			{
			uList.Add(a);
			}
			}
			}
			var d = uList.Find((value) => { return value == doorLock.doorLockProgrammingEventNotificationCommand.UserID; });
			if (d != null)
			{
			RefreshList();
			flMain.RemoveFromParent();
			bottomFrameLayout.RemoveAll();
			var d = uList.Find((value) => { return value == curDoorLockUser.UserID; });
			if (d != null)
			{
			RefreshList();
			flMain.RemoveFromParent();
			bottomFrameLayout.RemoveAll();
			}
			else
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			}
			}
			else
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(this.btnTip);
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			flMain.RemoveFromParent();
			bottomFrameLayout.RemoveAll();
			}
			}
			else
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
			flMain.RemoveFromParent();
			bottomFrameLayout.RemoveAll();
			}
			@@ -736,6 +711,9 @@
			void DisplayByType(int unlockMethod)
			{
			bodyView.RemoveAll();

			var curLocalDoorLockUserList = new Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj>();

			foreach (var curUserId in doorLock.localDoorLockUserList.Keys)
			{
			var curDoorLockUser = doorLock.localDoorLockUserList[curUserId];
			@@ -743,12 +721,20 @@
			{
			continue;
			}
			var RowView = new FrameLayout()
			curLocalDoorLockUserList.Add(curUserId, curDoorLockUser);
			}

			int i = 0;
			foreach (var curUserId in curLocalDoorLockUserList.Keys)
			{
			var curDoorLockUser = curLocalDoorLockUserList[curUserId];

			var rowFrameLayout = new FrameLayout()
			{
			Height = Application.GetRealHeight(161),
			Height = Application.GetRealHeight(150),
			BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
			};
			bodyView.AddChidren(RowView);
			bodyView.AddChidren(rowFrameLayout);

			var btnDistributeUnlockIconFrameLayout = new FrameLayout()
			{
			@@ -757,7 +743,7 @@
			X = Application.GetRealWidth(58),
			Y = Application.GetRealHeight(43),
			};
			RowView.AddChidren(btnDistributeUnlockIconFrameLayout);
			rowFrameLayout.AddChidren(btnDistributeUnlockIconFrameLayout);

			var btnDistributeUnlockIcon = new Button()
			{
			@@ -776,19 +762,25 @@
			TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
			Gravity = Gravity.CenterVertical,
			};
			RowView.AddChidren(btnText);
			rowFrameLayout.AddChidren(btnText);

			var line2 = new Button()
			{
			Y = RowView.Height - 1,
			Y = rowFrameLayout.Height - 1,
			X = Application.GetRealWidth(58),
			Width = Application.GetRealWidth(965),
			Height = 1,
			BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
			};
			RowView.AddChidren(line2);
			rowFrameLayout.AddChidren(line2);

			#region 数据处理
			int currentIndex = i;
			if (currentIndex == curLocalDoorLockUserList.Keys.Count - 1)
			{
			line2.Visible = false;
			}

			switch (curDoorLockUser.UnlockType)
			{
			case 0:
			@@ -829,9 +821,10 @@
			};
			btnDistributeUnlockIcon.MouseUpEventHandler += eHandler;
			btnDistributeUnlockIconFrameLayout.MouseUpEventHandler += eHandler;
			RowView.MouseUpEventHandler += eHandler;
			rowFrameLayout.MouseUpEventHandler += eHandler;
			btnText.MouseUpEventHandler += eHandler;
			#endregion
			i++;
			}
			}
			#region ◆ 接口实现__________________________