2019-12-24 / ct_chen

Actions:
1. 配合define.h修改欄位名稱 StoptDateTime => StopDateTime

Files:
1. 如表列

EVSE/Modularization/WebService.c

@@ -981,7 +981,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].CardNumber);
 				StartUserId[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartUserId);
 				StartDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartDateTime);
-				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StoptDateTime);
+				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StopDateTime);
 				StartMethod[0] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartMethod,1);
 				ConnectorTemp[0] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp,1);
 				CcsGunQty++;
@@ -1004,7 +1004,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].CardNumber);
 				StartUserId[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartUserId);
 				StartDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartDateTime);
-				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StoptDateTime);
+				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StopDateTime);
 				StartMethod[0] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartMethod,1);
 				ConnectorTemp[0] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].ConnectorTemp,1);
 				GbGunQty++;
@@ -1027,7 +1027,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].CardNumber);
 				StartUserId[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartUserId);
 				StartDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartDateTime);
-				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StoptDateTime);
+				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StopDateTime);
 				StartMethod[0] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartMethod,1);
 				ConnectorTemp[0] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].ConnectorTemp,1);
 				CHAdeMOGunQty++;
@@ -1050,7 +1050,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].CardNumber);
 				StartUserId[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartUserId);
 				StartDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartDateTime);
-				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StoptDateTime);
+				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StopDateTime);
 				StartMethod[0] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartMethod,1);
 				ConnectorTemp[0] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].ConnectorTemp,1);
 				AcGunQty++;
@@ -1075,7 +1075,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].CardNumber);
 				StartUserId[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartUserId);
 				StartDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartDateTime);
-				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StoptDateTime);
+				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StopDateTime);
 				StartMethod[1] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartMethod,1);
 				ConnectorTemp[1] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp,1);
 				CcsGunQty++;
@@ -1098,7 +1098,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].CardNumber);
 				StartUserId[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartUserId);
 				StartDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartDateTime);
-				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StoptDateTime);
+				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StopDateTime);
 				StartMethod[1] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartMethod,1);
 				ConnectorTemp[1] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].ConnectorTemp,1);
 				GbGunQty++;
@@ -1121,7 +1121,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].CardNumber);
 				StartUserId[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartUserId);
 				StartDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartDateTime);
-				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StoptDateTime);
+				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StopDateTime);
 				StartMethod[1] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartMethod,1);
 				ConnectorTemp[1] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].ConnectorTemp,1);
 				CHAdeMOGunQty++;
@@ -1144,7 +1144,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].CardNumber);
 				StartUserId[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartUserId);
 				StartDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartDateTime);
-				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StoptDateTime);
+				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StopDateTime);
 				StartMethod[1] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartMethod,1);
 				ConnectorTemp[1] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].ConnectorTemp,1);
 				AcGunQty++;
@@ -1169,7 +1169,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].CardNumber);
 				StartUserId[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartUserId);
 				StartDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartDateTime);
-				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StoptDateTime);
+				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StopDateTime);
 				StartMethod[2] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartMethod,1);
 				ConnectorTemp[2] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp,1);
 				CcsGunQty++;
@@ -1192,7 +1192,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].CardNumber);
 				StartUserId[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartUserId);
 				StartDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartDateTime);
-				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StoptDateTime);
+				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StopDateTime);
 				StartMethod[2] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartMethod,1);
 				ConnectorTemp[2] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].ConnectorTemp,1);
 				GbGunQty++;
@@ -1215,7 +1215,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].CardNumber);
 				StartUserId[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartUserId);
 				StartDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartDateTime);
-				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StoptDateTime);
+				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StopDateTime);
 				StartMethod[2] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartMethod,1);
 				ConnectorTemp[2] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].ConnectorTemp,1);
 				CHAdeMOGunQty++;
@@ -1238,7 +1238,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].CardNumber);
 				StartUserId[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartUserId);
 				StartDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartDateTime);
-				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StoptDateTime);
+				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StopDateTime);
 				StartMethod[2] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartMethod,1);
 				ConnectorTemp[2] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].ConnectorTemp,1);
 				AcGunQty++;
