From 49545dd232c9641d00bda7e61788f396869f5485 Mon Sep 17 00:00:00 2001
From: Robofish <1683502971@qq.com>
Date: Sat, 18 Oct 2025 23:55:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9.h=E8=A6=86=E7=9B=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/__pycache__/__init__.cpython-39.pyc | Bin 137 -> 137 bytes
 app/code_page/bsp_interface.py          |   4 ++-
 app/code_page/component_interface.py    |  10 +++++--
 app/code_page/device_interface.py       |  38 ++++++++++++++++++++++--
 app/data_interface.py                   |   8 +++--
 5 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/app/__pycache__/__init__.cpython-39.pyc b/app/__pycache__/__init__.cpython-39.pyc
index afcc28ac2f1af803f6e06595ca54fa9868cf7a78..a429031310885113a7c514cc28c21323692fb1d4 100644
GIT binary patch
delta 19
ZcmeBV>}2Fl<mKgJ0D|aGZzgir0RSiR1o!{|

delta 19
YcmeBV>}2Fl<mKgJ0D|t)`xCkA048k&o&W#<

diff --git a/app/code_page/bsp_interface.py b/app/code_page/bsp_interface.py
index fe94e88..f1ad7c7 100644
--- a/app/code_page/bsp_interface.py
+++ b/app/code_page/bsp_interface.py
@@ -1243,7 +1243,9 @@ class bsp(QWidget):
         dst_bsp_h = os.path.join(project_path, "User/bsp/bsp.h")
         os.makedirs(os.path.dirname(dst_bsp_h), exist_ok=True)
         if os.path.exists(src_bsp_h):
-            shutil.copyfile(src_bsp_h, dst_bsp_h)
+            with open(src_bsp_h, 'r', encoding='utf-8') as f:
+                content = f.read()
+            save_with_preserve(dst_bsp_h, content)
         
         total = 0
         success_count = 0
diff --git a/app/code_page/component_interface.py b/app/code_page/component_interface.py
index c17e697..0983027 100644
--- a/app/code_page/component_interface.py
+++ b/app/code_page/component_interface.py
@@ -294,7 +294,9 @@ class component(QWidget):
         dst_component_h = os.path.join(project_path, "User/component/component.h")
         os.makedirs(os.path.dirname(dst_component_h), exist_ok=True)
         if os.path.exists(src_component_h):
-            shutil.copyfile(src_component_h, dst_component_h)
+            with open(src_component_h, 'r', encoding='utf-8') as f:
+                content = f.read()
+            save_with_preserve(dst_component_h, content)
         
         # 收集所有需要生成的组件和它们的依赖
         components_to_generate = set()
@@ -367,9 +369,11 @@ class component(QWidget):
                         shutil.rmtree(dst_path)
                     shutil.copytree(src_path, dst_path)
                 elif os.path.isfile(src_path):
-                    # 如果是文件，复制单个文件
+                    # 如果是文件，复制单个文件并保留用户区域
                     os.makedirs(os.path.dirname(dst_path), exist_ok=True)
-                    shutil.copyfile(src_path, dst_path)
+                    with open(src_path, 'r', encoding='utf-8') as f:
+                        new_content = f.read()
+                    save_with_preserve(dst_path, new_content)
                 else:
                     # 如果既不是文件也不是目录，跳过
                     print(f"跳过不存在的依赖: {dep_path}")
diff --git a/app/code_page/device_interface.py b/app/code_page/device_interface.py
index 899f0fc..fa63661 100644
--- a/app/code_page/device_interface.py
+++ b/app/code_page/device_interface.py
@@ -7,6 +7,38 @@ import shutil
 import yaml
 import re
 
+def preserve_all_user_regions(new_code, old_code):
+    """ Preserves all user-defined regions in the new code based on the old code.
+    This function uses regex to find user-defined regions in the old code and replaces them in the new code.
+    Args:
+        new_code (str): The new code content.
+        old_code (str): The old code content.
+    Returns:
+        str: The new code with preserved user-defined regions.  
+    """
+    pattern = re.compile(
+        r"/\*\s*(USER [A-Z0-9_ ]+)\s*BEGIN\s*\*/(.*?)/\*\s*\1\s*END\s*\*/",
+        re.DOTALL
+    )
+    old_regions = {m.group(1): m.group(2) for m in pattern.finditer(old_code or "")}
+    def repl(m):
+        region = m.group(1)
+        old_content = old_regions.get(region)
+        if old_content is not None:
+            return m.group(0).replace(m.group(2), old_content)
+        return m.group(0)
+    return pattern.sub(repl, new_code)
+
+def save_with_preserve(path, new_code):
+    """保存文件并保留用户区域"""
+    if os.path.exists(path):
+        with open(path, "r", encoding="utf-8") as f:
+            old_code = f.read()
+        new_code = preserve_all_user_regions(new_code, old_code)
+    os.makedirs(os.path.dirname(path), exist_ok=True)
+    with open(path, "w", encoding="utf-8") as f:
+        f.write(new_code)
+
 def load_device_config(config_path):
     """加载设备配置"""
     if os.path.exists(config_path):
@@ -269,9 +301,11 @@ class DeviceSimple(QWidget):
                     f.write(content)
 
                 if file_type == 'header':
-                    # 头文件直接复制，不做修改
+                    # 头文件需要保留用户区域
                     os.makedirs(os.path.dirname(dst_path), exist_ok=True)
-                    shutil.copy2(src_path, dst_path)
+                    with open(src_path, 'r', encoding='utf-8') as f:
+                        content = f.read()
+                    save_with_preserve(dst_path, content)
                     
                 elif file_type == 'source':
                     # 源文件需要替换BSP设备名称
diff --git a/app/data_interface.py b/app/data_interface.py
index 7e7e911..c829085 100644
--- a/app/data_interface.py
+++ b/app/data_interface.py
@@ -416,14 +416,18 @@ class DataInterface(QWidget):
                 skipped.append(dst_c)
             else:
                 os.makedirs(os.path.dirname(dst_c), exist_ok=True)
-                shutil.copy2(src_c, dst_c)
+                with open(src_c, 'r', encoding='utf-8') as f:
+                    content = f.read()
+                save_with_preserve(dst_c, content)
                 copied.append(dst_c)
             if os.path.exists(src_h):
                 if os.path.exists(dst_h):
                     skipped.append(dst_h)
                 else:
                     os.makedirs(os.path.dirname(dst_h), exist_ok=True)
-                    shutil.copy2(src_h, dst_h)
+                    with open(src_h, 'r', encoding='utf-8') as f:
+                        content = f.read()
+                    save_with_preserve(dst_h, content)
                     copied.append(dst_h)
         msg = f"已拷贝 {len(copied)} 个文件到 User 目录"
         if skipped: