2020-12-29-1

陈嘉乐

2020-12-29 71c7ad13169695913282962a460858e13b6c0969

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

@@ -662,10 +662,10 @@
            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 = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);

               if (result == null)

               {

                   return null;

               string result = UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
               if (result == null)
               {
                   return null;
               }
               var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Shared.Phone.UserCenter.MemberInfoRes>>(result);
               return listInfo;
@@ -934,9 +934,9 @@
            /// Unlock命令：error,invalid schedule事件
            /// </summary>
            UnlockInvalidScheduleEvent = 6,
        }

        }
        #endregion



        #region 门锁编程事件通知
        /// <summary>
        /// 门锁编程事件通知
@@ -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>
@@ -1118,7 +1118,7 @@
                            result = new DefaultControlResponseAllData { errorMessageBase = "网关返回的数据为空" };
                        }
                        else
                        {

                        {
                            if (clientDataPassthroughResponseData?.PassData != null)
                            {
                                var data = clientDataPassthroughResponseData.PassData;