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

设备列表 使用Invoke 编译OK 未测试

This commit is contained in:
WangQiang 2016-06-16 03:26:00 +00:00
parent cdfdfe72b3
commit 99774b4504
4 changed files with 193 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
TinyNet/TinyServer.cpp
View File

@ -117,13 +117,20 @@ bool TinyServer::OnReceive(TinyMessage& msg)
switch(msg.Code)
{
case 1:
if(!OnJoin(msg)) return false;
{
if (!OnJoin(msg)) return false;
dv = Current;
break;
DevMgmt.DeviceRequest(DeviceAtions::Online, dv);
return true;
}
case 2:
if(!OnDisjoin(msg))
return false;
break;
{
if (!OnDisjoin(msg))return false;
DevMgmt.DeviceRequest(DeviceAtions::Delete, dv);
return true;
}
case 3:
// 设置当前设备
Current = dv;

306
TokenNet/DevicesManagement.cpp
View File

@ -3,6 +3,8 @@
DevicesManagement* DevicesManagement::Current = nullptr;
/******************************** 功能代码 ********************************/
DevicesManagement::DevicesManagement()
{
//DevArr.SetLength(0);
@ -257,6 +259,138 @@ void DevicesManagement::ShowDev()
debug_printf("\r\n\r\n");
}
/******************************** TokenMsg数据处理 ********************************/
/******************************** 收到Invoke ********************************/
void DevicesManagement::SetTokenClient(TokenClient *port)
{
if (port == nullptr)return;
Port = port;
Port->Register("Device/List", InvokeList);
Port->Register("Device/Update", InvokeUpdate);
Port->Register("Device/Delete", InvokeDelete);
Port->Register("Device/ListIDs", InvokeListIDs);
}
// Invoke 注册项
bool DevicesManagement::InvokeList(const BinaryPair& args, BinaryPair& result)
{
if (Current == nullptr)return false;
return Current->DeviceProcess(DeviceAtions::List, args, result);
}
bool DevicesManagement::InvokeUpdate(const BinaryPair& args, BinaryPair& result)
{
if (Current == nullptr)return false;
return Current->DeviceProcess(DeviceAtions::Update, args, result);
}
bool DevicesManagement::InvokeDelete(const BinaryPair& args, BinaryPair& result)
{
if (Current == nullptr)return false;
return Current->DeviceProcess(DeviceAtions::Delete, args, result);
}
bool DevicesManagement::InvokeListIDs(const BinaryPair& args, BinaryPair& result)
{
if (Current == nullptr)return false;
return Current->DeviceProcess(DeviceAtions::ListIDs, args, result);
}
// 缺少更新的处理 未完待续
bool DevicesManagement::DeviceProcess(DeviceAtions act,const BinaryPair& args, BinaryPair& result)
{
TS("DevicesManagement::DeviceProcess");
// 仅处理来自云端的请求
switch (act)
{
case DeviceAtions::List:
{
// 获取需要发送的IDs
ByteArray idss;
args.Get("IDs", idss);
for (int i = 0; i < idss.Length(); i++) // 判定依据需要修改
{
// 获取数据ms
MemoryStream dvms;
// 序列化一个DevInfo到ms
if (!GetDevInfo(idss[i], dvms))continue;
// 转换为ByteArray
ByteArray dvbs(dvms.GetBuffer(), dvms.Position());
String countstr;
// 这里需要注意 ！！！！！ i 是 int 类型
countstr += i;
// 写入DevInfo
result.Set(countstr, dvbs);
}
return true;
}
case DeviceAtions::Delete:
{
// 拿到操作对象
byte addr = 0;
args.Get("ID", addr);
if (addr != 0x00)
{
if (_DevProcess)_DevProcess(act, FindDev(addr), _ClbkParam);
DeleteDev(addr);
}
// 拿到操作对象s
ByteArray idss;
args.Get("IDs", idss);
if (idss.Length() > 0)
{
for (int i = 0; i < idss.Length(); i++)
{
// 外部处理一下
if (_DevProcess)_DevProcess(act, FindDev(idss[i]), _ClbkParam);
DeleteDev(idss[i]);
}
}
// 准备回复数据
if (addr == 0x00 && idss.Length() == 0)
{
debug_printf("DeleteDev Error\r\n");
return false;
}
}
break;
case DeviceAtions::ListIDs:
{
//　获取IDs ByteArray
MemoryStream idsms;
WriteIDs(idsms);
ByteArray idbs(idsms.GetBuffer(), idsms.Position());
result.Set("IDs", idbs);
}
break;
// 未写
case DeviceAtions::Update:
{
}
break;
/*case DeviceAtions::Register:
break;
case DeviceAtions::Online:
break;
case DeviceAtions::Offline:
break;*/
default:
{
debug_printf("不支持的设备操作指令！！\r\n");
return false;
}
}
return true;
}
// 获取设备ID集合
int DevicesManagement::WriteIDs(Stream &ms)
{
int len = 0;
@ -272,122 +406,6 @@ int DevicesManagement::WriteIDs(Stream &ms)
return len;
}
bool DevicesManagement::DeviceProcess(String &act, const Message& msg)
{
TS("DevicesManagement::DeviceProcess");
// 仅处理来自云端的请求
if (msg.Reply) return false;
DeviceAtions devact = DeviceAtions::Register;
if (act == "Device/List")devact = DeviceAtions::List;
if (act == "Device/Update")devact = DeviceAtions::Update;
if (act == "Device/Delete")devact = DeviceAtions::Delete;
if (act == "Device/ListIDs")devact = DeviceAtions::ListIDs;
// if (act == "Device/Register")devact = DeviceAtions::Register;
// if (act == "Device/Online")devact = DeviceAtions::Online;
// if (act == "Device/Offline")devact = DeviceAtions::Offline;
if (devact == DeviceAtions::Register)debug_printf("不支持的命令\r\n");
auto ms = msg.ToStream();
BinaryPair bp(ms);
// 建立Reply
auto tmsg = (*(TokenMessage*)&msg).CreateReply();
switch (devact)
{
case DeviceAtions::List:
{
// 获取需要发送的IDs
ByteArray idss;
bp.Get("IDs", idss);
// 准备写入器
MemoryStream ms2;
BinaryPair bp2(ms2);
// 写入命令类型
bp2.Set("Action", act);
// 设备DevsInfo数据
for (int i = 0; i < idss.Length(); i++) // 判定依据需要修改
{
// 获取数据ms
MemoryStream dvms;
// 序列化一个DevInfo到ms
if (!GetDevInfo(idss[i], dvms))continue;
// 转换为ByteArray
ByteArray dvbs(dvms.GetBuffer(), dvms.Position());
String countstr;
countstr += i;
// 写入DevInfo
bp2.Set(countstr, dvbs);
}
// 将所有数据写入Data
tmsg.SetData(Buffer(ms2.GetBuffer(), ms2.Position()));
// 发送
//Port->Reply(tmsg);
}
break;
case DeviceAtions::Delete:
{
// 拿到操作对象
byte addr = 0;
bp.Get("ID", addr);
DeleteDev(addr);
// 拿到操作对象s
ByteArray idss;
bp.Get("IDs", idss);
for (int i = 0; i < idss.Length(); i++)
{
auto dv = FindDev(idss[i]);
// 外部处理一下
if (_DevProcess)_DevProcess(devact, dv, _ClbkParam);
DeleteDev(idss[i]);
}
// 准备回复数据
if (addr == 0x00 && idss.Length() == 0)
{
debug_printf("DeleteDev Error\r\n");
tmsg.Error = true;
}
}
break;
case DeviceAtions::ListIDs:
{
MemoryStream ms2;
BinaryPair bp2(ms2);
bp2.Set("Action", act);
//　获取IDs ByteArray
MemoryStream idsms;
WriteIDs(idsms);
// for (int i = 0; i < DevArr.Length(); i++)
// {
// if (DevArr[i] == nullptr)continue;
// idsms.Write(DevArr[i]->Address);
// }
ByteArray idbs(idsms.GetBuffer(), idsms.Position());
// 写入名值对
bp2.Set("IDs", idbs);
tmsg.SetData(Buffer(ms2.GetBuffer(), ms2.Position()));
}
break;
/*case DeviceAtions::Update:
break;
case DeviceAtions::Register:
break;
case DeviceAtions::Online:
break;
case DeviceAtions::Offline:
break;*/
default:
debug_printf("不支持的设备操作指令！！\r\n");
tmsg.Error = true;
break;
}
return Port->Reply(tmsg);
}
// 获取设备信息到流
bool DevicesManagement::GetDevInfo(byte id, MemoryStream &ms)
{
@ -430,23 +448,26 @@ bool DevicesManagement::GetDevInfo(Device *dv, MemoryStream &ms)
return true;
}
/******************************** 发送Invoke ********************************/
void DevicesManagement::SendDevicesIDs()
{
// 获取IDList
MemoryStream idms;
WriteIDs(idms);
ByteArray idbs(idms.GetBuffer(), idms.Position());
TokenMessage msg(0x08);
// 封装成所需 Data
MemoryStream ms;
BinaryPair bp(ms);
bp.Set("Action", String("Device/ListIDs"));
bp.Set("IDs", idbs);
msg.SetData(Buffer(ms.GetBuffer(), ms.Position()));
if (Port)Port->Send(msg);
Buffer bs(ms.GetBuffer(), ms.Position());
// 发送
if (Port)Port->Invoke("Device/ListIDs", bs);
}
// 设备状态上报 一次一个设备 未完待续
// 设备状态上报 一次一个设备
bool DevicesManagement::SendDevices(DeviceAtions act, const Device* dv)
{
TS("DevicesManagement::SendDevices");
@ -464,40 +485,35 @@ bool DevicesManagement::SendDevices(DeviceAtions act, const Device* dv)
case DeviceAtions::Register:
actstr = "Device/Register";
break;
// case DeviceAtions::Update:
// actstr = "Device/Update";
// break;
// case DeviceAtions::Online:
// actstr = "Device/Online";
// break;
// case DeviceAtions::Offline:
// actstr = "Device/Offline";
// break;
// case DeviceAtions::Delete:
// actstr = "Device/Delete";
// break;
// case DeviceAtions::ListIDs:
// break;
// case DeviceAtions::List:
// break;
case DeviceAtions::Update:
actstr = "Device/Update";
break;
case DeviceAtions::Online:
actstr = "Device/Online";
break;
case DeviceAtions::Offline:
actstr = "Device/Offline";
break;
case DeviceAtions::Delete:
actstr = "Device/Delete";
break;
default:
debug_printf("无法处理的指令\r\n");
return false;
}
if (actstr.Length() == 0)return false;
// 拿取数据
MemoryStream datams;
BinaryPair bp(datams);
bp.Set("Action", actstr);
GetDevInfo((Device*)dv, datams);
TokenMessage tmsg(0x08);
tmsg.SetData(Buffer(datams.GetBuffer(), datams.Position()));
Port->Send(tmsg);
if (Port)Port->Invoke(actstr, Buffer(datams.GetBuffer(),datams.Position()));
return true;
}
/******************************** Tiny侧数据处理 ********************************/
void DevicesManagement::DeviceRequest(DeviceAtions act, byte id)
{
if (id == 0x00)return;
@ -543,6 +559,8 @@ void DevicesManagement::DeviceRequest(DeviceAtions act, const Device* dv)
}
}
/******************************** 其他 ********************************/
void DevicesManagement::MaintainState()
{
if (Port)return;

19
TokenNet/DevicesManagement.h
View File

@ -14,6 +14,14 @@
// DevicesManagement 服务于客户端/云端 所以内部 Port 限定为TokenClient
class DevicesManagement
{
public:
// 全局只允许一个设备管理器 Invoke 也就使用这个
static DevicesManagement * Current;
static bool InvokeList (const BinaryPair& args, BinaryPair& result);
static bool InvokeUpdate (const BinaryPair& args, BinaryPair& result);
static bool InvokeDelete (const BinaryPair& args, BinaryPair& result);
static bool InvokeListIDs (const BinaryPair& args, BinaryPair& result);
public:
DevicesManagement();
~DevicesManagement();
@ -28,7 +36,8 @@ public:
void ClearDev();
void ShowDev();
private: // 外部操作使用 DeviceRequest
private:
// 外部操作使用 DeviceRequest
void SaveDev();
bool DeleteDev(byte id);
int PushDev(Device* dv);
@ -37,12 +46,14 @@ public:
List DevArr;
// 持久在线列表
List OnlineAlways;
static DevicesManagement * Current;
// 发送时刻再绑定？！ 如果绑定失败报错？
TokenClient * Port = nullptr;
// 发送时刻再绑定？！ 如果绑定失败报错？
void SetTokenClient(TokenClient *port);
// 处理TokenMsg的设备指令
bool DeviceProcess(String &act, const Message& msg);
//bool DeviceProcess(String &act, const Message& msg);
bool DeviceProcess(DeviceAtions act,const BinaryPair& args, BinaryPair& result);
void SendDevicesIDs();
// 设备状态变更上报 由TinyServer这种对象调用
void DeviceRequest(DeviceAtions act, const Device* dv = nullptr);

34
TokenNet/Gateway.cpp
View File

@ -61,7 +61,9 @@ void Gateway::Start()
pDevMgmt = new DevicesManagement();
// 设备列表服务于Token 保存token的“联系方式”
pDevMgmt->Port = Client;
//pDevMgmt->Port = Client;
pDevMgmt->SetTokenClient(Client);
if (pDevMgmt->Length() == 0)
{
// 如果全局设备列表为空，则添加一条Addr=1的设备
@ -105,21 +107,6 @@ bool Gateway::OnLocal(const TinyMessage& msg)
{
TS("Gateway::OnLocal");
auto dv = Server->Current;
if (dv)
{
switch (msg.Code)
{
case 0x01:
//pDevMgmt->DeviceRequest(DeviceAtions::Register, dv);
pDevMgmt->DeviceRequest(DeviceAtions::Online, dv);
break;
case 0x02:
pDevMgmt->DeviceRequest(DeviceAtions::Delete, dv);
break;
}
}
// 应用级消息转发
if (msg.Code >= 0x10 && msg.Dest == Server->Cfg->Address)
{
@ -143,7 +130,7 @@ bool Gateway::OnRemote(const TokenMessage& msg)
OnMode(msg);
}
if (msg.Code == 0x08 || msg.Code == 0x02)
if (msg.Code == 0x02)
{
if (msg.Code == 0x02 && msg.Reply && Client->Token != 0)
{
@ -152,19 +139,6 @@ bool Gateway::OnRemote(const TokenMessage& msg)
pDevMgmt->SendDevicesIDs();
return true;
}
auto ms = msg.ToStream();
BinaryPair bp(ms);
String act;
bp.Get("Action", act);
if (act.StartsWith("Device/"))
{
// 由他内部回复数据
pDevMgmt->DeviceProcess(act, msg);
return true;
}
//if (act.StartsWith("USART/"))xxx();
//if (act.StartsWith("IO/"))xxx2();
}
// 应用级消息转发