2020-03-10 / ct_chen

Actions:
1. Webservice fix bug

Files:
1. as list

EVSE/rootfs/var/www/head.php

@@ -55,7 +55,23 @@
 			$ModelName='DC_AC';
 		}else{
 			$ModelName='DC';
-	}}
+		}
+	}
+	if(substr($model,10,1)=="E"){
+		$showEthernet="block";
+		$showWifi="none";
+		$showTelcom="none";
+	}
+	if(substr($model,10,1)=="W"){
+		$showEthernet="block";
+		$showWifi="block";
+		$showTelcom="none";
+	}
+	if(substr($model,10,1)=="T"){
+		$showEthernet="block";
+		$showWifi="none";
+		$showTelcom="block";
+	}
 	
 	//$ModelName='AC Net';
 	 //$ModelName='AC Eco';

EVSE/rootfs/var/www/set_charging.php

@@ -417,12 +417,12 @@ img {
 											<input type="hidden" name="PresentChargingPower1" id="PresentChargingPower1" value="<?php echo $obj['ChargingInfo1']['PresentChargingPower'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
-											<label>Present Charged Energy</label>
+											<label>Present Charging Energy</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo1']['PresentChargedEnergy'];?> kWh">
 											<input type="hidden" name="PresentChargedEnergy1" id="PresentChargedEnergy1" value="<?php echo $obj['ChargingInfo1']['PresentChargedEnergy'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
-											<label>Present Charged Duration</label>
+											<label>Present Charging Duration</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo1']['PresentChargedDuration'];?> seconds">
 											<input type="hidden" name="PresentChargedDuration1" id="PresentChargedDuration1" value="<?php echo $obj['ChargingInfo1']['PresentChargedDuration'];?>">
 										</div>
@@ -432,17 +432,17 @@ img {
 											<input type="hidden" name="RemainChargingDuration1" id="RemainChargingDuration1" value="<?php echo $obj['ChargingInfo1']['RemainChargingDuration'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am001;?>">
-											<label>Ev Battery Max Voltage</label>
+											<label>EV Battery Max Voltage</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo1']['EvBatteryMaxVoltage'];?> volt">
 											<input type="hidden" name="EvBatteryMaxVoltage1" id="EvBatteryMaxVoltage1" value="<?php echo $obj['ChargingInfo1']['EvBatteryMaxVoltage'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am001;?>">
-											<label>Ev Battery Target Voltage</label>
+											<label>EV Battery Target Voltage</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo1']['EvBatterytargetVoltage'];?> volt">
 											<input type="hidden" name="EvBatterytargetVoltage1" id="EvBatterytargetVoltage1" value="<?php echo $obj['ChargingInfo1']['EvBatterytargetVoltage'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am001;?>">
-											<label>Ev Battery Soc</label>
+											<label>EV Battery Soc</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo1']['EvBatterySoc'];?>">
 											<input type="hidden" name="EvBatterySoc1" id="EvBatterySoc1" value="<?php echo $obj['ChargingInfo1']['EvBatterySoc'];?>">
 										</div>
@@ -500,12 +500,12 @@ img {
 											<input type="hidden" name="PresentChargingPower2" id="PresentChargingPower2" value="<?php echo $obj['ChargingInfo2']['PresentChargingPower'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
-											<label>Present Charged Energy</label>
+											<label>Present Charging Energy</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo2']['PresentChargedEnergy'];?> kWh">
 											<input type="hidden" name="PresentChargedEnergy2" id="PresentChargedEnergy2" value="<?php echo $obj['ChargingInfo2']['PresentChargedEnergy'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
-											<label>Present Charged Duration</label>
+											<label>Present Charging Duration</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo2']['PresentChargedDuration'];?> seconds">
 											<input type="hidden" name="PresentChargedDuration2" id="PresentChargedDuration2" value="<?php echo $obj['ChargingInfo2']['PresentChargedDuration'];?>">
 										</div>
@@ -515,17 +515,17 @@ img {
 											<input type="hidden" name="RemainChargingDuration2" id="RemainChargingDuration2" value="<?php echo $obj['ChargingInfo2']['RemainChargingDuration'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am001;?>">
-											<label>Ev Battery Max Voltage</label>
+											<label>EV Battery Max Voltage</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo2']['EvBatteryMaxVoltage'];?> volt">
 											<input type="hidden" name="EvBatteryMaxVoltage2" id="EvBatteryMaxVoltage2" value="<?php echo $obj['ChargingInfo2']['EvBatteryMaxVoltage'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am001;?>">
-											<label>Ev Battery Target Voltage</label>
+											<label>EV Battery Target Voltage</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo2']['EvBatterytargetVoltage'];?> volt">
 											<input type="hidden" name="EvBatterytargetVoltage2" id="EvBatterytargetVoltage2" value="<?php echo $obj['ChargingInfo2']['EvBatterytargetVoltage'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am001;?>">
-											<label>Ev Battery Soc</label>
+											<label>EV Battery Soc</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo2']['EvBatterySoc'];?>">
 											<input type="hidden" name="EvBatterySoc2" id="EvBatterySoc2" value="<?php echo $obj['ChargingInfo2']['EvBatterySoc'];?>">
 										</div>
@@ -583,12 +583,12 @@ img {
 											<input type="hidden" name="PresentChargingPower3" id="PresentChargingPower3" value="<?php echo $obj['ChargingInfo3']['PresentChargingPower'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
-											<label>Present Charged Energy</label>
+											<label>Present Charging Energy</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo3']['PresentChargedEnergy'];?> kWh">
 											<input type="hidden" name="PresentChargedEnergy3" id="PresentChargedEnergy3" value="<?php echo $obj['ChargingInfo3']['PresentChargedEnergy'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
-											<label>Present Charged Duration</label>
+											<label>Present Charging Duration</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo3']['PresentChargedDuration'];?> seconds">
 											<input type="hidden" name="PresentChargedDuration3" id="PresentChargedDuration3" value="<?php echo $obj['ChargingInfo3']['PresentChargedDuration'];?>">
 										</div>
@@ -598,17 +598,17 @@ img {
 											<input type="hidden" name="RemainChargingDuration3" id="RemainChargingDuration3" value="<?php echo $obj['ChargingInfo3']['RemainChargingDuration'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am001;?>">
-											<label>Ev Battery Max Voltage</label>
+											<label>EV Battery Max Voltage</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo3']['EvBatteryMaxVoltage'];?> volt">
 											<input type="hidden" name="EvBatteryMaxVoltage3" id="EvBatteryMaxVoltage3" value="<?php echo $obj['ChargingInfo3']['EvBatteryMaxVoltage'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am001;?>">
-											<label>Ev Battery Target Voltage</label>
+											<label>EV Battery Target Voltage</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo3']['EvBatterytargetVoltage'];?> volt">
 											<input type="hidden" name="EvBatterytargetVoltage3" id="EvBatterytargetVoltage3" value="<?php echo $obj['ChargingInfo3']['EvBatterytargetVoltage'];?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am001;?>">
-											<label>Ev Battery Soc</label>
+											<label>EV Battery Soc</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo3']['EvBatterySoc'];?>">
 											<input type="hidden" name="EvBatterySoc3" id="EvBatterySoc3" value="<?php echo $obj['ChargingInfo3']['EvBatterySoc'];?>">
 										</div>

EVSE/rootfs/var/www/set_network.php

@@ -116,70 +116,70 @@ img {
 									</section>
 								</article>
 								<!--Ethernet Interface0-->
-								<article class="envor-sorting-item css">
+								<article class="envor-sorting-item css" style="display:<?php echo $am101;?>">
 									<header><?php echo $lang->showWord("ethernet_interface"); ?><i class="fa fa-plus"></i></header>
 									<section>
-										<div class="form-group" style="display:<?php echo $am101;?>">
-											<label>Dhcp Client</label>
+										<div class="form-group">
+											<label>DHCP Client</label>
 											<select class="form-control" id="Eth0DhcpClient" name="Eth0DhcpClient">
 												<option value="0" <?php echo $obj->{'Eth0DhcpClient'}=="0"?"selected":""?>>enable</option>
 												<option value="1" <?php echo $obj->{'Eth0DhcpClient'}=="1"?"selected":""?>>disable</option>
 											</select>
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Mac Address</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'Eth0MacAddress'};?>">
 											<input type="hidden" name="Eth0MacAddress" id="Eth0MacAddress" value="<?php echo $obj->{'Eth0MacAddress'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
-											<label>Ip Address</label>
+										<div class="form-group">
+											<label>IP Address</label>
 											<input type="text" name="Eth0IpAddress" id="Eth0IpAddress" class="form-control" value="<?php echo $obj->{'Eth0IpAddress'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Submask Address</label>
 											<input type="text" name="Eth0SubmaskAddress" id="Eth0SubmaskAddress" class="form-control" value="<?php echo $obj->{'Eth0SubmaskAddress'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Gateway Address</label>
 											<input type="text" name="Eth0GatewayAddress" id="Eth0GatewayAddress" class="form-control" value="<?php echo $obj->{'Eth0GatewayAddress'};?>">
 										</div>
 									</section>
 								</article>
 <?php /*								<!--Ethernet Interface1-->
-								<article class="envor-sorting-item css">
+								<article class="envor-sorting-item css" style="display:<?php echo $am101;?>">
 									<header><?php echo $lang->showWord("ethernet_interface"); ?><i class="fa fa-plus"></i></header>
 									<section>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Eth1DhcpClient</label>
 											<select class="form-control" id="Eth1DhcpClient" name="Eth1DhcpClient">
 												<option value="0" <?php echo $obj->{'Eth1DhcpClient'}=="0"?"selected":""?>>enable</option>
 												<option value="1" <?php echo $obj->{'Eth1DhcpClient'}=="1"?"selected":""?>>disable</option>
 											</select>
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Eth1MacAddress</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'Eth1MacAddress'};?>">
 											<input type="hidden" name="Eth1MacAddress" id="Eth1MacAddress" value="<?php echo $obj->{'Eth1MacAddress'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Eth1IpAddress</label>
 											<input type="text" name="Eth1IpAddress" id="Eth1IpAddress" class="form-control" value="<?php echo $obj->{'Eth1IpAddress'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Eth1SubmaskAddress</label>
 											<input type="text" name="Eth1SubmaskAddress" id="Eth1SubmaskAddress" class="form-control" value="<?php echo $obj->{'Eth1SubmaskAddress'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Eth1GatewayAddress</label>
 											<input type="text" name="Eth1GatewayAddress" id="Eth1GatewayAddress" class="form-control" value="<?php echo $obj->{'Eth1GatewayAddress'};?>">
 										</div>
 									</section>
 								</article>*/?>
 								<!--WiFi Module-->
-								<article class="envor-sorting-item css">
+								<article class="envor-sorting-item css" style="display:<?php echo $showWifi;?>">
 									<header><?php echo $lang->showWord("WiFi_module"); ?><i class="fa fa-plus"></i></header>
 									<section>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Mode</label>
 											<select class="form-control" id="WifiMode" name="WifiMode" onchange="WifiMode_changed();">
 												<option value="0" <?php echo $obj->{'WifiMode'}=="0"?"selected":""?>>disable</option>
@@ -188,51 +188,51 @@ img {
 <?php /*												<option value="3" <?php echo $obj->{'WifiMode'}=="3"?"selected":""?>>Ad-Hoc</option>*/?>
 											</select>
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>SSID</label>
 											<input type="text" name="WifiSsid" id="WifiSsid" class="form-control" value="<?php echo $obj->{'WifiSsid'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Password</label>
 											<input type="text" name="WifiPassword" id="WifiPassword" class="form-control" value="<?php echo $obj->{'WifiPassword'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>RSSI</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'WifiRssi'};?> dBm">
 											<input type="hidden" name="WifiRssi" id="WifiRssi" value="<?php echo $obj->{'WifiRssi'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
-											<label>Dhcp Server</label>
+										<div class="form-group">
+											<label>DHCP Server</label>
 											<select class="form-control" id="WifiDhcpServer" name="WifiDhcpServer">
 												<option value="0" <?php echo $obj->{'WifiDhcpServer'}=="0"?"selected":""?>>enable</option>
 												<option value="1" <?php echo $obj->{'WifiDhcpServer'}=="1"?"selected":""?>>disable</option>
 											</select>
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
-											<label>Dhcp Client</label>
+										<div class="form-group">
+											<label>DHCP Client</label>
 											<select class="form-control" id="WifiDhcpClient" name="WifiDhcpClient">
 												<option value="0" <?php echo $obj->{'WifiDhcpClient'}=="0"?"selected":""?>>enable</option>
 												<option value="1" <?php echo $obj->{'WifiDhcpClient'}=="1"?"selected":""?>>disable</option>
 											</select>
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Mac Address</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'WifiMacAddress'};?>">
 											<input type="hidden" name="WifiMacAddress" id="WifiMacAddress" value="<?php echo $obj->{'WifiMacAddress'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
-											<label>Ip Address</label>
+										<div class="form-group">
+											<label>IP Address</label>
 											<input type="text" name="WifiIpAddress" id="WifiIpAddress" class="form-control" value="<?php echo $obj->{'WifiIpAddress'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Submask Address</label>
 											<input type="text" name="WifiSubmaskAddress" id="WifiSubmaskAddress" class="form-control" value="<?php echo $obj->{'WifiSubmaskAddress'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Gateway Address</label>
 											<input type="text" name="WifiGatewayAddress" id="WifiGatewayAddress" class="form-control" value="<?php echo $obj->{'WifiGatewayAddress'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Network Connection Status</label>
 											<input type="text" readonly class="form-control" value="<?php echo $WifiNetworkConn;?>">
 											<input type="hidden" name="WifiNetworkConn" id="WifiNetworkConn" value="<?php echo $obj->{'WifiNetworkConn'};?>">
@@ -240,56 +240,56 @@ img {
 									</section>
 								</article>
 								<!--3G/4G Module-->
-								<article class="envor-sorting-item css">
+								<article class="envor-sorting-item css" style="display:<?php echo $showTelcom;?>">
 									<header><?php echo $lang->showWord("3G/4G_module"); ?><i class="fa fa-plus"></i></header>
 									<section>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>APN</label>
 											<input type="text" name="TelcomApn" id="TelcomApn" class="form-control" value="<?php echo $obj->{'TelcomApn'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>RSSI</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'TelcomRssi'};?> dBm">
 											<input type="hidden" name="TelcomRssi" id="TelcomRssi" value="<?php echo $obj->{'TelcomRssi'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Chap Pap Id</label>
 											<input type="text" name="TelcomChapPapId" id="TelcomChapPapId" class="form-control" value="<?php echo $obj->{'TelcomChapPapId'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Chap Pap Pwd</label>
 											<input type="text" name="TelcomChapPapPwd" id="TelcomChapPapPwd" class="form-control" value="<?php echo $obj->{'TelcomChapPapPwd'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Modem IMEI</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'TelcomModemImei'};?>">
 											<input type="hidden" name="TelcomModemImei" id="TelcomModemImei" value="<?php echo $obj->{'TelcomModemImei'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
-											<label>Sim IMSI</label>
+										<div class="form-group">
+											<label>SIM IMSI</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'TelcomSimImsi'};?>">
 											<input type="hidden" name="TelcomSimImsi" id="TelcomSimImsi" value="<?php echo $obj->{'TelcomSimImsi'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
-											<label>Sim ICCID</label>
+										<div class="form-group">
+											<label>SIM ICCID</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'TelcomSimIccid'};?>">
 											<input type="hidden" name="TelcomSimIccid" id="TelcomSimIccid" value="<?php echo $obj->{'TelcomSimIccid'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
-											<label>Sim Status</label>
+										<div class="form-group">
+											<label>SIM Status</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $TelcomSimStatus;?>">
 											<input type="hidden" name="TelcomSimStatus" id="TelcomSimStatus" value="<?php echo $obj->{'TelcomSimStatus'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Modem Mode</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $TelcomModemMode;?>">
 											<input type="hidden" name="TelcomModemMode" id="TelcomModemMode" value="<?php echo $obj->{'TelcomModemMode'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
-											<label>Ip Address</label>
+										<div class="form-group">
+											<label>IP Address</label>
 											<input type="text" name="TelcomIpAddress" id="TelcomIpAddress" class="form-control" value="<?php echo $obj->{'TelcomIpAddress'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am101;?>">
+										<div class="form-group">
 											<label>Network Connection Status</label>
 											<input type="text" readonly class="form-control" value="<?php echo $TelcomNetworkConn;?>">
 											<input type="hidden" name="TelcomNetworkConn" id="TelcomNetworkConn" value="<?php echo $obj->{'TelcomNetworkConn'};?>">

EVSE/rootfs/var/www/set_system.php

@@ -281,7 +281,7 @@ img {
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'RelayModuleFwRev'};?>">
 											<input type="hidden" name="RelayModuleFwRev" id="RelayModuleFwRev" value="<?php echo $obj->{'RelayModuleFwRev'};?>">
 										</div>
-										<div class="form-group" style="display:<?php echo $am001;?>">
+										<div class="form-group" style="display:<?php echo $showTelcom;?>">
 											<label>Telcom Modem Fw Rev</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'TelcomModemFwRev'};?>">
 											<input type="hidden" name="TelcomModemFwRev" id="TelcomModemFwRev" value="<?php echo $obj->{'TelcomModemFwRev'};?>">