Update app.py

app.py

@@ -23,18 +23,25 @@ A5_HEIGHT_IN = 8.27
 NUM_COLS = 3
 
 # --- 字体加载与文本处理函数 ---
-def get_font(size=14):
-    """加载中文字体文件"""
-    font_path = "simHei.ttc"
-    if not os.path.exists(font_path):
-        font_path = "SimHei.ttf"
+
+def get_font_regular(size=14):
+    """加载思源黑体-常规 (SourceHanSansCN-Regular.otf)"""
+    font_path = "SourceHanSansCN-Regular.otf"
     if os.path.exists(font_path):
         return font_manager.FontProperties(fname=font_path, size=size)
     else:
-        # 仅在使用时发出警告
-        st.warning("警告：未找到SimHei字体文件，部分复杂中文（如电影名）可能无法正确显示。请将 simHei.ttc 或 SimHei.ttf 文件放入项目文件夹。")
+        st.warning("警告：未找到字体文件 'SourceHanSansCN-Regular.otf'，LED屏排片表显示可能不正确。")
         return font_manager.FontProperties(family='sans-serif', size=size)
 
+def get_font_bold(size=14):
+    """加载思源黑体-粗体 (SourceHanSansCN-Bold.otf)"""
+    font_path = "SourceHanSansCN-Bold.otf"
+    if os.path.exists(font_path):
+        return font_manager.FontProperties(fname=font_path, size=size)
+    else:
+        st.warning("警告：未找到字体文件 'SourceHanSansCN-Bold.otf'，散场时间表显示可能不正确。")
+        return font_manager.FontProperties(family='sans-serif', size=size, weight='bold')
+
 def get_pinyin_abbr(text):
     """获取中文文本前两个字的拼音首字母"""
     if not text:
@@ -56,7 +63,7 @@ def format_seq(n):
         return circled_chars[n - 1]
     return f'({n})'
 
-# --- '放映时间核对表' 处理函数 (使用SimHei) ---
+# --- '放映时间核对表' 处理函数 ---
 def process_schedule_led(file):
     """处理 '放映时间核对表.xls' 文件"""
     try:
@@ -104,7 +111,7 @@ def process_schedule_led(file):
         return None, date_str
 
 def create_print_layout_led(data, date_str):
-    """为 '放映时间核对表' 生成打印布局 (使用SimHei)"""
+    """为 '放映时间核对表' 生成打印布局 (使用 Regular 字体)"""
     if data is None or data.empty:
         return None
     A4_width_in, A4_height_in = 8.27, 11.69
@@ -124,7 +131,7 @@ def create_print_layout_led(data, date_str):
 
     def get_col_width_in(series, font_size_pt, is_math=False):
         if series.empty: return 0
-        font_prop = get_font(font_size_pt)
+        font_prop = get_font_regular(font_size_pt) # 使用 Regular 字体
         longest_str_idx = series.astype(str).str.len().idxmax()
         max_content = str(series.loc[longest_str_idx])
         text_width_px, _, _ = renderer.get_text_width_height_descent(max_content, font_prop, ismath=is_math)
@@ -158,22 +165,22 @@ def create_print_layout_led(data, date_str):
             y_center = y_bottom + row_height / 2
             if row['Hall'] != last_hall_drawn:
                 ax.text(col_x_starts['hall'] + col_widths['hall'] / 2, y_center, row['hall_str'],
-                        fontproperties=get_font(base_font_size_pt), ha='center', va='center')
+                        fontproperties=get_font_regular(base_font_size_pt), ha='center', va='center')
                 last_hall_drawn = row['Hall']
             ax.text(col_x_starts['seq'] + col_widths['seq'] / 2, y_center, row['seq_str'],
-                    fontproperties=get_font(seq_font_size_pt), ha='center', va='center')
+                    fontproperties=get_font_regular(seq_font_size_pt), ha='center', va='center')
             ax.text(col_x_starts['pinyin'] + col_widths['pinyin'] / 2, y_center, row['pinyin_abbr'],
-                    fontproperties=get_font(base_font_size_pt), ha='center', va='center')
+                    fontproperties=get_font_regular(base_font_size_pt), ha='center', va='center')
             ax.text(col_x_starts['time'] + col_widths['time'] / 2, y_center, row['time_str'],
-                    fontproperties=get_font(base_font_size_pt), ha='center', va='center')
+                    fontproperties=get_font_regular(base_font_size_pt), ha='center', va='center')
             movie_font_size = base_font_size_pt
-            movie_font_prop = get_font(movie_font_size)
+            movie_font_prop = get_font_regular(movie_font_size)
             text_w_px, _, _ = renderer.get_text_width_height_descent(row['Movie'], movie_font_prop, ismath=False)
             text_w_in = text_w_px / dpi
             max_width_in = col_widths['movie'] * 0.9
             if text_w_in > max_width_in:
                 movie_font_size *= (max_width_in / text_w_in)
-                movie_font_prop = get_font(movie_font_size)
+                movie_font_prop = get_font_regular(movie_font_size)
             ax.text(col_x_starts['movie'] + 0.05, y_center, row['Movie'], fontproperties=movie_font_prop, ha='left', va='center')
             is_last_in_hall = (i == len(data) - 1) or (row['Hall'] != data.loc[i + 1, 'Hall'])
             line_start_x = margin_col_width
