黄学彪
2020-12-16 0d9f64668fd7350d6a21fd157e32009a96d98134
ZigbeeApp/Shared/Phone/Common/Common/TemplateDataCommon.cs
old mode 100755 new mode 100644
File was renamed from ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs
@@ -3,7 +3,7 @@
using System.Collections.Generic;
using System.Text;
namespace Shared.Phone.TemplateData
namespace Shared.Phone
{
    #region ■ 共通模板数据定义___________________
@@ -248,7 +248,7 @@
        /// <summary>
        /// 编辑时间 2020.01.04 19:55格式
        /// </summary>
        public string CreatedOnUtc = string.Empty;
        public string CreateTime = string.Empty;
        /// <summary>
        /// 主键
        /// </summary>
@@ -367,7 +367,9 @@
        public override List<string> GetFailMsg()
        {
            //设置窗帘限位点失败
            return new List<string> { Language.StringByID(R.MyInternationalizationString.uCommitCurtainLimitFail) };
            return new List<string> { Language.StringByID(R.MyInternationalizationString.uSetCurtainDirectionFail),
                 Language.StringByID(R.MyInternationalizationString.uCommitCurtainLimitFail)
            };
        }
    }
@@ -487,7 +489,7 @@
            //当前选择的模板对象
            var dicChangedMac = new Dictionary<string, string>();
            var dicNowSelect = TemplateCommonLogic.Current.modelData.dicDeviceTemplateSelect;
            var dicNowSelect = HdlTemplateCommonLogic.Current.modelData.dicDeviceTemplateSelect;
            foreach (var localMac in dicNowSelect.Keys)
            {
                dicChangedMac[dicNowSelect[localMac]] = localMac;
@@ -577,7 +579,7 @@
        {
            //当前选择的模板对象
            var dicChangedMac = new Dictionary<string, string>();
            var dicNowSelect = TemplateCommonLogic.Current.modelData.dicDeviceTemplateSelect;
            var dicNowSelect = HdlTemplateCommonLogic.Current.modelData.dicDeviceTemplateSelect;
            foreach (var localMac in dicNowSelect.Keys)
            {
                dicChangedMac[dicNowSelect[localMac]] = localMac;
@@ -597,7 +599,7 @@
                }
            }
            //变更缓存
            TemplateCommonLogic.Current.SaveDeviceMemmoryData(this.DeviceMac, this.DeviceEpoint);
            HdlTemplateCommonLogic.Current.SaveDeviceMemmoryData(this.DeviceMac, this.DeviceEpoint);
        }
    }
@@ -837,7 +839,7 @@
        /// <returns></returns>
        public override List<string> GetSendGatewayValue()
        {
            var command = Common.LocalDevice.Current.GetReDeviceEpointNameCommandText(DeviceMac, DeviceEpoint, deviceEpointName);
            var command = HdlDeviceCommonLogic.Current.GetReDeviceEpointNameCommandText(DeviceMac, DeviceEpoint, deviceEpointName);
            return new List<string>() { command };
        }
@@ -876,7 +878,7 @@
        /// <returns></returns>
        public override List<string> GetSendGatewayValue()
        {
            var command = Common.LocalDevice.Current.GetReDeviceMacNameCommandText(DeviceMac, DeviceEpoint, deviceMacName);
            var command = HdlDeviceCommonLogic.Current.GetReDeviceMacNameCommandText(DeviceMac, DeviceEpoint, deviceMacName);
            return new List<string>() { command };
        }