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/PirSensor/PirSensorBindTargetSettionForm.cs | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs index 1e676e1..f1f280b 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs @@ -52,7 +52,7 @@ /// <param name="i_iasZone">浼犳劅鍣ㄨ澶�</param> public void ShowForm(IASZone i_iasZone) { - UserView.HomePage.Instance.ScrollEnabled = false; + this.ScrollEnabled = false; deviceIASZone = i_iasZone; //璁剧疆澶撮儴淇℃伅 @@ -606,15 +606,6 @@ #endregion #region 鈻� 涓�鑸柟娉昣__________________________ - - /// <summary> - /// 鐣岄潰鍏抽棴 - /// </summary> - public override void CloseFormBefore() - { - UserView.HomePage.Instance.ScrollEnabled = true; - base.CloseFormBefore(); - } #endregion } -- Gitblit v1.8.0