请合并代码，完成晾衣架最终功能。

xm

2020-12-14 d6fb0646531172f23648441c224cdcccd721b894

 ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs

old mode 100755
new mode 100644
@@ -628,11 +628,11 @@
                //访问接口
                if (UserCenterResourse.UserInfo.AuthorityNo == 1)
                {
                    result1 = await CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync(RequestName, byteData);
                    result1 = CommonPage.Instance.RequestHttpsZigbeeBytesResultAsync(RequestName, byteData);
                }
                else
                {
                    result1 = await CommonPage.Instance.RequestZigbeeHttpsByAdmin(RequestName, byteData);
                    result1 = CommonPage.Instance.RequestZigbeeHttpsByAdmin(RequestName, byteData);
                }
                if (result1 != null)
                {
@@ -662,7 +662,7 @@
            return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<List<Shared.Phone.UserCenter.MemberInfoRes>>>)(async () =>
           {
               var pra = new Shared.Phone.UserCenter.MemberListInfoPra();
               string result = await UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);

               string result = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);

               if (result == null)

               {

                   return null;

@@ -965,7 +965,7 @@
            /// <summary>
            /// 编程事件触发源
            /// 常用：
            /// 0:Keypad(键盘/密码)；3:RFID(射频卡)；15:指纹
            /// 0:Keypad(键盘/密码)；3:RFID(射频卡)；15:指纹 58：face  59：静脉
            ///不常用：
            /// 1:RF(Zigbee无线)；2:Manual(手动)；255:Indeterminate(不确定)
            /// </summary>