合并代码

xm

2020-04-22 dfa6733793434bdcfd394f978ae72f1628b2260f

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceDoorLockLogic.cs

@@ -88,7 +88,7 @@
            var pra2 = new AddDoorPra();

            pra2.LoginAccessToken = UserCenterLogic.GetConnectMainToken();

            pra2.DoorLockId = i_doorLock.DeviceAddr + "_" + i_doorLock.DeviceEpoint;

            var result2 = await UserCenterLogic.GetResponseDataByRequestHttps("DoorLock/AddDoorLock", true, pra, listCheck);

            var result2 = await UserCenterLogic.GetResponseDataByRequestHttps("DoorLock/AddDoorLock", true, pra2, listCheck);

            //云端是直接返回创建的主键字符串

            return result2;

        }

@@ -122,6 +122,10 @@
            /// 常开持续时间(1~72小时 OtherOpenLockMode=9003的时候有效)

            /// </summary>

            public string NormallyOpenContinuedTime = string.Empty;

            /// <summary>

            /// 开锁时间(历史记录的时间From-To检索的对象)

            /// </summary>

            public string UnlockTime = DateTime.UtcNow.ToString();

        }



        /// <summary>

@@ -184,6 +188,10 @@
            /// 其他开锁方式 固定9000

            /// </summary>

            public int OpenLockMode = 9000;

            /// <summary>

            ///  录入时间

            /// </summary>

            public string EntryTime = DateTime.Now.ToString();

        }



        /// <summary>