From b94f6ac95631a34b815a428742e541c5cd8a1259 Mon Sep 17 00:00:00 2001
From: jas <1790731762@qq.com>
Date: Tue, 12 Dec 2023 10:36:07 +0800
Subject: [PATCH] =?UTF-8?q?[zhoulongyu]:=20=E4=BD=BF=E7=94=A8=E5=B5=8C?=
 =?UTF-8?q?=E5=A5=97std::map=20=E6=8A=8A=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9B=B8=E5=85=B3=E7=9A=84=E4=B8=89=E4=B8=AA=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=98=A0=E5=B0=84=E8=B5=B7=E6=9D=A5,=20=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90char[]=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E7=9A=84set?=
 =?UTF-8?q?=E5=92=8Cget?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 middleware/IpcConfig/src/IpcConfig.cpp | 30 ++++++++++++++------------
 middleware/IpcConfig/src/IpcConfig.h   |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/middleware/IpcConfig/src/IpcConfig.cpp b/middleware/IpcConfig/src/IpcConfig.cpp
index d745141..1e28df9 100644
--- a/middleware/IpcConfig/src/IpcConfig.cpp
+++ b/middleware/IpcConfig/src/IpcConfig.cpp
@@ -16,6 +16,8 @@
 #include "ILog.h"
 #include <string.h>
 
+#define CHECK_MAP(map) (map.size()==1? true:false)
+
 IpcConfig::IpcConfig()
 {
     mCfgChanged = CONFIG_HAS_NOT_CHANGED;
@@ -26,12 +28,13 @@ IpcConfig::IpcConfig()
             IpcConfigKey::TEST_NUM,
             std::reference_wrapper<int>(mAllData.testNum)));
 
-    mCfgMapString.insert(
-        std::make_pair<
-            IpcConfigKey,
-            std::reference_wrapper<CHAR_STRING>>(
-            IpcConfigKey::TEST_STRING,
+    std::map<std::string, std::reference_wrapper<CHAR_STRING>> innerMap;
+    innerMap.insert(
+        std::make_pair(
+            "test_string",
             std::reference_wrapper<CHAR_STRING>(mAllData.testString)));
+    mCfgMapString.insert(std::make_pair(IpcConfigKey::TEST_STRING, innerMap));
+
 }
 const StatusCode IpcConfig::Init(void)
 {
@@ -296,26 +299,26 @@ void IpcConfig::SetBool(const IpcConfigKey &key, const bool &value)
 }
 const std::string IpcConfig::GetString(const IpcConfigKey &key)
 {
-    std::map<IpcConfigKey, std::reference_wrapper<CHAR_STRING>>::iterator iter;
+    std::map<IpcConfigKey, std::map<std::string, std::reference_wrapper<CHAR_STRING>>>::iterator iter;
     iter = mCfgMapString.find(key);
-    if (iter != mCfgMapString.end())
+    if (iter != mCfgMapString.end() && CHECK_MAP(iter->second))
     {
-        std::reference_wrapper<CHAR_STRING> s = iter->second;
-        const std::string sv(s);
+        const std::string sv(iter->second.begin()->second);     // char[] --> const std::strinbg
         return sv;
     }
     LogError("Can't find the key.\n");
     const std::string UNKNOWN_CONFIG = "undefine";
     return UNKNOWN_CONFIG;
 }
-
 void IpcConfig::SetString(const IpcConfigKey &key, const std::string string)
 {
-    std::map<IpcConfigKey, std::reference_wrapper<CHAR_STRING>>::iterator iter;
+    std::map<IpcConfigKey, std::map<std::string, std::reference_wrapper<CHAR_STRING>>>::iterator iter;
     iter = mCfgMapString.find(key);
-    if (iter != mCfgMapString.end())
+    if (iter != mCfgMapString.end() && CHECK_MAP(iter->second))
     {
-        strncpy(iter->second, string.c_str(), sizeof(CHAR_STRING));
+        strncpy(iter->second.begin()->second, string.c_str(), sizeof(CHAR_STRING));     // const std::strinbg --> char[]
+        const char * name = iter->second.begin()->first.c_str();    // const std::strinbg --> const char *
+        ConfigSetString(mCfg, name, iter->second.begin()->second);
         mCfgChanged = CONFIG_HAS_CHANGED;
     }
     else
@@ -335,7 +338,6 @@ void IpcConfig::ReadAllConfigParameters(void)
         mAllData.testNum = DEFAULT_TEST_NUM;
         ConfigSetInt(mCfg, "test_num", mAllData.testNum);
     }
-
     const char *testString = NULL;
     StatusCode string_code = ConfigGetString(mCfg, "test_string", &(testString));
     if (StatusCodeEqual(string_code, "CONFIG_CODE_PARAM_NOT_EXIST"))
diff --git a/middleware/IpcConfig/src/IpcConfig.h b/middleware/IpcConfig/src/IpcConfig.h
index d21517c..6bad323 100644
--- a/middleware/IpcConfig/src/IpcConfig.h
+++ b/middleware/IpcConfig/src/IpcConfig.h
@@ -80,6 +80,6 @@ private:
     std::map<IpcConfigKey, std::reference_wrapper<double>> mCfgMapDouble;
     std::map<IpcConfigKey, std::reference_wrapper<long double>> mCfgMapLongDouble;
     std::map<IpcConfigKey, std::reference_wrapper<bool>> mCfgMapBool;
-    std::map<IpcConfigKey, std::reference_wrapper<CHAR_STRING>> mCfgMapString;
+    std::map<IpcConfigKey, std::map<std::string, std::reference_wrapper<CHAR_STRING>>> mCfgMapString;
 };
 #endif
\ No newline at end of file