From dfd3bdc07c49fab66b38382e0bbe7c91bdf4f15b Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 28 四月 2020 15:03:43 +0800
Subject: [PATCH] 合并新代码,提供逻辑需要的门锁接口

---
 ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
old mode 100755
new mode 100644
index 9631854..a8c383d
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
@@ -13,8 +13,7 @@
     /// </summary>
     public class DeviceAcDetailCardForm : DeviceDetailCardCommonForm
     {
-        #region 鈻� 鍙橀噺澹版槑___________________________
-
+        #region 鈻� 鍙橀噺澹版槑___________________________ 
         /// <summary>
         /// 鐣岄潰涓婂彲浠ユ搷浣滅殑鎺т欢
         /// </summary>
@@ -67,7 +66,7 @@
         public override void InitMiddleFrameAfter(FrameLayout frameWhiteBack)
         {
             //宸︽粦涓嶈兘
-            this.ScrollEnabled = false;
+            this.ScrollEnabled = true;
             this.deviceAc = (AC)this.device;
             //鍏堟竻绌�
             this.listControl = new List<ButtonBase>();

--
Gitblit v1.8.0