上传版本

黄学彪

2020-04-29 b68cdc7e103a00d5df73e4b75603be8da1815b4a

 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>
        /// 是否常开模式[当数据获取失败，返回空] 
        /// 是否常开模式【key = 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
                {