openharmony/distributed_camera
1
0
Fork 0
mirror of https://github.com/openharmony/distributed_camera.git synced 2026-07-20 00:54:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

!134 modify abnormal state

Browse Source 
Merge pull request !134 from chen0088/master
This commit is contained in:
openharmony_ci
2022-06-22 10:41:22 +00:00
committed by Gitee
parent 2334dfbab5 cbc1eb8b05
commit 7039a01622
2 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/cameraservice/sinkservice/src/distributedcamera/dcamera_sink_hidumper.cpp
+20 -10
View File
@@ -51,6 +51,14 @@ bool DcameraSinkHidumper::Dump(const std::vector<std::string>& args, std::string
DHLOGI("DcameraSinkHidumper Dump args[%d]: %s.", i, args.at(i).c_str());
}
if (args.empty()) {
ShowHelp(result);
return true;
} else if (args.size() > 1) {
ShowIllegalInfomation(result);
return true;
}
if (ProcessDump(args[0], result) != DCAMERA_OK) {
return false;
}
@@ -98,7 +106,7 @@ int32_t DcameraSinkHidumper::ProcessDump(const std::string& args, std::string& r
int32_t DcameraSinkHidumper::GetLocalCameraNumber(std::string& result)
{
DHLOGI("GetLocalCameraNumber Dump.");
result.append("CameraNumber\n")
result.append("CameraNumber: ")
.append(std::to_string(camDumpInfo_.camNumber));
return DCAMERA_OK;
}
@@ -106,7 +114,7 @@ int32_t DcameraSinkHidumper::GetLocalCameraNumber(std::string& result)
int32_t DcameraSinkHidumper::GetOpenedCameraInfo(std::string& result)
{
DHLOGI("GetOpenedCameraInfo Dump.");
result.append("OpenedCamera\n");
result.append("OpenedCamera:\n");
std::vector<std::string> camIds = camDumpInfo_.camIds;
for (size_t i = 0; i < camIds.size(); i++) {
result.append(camIds[i]);
@@ -118,7 +126,7 @@ int32_t DcameraSinkHidumper::GetOpenedCameraInfo(std::string& result)
int32_t DcameraSinkHidumper::GetVersionInfo(std::string& result)
{
DHLOGI("GetVersionInfo Dump.");
result.append("CameraVersion\n")
result.append("CameraVersion: ")
.append(camDumpInfo_.version);
return DCAMERA_OK;
}
@@ -128,18 +136,20 @@ void DcameraSinkHidumper::ShowHelp(std::string& result)
DHLOGI("ShowHelp Dump.");
result.append("Usage:dump <command> [options]\n")
.append("Description:\n")
.append("--version ")
.append("dump camera version in the system\n")
.append("--camNum ")
.append("dump local camera numbers in the system\n")
.append("--opened ")
.append("dump the opened camera in the system\n");
.append("-h ")
.append(": show help\n")
.append("--version ")
.append(": dump camera version in the system\n")
.append("--camNum ")
.append(": dump local camera numbers in the system\n")
.append("--opened ")
.append(": dump the opened camera in the system\n");
}
int32_t DcameraSinkHidumper::ShowIllegalInfomation(std::string& result)
{
DHLOGI("ShowIllegalInfomation Dump.");
result.append("unknown command");
result.append("unknown command, -h for help.");
return DCAMERA_OK;
}
} // namespace DistributedHardware
services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp
+30 -20
View File
@@ -64,6 +64,14 @@ bool DcameraSourceHidumper::Dump(const std::vector<std::string>& args, std::stri
DHLOGI("DcameraSourceHidumper Dump args[%d]: %s.", i, args.at(i).c_str());
}
if (args.empty()) {
ShowHelp(result);
return true;
} else if (args.size() > 1) {
ShowIllegalInfomation(result);
return true;
}
if (ProcessDump(args[0], result) != DCAMERA_OK) {
return false;
}
@@ -111,7 +119,7 @@ int32_t DcameraSourceHidumper::ProcessDump(const std::string& args, std::string&
int32_t DcameraSourceHidumper::GetRegisteredInfo(std::string& result)
{
DHLOGI("GetRegisteredInfo Dump.");
result.append("CameraNumber\n")
result.append("CameraNumber: ")
.append(std::to_string(camDumpInfo_.regNumber));
return DCAMERA_OK;
}
@@ -122,28 +130,28 @@ int32_t DcameraSourceHidumper::GetCurrentStateInfo(std::string& result)
std::map<std::string, int32_t> devState = camDumpInfo_.curState;
std::string deviceId("");
int32_t camState = 0;
result.append("CameraId\tState\n");
for (auto it = devState.begin(); it != devState.end(); it++) {
deviceId = it->first;
camState = it->second;
DHLOGI("GetCurrentStateInfo camState is %d.", camState);
auto state = STATE_MAP.find(camState);
std::string curState("");
if (state != STATE_MAP.end()) {
curState = state->second;
}
result.append(deviceId)
.append("\t")
.append(curState)
.append("\n");
}
DHLOGI("GetCurrentStateInfo camState is %d.", camState);
auto state = STATE_MAP.find(camState);
std::string curState("");
if (state != STATE_MAP.end()) {
curState = state->second;
}
result.append("CameraId ")
.append("State\n")
.append(deviceId)
.append(" ")
.append(curState);
return DCAMERA_OK;
}
int32_t DcameraSourceHidumper::GetVersionInfo(std::string& result)
{
DHLOGI("GetVersionInfo Dump.");
result.append("CameraVersion\n")
result.append("CameraVersion: ")
.append(camDumpInfo_.version);
return DCAMERA_OK;
}
@@ -153,18 +161,20 @@ void DcameraSourceHidumper::ShowHelp(std::string& result)
DHLOGI("ShowHelp Dump.");
result.append("Usage:dump <command> [options]\n")
.append("Description:\n")
.append("--version ")
.append("dump camera version in the system\n")
.append("--registered ")
.append("dump number of registered cameras in the system\n")
.append("--curState ")
.append("dump current state of the camera in the system\n");
.append("-h ")
.append(": show help\n")
.append("--version ")
.append(": dump camera version in the system\n")
.append("--registered ")
.append(": dump number of registered cameras in the system\n")
.append("--curState ")
.append(": dump current state of the camera in the system\n");
}
int32_t DcameraSourceHidumper::ShowIllegalInfomation(std::string& result)
{
DHLOGI("ShowIllegalInfomation Dump.");
result.append("unknown command");
result.append("unknown command, -h for help.");
return DCAMERA_OK;
}
} // namespace DistributedHardware