~xm/HomeApp.git

old mode 100755 new mode 100644

			@@ -14,7 +14,6 @@
			#region ◆ 变量申明__________________________
			public FrameLayout topFrameLayout = new FrameLayout { Height = Application.GetRealHeight(184), BackgroundColor = ZigbeeColor.Current.XMTopFrameLayout };
			public FrameLayout midFrameLayout = new FrameLayout { Height = Application.GetRealHeight(1921 - 184), BackgroundColor = ZigbeeColor.Current.XMMidFrameLayout };

			#region ◆ 底部有圆角布局__________________________
			public FrameLayout shadowRadiusFrameLayout = new FrameLayout { BackgroundColor = 0x0f000000 };
			public FrameLayout bottomRadiusFrameLayout1 = new FrameLayout()
			@@ -70,6 +69,16 @@
			};
			#endregion

			/// <summary>
			/// ◆ 中部刷新布局__________________________
			/// </summary>
			//public VerticalRefreshLayout midVerticalScrolViewLayout = new VerticalRefreshLayout()
			//{
			//};

			/// <summary>
			/// ◆ 标题栏布局__________________________
			/// </summary>
			public FrameLayout titleFrameLayout = new FrameLayout
			{
			Y = Application.GetRealHeight(92),
			@@ -97,7 +106,7 @@
			Y = Application.GetRealHeight(98),
			UnSelectedImagePath = "DoorLock/Left.png",
			};


			/// <summary>
			/// 标题下线
			/// </summary>
			@@ -107,6 +116,7 @@
			Height = 1,
			BackgroundColor = Shared.Common.ZigbeeColor.Current.XMTitleLine,
			};


			/// <summary>
			/// 弹窗取消按键
			@@ -144,7 +154,6 @@
			};
			titleFrameLayout.AddChidren(title);
			btnBackFrameLayout.AddChidren(btnBack);
			//this.midFrameLayout.AddChidren(this.btnTip);
			}
			/// <summary>
			/// 门锁中部布局
			@@ -402,7 +411,7 @@
			/// <param name="action">二次验证的结果成功后的通知</param>
			/// <param name="progressButton">门锁开或关时进度显示</param>
			/// <param name="btnDoorLockPic">门锁图片开/关显示</param>
			public void RemoteUnlockRequest(ZigBee.Device.DoorLock doorLock, Action action, Button progressButton = null, Button btnDoorLockPic = null, Button btnStatus = null)
			public void RemoteUnlockRequest(ZigBee.Device.DoorLock doorLock, Action action, Button progressButton = null, Button btnDoorLockPic = null, Button btnStatus = null, Button btnDoorLockTitle = null)
			{
			if (doorLock.RemoteUnlockPassword == "")
			{
			@@ -425,18 +434,41 @@
			{
			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			{
			var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
			var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			userDoorLockPage.Show();
			functionSetting.Show();
			functionSetting.devicNameAction += (deviceRename) =>
			{
			if (!string.IsNullOrEmpty(deviceRename))
			{
			if (btnDoorLockTitle != null)
			{
			btnDoorLockTitle.Text = deviceRename;
			}
			}
			};
			dialog.Close();
			}
			else
			{
			var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
			var functionSettingSub = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSettingSub);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			userDoorLockPage.Show();
			functionSettingSub.Show();
			functionSettingSub.devicNameAction += (deviceRename) =>
			{
			if (!string.IsNullOrEmpty(deviceRename))
			{
			if (!string.IsNullOrEmpty(deviceRename))
			{
			if (btnDoorLockTitle != null)
			{
			btnDoorLockTitle.Text = deviceRename;
			}
			}
			}
			};
			dialog.Close();
			}
			};
			@@ -622,18 +654,40 @@

			if (UserCenterResourse.UserInfo.AuthorityNo == 1)
			{
			var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
			var functionSetting = new Shared.Phone.UserCenter.DoorLock.FunctionSetting(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSetting);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			userDoorLockPage.Show();

			functionSetting.Show();
			functionSetting.devicNameAction += (deviceRename) =>
			{
			if (!string.IsNullOrEmpty(deviceRename))
			{
			if (btnDoorLockTitle != null)
			{
			btnDoorLockTitle.Text = deviceRename;
			}
			}
			};
			}
			else
			{
			var userDoorLockPage = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(userDoorLockPage);
			var functionSettingSub = new Shared.Phone.UserCenter.DoorLock.FunctionSettingSub(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(functionSettingSub);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			userDoorLockPage.Show();
			functionSettingSub.Show();
			functionSettingSub.devicNameAction += (deviceRename) =>
			{
			if (!string.IsNullOrEmpty(deviceRename))
			{
			if (!string.IsNullOrEmpty(deviceRename))
			{
			if (btnDoorLockTitle != null)
			{
			btnDoorLockTitle.Text = deviceRename;
			}
			}
			}
			};
			}
			}
			}
			@@ -675,5 +729,7 @@
			dialog3.Close();
			};
			}
			// 获取到到名称更改回调通知
			public Action<string> devicNameSecAction;
			}
			}