wxr
2024-09-24 691dbe24f5724f153e07947c7b75bdfea5f0b6d5
HDL_ON/DAL/DriverLayer/Control.cs
@@ -276,8 +276,8 @@
        public void SearchLoaclGateway()
        {
            //2021-01-15 : 住宅没有绑定网关的时候不用搜索,并且不能链接mqtt
            if (DB_ResidenceData.Instance.HomeGateway == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.gatewayId) ||
                    !UserInfo.Current.IsLogin)
            if (DB_ResidenceData.Instance.HomeGateway == null || string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.gatewayId))
                //|| !UserInfo.Current.IsLogin)
            {
                return;
            }
@@ -444,7 +444,7 @@
            //如果是控制调光的开时,亮度值不能为0
            if (commandDictionary.Count > 2)
            if (commandDictionary.Count >= 2)
            {
                if (commandDictionary.ContainsKey(FunctionAttributeKey.OnOff) && commandDictionary.ContainsKey(FunctionAttributeKey.Brightness))
                {
@@ -978,10 +978,10 @@
        /// <returns></returns>
        public void ConvertReceiveData(byte[] receiveBytes, string ip)
        {
            if (!UserInfo.Current.IsLogin)
            {
                return;
            }
            //if (!UserInfo.Current.IsLogin)
            //{
            //    return;
            //}
            var reString = Encoding.UTF8.GetString(receiveBytes);
            AnalysisReceiveData(reString, receiveBytes, ip);
        }
@@ -1363,6 +1363,9 @@
                                AcstParentPage.UpdateAcstSubInfo(localFunction);
                                WaterHeaterJinmaoPage.UpdateStatus();
                                break;
                            case SPK.InverterJinmao:
                                InverterJinmaoPage.UpdateStatus(localFunction);
                                break;
                            case SPK.AirSwitch:
                                AirSwitchPage.UpdataState(localFunction);
                                if (localFunction.GetAttribute(FunctionAttributeKey.Power) != null)//如果是带电量的空开也要更新能源界面