From 3069c032027eeea7a14fa9f462440bb2d802d9a9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 11 一月 2021 14:25:09 +0800
Subject: [PATCH] 20210111-合并代码
---
HDL_ON/Entity/Function/AC.cs | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/Entity/Function/AC.cs b/HDL_ON/Entity/Function/AC.cs
index e21a0b1..32d7556 100644
--- a/HDL_ON/Entity/Function/AC.cs
+++ b/HDL_ON/Entity/Function/AC.cs
@@ -252,15 +252,14 @@
min = 16,
};
}
- if (_trait_temp.curValue.ToString() == "{}")
- _trait_temp.curValue = 16;
}
- //if (_trait_temp.curValue.ToString().Length > 3)
+ if (_trait_temp.curValue.ToString() == "{}")
{
- double vv = 16;
- Double.TryParse(_trait_temp.curValue.ToString(),out vv);
- _trait_temp.curValue = Convert.ToInt32(vv);
+ _trait_temp.curValue = 16;
}
+ double vv = 16;
+ Double.TryParse(_trait_temp.curValue.ToString(), out vv);
+ _trait_temp.curValue = Convert.ToInt32(vv);
return _trait_temp;
}
}
@@ -285,9 +284,9 @@
min = 0,
};
}
- if (_trait_swting.curValue.ToString() == "{}")
- _trait_swting.curValue = "up";
}
+ if (_trait_swting.curValue.ToString() == "{}")
+ _trait_swting.curValue = "up";
return _trait_swting;
}
}
@@ -333,14 +332,13 @@
min = 0,
};
}
- if (_trait_IndoorTemp.curValue.ToString() == "{}")
- _trait_IndoorTemp.curValue = 0;
}
- //if (_trait_IndoorTemp.curValue.ToString().Length > 3)
+ if (_trait_IndoorTemp.curValue.ToString() == "{}")
{
- var vv = Convert.ToDouble(_trait_IndoorTemp.curValue);
- _trait_IndoorTemp.curValue = Convert.ToInt32(vv);
+ _trait_IndoorTemp.curValue = 0;
}
+ var vv = Convert.ToDouble(_trait_IndoorTemp.curValue);
+ _trait_IndoorTemp.curValue = Convert.ToInt32(vv);
return _trait_IndoorTemp;
}
}
--
Gitblit v1.8.0