Преглед изворни кода

Updated version number and seperated hardware man and power man

Toby Chui пре 2 година
родитељ
комит
9ad403ad4a
3 измењених фајлова са 17 додато и 12 уклоњено
  1. 2 2
      hardware.power.go
  2. 2 1
      main.flags.go
  3. 13 9
      web/desktop.system

+ 2 - 2
hardware.power.go

@@ -10,7 +10,7 @@ import (
 )
 
 func HardwarePowerInit() {
-	if *allow_hardware_management {
+	if *allow_power_management {
 		//Only register these paths when hardware management is enabled
 		http.HandleFunc("/system/power/shutdown", hardware_power_poweroff)
 		http.HandleFunc("/system/power/restart", hardware_power_restart)
@@ -30,7 +30,7 @@ func HardwarePowerInit() {
 }
 
 func hardware_power_checkIfHardware(w http.ResponseWriter, r *http.Request) {
-	if *allow_hardware_management {
+	if *allow_power_management {
 		utils.SendJSONResponse(w, "true")
 	} else {
 		utils.SendJSONResponse(w, "false")

+ 2 - 1
main.flags.go

@@ -29,7 +29,7 @@ var subserviceBasePort = 12810            //Next subservice port
 
 // =========== SYSTEM BUILD INFORMATION ==============
 var build_version = "development"                      //System build flag, this can be either {development / production / stable}
-var internal_version = "0.2.008"                       //Internal build version, [fork_id].[major_release_no].[minor_release_no]
+var internal_version = "0.2.009"                       //Internal build version, [fork_id].[major_release_no].[minor_release_no]
 var deviceUUID string                                  //The device uuid of this host
 var deviceVendor = "IMUSLAB.INC"                       //Vendor of the system
 var deviceVendorURL = "http://imuslab.com"             //Vendor contact information
@@ -69,6 +69,7 @@ var session_key = flag.String("session_key", "", "Session key, must be 16, 24 or
 
 // Flags related to hardware or interfaces
 var allow_hardware_management = flag.Bool("enable_hwman", true, "Enable hardware management functions in system")
+var allow_power_management = flag.Bool("enable_pwman", true, "Enable power management of the host system")
 var wpa_supplicant_path = flag.String("wpa_supplicant_config", "/etc/wpa_supplicant/wpa_supplicant.conf", "Path for the wpa_supplicant config")
 var wan_interface_name = flag.String("wlan_interface_name", "wlan0", "The default wireless interface for connecting to an AP")
 

+ 13 - 9
web/desktop.system

@@ -1085,12 +1085,15 @@
             <i class="expand icon"></i> <span locale="quickAccess/fullscreen">Toggle Fullscreen</span>
         </div>
         <div class="ui divider" style="margin: 0.4em;"></div>
-        <div class="item hardware" onclick="restart(); hideToolPanel();" ontouchend="restart(); hideToolPanel();">
+        <div class="item powerman" onclick="restart(); hideToolPanel();" ontouchend="restart(); hideToolPanel();">
             <i class="repeat icon"></i> <span locale="quickAccess/restart">Restart</span>
         </div>
-        <div class="item hardware" style="color:#b51d1d;"  onclick="shutdown(); hideToolPanel();" ontouchend="shutdown(); hideToolPanel();">
+        <div class="item powerman" style="color:#b51d1d;"  onclick="shutdown(); hideToolPanel();" ontouchend="shutdown(); hideToolPanel();">
             <i class="power icon"></i> <span locale="quickAccess/poweroff">Power Off</span>
         </div>
+        <div class="ui container" style="padding-left: 1em; color: rgb(199, 199, 199);">
+            <small id="sysinfo"></small>
+        </div>
     </div>
     <div>
         <canvas id="textWidthCanvas" style="display:none;"></canvas>
@@ -1167,7 +1170,7 @@
         var daysNames = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'];
         var hostInfo = {};
         var userInfo = {};
-        var hardwareman = false;
+        var powerman = false;
         var downloadMode = false;
         var lowMemoryMode = true;
 
@@ -1353,7 +1356,7 @@
                 //Update the ui element as well
                 $(".hostname").text(hostInfo.Hostname);
                 document.title = hostInfo.Hostname;
-
+                $("#sysinfo").text(hostInfo.DeviceModel + " firmware:" + hostInfo.BuildVersion + " " + hostInfo.InternalVersion);
             });
 
             //Setup volume bar
@@ -1380,14 +1383,15 @@
             $.get("system/power/accessCheck",function(data){
                 if (data == true){
                     //Hardware management mode is on
-                    hardwareman = true;
+                    powerman = true;
                 }else{
                     //Hardware management mode is off
-                    $(".item.hardware").hide();
-                    hardwareman = false;
+                    $(".item.powerman").remove();
+                    powerman = false;
                 }   
             });
 
+
         }
 
         function toggleNotification(action=undefined){
@@ -6174,7 +6178,7 @@
         }
 
         function restart(){
-            if (!hardwareman){
+            if (!powerman){
                 return
             }
             var apiObject = {
@@ -6199,7 +6203,7 @@
         }
 
         function shutdown(){
-            if (!hardwareman){
+            if (!powerman){
                 return
             }