NewLife
/
SmartOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TokenClient 不做注册invoke操作

This commit is contained in:
WangQiang 2016-08-20 07:12:12 +00:00
parent fde3d42543
commit d7109dee02
7 changed files with 27 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Board/AP0104.cpp
View File

@ -157,6 +157,11 @@ void AP0104::InitClient()
Client = client;
Client->MaxNotActive = 480000;
// 重启
Client->Register("Gateway/Restart", &TokenClient::InvokeRestStart, Client);
// 重置
Client->Register("Gateway/Reset", &TokenClient::InvokeRestBoot, Client);
if (Data && Size > 0)
{
auto& ds = Client->Store;

6
Board/AP0801.cpp
View File

@ -159,7 +159,11 @@ void AP0801::InitClient()
Client = client;
Client->MaxNotActive = 480000;
Client->UseLocal();
// 重启
Client->Register("Gateway/Restart", &TokenClient::InvokeRestStart, Client);
// 重置
Client->Register("Gateway/Reset", &TokenClient::InvokeRestBoot, Client);
if(Data && Size > 0)
{

4
Board/AP0802.cpp
View File

@ -173,6 +173,10 @@ void AP0802::InitClient()
Client = client;
Client->MaxNotActive = 480000;
// 重启
Client->Register("Gateway/Restart", &TokenClient::InvokeRestStart, Client);
// 重置
Client->Register("Gateway/Reset", &TokenClient::InvokeRestBoot, Client);
if(Data && Size > 0)
{

4
Board/IOK027X.cpp
View File

@ -114,6 +114,10 @@ void IOK027X::InitClient()
Client = client;
Client->MaxNotActive = 480000;
// 重启
Client->Register("Gateway/Restart", &TokenClient::InvokeRestStart, Client);
// 重置
Client->Register("Gateway/Reset", &TokenClient::InvokeRestBoot, Client);
if (Data && Size > 0)
{

5
Board/Pandora.cpp
View File

@ -91,6 +91,11 @@ void PA0903::InitClient()
Client = client;
// 重启
Client->Register("Gateway/Restart", &TokenClient::InvokeRestStart, Client);
// 重置
Client->Register("Gateway/Reset", &TokenClient::InvokeRestBoot, Client);
if (Data && Size > 0)
{
auto& ds = Client->Store;

59
TokenNet/TokenClient.cpp
View File

@ -45,14 +45,6 @@ TokenClient::TokenClient()
Register("Gateway/Restart", InvokeRestStart, this);
// 重置
Register("Gateway/Reset", InvokeRestBoot, this);
// 透传
Register("Proxy/Read", InvokeRead, this);
Register("Proxy/Write", InvokeWrite, this);
// 设置配置
Register("Proxy/SetConfig", InvokeConfigSet, this);
// 获取配置
Register("Proxy/GetConfig", InvokeConfigGet, this);
}
void TokenClient::Open()
@ -1033,54 +1025,3 @@ bool TokenClient::InvokeRestBoot(void * param, const Pair& args, Stream& result)
return true;
}
bool TokenClient::InvokeWrite(void * param, const Pair& args, Stream& result)
{
ByteArray data;
//if (!args.Get("id", id)) return false;
if (!args.Get("data", data)) return false;
// 拿到数据，根据ID分发给各个串口
//测试，原样返回结果
//result.Write("id");
//result.Write(id);
//result.Write("data")
result.Write(data.Length());
return true;
}
bool TokenClient::InvokeRead(void * param, const Pair& args, Stream& result)
{
ByteArray data;
//if (!args.Get("id", id)) return false;
if (!args.Get("data", data)) return false;
// 拿到数据，根据ID分发给各个串口
//测试，原样返回结果
//result.Write("id");
//result.Write(id);
//result.Write("data")
result.Write(data);
return true;
}
bool TokenClient::InvokeConfigGet(void * param, const Pair& args, Stream& result)
{
result.Write(true);
return true;
}
bool TokenClient::InvokeConfigSet(void * param, const Pair& args, Stream& result)
{
result.Write(true);
return true;
}

15
TokenNet/TokenClient.h
View File

@ -86,6 +86,10 @@ public:
Register(action, *(InvokeHandler*)&func, target);
}
// 重启，重置
static bool InvokeRestStart(void * param, const Pair& args, Stream& result);
static bool InvokeRestBoot(void * param, const Pair& args, Stream& result);
private:
bool OnHello(TokenMessage& msg, TokenController* ctrl);
@ -104,17 +108,6 @@ private:
void OnInvoke(const TokenMessage& msg, TokenController* ctrl);
bool OnInvoke(const String& action, const Pair& args, Stream& result);
// 重启，重置
static bool InvokeRestStart(void * param, const Pair& args, Stream& result);
static bool InvokeRestBoot(void * param, const Pair& args, Stream& result);
//配置
static bool InvokeConfigSet(void * param, const Pair& args, Stream& result);
static bool InvokeConfigGet(void * param, const Pair& args, Stream& result);
//透传消息
static bool InvokeRead(void * param, const Pair& args, Stream& result);
static bool InvokeWrite(void * param, const Pair& args, Stream& result);
private:
uint _task;