V1.60.0

bassmaster187 · Dec 7, 2024 · 639896d · 639896d
1 parent 06cda41
commit 639896d
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 6 deletions.
diff --git a/TeslaLogger/Car.cs b/TeslaLogger/Car.cs
@@ -454,7 +454,8 @@ private void InitStage3()
                 if (!DbHelper.GetRegion())
                     webhelper.GetRegion();
 
-                webhelper.CheckVirtualKey();
+                if (!dbHelper.CheckVirtualKey())
+                    webhelper.CheckVirtualKey();
 
                 if (webhelper.GetVehicles() == "NULL")
                 {
@@ -1600,7 +1601,9 @@ private void HandleStateChange(TeslaState _oldState, TeslaState _newState)
             if (_oldState == TeslaState.Start && _newState == TeslaState.Online)
             {
                 telemetry?.StartConnection();
-                _ = webhelper.GetOdometerAsync();
+                if (!FleetAPI)
+                    _ = webhelper.GetOdometerAsync();
+
                 Tools.DebugLog($"#{CarInDB}:Start -> Online SendDataToAbetterrouteplannerAsync(utc:{Tools.ToUnixTime(DateTime.UtcNow) * 1000}, soc:{CurrentJSON.current_battery_level}, speed:0, charging:false, power:0, lat:{CurrentJSON.GetLatitude()}, lon:{CurrentJSON.GetLongitude()})");
                 _ = webhelper.SendDataToAbetterrouteplannerAsync(Tools.ToUnixTime(DateTime.UtcNow) * 1000, CurrentJSON.current_battery_level, 0, false, 0, CurrentJSON.GetLatitude(), CurrentJSON.GetLongitude());
             }

diff --git a/TeslaLogger/DBHelper.cs b/TeslaLogger/DBHelper.cs
@@ -7095,6 +7095,40 @@ id ASC
             }
         }
 
+        internal bool CheckVirtualKey()
+        {
+            try
+            {
+                using (MySqlConnection con = new MySqlConnection(DBConnectionstring))
+                {
+                    con.Open();
+                    using (MySqlCommand cmd = new MySqlCommand("SELECT needVirtualKey, virtualkey FROM cars where id = @CarID", con))
+                    {
+                        cmd.Parameters.AddWithValue("@CarID", car.CarInDB);
+
+                        MySqlDataReader dr = SQLTracer.TraceDR(cmd);
+                        if (dr.Read())
+                        {
+                            if (dr[0] == DBNull.Value)
+                                return false;
+
+                            if (dr["needVirtualKey"].ToString() == "0" && dr["virtualKey"].ToString() == "1")
+                            {
+                                return true;
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                ex.ToExceptionless().FirstCarUserID().Submit();
+                Logfile.Log(ex.ToString());
+            }
+
+            return false;
+        }
+
         internal bool GetRegion()
         {
             try

diff --git a/TeslaLogger/Properties/AssemblyInfo.cs b/TeslaLogger/Properties/AssemblyInfo.cs
@@ -32,8 +32,8 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.59.14.0")]
-[assembly: AssemblyFileVersion("1.59.14.0")]
+[assembly: AssemblyVersion("1.60.0.0")]
+[assembly: AssemblyFileVersion("1.60.0.0")]
 
 [assembly: InternalsVisibleTo("UnitTestsTeslaloggerNET8")]
 [assembly: InternalsVisibleTo("UnitTestsTeslalogger")]
diff --git a/TeslaLogger/bin/TeslaLogger.exe b/TeslaLogger/bin/TeslaLogger.exe
diff --git a/TeslaLogger/bin/changelog.md b/TeslaLogger/bin/changelog.md
@@ -1,5 +1,5 @@
-# Version 1.59.14
-- Bugfixes
+# Version 1.60.0
+- Stable version
 
 # Version 1.59.12
 - Daily info on admin panel about the need to migrate to Fleet API and the subscription model