~wjc/HomeApp.git

			@@ -33,7 +33,7 @@
			/// 构造函数
			/// </summary>
			/// <param name="doorLock"></param>
			public UnLockMethod(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes accountObj)
			public UnLockMethod(ZigBee.Device.DoorLock doorLock, MemberInfoRes accountObj)
			{
			this.doorLock = doorLock;
			this.curAccountObj = accountObj;
			@@ -56,7 +56,7 @@
			/// <summary>
			/// 当前账户
			/// </summary>
			Shared.Phone.UserCenter.MemberInfoRes curAccountObj;
			MemberInfoRes curAccountObj;
			/// <summary>
			/// 数据为空，UI显示的空图片
			/// </summary>
			@@ -88,15 +88,16 @@
			{
			try
			{
			var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
			if (doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] == true)
			{
			//数据如果在门锁上面是空的时候，数据也是没有的
			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);
			//if (doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] == true)
			//{
			// //数据如果在门锁上面是空的时候，数据也是没有的
			// Application.RunOnMainThread(() =>
			// {
			// new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			// });
			//}
			}
			catch { }
			finally
			@@ -112,8 +113,8 @@
			});
			}

			/// <summary>
			/// UI显示
			/// <summary>
			/// UI显示
			/// </summary>
			public void Show()
			{
			@@ -144,25 +145,26 @@
			UnSelectedImagePath = "DoorLock/AddIcon.png",
			};
			btnAddFrameLayout.AddChidren(btnAdd);
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
			{
			btnAdd.Width = 0;
			}
			btnAdd.MouseDownEventHandler += (sender, e) =>
			{
			if (doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] == true)
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			}
			else
			{
			var addUnLockMethod = new Shared.Phone.UserCenter.DoorLock.AddUnLockMethod(doorLock, curAccountObj);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(addUnLockMethod);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			addUnLockMethod.Show();
			}
			//☆マーク☆
			//if (doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] == true)
			//{
			// new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			//}
			//else
			//{
			// var addUnLockMethod = new Shared.Phone.UserCenter.DoorLock.AddUnLockMethod(doorLock, curAccountObj);
			// Shared.Phone.UserView.HomePage.Instance.AddChidren(addUnLockMethod);
			// Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			// addUnLockMethod.Show();
			//}
			};
			if (UserCenterResourse.UserInfo.AuthorityNo == 3)
			if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 3)
			{
			btnAddFrameLayout.Width = 0;
			}
			@@ -172,15 +174,16 @@
			}

			MidFrameLayoutContent();
			if (doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] == true)
			{
			CommonPage.Loading.Start("Loading...");
			ReadDoorLockUserInfo();
			}
			else
			{
			RefreshList();
			}
			//☆マーク☆
			//if (doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] == true)
			//{
			// CommonPage.Loading.Start("Loading...");
			// ReadDoorLockUserInfo();
			//}
			//else
			//{
			// RefreshList();
			//}
			}

			/// <summary>
			@@ -288,6 +291,7 @@
			Width = Application.GetRealHeight(757),
			Visible = false,
			UnSelectedImagePath = "DoorLock/UnLockBlankPic.png",
			Gravity = Gravity.CenterHorizontal,
			};
			blankFrameLayout.AddChidren(entryStatusPic);

			@@ -314,9 +318,9 @@
			TextSize = 12,
			};
			blankFrameLayout.AddChidren(btnPicTip1);
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
			{
			btnPicTip1.Width = 0;
			btnPicTip1.Width = 0;
			}
			}

			@@ -334,15 +338,15 @@
			foreach (var curUserId in doorLock.localDoorLockUserList.Keys)
			{
			var curDoorLockUser = doorLock.localDoorLockUserList[curUserId];

			if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) \|\| curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
			{
			continue;
			}
			else
			{
			curAccountDoorLockUserList.Add(curDoorLockUser.UserID, curDoorLockUser);
			}
			//☆マーク☆
			//if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) \|\| curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
			//{
			// continue;
			//}
			//else
			//{
			// curAccountDoorLockUserList.Add(curDoorLockUser.UserID, curDoorLockUser);
			//}
			}

			if (curAccountDoorLockUserList.Count == 0)
			@@ -405,15 +409,8 @@
			var btnicon = rowFrameLayout.frameTable.AddLeftIcon();
			btnicon.UnSelectedImagePath = "DoorLock/DoorLockUserPic.png";
			//上面门锁用户名称一行
			var memberText = "";
			if (string.IsNullOrEmpty(curAccountObj.UserName))
			{
			memberText = curAccountObj.Account;
			}
			else
			{
			memberText = curAccountObj.UserName;
			}
			var memberText = curAccountObj.ShowName;

			//成员一行
			var btnaa = rowFrameLayout.frameTable.AddBottomView(memberText, 800);
			var btnDoorlockUser = new EditText()
			@@ -433,7 +430,7 @@
			btndelete.ButtonClickEvent += (sender, e) =>
			{
			string msg = Language.StringByID(R.MyInternationalizationString.SureToDelUnlockMethod);
			var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
			var alert = new ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
			alert.Show();
			//使用确认型弹框时,的回调函数
			alert.ConfirmClickEvent += async () =>
			@@ -448,9 +445,10 @@
			if (resultData.defaultControlResponseData.status == 0 \|\| resultData.defaultControlResponseData.status == 2)
			{
			var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
			{
			deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			//☆マーク☆
			//deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			deleteDoorLockData.IsOtherAccountCtrl = true;
			}
			if (doorLock.DeviceAddr != null)
			@@ -463,7 +461,7 @@
			var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
			if (result != null)
			{
			if (result.StateCode == "Success")
			if (result.Code == HttpMessageEnum.A成功)
			{
			isSecondDel = false;
			if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
			@@ -493,9 +491,10 @@
			if (isSecondDel)
			{
			var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
			{
			deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			//☆マーク☆
			//deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			deleteDoorLockData.IsOtherAccountCtrl = true;
			}
			if (doorLock.DeviceAddr != null)
			@@ -508,7 +507,7 @@
			var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
			if (result != null)
			{
			if (result.StateCode == "Success")
			if (result.Code == HttpMessageEnum.A成功)
			{
			isSecondDel = false;
			if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
			@@ -603,9 +602,10 @@
			Action<Shared.View> action = async (obj) =>
			{
			var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
			{
			refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			//☆マーク☆
			//refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			refreshDoorLockData.IsOtherAccountCtrl = true;
			}
			if (doorLock.DeviceAddr != null)
			@@ -619,7 +619,7 @@
			var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
			if (result != null)
			{
			if (result.StateCode == "Success")
			if (result.Code == HttpMessageEnum.A成功)
			{
			if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
			{
			@@ -627,9 +627,11 @@
			var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
			localDoorLockObj.UserID = curDoorLockUser.UserID;
			localDoorLockObj.UnlockType = curDoorLockUser.UnlockType;
			localDoorLockObj.PrimaryId = curDoorLockUser.PrimaryId;
			localDoorLockObj.EntryTime = curDoorLockUser.EntryTime;
			localDoorLockObj.UserName = refreshDoorLockData.UserIdRemarks;
			localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark;
			//☆マーク☆
			//localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark;
			doorLock.localDoorLockUserList.Add(curDoorLockUser.UserID, localDoorLockObj);
			TypeRefresh();
			}