Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath

wxr

2020-12-19 4a9318077bd095fbc7c57c593e5ca8185603dac4

 HDL_ON/Entity/Function/AC.cs

@@ -255,9 +255,10 @@
                    if (_trait_temp.curValue.ToString() == "{}")
                        _trait_temp.curValue = 16;
                }
                if (_trait_temp.curValue.ToString().Length > 3)
                //if (_trait_temp.curValue.ToString().Length > 3)
                {
                    var vv = Convert.ToDouble(_trait_temp.curValue);
                    double vv = 16;
                    Double.TryParse(_trait_temp.curValue.ToString(),out vv);
                    _trait_temp.curValue = Convert.ToInt32(vv);
                }
                return _trait_temp;
@@ -335,7 +336,7 @@
                    if (_trait_IndoorTemp.curValue.ToString() == "{}")
                        _trait_IndoorTemp.curValue = 0;
                }
                if (_trait_IndoorTemp.curValue.ToString().Length > 3)
                //if (_trait_IndoorTemp.curValue.ToString().Length > 3)
                {
                    var vv = Convert.ToDouble(_trait_IndoorTemp.curValue);
                    _trait_IndoorTemp.curValue = Convert.ToInt32(vv);