From 6026d7a93d8bcb2d88dd53328af6f32434adae6d Mon Sep 17 00:00:00 2001
From: "parallelbgls@outlook.com" <parallelbgls@outlook.com>
Date: Wed, 17 Sep 2014 16:23:16 +0800
Subject: [PATCH] 2014-09-17 update 1

---
 .../Controllers/CrossLampController.cs          |   3 +++
 .../CrossLampControl.WebApi/Models/Lamp.cs      |   8 +++++++-
 .../Scripts/_references.js                      | Bin 396 -> 600 bytes
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Modbus.Net/CrossLampControl.WebApi/Controllers/CrossLampController.cs b/Modbus.Net/CrossLampControl.WebApi/Controllers/CrossLampController.cs
index cdbf1ab..21921e9 100644
--- a/Modbus.Net/CrossLampControl.WebApi/Controllers/CrossLampController.cs
+++ b/Modbus.Net/CrossLampControl.WebApi/Controllers/CrossLampController.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Web.Http;
+using System.Web.Http.Routing;
 using CrossLampControl.WebApi.Models;
 using ModBus.Net;
 
@@ -41,7 +42,9 @@ namespace CrossLampControl.WebApi.Controllers
             {
                 light.SubLamp = LightLamp.Red.ToString();
             }
+            light.SetStart(lamps[6]);
             return light;
         }
+
     }
 }
diff --git a/Modbus.Net/CrossLampControl.WebApi/Models/Lamp.cs b/Modbus.Net/CrossLampControl.WebApi/Models/Lamp.cs
index 23c7a32..f7222c3 100644
--- a/Modbus.Net/CrossLampControl.WebApi/Models/Lamp.cs
+++ b/Modbus.Net/CrossLampControl.WebApi/Models/Lamp.cs
@@ -10,6 +10,7 @@ namespace CrossLampControl.WebApi.Models
     {
         public string MainLamp { get; set; }
         public string SubLamp { get; set; }
+        public string StartPause { get; set; }
 
         public Lamp()
         {
@@ -17,10 +18,15 @@ namespace CrossLampControl.WebApi.Models
             SubLamp = LightLamp.Red.ToString();
         }
 
-        public Lamp(LightLamp mLamp, LightLamp sLamp)
+        public void SetLamp(LightLamp mLamp, LightLamp sLamp)
         {
             MainLamp = mLamp.ToString();
             SubLamp = sLamp.ToString();
         }
+
+        public void SetStart(bool isStart)
+        {
+            StartPause = isStart ? "Start" : "Pause";
+        }
     }
 }
\ No newline at end of file
diff --git a/Modbus.Net/CrossLampControl.WebApi/Scripts/_references.js b/Modbus.Net/CrossLampControl.WebApi/Scripts/_references.js
index 518a95992a99e9a3b60c01f77668ad6fb1fcbf08..cafa52a854a79f55189cce32d675537416b56be6 100644
GIT binary patch
delta 92
zcmeBSzQHmfZ?YVt-^3GP6Ho96>M@itBr@bMWHO`x=@N$2i4Sdo;+h!Z40;Tu40#Os
X3`sy$ML>2jP)`{|eO}b$97Y8I+{78!

delta 20
ccmcb?(!)F<Z}L6HsEK>RCg%A~wqQ~K09+Ob6951J