From ef0c6b76b06590b38f6e87d1e4efb35b81374502 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 25 五月 2020 09:49:02 +0800
Subject: [PATCH] 请合并代码，优化逻辑执行提示和撤销门锁定时功能。
---
ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
old mode 100755
new mode 100644
index 7c602f5..85a1f1f
--- a/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp20200519/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -882,7 +882,7 @@
/// <summary>
/// 瀹夐槻鎶ヨ淇℃伅绫�
/// </summary>
- public class SafeguardAlarmInfo: DeviceAlarmInfo
+ public class SafeguardAlarmInfo : DeviceAlarmInfo
{
/// <summary>
/// 涓婃姤绫诲瀷
@@ -1292,6 +1292,10 @@
/// 寮哄埗璺宠浆缃戝叧浜у搧鐣岄潰 1->缃戝叧鍒楄〃寮哄埗璺宠浆
/// </summary>
public int GotoGatewayProductInfoForm = 0;
+ /// <summary>
+ /// 鑷姩鍖栧父寮�鏃堕棿鍙樻洿涓哄垎閽�,鑰屼笉鏄皬鏃� 1->寮哄埗鍙樻洿涓哄垎閽�
+ /// </summary>
+ public int DoorLockNomallyOpenTimeMode = 1;
}
#endregion
@@ -1363,4 +1367,31 @@
}
#endregion
+
+ #region 鈻� 缃戝叧鍥炲鎺ユ敹绫籣_____________________
+
+ /// <summary>
+ /// 缃戝叧鍥炲鎺ユ敹绫�
+ /// </summary>
+ public class ReceiptGatewayResult
+ {
+ /// <summary>
+ /// 閿欒娑堟伅,濡傛灉娌℃湁閿欒,鍒欎负null(缃戝叧瓒呮椂涔熶负null)
+ /// </summary>
+ public string ErrorMsg = null;
+ /// <summary>
+ /// 閿欒娑堟伅鐨勭被鍨� -1:缃戝叧瀵硅薄涓㈠け 0:瓒呮椂缃戝叧娌℃湁鍥炲 1:姝ｅ父
+ /// </summary>
+ public int ErrorMsgDiv = 1;
+ /// <summary>
+ /// 鎺ユ敹鐨勬暟鎹�
+ /// </summary>
+ public string ReceiptData = null;
+ /// <summary>
+ /// 鎺ユ敹鐨勬暟鎹�(澶氫釜杩斿洖涓婚涓撶敤)
+ /// </summary>
+ public string[] listReceiptData = null;
+ }
+
+ #endregion
}
--
Gitblit v1.8.0