From 8a3af834d24abcf5231831c80cdf81c3a9ec318c Mon Sep 17 00:00:00 2001
From: HanSY <hansiyuan1@huawei.com>
Date: Wed, 18 Jun 2025 19:27:36 +0800
Subject: [PATCH] =?UTF-8?q?restool=E6=96=B0=E9=9C=80=E6=B1=82=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E7=A0=81=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: HanSY <hansiyuan1@huawei.com>
---
 include/resource_table.h | 3 ++-
 src/resource_table.cpp   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/resource_table.h b/include/resource_table.h
index 2fb3e0c..eb8d2c8 100644
--- a/include/resource_table.h
+++ b/include/resource_table.h
@@ -17,6 +17,7 @@
 #define OHOS_RESTOOL_RESOURCE_TABLE_H
 
 #include <fstream>
+#include <map>
 #include <memory>
 #include <sstream>
 #include <unordered_map>
@@ -115,7 +116,7 @@ private:
         uint32_t resId = 0;
         uint32_t length = 0;
         uint32_t valueCount = 0;
-        std::unordered_map<uint32_t, uint32_t> dataOffset; // <resConfigId, offset>
+        std::map<uint32_t, uint32_t> dataOffset; // <resConfigId, offset>
     };
 
     struct DataHeader {
diff --git a/src/resource_table.cpp b/src/resource_table.cpp
index a6d4837..7532bee 100644
--- a/src/resource_table.cpp
+++ b/src/resource_table.cpp
@@ -315,7 +315,7 @@ void ResourceTable::PrepareResIndex(IdSetHeader &idSetHeader, const TableData &t
 
     ResIndex resIndex;
     resIndex.resId = tableData.id;
-    resIndex.name = tableData.resourceItem.GetName();
+    resIndex.name = ResourceUtil::GetIdName(tableData.resourceItem.GetName(), resType);
     resIndex.length = resIndex.name.length();
     idSetHeader.resTypes[resType].resIndexs[tableData.id] = resIndex;
     idSetHeader.resTypes[resType].length += ResIndex::RES_INDEX_LEN + resIndex.length;
-- 
Gitee