Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug
# Conflicts:
# QiaoJiaSystem/DataManagerServer/http_configserver.cpp
add if is_run to sdk_type for find local camera list
| | |
|---|
| | | |
|---|
| | | if (count > 0) { |
|---|
| | | for (auto rule:ruleMap) { |
|---|
| | | if (rule.second.nIsRun == 1) { |
|---|
| | | elem["nSdkTypes"].append(rule.second.nSdkType); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | // Record_Cam_Sdk rec_sdk = db_c.searchCamSdkTableByCamId(iter->str_cam_dev_id); |
|---|
| | | // elem["str_sdks"] = rec_sdk.str_sdks.toStdString(); |
|---|
| | | // elem["str_det_thr"] = rec_sdk.str_det_thr.toStdString(); |
|---|
