From b68cdc7e103a00d5df73e4b75603be8da1815b4a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 29 四月 2020 13:59:52 +0800
Subject: [PATCH] 上传版本
---
ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs | 37 ++++++++++++++++---------------------
1 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
index 90476ec..944cd49 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
@@ -36,7 +36,8 @@
//鏈湴鎵�鏈夎处鎴峰垪琛�
public List<Shared.Phone.UserCenter.MemberInfoRes> localAllAccountList = new List<Shared.Phone.UserCenter.MemberInfoRes> { };
/// <summary>
- /// 鏄惁甯稿紑妯″紡[褰撴暟鎹幏鍙栧け璐ワ紝杩斿洖绌篯
+ /// 鏄惁甯稿紑妯″紡銆恔ey = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint銆�
+ /// ture:甯稿紑锛� false:鍏抽棴
/// </summary>
public Dictionary<string, bool> IsDoorLockNormallyMode = new Dictionary<string, bool> { };//鏄惁鍐荤粨瀛愯处鎴�
public string LocalTempPassword = string.Empty;//鏈湴鐢熸垚鐨勪复鏃跺瘑鐮�
@@ -983,8 +984,8 @@
/// <summary>
/// 鐭闂ㄩ攣鏃堕棿
/// </summary>
- /// <returns>The writable value async.</returns>
- /// <param name="timestamp">鐭闂ㄩ攣鐨勬椂闂�</param>
+ /// <param name="timestamp"></param>
+ /// <returns></returns>
public async System.Threading.Tasks.Task<SetWritableValueResponAllData> RectifyDoorLockTimeAsync(int timestamp)
{
if (Gateway == null)
@@ -2408,7 +2409,7 @@
{
var tempD = new VolumeResponseData();
tempD.command = data[10].ToString() + data[11].ToString();
- tempD.value = Convert.ToInt32(data[13].ToString(), 16);
+ tempD.value = Convert.ToInt32(data[12].ToString() + data[13].ToString(), 16);
result = new VolumeResponseAllData { volumeResponseData = tempD };
DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0456_{ topic}");
}
@@ -2455,10 +2456,7 @@
///<summary >
///闊抽噺
///<para>鍛戒护鍊�: comandValue</para>
- ///<para>comandValue: 0 闈欓煶</para>
- ///<para>comandValue:1 鏈�灏忛煶閲�</para>
- ///<para>comandValue:2~13 闊抽噺 </para>
- ///<para>comandValue:14 鏈�澶ч煶閲�</para>
+ ///<para>comandValue: 0-0x64 闊抽噺</para>
/// </summary>
public async System.Threading.Tasks.Task<DefaultControlResponseAllData> SetVolumeAsync(int comandValue)
{
@@ -2560,10 +2558,7 @@
/// <summary>
/// 闊抽噺鍙戦�佹暟鎹�
- ///<para>comandValue: 0 闈欓煶</para>
- ///<para>comandValue:1 鏈�灏忛煶閲�</para>
- ///<para>comandValue:2~13 闊抽噺 </para>
- ///<para>comandValue:14 鏈�澶ч煶閲�</para>
+ ///<para>comandValue: 0-100 闊抽噺</para>
/// </summary>
public string VolumeData(int comandValue)
{
@@ -2578,16 +2573,16 @@
{
if (comandValue >= 1)
{
- //comandValue = comandValue * 100;
- //float v = (float)100 / 15;
- //int vv = Convert.ToInt32(v * 100);
- //var comandValueTemp = comandValue / vv;
- //if (comandValueTemp == 0)
- //{
- // comandValueTemp = 1;
- //}
cValue = Convert.ToString(comandValue, 16).ToUpper();
- cValue = "F" + cValue;
+ if (cValue.Length == 1)
+ {
+ cValue = "0" + cValue;
+ }
+ else
+ {
+ cValue = cValue;
+ }
+
}
else
{
--
Gitblit v1.8.0