@@ -191,7 +198,7 @@ def create_print_layout_led(data, date_str):
         ax.set_xlim(0, A4_width_in)
         ax.set_ylim(0, A4_height_in)
         ax.text(margin_col_width, A4_height_in - (row_height / 2), date_str,
-                fontproperties=get_font(10), color='#A9A9A9', ha='left', va='center')
+                fontproperties=get_font_regular(10), color='#A9A9A9', ha='left', va='center')
         draw_figure(fig, ax)
         buf = io.BytesIO()
         fig.savefig(buf, format=format_type, dpi=dpi, bbox_inches='tight', pad_inches=0)
@@ -202,7 +209,7 @@ def create_print_layout_led(data, date_str):
         plt.close(fig)
     return outputs
 
-# --- '放映场次核对表' 处理函数 (使用默认字体) ---
+# --- '放映场次核对表' 处理函数 ---
 def process_schedule_times(file):
     """处理 '放映场次核对表.xls' 文件"""
     try:
@@ -210,7 +217,7 @@ def process_schedule_times(file):
         df = df.iloc[:, [6, 7, 9]]
         df.columns = ['Hall', 'StartTime', 'EndTime']
         df = df.dropna(subset=['Hall', 'StartTime', 'EndTime'])
-        df['Hall'] = df['Hall'].str.extract(r'(\d+号)').astype(str) + ' '
+        df['Hall'] = df['Hall'].str.extract(r'(\d+)号').astype(str) + ' '
         base_date = datetime.today().date()
         df['StartTime'] = pd.to_datetime(df['StartTime'])
         df['EndTime'] = pd.to_datetime(df['EndTime'])
@@ -251,7 +258,7 @@ def process_schedule_times(file):
         return None, None, None
 
 def create_print_layout_times(data, title, date_str):
-    """为 '放映场次核对表' 生成打印布局 (使用默认字体)"""
+    """为 '放映场次核对表' 生成打印布局 (使用 Bold 字体)"""
     if data.empty:
         return None
 
@@ -268,13 +275,9 @@ def create_print_layout_times(data, title, date_str):
         fontsize_from_width = target_text_width_pt / (8 * 0.6)
         fontsize_from_height = cell_height_pt * 0.8
         base_fontsize = min(fontsize_from_width, fontsize_from_height)
-        
-        # **修改点**: 使用Matplotlib的默认字体设置
-        plt.rcParams['font.sans-serif'] = plt.rcParamsDefault['font.sans-serif']
-
         fig = plt.figure(figsize=(A5_WIDTH_IN, A5_HEIGHT_IN), dpi=300)
         fig.subplots_adjust(left=0, right=1, top=1, bottom=0)
-
+        
         gs = gridspec.GridSpec(
             num_rows + 1, NUM_COLS,
             hspace=0, wspace=0,
@@ -303,22 +306,17 @@ def create_print_layout_times(data, title, date_str):
                     spine.set_color(BORDER_COLOR)
                     spine.set_linewidth(0.75)
                 display_text = f"{hall}{end_time}"
-                
-                # **修改点**: 移除 fontproperties，改用 fontsize
                 ax.text(0.5, 0.5, display_text,
-                        fontsize=base_fontsize,
-                        fontweight='bold',
+                        fontproperties=get_font_bold(base_fontsize), # 使用 Bold 字体
                         ha='center', va='center',
                         transform=ax.transAxes)
                 ax.set_xticks([])
                 ax.set_yticks([])
                 ax.set_facecolor('none')
         ax_date = fig.add_subplot(gs[0, :])
-        
-        # **修改点**: 移除 fontproperties，改用 fontsize
         ax_date.text(0.01, 0.5, f"{date_str} {title}",
-                     fontsize=base_fontsize * 0.5,
-                     color=DATE_COLOR, fontweight='bold',
+                     fontproperties=get_font_bold(base_fontsize * 0.5), # 使用 Bold 字体
+                     color=DATE_COLOR,
                      ha='left', va='center',
                      transform=ax_date.transAxes)
         ax_date.set_axis_off()
@@ -374,7 +372,7 @@ if uploaded_file:
             with col1:
                 st.subheader("白班 (散场时间 ≤ 17:30)")
                 if part1_output:
-                    tab1_1, tab1_2 = st.tabs(["PDF 预览 ", "图片预览 (PNG) "]) # 添加空格以区分
+                    tab1_1, tab1_2 = st.tabs(["PDF 预览 ", "图片预览 (PNG) "]) 
                     with tab1_1:
                         st.markdown(display_pdf(part1_output['pdf']), unsafe_allow_html=True)
                     with tab1_2:
@@ -384,7 +382,7 @@ if uploaded_file:
             with col2:
                 st.subheader("晚班 (散场时间 > 17:30)")
                 if part2_output:
-                    tab2_1, tab2_2 = st.tabs(["PDF 预览  ", "图片预览 (PNG)  "]) # 添加空格以区分
+                    tab2_1, tab2_2 = st.tabs(["PDF 预览  ", "图片预览 (PNG)  "])
                     with tab2_1:
                         st.markdown(display_pdf(part2_output['pdf']), unsafe_allow_html=True)
                     with tab2_2: