2022-01-12 1.更新

JLChen

2022-01-12 407fae6f07a2a982a2a814c2f145c40733c966cb

 Crabtree/SmartHome/HDL/Common/CommonUtlis.cs

@@ -261,6 +261,12 @@
            btnOption.MouseUpEventHandler += (sdf, fds) => {
                //修改名称
                var newStr = etZoneName.Text.Trim ();
                //输入内容不能为空
                if (string.IsNullOrEmpty (newStr)) {
                    Utlis.ShowTip (Language.StringByID(SimpleControl.R.MyInternationalizationString.PleaseEnterContent));
                    return;
                }

                if (nameStr != newStr) {
                    saveAction?.Invoke (newStr);
                }
@@ -649,6 +655,7 @@

        /// <summary>
        /// 本地Common匹配云端的FunctionList 返回Function
        /// 匹配子网号、设备号、回路号、大类小类
        /// </summary>
        /// <param name="common">本地设备</param>
        /// <returns></returns>
@@ -659,7 +666,8 @@
            foreach (var function in FunctionList) {
                if (common.SubnetID == function.bus.SubnetID &&
                    common.DeviceID == function.bus.DeviceID &&
                    common.LoopID == function.bus.LoopId
                    common.LoopID == function.bus.LoopId &&
                    common.DeviceTypeString == function.DeviceTypeString
                    ) {
                    return function;
                }