@@ -1361,7 +1361,7 @@ int main(int argc, char *argv[]) {
 			json_object_object_add(ChargingInfo1,"CardNumber",CardNumber[0]);
 			json_object_object_add(ChargingInfo1,"StartUserId",StartUserId[0]);
 			json_object_object_add(ChargingInfo1,"StartDateTime",StartDateTime[0]);
-			json_object_object_add(ChargingInfo1,"StoptDateTime",StopDateTime[0]);
+			json_object_object_add(ChargingInfo1,"StopDateTime",StopDateTime[0]);
 			json_object_object_add(ChargingInfo1,"StartMethod",StartMethod[0]);
 			json_object_object_add(ChargingInfo1,"ConnectorTemp",ConnectorTemp[0]);
 			json_object_object_add(ChargingInfo1,"PresentChargingVoltage",PresentChargingVoltage[0]);
@@ -1384,7 +1384,7 @@ int main(int argc, char *argv[]) {
 			json_object_object_add(ChargingInfo2,"CardNumber",CardNumber[1]);
 			json_object_object_add(ChargingInfo2,"StartUserId",StartUserId[1]);
 			json_object_object_add(ChargingInfo2,"StartDateTime",StartDateTime[1]);
-			json_object_object_add(ChargingInfo2,"StoptDateTime",StopDateTime[1]);
+			json_object_object_add(ChargingInfo2,"StopDateTime",StopDateTime[1]);
 			json_object_object_add(ChargingInfo2,"StartMethod",StartMethod[1]);
 			json_object_object_add(ChargingInfo2,"ConnectorTemp",ConnectorTemp[1]);
 			json_object_object_add(ChargingInfo2,"PresentChargingVoltage",PresentChargingVoltage[1]);
@@ -1407,7 +1407,7 @@ int main(int argc, char *argv[]) {
 			json_object_object_add(ChargingInfo3,"CardNumber",CardNumber[2]);
 			json_object_object_add(ChargingInfo3,"StartUserId",StartUserId[2]);
 			json_object_object_add(ChargingInfo3,"StartDateTime",StartDateTime[2]);
-			json_object_object_add(ChargingInfo3,"StoptDateTime",StopDateTime[2]);
+			json_object_object_add(ChargingInfo3,"StopDateTime",StopDateTime[2]);
 			json_object_object_add(ChargingInfo3,"StartMethod",StartMethod[2]);
 			json_object_object_add(ChargingInfo3,"ConnectorTemp",ConnectorTemp[2]);
 			json_object_object_add(ChargingInfo3,"PresentChargingVoltage",PresentChargingVoltage[2]);

EVSE/rootfs/var/www/set_charging.php

@@ -219,9 +219,9 @@
 											<input type="hidden" name="StartDateTime1" id="StartDateTime1" value="<?php echo $obj['ChargingInfo1']['StartDateTime'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
-											<label>StoptDateTime</label>
-											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo1']['StoptDateTime'];?>">
-											<input type="hidden" name="StoptDateTime1" id="StoptDateTime1" value="<?php echo $obj['ChargingInfo1']['StoptDateTime'];?>">
+											<label>StopDateTime</label>
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo1']['StopDateTime'];?>">
+											<input type="hidden" name="StopDateTime1" id="StopDateTime1" value="<?php echo $obj['ChargingInfo1']['StopDateTime'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>StartMethod</label>
@@ -307,9 +307,9 @@
 											<input type="hidden" name="StartDateTime2" id="StartDateTime2" value="<?php echo $obj['ChargingInfo2']['StartDateTime'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
-											<label>StoptDateTime</label>
-											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo2']['StoptDateTime'];?>">
-											<input type="hidden" name="StoptDateTime2" id="StoptDateTime2" value="<?php echo $obj['ChargingInfo2']['StoptDateTime'];?>">
+											<label>StopDateTime</label>
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo2']['StopDateTime'];?>">
+											<input type="hidden" name="StopDateTime2" id="StopDateTime2" value="<?php echo $obj['ChargingInfo2']['StopDateTime'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>StartMethod</label>
@@ -395,9 +395,9 @@
 											<input type="hidden" name="StartDateTime3" id="StartDateTime3" value="<?php echo $obj['ChargingInfo3']['StartDateTime'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
-											<label>StoptDateTime</label>
-											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo3']['StoptDateTime'];?>">
-											<input type="hidden" name="StoptDateTime3" id="StoptDateTime3" value="<?php echo $obj['ChargingInfo3']['StoptDateTime'];?>">
+											<label>StopDateTime</label>
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo3']['StopDateTime'];?>">
+											<input type="hidden" name="StopDateTime3" id="StopDateTime3" value="<?php echo $obj['ChargingInfo3']['StopDateTime'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>StartMethod</label>