From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs | 270 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 221 insertions(+), 49 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs
index 65a7576..645568d 100755
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs
+++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs
@@ -112,6 +112,15 @@
}
/// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public virtual List<string> GetFailMsg()
+ {
+ return new List<string>();
+ }
+
+ /// <summary>
/// 鍙樻洿Mac缂撳瓨(鍦ㄧ綉鍏虫墽琛屽畬鎴愬鍏ヤ箣鍚庢墽琛�)
/// </summary>
public virtual void ChangedMacMemmory()
@@ -223,6 +232,25 @@
}
/// <summary>
+ /// 浜戠妯℃澘鐨勫熀鏈俊鎭�
+ /// </summary>
+ public class CloundModelBaseInfo
+ {
+ /// <summary>
+ /// 妯℃澘鍚嶅瓧
+ /// </summary>
+ public string TemplateName = string.Empty;
+ /// <summary>
+ /// 缂栬緫鏃堕棿 2020.01.04 19:55鏍煎紡
+ /// </summary>
+ public string CreatedOnUtc = string.Empty;
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ public string Id = string.Empty;
+ }
+
+ /// <summary>
/// 妯℃澘浣忓畢鐨勪俊鎭�
/// </summary>
public class TemplateHomeInfo
@@ -269,6 +297,15 @@
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
return 5;
}
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //鍒囨崲鎵嬫媺鎺у埗澶辫触
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uChangeHandPullControlFail) };
+ }
}
/// <summary>
@@ -314,6 +351,15 @@
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
return 5;
}
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁剧疆绐楀笜闄愪綅鐐瑰け璐�
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uCommitCurtainLimitFail) };
+ }
}
#endregion
@@ -348,6 +394,15 @@
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
return 5;
}
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁剧疆绌鸿皟妯″紡澶辫触
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uSetAcModeFail) };
+ }
}
/// <summary>
@@ -377,6 +432,15 @@
{
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
return 5;
+ }
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁剧疆绌鸿皟鎽嗛澶辫触
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uSetAirConditionerSwingFunctionFail) };
}
}
@@ -449,8 +513,13 @@
}
var listCommand = new List<string>();
//娓呯┖缁戝畾
- var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", this.DeviceMac }, { "Epoint", this.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 5006 } };
- listCommand.Add(jObject.ToString());
+ listCommand.Add(string.Empty);
+ //杩欎釜鍒ゆ柇鏄负浜嗛拡瀵逛竴璺皟鍏夊櫒鍜屼笁璺户鐢靛櫒鐨勯偅涓涓冨洖璺�
+ if (this.ListReceiveResult.Count > 0 && string.IsNullOrEmpty(this.ListReceiveResult[0]) == false)
+ {
+ var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", this.DeviceMac }, { "Epoint", this.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 5006 } };
+ listCommand[0] = jObject.ToString();
+ }
//鍔熻兘閰嶇疆
listCommand.Add(string.Empty);
@@ -481,6 +550,18 @@
}
/// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //娓呯┖缁戝畾鍒楄〃澶辫触 , 璁惧灞炴�у彉鏇村け璐� , 缁戝畾鐩爣璁剧疆澶辫触
+ return new List<string> {"娓呯┖缁戝畾鍒楄〃澶辫触"
+ ,Language.StringByID(R.MyInternationalizationString.uDeviceAttributeChangedFail)
+ ,Language.StringByID(R.MyInternationalizationString.uSetBindTargetsFail)};
+ }
+
+ /// <summary>
/// 鍙樻洿缁戝畾鐩爣鐨凪ac
/// </summary>
public override void ChangedMacMemmory()
@@ -506,12 +587,8 @@
data.BindMacAddr = dicChangedMac[data.BindMacAddr];
}
}
- var localDevice = Common.LocalDevice.Current.GetDevice(this.DeviceMac, this.DeviceEpoint);
- if (localDevice != null)
- {
- //鍙樻洿缂撳瓨
- TemplateCommonLogic.Current.SaveDeviceMemmoryData(localDevice);
- }
+ //鍙樻洿缂撳瓨
+ TemplateCommonLogic.Current.SaveDeviceMemmoryData(this.DeviceMac, this.DeviceEpoint);
}
}
@@ -547,6 +624,15 @@
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
return 5;
}
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁剧疆浼犳劅鍣ㄩ厤缃俊鎭け璐�
+ return new List<string> {Language.StringByID(R.MyInternationalizationString.uSetPirSensorSettionFail)};
+ }
}
#endregion
@@ -581,21 +667,108 @@
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
return 5;
}
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁剧疆闇囧姩鍙嶉閰嶇疆淇℃伅澶辫触
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uSetVibrationFeedbackSettionFail) };
+ }
}
/// <summary>
- /// 闈㈡澘鑳屽厜鐏ā鏉挎暟鎹畾涔�
+ /// 闈㈡澘浜害璋冭妭妯℃澘鏁版嵁瀹氫箟
/// </summary>
- public class ModelPanelBackLightInfo : TemplateDeviceDataCommon
+ public class ModelPanelBrightnessAdjustInfo : TemplateDeviceDataCommon
{
/// <summary>
- /// 浜害璋冭妭鐨勪俊鎭�
+ /// 鎸夐敭寮�鐘舵�侊紙鎸囩ず锛変寒搴�(杩欎釜鏄偣鍑诲悗鐨勫��,鎴栬�� 1-6骞叉帴鐐圭殑鑳屽厜鐏�)
/// </summary>
- public ModelPanelSwitchLevelInfo linghtLevelInfo = new ModelPanelSwitchLevelInfo();
+ public int panelDirectionsLevel = -1;
+ /// <summary>
+ /// 鎸夐敭鍏崇姸鎬侊紙鑳屽厜锛変寒搴�(杩欎釜鏄偣鍑诲墠鐨勫��,鎴栬�� 绗竷骞叉帴鐐圭殑鑳屽厜鐏�)
+ /// </summary>
+ public int panelBacklightLevel = -1;
+
+ /// <summary>
+ /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗�
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetSendGatewayValue()
+ {
+ //浜害璋冭妭
+ var command1 = HdlDevicePanelLogic.Current.GetPanelLevelCommadText(DeviceMac, panelDirectionsLevel, panelBacklightLevel);
+ return new List<string>() { command1 };
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍙戦�佸懡浠ゅぇ姒傞渶瑕佺殑鏃堕棿(绉�)
+ /// </summary>
+ /// <returns></returns>
+ public override int GetSendTime()
+ {
+ //鎵ц杩欎釜鍛戒护澶х害闇�瑕�8绉�
+ return 3;
+ }
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁剧疆浜害璋冭妭澶辫触
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uSetLightRegulationFail) };
+ }
+ }
+
+ /// <summary>
+ /// 闈㈡澘鑺傝兘妯″紡妯℃澘鏁版嵁瀹氫箟
+ /// </summary>
+ public class ModelPanelEnergyModeInfo : TemplateDeviceDataCommon
+ {
/// <summary>
/// 鑺傝兘妯″紡
/// </summary>
public ZigBee.Device.Panel.PanelSaveEnergyModeInfo energyModeInfo = new ZigBee.Device.Panel.PanelSaveEnergyModeInfo();
+ /// <summary>
+ /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗�
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetSendGatewayValue()
+ {
+ //鑺傝兘妯″紡
+ var command1 = HdlDevicePanelLogic.Current.GetDeviceEnergyConservationModeCommandText(DeviceMac, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
+
+ return new List<string>() { command1 };
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍙戦�佸懡浠ゅぇ姒傞渶瑕佺殑鏃堕棿(绉�)
+ /// </summary>
+ /// <returns></returns>
+ public override int GetSendTime()
+ {
+ //鎵ц杩欎釜鍛戒护澶х害闇�瑕�8绉�
+ return 3;
+ }
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //鑺傝兘妯″紡閰嶇疆澶辫触
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uSetEnergyConservationFail) };
+ }
+ }
+
+ /// <summary>
+ /// 闈㈡澘鎸囩ず鐏ā鏉挎暟鎹畾涔�(涔熷彨鑳屽厜鐏�)
+ /// </summary>
+ public class ModelPanelIndicatorLightInfo : TemplateDeviceDataCommon
+ {
/// <summary>
/// 鎸夐敭鐨勯鑹叉暟鎹�
/// </summary>
@@ -610,15 +783,10 @@
/// <returns></returns>
public override List<string> GetSendGatewayValue()
{
- //杩欎笁涓笢瑗跨殑椤哄簭涓嶈兘鍙�
- //浜害璋冭妭
- var command1 = HdlDevicePanelLogic.Current.GetPanelLevelCommadText(DeviceMac, linghtLevelInfo.panelDirectionsLevel, linghtLevelInfo.panelBacklightLevel);
- //鑺傝兘妯″紡
- var command2 = HdlDevicePanelLogic.Current.GetDeviceEnergyConservationModeCommandText(DeviceMac, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
//鎸夐敭鎸囩ず鐏鑹�
- var command3 = HdlDevicePanelLogic.Current.GetPanelColorCommandText(DeviceMac, keyColorData, KeyNum);
+ var command1 = HdlDevicePanelLogic.Current.GetPanelColorCommandText(DeviceMac, keyColorData, KeyNum);
- return new List<string>() { command1, command2, command3 };
+ return new List<string>() { command1 };
}
/// <summary>
@@ -628,24 +796,17 @@
public override int GetSendTime()
{
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�8绉�
- return 8;
+ return 3;
}
- }
-
- /// <summary>
- /// 鎸夐敭鎸囩ず鐏潰鏉垮紑鍏充寒搴﹂厤缃洖澶�
- /// </summary>
- public class ModelPanelSwitchLevelInfo
- {
/// <summary>
- ///鎸夐敭寮�鐘舵�侊紙鎸囩ず锛変寒搴�(杩欎釜鏄偣鍑诲悗鐨勫��)
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
/// </summary>
- public int panelDirectionsLevel = -1;
-
- /// <summary>
- /// 鎸夐敭鍏崇姸鎬侊紙鑳屽厜锛変寒搴�(杩欎釜鏄偣鍑诲墠鐨勫��)
- /// </summary>
- public int panelBacklightLevel = -1;
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁剧疆鎸夐敭闈㈡澘鎸囩ず鐏鑹插け璐�
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uSetPanelPilolightSettionFail) };
+ }
}
#endregion
@@ -680,6 +841,15 @@
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�3绉�
return 3;
}
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁惧绔偣鍚嶇О淇敼澶辫触
+ return new List<string> { "璁惧绔偣鍚嶇О淇敼澶辫触" };
+ }
}
/// <summary>
@@ -709,6 +879,15 @@
{
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�3绉�
return 3;
+ }
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁惧鍚嶇О淇敼澶辫触
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uDeviceReNameFail) };
}
}
@@ -759,24 +938,17 @@
/// </summary>
A璁惧缁戝畾鍒楄〃 = 14,
/// <summary>
- /// 瀵硅薄绫�:ModelPanelBackLightInfo
+ /// 瀵硅薄绫�:ModelPanelBrightnessAdjustInfo
/// </summary>
- A闈㈡澘鑳屽厜鐏� = 15,
+ A闈㈡澘浜害璋冭妭 = 15,
/// <summary>
- /// ModelAutomaticTimingOffInfo
+ /// 瀵硅薄绫�:ModelPanelEnergyModeInfo
/// </summary>
- A瀹氭椂鑷姩鍏抽棴 = 16,
- }
-
- /// <summary>
- /// 鍙戦�佹ā鏉挎暟鎹殑鍖哄垎
- /// </summary>
- public enum ModelDataSendEnum
- {
- A鏈畾涔� = -1,
- A绉佹湁灞炴�� = 1,
- A绉佹湁鍗忚 = 2,
- A閫忎紶鏁版嵁 = 3
+ A闈㈡澘鑺傝兘妯″紡 = 16,
+ /// <summary>
+ /// 涔熷彨鑳屽厜鐏� 瀵硅薄绫�:ModelPanelIndicatorLightInfo
+ /// </summary>
+ A闈㈡澘鎸囩ず鐏� = 17
}
#endregion
--
Gitblit v1.8.0