From ea9fa252b53984ffc5a2bcd4ace5162622bd4eff Mon Sep 17 00:00:00 2001
From: lxw <xuewenliu11@163.com>
Date: Wed, 12 Jun 2024 13:17:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Service/Execute/Api/CloudApi.cs           |  4 ++--
 Service/Execute/Api/RfidApi.cs            |  8 ++++----
 Service/Execute/Api/TboxApi.cs            | 12 ++++++------
 Service/Execute/Step/StationReadyState.cs |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Service/Execute/Api/CloudApi.cs b/Service/Execute/Api/CloudApi.cs
index 09111d0..78b995b 100644
--- a/Service/Execute/Api/CloudApi.cs
+++ b/Service/Execute/Api/CloudApi.cs
@@ -45,7 +45,7 @@ public abstract class CloudApi
 
         Log.Info(
             $" CloudApi VehicleCheck  SendVehicleCertification resp={JsonConvert.SerializeObject(sendVehicleCertification)}");
-     
+
 
         return sendVehicleCertification;
     }
@@ -137,7 +137,7 @@ public abstract class CloudApi
             $" CloudApi CarCanStart  ");
         var cloudClientCarCanStart = CloudClientMgr.CloudClient.CarCanStart;
         Log.Info(
-            $" CloudApi CarCanStart   resp={cloudClientCarCanStart}");
+            $" CloudApi CarCanStart resp= {JsonConvert.SerializeObject(cloudClientCarCanStart)}");
         return cloudClientCarCanStart;
     }
 
diff --git a/Service/Execute/Api/RfidApi.cs b/Service/Execute/Api/RfidApi.cs
index 0d460aa..4fe51c1 100644
--- a/Service/Execute/Api/RfidApi.cs
+++ b/Service/Execute/Api/RfidApi.cs
@@ -96,18 +96,18 @@ public class RfidApi
         }
     }
 
-    public static async Task<RfidReadModel?> ReadRifd()
+    public static async Task<RfidReadModel?> ReadRfid()
     {
        
 
-        Log.Info("RfidApi ReadRifd");
+        Log.Info("RfidApi ReadRfid");
         string readUrl = BASE_URL + "/Api/BeginRead";
         string url = BASE_URL + "/Api/ReadRfidData";
         try
         {
             var vBeginRead = await _httpClient.GetStringAsync(readUrl);
             string s = await _httpClient.GetStringAsync(url);
-            Log.Info($"ReadRifd resp={s}");
+            Log.Info($"ReadRfid resp={s}");
             if (s != String.Empty)
             {
                 RfidReadModel? model = JsonConvert.DeserializeObject<RfidReadModel>(s);
@@ -119,7 +119,7 @@ public class RfidApi
         }
         catch (Exception e)
         {
-            Log.Error($"RfidApi ReadRifd err e={e}");
+            Log.Error($"RfidApi ReadRfid err e={e}");
             return null;
         }
 
diff --git a/Service/Execute/Api/TboxApi.cs b/Service/Execute/Api/TboxApi.cs
index ab80155..55dab37 100644
--- a/Service/Execute/Api/TboxApi.cs
+++ b/Service/Execute/Api/TboxApi.cs
@@ -32,7 +32,7 @@ public class TBoxApi
                 tboxCarInfoModel = JsonConvert.DeserializeObject<TboxCarInfoModel>(s);
             }
 
-            Log.Info($"TBoxApi GetCarInfo resp = {tboxCarInfoModel}");
+            Log.Info($"TBoxApi GetCarInfo resp = {JsonConvert.SerializeObject(tboxCarInfoModel)}");
             return tboxCarInfoModel;
         }
         catch (Exception e)
@@ -71,10 +71,10 @@ public class TBoxApi
             if (!String.IsNullOrWhiteSpace(s))
             {
                 tboxCarInfoModel = JsonConvert.DeserializeObject<TboxCarInfoModel>(s);
-                Log.Info($"IsConnected resp={tboxCarInfoModel}");
+                Log.Info($"IsConnected resp={JsonConvert.SerializeObject(tboxCarInfoModel)}");
             }
 
-            Log.Info($"GetCarInfo resp = {tboxCarInfoModel}");
+            Log.Info($"GetCarInfo resp = {JsonConvert.SerializeObject(tboxCarInfoModel)}");
             return tboxCarInfoModel.Connected;
         }
         catch (Exception e)
@@ -99,7 +99,7 @@ public class TBoxApi
                 bools.Add(unLockCar);
             }
         }
-        Log.Info($" TBoxApi end UnLockCarManyTimes carNo={carNo} time={_times} resp={JsonConvert.SerializeObject(bools)}");
+        Log.Info($" TBoxApi end UnLockCarManyTimes carNo={carNo} times={_times} resp={JsonConvert.SerializeObject(bools)}");
         
         return bools.Select(i => i).Count() > _successTimes;
     }
@@ -117,7 +117,7 @@ public class TBoxApi
                 bools.Add(unLockCar);
             }
         }
-        Log.Info($" TBoxApi end LockCarManyTimes carNo={carNo} time={_times} resp={JsonConvert.SerializeObject(bools)}");
+        Log.Info($" TBoxApi end LockCarManyTimes carNo={carNo} times={_times} resp={JsonConvert.SerializeObject(bools)}");
 
         return bools.Select(i => i).Count() > _successTimes;
     }
@@ -158,7 +158,7 @@ public class TBoxApi
                 tboxCarInfoModels = JsonConvert.DeserializeObject<List<TboxCarInfoModel>>(s);
             }
 
-            Log.Info($"TBoxApi GetCarInfoList resp = {tboxCarInfoModels}");
+            Log.Info($"TBoxApi GetCarInfoList resp = {JsonConvert.SerializeObject(tboxCarInfoModels)}");
             return tboxCarInfoModels;
         }
         catch (Exception e)
diff --git a/Service/Execute/Step/StationReadyState.cs b/Service/Execute/Step/StationReadyState.cs
index 1166baf..b33ff71 100644
--- a/Service/Execute/Step/StationReadyState.cs
+++ b/Service/Execute/Step/StationReadyState.cs
@@ -208,7 +208,7 @@ public class StationReadyState : IState
         return Invoker.Invoke("read rfid", 3000, 20, machine.IsCanceled,
             () => machine.RfidReadFlag, () =>
             {
-                Task<RfidReadModel?> rfidReadModel = RfidApi.ReadRifd();
+                Task<RfidReadModel?> rfidReadModel = RfidApi.ReadRfid();
                 rfidReadModel.Wait();
                 var machineRfidReadModel = rfidReadModel.Result;