From 32475cf12e9f52f1524249bf2f458958a5b10b32 Mon Sep 17 00:00:00 2001
From: chen0088 <chenmenghuan3@huawei.com>
Date: Wed, 22 Jun 2022 10:13:58 +0800
Subject: [PATCH] modify abnormal state

Signed-off-by: chen0088 <chenmenghuan3@huawei.com>
---
 .../dcamera_sink_hidumper.cpp                 |  2 +-
 .../dcamera_source_hidumper.cpp               | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/services/cameraservice/sinkservice/src/distributedcamera/dcamera_sink_hidumper.cpp b/services/cameraservice/sinkservice/src/distributedcamera/dcamera_sink_hidumper.cpp
index bef6615..ae258e6 100644
--- a/services/cameraservice/sinkservice/src/distributedcamera/dcamera_sink_hidumper.cpp
+++ b/services/cameraservice/sinkservice/src/distributedcamera/dcamera_sink_hidumper.cpp
@@ -116,7 +116,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]);
diff --git a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp
index 4b51e1a..6f34ec7 100644
--- a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp
+++ b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp
@@ -132,21 +132,21 @@ 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;
 }