~wjc/HomeApp.git

			@@ -570,14 +570,15 @@
			if (doorLock.tempPasswordObject != null)
			{
			var addDoorLockTempPasswordData = new ZigBee.Device.DoorLock.AddDoorLockTempPasswordData();
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
			{
			addDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			//☆マーク☆
			//addDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			addDoorLockTempPasswordData.IsOtherAccountCtrl = true;
			}
			//对密码进行加密处理
			string hdlKey = "hD1(La3o";
			var enPsw = UserCenterLogic.EncryptPassword(hdlKey, doorLock.tempPasswordObject.TempPassword);
			var enPsw = HdlCommonLogic.Current.EncryptPassword(hdlKey, doorLock.tempPasswordObject.TempPassword);
			addDoorLockTempPasswordData.TempPwd = enPsw;
			if (doorLock.DeviceAddr != null)
			{
			@@ -597,7 +598,7 @@
			});
			return;
			}
			if (result1.StateCode != "Success")
			if (result1.Code != HttpMessageEnum.A成功)
			{
			Application.RunOnMainThread(() =>
			{
			@@ -708,7 +709,7 @@
			{
			dialog.Close();
			string msg = Language.StringByID(R.MyInternationalizationString.SureToDeleteTempPassword);
			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 += () =>
			@@ -743,9 +744,10 @@
			if (resultData.defaultControlResponseData.status == 0 \|\| resultData.defaultControlResponseData.status == 2)
			{
			var delDoorLockTempPasswordData = new ZigBee.Device.DoorLock.DelDoorLockTempPasswordData();
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
			{
			delDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			//☆マーク☆
			//delDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			delDoorLockTempPasswordData.IsOtherAccountCtrl = true;
			}
			if (doorLock.DeviceAddr != null)
			@@ -755,7 +757,7 @@
			var result1 = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLockPwd", delDoorLockTempPasswordData);
			if (result1 != null)
			{
			if (result1.StateCode == "Success")
			if (result1.Code == HttpMessageEnum.A成功)
			{
			doorLock.tempPasswordObject = null;
			doorLock.LocalTempPassword = "";
			@@ -820,9 +822,10 @@
			try
			{
			var getDoorLockTempPasswordData = new ZigBee.Device.DoorLock.GetDoorLockTempPasswordData();
			if (UserCenterResourse.UserInfo.AuthorityNo != 1)
			if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
			{
			getDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			//☆マーク☆
			//getDoorLockTempPasswordData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
			getDoorLockTempPasswordData.IsOtherAccountCtrl = true;
			}
			if (doorLock.DeviceAddr != null)
			@@ -842,7 +845,7 @@
			tpObj.InValidTime = curDoorLockTempPaw.ValidEndTime;
			//解密密码
			string hdlKey = "hD1(La3o";
			var desPsw = UserCenterLogic.DecryptPassword(hdlKey, curDoorLockTempPaw.TempPwd);
			var desPsw = HdlCommonLogic.Current.DecryptPassword(hdlKey, curDoorLockTempPaw.TempPwd);
			doorLock.LocalTempPassword = tpObj.TempPassword = desPsw;
			doorLock.tempPasswordObject = tpObj;
			TimeDateData(doorLock.tempPasswordObject.ValidTime, doorLock.tempPasswordObject.InValidTime);
			@@ -930,20 +933,39 @@
			if (isDefaultTime)
			{
			var cur = DateTime.Now;
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour = cur.Hour;
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateHour = cur.Hour;
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMinute = cur.Minute;
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMinute = cur.Minute;
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateSecond = cur.Second;
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateSecond = cur.Second;
			DoorLockCommonInfo.ValidDateHour = cur.Hour;
			DoorLockCommonInfo.ValidDateMinute = cur.Minute;
			DoorLockCommonInfo.ValidDateSecond = cur.Second;
			DoorLockCommonInfo.InValidDateHour = cur.Hour;
			DoorLockCommonInfo.InValidDateMinute = cur.Minute;
			DoorLockCommonInfo.InValidDateSecond = cur.Second;
			DoorLockCommonInfo.ValidDateYear = cur.Year;
			DoorLockCommonInfo.ValidDateMonth = cur.Month;
			DoorLockCommonInfo.ValidDateDay = cur.Day;

			var InValidTime = cur.AddDays(1);
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateYear = cur.Year;
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateYear = InValidTime.Year;
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMonth = cur.Month;
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth = InValidTime.Month;
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateDay = cur.Day;
			Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateDay = InValidTime.Day;
			var curD = DoorLockCommonInfo.LastDayOfMonth(cur);
			if (DoorLockCommonInfo.ValidDateDay == curD.Day)
			{
			if (DoorLockCommonInfo.ValidDateMonth == 12)
			{
			DoorLockCommonInfo.InValidDateYear = cur.Year + 1;
			DoorLockCommonInfo.InValidDateMonth = 1;
			DoorLockCommonInfo.InValidDateDay = 1;
			}
			else
			{
			DoorLockCommonInfo.InValidDateYear = cur.Year;
			DoorLockCommonInfo.InValidDateMonth = cur.Month + 1;
			DoorLockCommonInfo.InValidDateDay = 1;
			}
			}
			else
			{
			DoorLockCommonInfo.InValidDateYear = cur.Year;
			DoorLockCommonInfo.InValidDateMonth = cur.Month;
			DoorLockCommonInfo.InValidDateDay = cur.Day + 1;
			}

			//doorLock.ReSave();
			}
			if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour < 10)