Skip to content

K
KonkeKangjia
Commit 8ffc3060 authored by 杨熙's avatar 杨熙
Browse files
Options

添加设备信息

parent 90150f1d
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 17 deletions
src/MQ_CCU_Adapter.cpp
View file @ 8ffc3060
...@@ -419,15 +419,15 @@ void MQ_CCU_Adapter::handleDevOnlinePush(EH::Json::Value arg){ ...@@ -419,15 +419,15 @@ void MQ_CCU_Adapter::handleDevOnlinePush(EH::Json::Value arg){
int product_id = arg["product_id"].asInt(); int product_id = arg["product_id"].asInt();
if(onlinestatus == 2){ if(onlinestatus == 2){
EH::Json::Value payload; EH::Json::Value payload;
if(subDevIt->second->dev_type == ZeroFire2ChanChopinSwitch_PID){ //肖邦-二路灯控 if(subDevIt->second->dev_model_id == ZeroFire2ChanChopinSwitch_PID){ //肖邦-二路灯控
payload["devID"] = sn+"01"; payload["devID"] = sn+"01";
payload["prodID"] = subDevIt->second->dev_type; payload["prodID"] = subDevIt->second->dev_model_id;
sendtoRoma(payload,respTopic_2); sendtoRoma(payload,respTopic_2);
payload["devID"] = sn+"02"; payload["devID"] = sn+"02";
sendtoRoma(payload,respTopic_2); sendtoRoma(payload,respTopic_2);
}else if(subDevIt->second->dev_type == ZeroFire3ChanChopinSwitch_PID){ //肖邦-三路灯控 }else if(subDevIt->second->dev_model_id == ZeroFire3ChanChopinSwitch_PID){ //肖邦-三路灯控
payload["devID"] = sn+"01"; payload["devID"] = sn+"01";
payload["prodID"] = subDevIt->second->dev_type; payload["prodID"] = subDevIt->second->dev_model_id;
sendtoRoma(payload,respTopic_2); sendtoRoma(payload,respTopic_2);
payload["devID"] = sn+"02"; payload["devID"] = sn+"02";
sendtoRoma(payload,respTopic_2); sendtoRoma(payload,respTopic_2);
...@@ -435,21 +435,21 @@ void MQ_CCU_Adapter::handleDevOnlinePush(EH::Json::Value arg){ ...@@ -435,21 +435,21 @@ void MQ_CCU_Adapter::handleDevOnlinePush(EH::Json::Value arg){
sendtoRoma(payload,respTopic_2); sendtoRoma(payload,respTopic_2);
}else{ }else{
payload["devID"] = sn; payload["devID"] = sn;
payload["prodID"] = subDevIt->second->dev_type; payload["prodID"] = subDevIt->second->dev_model_id;
sendtoRoma(payload,respTopic_2); sendtoRoma(payload,respTopic_2);
} }
subDevIt->second->online = false; subDevIt->second->online = false;
}else{ }else{
EH::Json::Value payload; EH::Json::Value payload;
if(subDevIt->second->dev_type == ZeroFire2ChanChopinSwitch_PID){ //肖邦-二路灯控 if(subDevIt->second->dev_model_id == ZeroFire2ChanChopinSwitch_PID){ //肖邦-二路灯控
payload["devID"] = sn+"01"; payload["devID"] = sn+"01";
payload["prodID"] = subDevIt->second->dev_type; payload["prodID"] = subDevIt->second->dev_model_id;
sendtoRoma(payload,respTopic_1); sendtoRoma(payload,respTopic_1);
payload["devID"] = sn+"02"; payload["devID"] = sn+"02";
sendtoRoma(payload,respTopic_1); sendtoRoma(payload,respTopic_1);
}else if(subDevIt->second->dev_type == ZeroFire3ChanChopinSwitch_PID){ //肖邦-三路灯控 }else if(subDevIt->second->dev_model_id == ZeroFire3ChanChopinSwitch_PID){ //肖邦-三路灯控
payload["devID"] = sn+"01"; payload["devID"] = sn+"01";
payload["prodID"] = subDevIt->second->dev_type; payload["prodID"] = subDevIt->second->dev_model_id;
sendtoRoma(payload,respTopic_1); sendtoRoma(payload,respTopic_1);
payload["devID"] = sn+"02"; payload["devID"] = sn+"02";
sendtoRoma(payload,respTopic_1); sendtoRoma(payload,respTopic_1);
...@@ -457,7 +457,7 @@ void MQ_CCU_Adapter::handleDevOnlinePush(EH::Json::Value arg){ ...@@ -457,7 +457,7 @@ void MQ_CCU_Adapter::handleDevOnlinePush(EH::Json::Value arg){
sendtoRoma(payload,respTopic_1); sendtoRoma(payload,respTopic_1);
}else{ }else{
payload["devID"] = sn; payload["devID"] = sn;
payload["prodID"] = subDevIt->second->dev_type; payload["prodID"] = subDevIt->second->dev_model_id;
sendtoRoma(payload,respTopic_1); sendtoRoma(payload,respTopic_1);
} }
subDevIt->second->online = true; subDevIt->second->online = true;
......
src/kk_handleDeviceInfo.cpp
View file @ 8ffc3060
...@@ -35,13 +35,13 @@ EH::Json::Value kk_handleDeviceInfo::XiaoK_Zu_Wang(string kkDevProductId){ ...@@ -35,13 +35,13 @@ EH::Json::Value kk_handleDeviceInfo::XiaoK_Zu_Wang(string kkDevProductId){
try { try {
if (kkDevProductId == "3022"){ if (kkDevProductId == "3022"){
devProductinfo["dev_model_id"] = ZeroFire1ChanChopinSwitch_PID;//肖邦一路灯控 devProductinfo["dev_model_id"] = ZeroFire1ChanChopinSwitch_PID;//肖邦一路灯控
devProductinfo["dev_type"] = "400100"; // devProductinfo["dev_type"] = "400100";
}else if (kkDevProductId == "3023"){ }else if (kkDevProductId == "3023"){
devProductinfo["dev_model_id"] = ZeroFire2ChanChopinSwitch_PID;//肖邦二路灯控 devProductinfo["dev_model_id"] = ZeroFire2ChanChopinSwitch_PID;//肖邦二路灯控
devProductinfo["dev_type"] = "400200"; // devProductinfo["dev_type"] = "400200";
}else if (kkDevProductId == "3024"){ }else if (kkDevProductId == "3024"){
devProductinfo["dev_model_id"] = ZeroFire3ChanChopinSwitch_PID;//肖邦三路灯控 devProductinfo["dev_model_id"] = ZeroFire3ChanChopinSwitch_PID;//肖邦三路灯控
devProductinfo["dev_type"] = "400300"; // devProductinfo["dev_type"] = "400300";
}else if (kkDevProductId == "3026"){ }else if (kkDevProductId == "3026"){
devProductinfo["dev_model_id"] = Chopin1CurtainSwitch_PID; //肖邦一路窗帘 devProductinfo["dev_model_id"] = Chopin1CurtainSwitch_PID; //肖邦一路窗帘
devProductinfo["dev_type"] = "410100"; devProductinfo["dev_type"] = "410100";
......
src/kk_handleDeviceInfo.h
View file @ 8ffc3060
...@@ -21,19 +21,28 @@ using namespace std; ...@@ -21,19 +21,28 @@ using namespace std;
#define ZeroFire2ChanChopinSwitch_PID "APAK03" //肖邦-二路灯控 #define ZeroFire2ChanChopinSwitch_PID "APAK03" //肖邦-二路灯控
#define ZeroFire3ChanChopinSwitch_PID "APAK04" //肖邦-三路灯控 #define ZeroFire3ChanChopinSwitch_PID "APAK04" //肖邦-三路灯控
//第2期接入设备 //临时定义 2020.11.18 //第2期接入设备 //临时定义 2020.11.18
#define CardAccessPanel_PID "APAK05" //系列插卡取电面板
#define ZeroFireChopinWallSocket10A_PID "APAK0e" //肖邦10A插座（五孔）
#define AtmosphereLightBelt_PID "APAK06" //氛围灯带控制器
#define DoorContact_PID "APAK07" //邦德-门磁传感器
#define BodyMotionSensor_PID "APAK08" //人体传感器
#define Environmental_Detector_PID "APAK09" //环境传感器
#define Smoke_Detector_PID "APAK0a" //烟雾探测器
#define GasDetector_PID "APAK0f" //燃气报警器
#define WaterSensor_PID "APAK0b" //邦德-水浸传感器
#define DooyaMotor_PID "APAK0c" //杜亚电机
#define FanCoilPanel_PID "APAK0d" //肖邦-风机盘管面板
#define Chopin1CurtainSwitch_PID "410100" //肖邦-一路窗帘 #define Chopin1CurtainSwitch_PID "410100" //肖邦-一路窗帘
#define Chopin2CurtainSwitch_PID "410200" //肖邦-二路窗帘 #define Chopin2CurtainSwitch_PID "410200" //肖邦-二路窗帘
#define ZeroFire2ChanModularSwitch_PID "400201" //两路智能开关模块Z3S(KONKE) #define ZeroFire2ChanModularSwitch_PID "400201" //两路智能开关模块Z3S(KONKE)
#define Chopin1ChanScenePanel_PID "420100" //肖邦-零火一路情景面板 #define Chopin1ChanScenePanel_PID "420100" //肖邦-零火一路情景面板
#define WaterSensor_PID "440500" //邦德-水浸传感器
#define BodyMotionSensor_PID "440200" //KIT-人体传感器
#define DoorContact_PID "440100" //邦德-门磁传感器
#define SOSButton_PID "440400" //邦德-sos紧急呼叫 #define SOSButton_PID "440400" //邦德-sos紧急呼叫
#define SoundLightAlarm_PID "440300" //邦德-声光报警器 #define SoundLightAlarm_PID "440300" //邦德-声光报警器
#define DimmerLightPanel_PID "430100" //肖邦-调光面板 #define DimmerLightPanel_PID "430100" //肖邦-调光面板
#define WaterHeating_PID "450300" //肖邦-水地暖 #define WaterHeating_PID "450300" //肖邦-水地暖
#define ElectricHeating_PID "450301" //肖邦-电地暖 #define ElectricHeating_PID "450301" //肖邦-电地暖
#define FanCoilPanel_PID "450100" //肖邦-风机盘管面板
#define AirConditioner_PID "450101" //肖邦-中央空调线控器（大金） #define AirConditioner_PID "450101" //肖邦-中央空调线控器（大金）
#define ChopinFreshAir_PID "450200" //肖邦-新风控制面板 #define ChopinFreshAir_PID "450200" //肖邦-新风控制面板
#define DAIKINCentralACgw_PID "450400" //中央空调网关 #define DAIKINCentralACgw_PID "450400" //中央空调网关
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment