From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/Entity/Function/AC.cs | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/Entity/Function/AC.cs b/HDL_ON/Entity/Function/AC.cs
old mode 100755
new mode 100644
index a24c624..32d7556
--- a/HDL_ON/Entity/Function/AC.cs
+++ b/HDL_ON/Entity/Function/AC.cs
@@ -194,9 +194,9 @@
min = 0,
};
}
- if (_trait_mode.curValue.ToString() == "{}")
- _trait_mode.curValue = "cool";
}
+ if (_trait_mode.curValue.ToString() == "{}")
+ _trait_mode.curValue = "cool";
return _trait_mode;
}
}
@@ -222,9 +222,9 @@
curValue = "high"
};
}
- if (_trait_fan.curValue.ToString() == "{}")
- _trait_fan.curValue = "high";
}
+ if (_trait_fan.curValue.ToString() == "{}")
+ _trait_fan.curValue = "high";
return _trait_fan;
}
}
@@ -252,14 +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() == "{}")
{
- var vv = Convert.ToDouble(_trait_temp.curValue);
- _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;
}
}
@@ -284,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;
}
}
@@ -332,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