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

modify abnormal state

Browse Source 
Signed-off-by: chen0088 <chenmenghuan3@huawei.com>
This commit is contained in:
chen0088
2022-06-22 15:02:54 +08:00
parent 34fccde050
commit cbc1eb8b05
2 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/cameraservice/sinkservice/src/distributedcamera/dcamera_sink_hidumper.cpp
+12 -10
View File
@@ -53,10 +53,10 @@ bool DcameraSinkHidumper::Dump(const std::vector<std::string>& args, std::string
if (args.empty()) {
ShowHelp(result);
return DCAMERA_OK;
return true;
} else if (args.size() > 1) {
ShowIllegalInfomation(result);
return DCAMERA_OK;
return true;
}
if (ProcessDump(args[0], result) != DCAMERA_OK) {
@@ -106,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;
}
@@ -126,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;
}
@@ -136,12 +136,14 @@ 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)
services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp
+12 -10
View File
@@ -66,10 +66,10 @@ bool DcameraSourceHidumper::Dump(const std::vector<std::string>& args, std::stri
if (args.empty()) {
ShowHelp(result);
return DCAMERA_OK;
return true;
} else if (args.size() > 1) {
ShowIllegalInfomation(result);
return DCAMERA_OK;
return true;
}
if (ProcessDump(args[0], result) != DCAMERA_OK) {
@@ -119,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;
}
@@ -151,7 +151,7 @@ int32_t DcameraSourceHidumper::GetCurrentStateInfo(std::string& result)
int32_t DcameraSourceHidumper::GetVersionInfo(std::string& result)
{
DHLOGI("GetVersionInfo Dump.");
result.append("CameraVersion\n")
result.append("CameraVersion: ")
.append(camDumpInfo_.version);
return DCAMERA_OK;
}
@@ -161,12 +161,14 @@ 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)