新版本

黄学彪

2020-07-29 8ce0f9b1e568dd9125e74421cd02fbc29381c1f1

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

@@ -118,7 +118,7 @@
            //如果当前是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return ModelData.DeviceModelDataLogic.Current.GetPanelColorInfo(device, keyNum);

                return TemplateData.TemplateDeviceDataLogic.Current.GetPanelColorInfo(device, keyNum);

            }

            //发送数据 keyNum转为16进制 范围：01~10

            var passData = "0504040101" + Convert.ToString((int)keyNum, 16).ToUpper().PadLeft(2, '0');

@@ -215,7 +215,7 @@
            //如果当前是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return ModelData.DeviceModelDataLogic.Current.SetPanelColorInfo(device, keyColorData, keyNumStatus, "ZbDataPassthrough");

                return TemplateData.TemplateDeviceDataLogic.Current.SetPanelColorInfo(device, keyColorData, keyNumStatus, null);

            }

            //获取配置按键指示灯颜色的命令字符

            var sendData = this.GetPanelColorCommandText(device.DeviceAddr, keyColorData, keyNumStatus);

@@ -228,6 +228,10 @@
            var tempD = new CommonDevice.ResponseData();

            tempD.command = data[12].ToString() + data[13].ToString() + data[10].ToString() + data[11].ToString();

            tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);



            //添加缓存

            TemplateData.TemplateDeviceDataLogic.Current.SetPanelColorInfo(device, keyColorData, keyNumStatus, result.JsonData[0]);



            return new CommonDevice.ResponseAllData { responseData = tempD };

        }



@@ -386,7 +390,7 @@
            //如果当前是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return ModelData.DeviceModelDataLogic.Current.GetDeviceLightSettion(device);

                return TemplateData.TemplateDeviceDataLogic.Current.GetDeviceLightSettion(device);

            }

            //获取发送的命令字符

            var passData = "050604010101";

@@ -422,7 +426,7 @@
            //如果当前是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return ModelData.DeviceModelDataLogic.Current.SetDeviceLightSettion(device, directionsLevel, backlightLevel, "ZbDataPassthrough");

                return TemplateData.TemplateDeviceDataLogic.Current.SetDeviceLightSettion(device, directionsLevel, backlightLevel, null);

            }

            //获取修改面板的亮度调节的命令字符

            var sendData = this.GetPanelLevelCommadText(device.DeviceAddr, directionsLevel, backlightLevel);

@@ -456,7 +460,7 @@
            }



            //修改缓存

            ModelData.DeviceModelDataLogic.Current.SetDeviceLightSettion(device, directionsLevel, backlightLevel, "ZbDataPassthrough");

            TemplateData.TemplateDeviceDataLogic.Current.SetDeviceLightSettion(device, directionsLevel, backlightLevel, result.JsonData[0]);



            return true;

        }

@@ -611,7 +615,7 @@
            //如果当前住宅是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return ModelData.DeviceModelDataLogic.Current.GetDeviceEnergyConservationMode(device);

                return TemplateData.TemplateDeviceDataLogic.Current.GetDeviceEnergyConservationMode(device);

            }

            //发送命令

            string passData = "050804010101";

@@ -677,7 +681,7 @@
            //如果当前是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return ModelData.DeviceModelDataLogic.Current.SetDeviceEnergyConservationMode(device, modeEnable, modeTime, level, "ZbDataPassthrough");

                return TemplateData.TemplateDeviceDataLogic.Current.SetDeviceEnergyConservationMode(device, modeEnable, modeTime, level, null);

            }

            //获取设置设备的节能模式的命令字符

            var sendData = this.GetDeviceEnergyConservationModeCommandText(device.DeviceAddr, modeEnable, modeTime, level);

@@ -707,7 +711,7 @@
            }



            //修改缓存

            ModelData.DeviceModelDataLogic.Current.SetDeviceEnergyConservationMode(device, modeEnable, modeTime, level, "ZbDataPassthrough");

            TemplateData.TemplateDeviceDataLogic.Current.SetDeviceEnergyConservationMode(device, modeEnable, modeTime, level, result.JsonData[0]);



            return true;

        }

@@ -1048,7 +1052,7 @@
            //如果是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return ModelData.DeviceModelDataLogic.Current.GetPanelVibrationInfo(device);

                return TemplateData.TemplateDeviceDataLogic.Current.GetPanelVibrationInfo(device);

            }

            //发送数据

            var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", 200 }, { "Cluster_ID", 64513 }, { "Command", 0 } };

@@ -1083,7 +1087,7 @@
            //如果是虚拟住宅

            if (Common.Config.Instance.Home.IsVirtually == true)

            {

                return ModelData.DeviceModelDataLogic.Current.SetPanelVibrationInfo(device, datainfo, "ClientDataPassthrough");

                return TemplateData.TemplateDeviceDataLogic.Current.SetPanelVibrationInfo(device, datainfo, null);

            }

            //获取编辑面板震动功能的命令字符

            var sendData = this.GetPanelVibrationCommandText(device.DeviceAddr, datainfo);

@@ -1096,6 +1100,9 @@
                this.ShowTipMsg(errorMsg);

                return false;

            }

            //添加缓存

            TemplateData.TemplateDeviceDataLogic.Current.SetPanelVibrationInfo(device, datainfo, result.JsonData[0]);



            return true;

        }



@@ -1258,7 +1265,6 @@
        private void LoadDryContactFunctionFromLocaltion()

        {

            this.dicDryContactFunction = new Dictionary<string, DryContactFunctionInfo>();



            byte[] filebyte = HdlFileLogic.Current.ReadFileByteContent(DirNameResourse.DryContactFunctionFile);

            if (filebyte == null)

            {