From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs
index ff6ea94..c88369a 100755
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs
+++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs
@@ -244,7 +244,7 @@
/// <returns></returns>
public BindObj.AddedDeviceBindResponseAllData AddDeviceBindList(BindObj.AddBindData addBindData, string receiveResult)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(addBindData.DeviceAddr, addBindData.Epoint);
+ var device = Common.LocalDevice.Current.GetDevice(addBindData.DeviceAddr, addBindData.Epoint);
//鑾峰彇瀵硅薄
var classData = new ModelDeviceBindData();
var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
@@ -341,7 +341,7 @@
/// <returns></returns>
public BindObj.DelDeviceBindResponseAllData DeleteDeviceBindList(BindObj.DelDeviceBindData delDeviceBindData)
{
- var device = HdlDeviceCommonLogic.Current.GetDevice(delDeviceBindData.DeviceAddr, delDeviceBindData.Epoint);
+ var device = Common.LocalDevice.Current.GetDevice(delDeviceBindData.DeviceAddr, delDeviceBindData.Epoint);
//鑾峰彇瀵硅薄
var classData = new ModelDeviceBindData();
var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
@@ -399,7 +399,7 @@
/// <returns></returns>
public BindObj.ClearBindInfoResponseAllData ClearDeviceAllBind(CommonDevice device)
{
- string mainkey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
+ string mainkey = Common.LocalDevice.Current.GetDeviceMainKeys(device);
if (TemplateCommonLogic.Current.modelData.dicDeviceTemplateData.ContainsKey(mainkey) == true)
{
//绉婚櫎鍏ㄩ儴鐨� 璁惧缁戝畾鍒楄〃 鏁版嵁
@@ -547,13 +547,13 @@
/// </summary>
/// <param name="device"></param>
/// <returns></returns>
- public HdlDevicePanelLogic.PanelVibrationInfo GetPanelVibrationInfo(string deviceMac, int deviceEpoint)
+ public UserCenter.HdlDevicePanelLogic.PanelVibrationInfo GetPanelVibrationInfo(string deviceMac, int deviceEpoint)
{
//鑾峰彇瀵硅薄
var classData = new ModelPanelVibrationInfo();
var memoryData = (ModelPanelVibrationInfo)this.GetDeviceModelDataClass(deviceMac, deviceEpoint, ModelDeviceSaveEnum.A闈㈡澘闇囧姩鍔熻兘, classData);
- var data = new HdlDevicePanelLogic.PanelVibrationInfo();
+ var data = new UserCenter.HdlDevicePanelLogic.PanelVibrationInfo();
data.A闇囧姩浣胯兘 = memoryData.vibrationInfo.A闇囧姩浣胯兘;
data.A闇囧姩寮哄害 = memoryData.vibrationInfo.A闇囧姩寮哄害;
data.A闇囧姩鏃堕棿 = memoryData.vibrationInfo.A闇囧姩鏃堕棿;
@@ -568,7 +568,7 @@
/// <param name="datainfo"></param>
/// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
/// <returns></returns>
- public bool SetPanelVibrationInfo(string deviceMac, int deviceEpoint, HdlDevicePanelLogic.PanelVibrationInfo datainfo, string receiveResult)
+ public bool SetPanelVibrationInfo(string deviceMac, int deviceEpoint, UserCenter.HdlDevicePanelLogic.PanelVibrationInfo datainfo, string receiveResult)
{
//鑾峰彇瀵硅薄
var classData = new ModelPanelVibrationInfo();
@@ -872,7 +872,7 @@
/// <returns></returns>
private string SetDouMarks(string i_text)
{
- return HdlUserCenterResourse.douMarks + i_text + HdlUserCenterResourse.douMarks;
+ return UserCenter.UserCenterResourse.douMarks + i_text + UserCenter.UserCenterResourse.douMarks;
}
#endregion
--
Gitblit v1.8.0