*修改代码结构

1 files changed, 17 insertions, 13 deletions

diff --git a/src/lua/modules/time/je_lua_timer.cpp b/src/lua/modules/time/je_lua_timer.cpp
index 6e5c390..67f92e2 100644
--- a/src/lua/modules/time/je_lua_timer.cpp
+++ b/src/lua/modules/time/je_lua_timer.cpp
@@ -1,4 +1,4 @@
-#include "../types.h"
+
 #include "lua/common/je_lua_callback.h"
 #include "lua/common/je_lua_common.h"
 #include "je_lua_timer.h"
@@ -10,6 +10,10 @@ namespace JinEngine
     namespace Lua
     {
 
+        const char* Jin_Lua_Timer = "Timer";
+
+        const char* Jin_Lua_Handler = "Handler";
+
         typedef Shared<Timer>& SharedTimer;
 
         static Timer::TimerCallback timerCallback = [](void* data)->void 
@@ -26,7 +30,7 @@ namespace JinEngine
 
         LUA_IMPLEMENT inline SharedTimer checkTimer(lua_State* L)
         {
-            Proxy* proxy = (Proxy*)luax_checktype(L, 1, JIN_TIME_TIMER);
+            Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Timer);
             return proxy->getShared<Timer>();
         }
 
@@ -42,8 +46,8 @@ namespace JinEngine
             for(int i = 4; i <= n; ++i)
                 func->pushParam(i);
             Timer::Handler* handler = timer->every(s, timerCallback, func, finishCallback);
-            Proxy* proxy = luax_newinstance(L, JIN_TIME_HANDLER);
-            proxy->bind(new Shared<Timer::Handler>(handler, JIN_TIME_HANDLER));
+            Proxy* proxy = luax_newinstance(L, Jin_Lua_Handler);
+            proxy->bind(new Shared<Timer::Handler>(handler, Jin_Lua_Handler));
             return 1;
         }
 
@@ -59,8 +63,8 @@ namespace JinEngine
             for (int i = 4; i <= n; ++i)
                 func->pushParam(i);
             Timer::Handler* handler = timer->after(s, timerCallback, func, finishCallback);
-            Proxy* proxy = luax_newinstance(L, JIN_TIME_HANDLER);
-            proxy->bind(new Shared<Timer::Handler>(handler, JIN_TIME_HANDLER));
+            Proxy* proxy = luax_newinstance(L, Jin_Lua_Handler);
+            proxy->bind(new Shared<Timer::Handler>(handler, Jin_Lua_Handler));
             return 1;
         }
 
@@ -77,8 +81,8 @@ namespace JinEngine
             for (int i = 5; i <= n; ++i)
                 func->pushParam(i);
             Timer::Handler* handler = timer->repeat(s, count, timerCallback, func, finishCallback);
-            Proxy* proxy = luax_newinstance(L, JIN_TIME_HANDLER);
-            proxy->bind(new Shared<Timer::Handler>(handler, JIN_TIME_HANDLER));
+            Proxy* proxy = luax_newinstance(L, Jin_Lua_Handler);
+            proxy->bind(new Shared<Timer::Handler>(handler, Jin_Lua_Handler));
             return 1;
         }
 
@@ -93,9 +97,9 @@ namespace JinEngine
 
         LUA_IMPLEMENT int l_cancel(lua_State* L)
         {
-            Proxy* p = (Proxy*)luax_checktype(L, 1, JIN_TIME_TIMER);
+            Proxy* p = (Proxy*)luax_checktype(L, 1, Jin_Lua_Timer);
             Timer* timer = p->getObject<Timer>();
-            Proxy* ph = (Proxy*)luax_checktype(L, 2, JIN_TIME_HANDLER);
+            Proxy* ph = (Proxy*)luax_checktype(L, 2, Jin_Lua_Handler);
             Timer::Handler* handler = ph->getObject<Timer::Handler>();
             timer->cancel(handler);
             return 0;
@@ -103,7 +107,7 @@ namespace JinEngine
 
         LUA_IMPLEMENT int l_cancelAll(lua_State* L)
         {
-            Proxy* p = (Proxy*)luax_checktype(L, 1, JIN_TIME_TIMER);
+            Proxy* p = (Proxy*)luax_checktype(L, 1, Jin_Lua_Timer);
             Timer* timer = p->getObject<Timer>();
             timer->cancelAll();
             return 0;
@@ -111,7 +115,7 @@ namespace JinEngine
 
         LUA_IMPLEMENT int l_gc(lua_State* L)
         {
-            Proxy* p = (Proxy*)luax_checktype(L, 1, JIN_TIME_TIMER);
+            Proxy* p = (Proxy*)luax_checktype(L, 1, Jin_Lua_Timer);
             p->release();
             return 0;
         }
@@ -129,7 +133,7 @@ namespace JinEngine
                 { 0,           0           }
             };
 
-            luax_newtype(L, JIN_TIME_TIMER, f);
+            luax_newtype(L, Jin_Lua_Timer, f);
 
             return 0;
         }