From c0021397eeb8335d6d1f20990c71533c3d94e7af Mon Sep 17 00:00:00 2001 From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local> Date: 星期五, 10 一月 2020 17:02:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into DEV_GXC --- ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs index f67c9ad..8e4e596 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs @@ -43,7 +43,7 @@ /// </summary> public void ShowForm(string i_deviceMac) { - UserView.HomePage.Instance.ScrollEnabled = false; + this.ScrollEnabled = false; this.deviceMac = i_deviceMac; this.listDevice = Common.LocalDevice.Current.GetDevicesByMac(i_deviceMac); @@ -386,20 +386,6 @@ this.CloseProgressBar(); return true; - } - - #endregion - - #region 鈻� 鐣岄潰鍏抽棴___________________________ - - /// <summary> - /// 鐣岄潰鍏抽棴 - /// </summary> - public override void CloseFormBefore() - { - UserView.HomePage.Instance.ScrollEnabled = true; - - base.CloseFormBefore(); } #endregion -- Gitblit v1.8.0