Update app.py

app.py

@@ -6,78 +6,71 @@ import io
 import base64
 import os
 from datetime import datetime, timedelta
-import math
 from pypinyin import lazy_pinyin, Style
 from matplotlib.backends.backend_pdf import PdfPages
-import matplotlib.gridspec as gridspec
-from matplotlib.patches import FancyBboxPatch
 
-# --- Constants for "Quick Print" (放映场次核对表) ---
-SPLIT_TIME = "17:30"
-BUSINESS_START = "09:30"
-BUSINESS_END = "01:30"
-BORDER_COLOR = '#A9A9A9'
-DATE_COLOR = '#A9A9A9'
-
-# --- Helper functions for "LED Screen" (放映时间核对表) ---
 def get_font(size=14):
-    """Loads a specific font file, falling back to a default if not found."""
+    """
+    Retrieves the specified font properties. Looks for 'simHei.ttc' first,
+    then falls back to 'SimHei.ttf'.
+    """
     font_path = "simHei.ttc"
     if not os.path.exists(font_path):
-        font_path = "SimHei.ttf"  # Fallback font
-    # Add a final fallback for systems without Chinese fonts
-    try:
-        return font_manager.FontProperties(fname=font_path, size=size)
-    except RuntimeError:
-        # If the font file is not found, use a default font that should exist.
-        # This will likely not render Chinese characters correctly but prevents crashing.
-        return font_manager.FontProperties(family='sans-serif', size=size)
-
+        font_path = "SimHei.ttf"
+    return font_manager.FontProperties(fname=font_path, size=size)
 
 def get_pinyin_abbr(text):
-    """Gets the first letter of the Pinyin for the first two Chinese characters of a text."""
+    """
+    Gets the first letter of the Pinyin for the first two Chinese characters of a text.
+    """
     if not text:
         return ""
     # Extract the first two Chinese characters
     chars = [c for c in text if '\u4e00' <= c <= '\u9fff']
     chars = chars[:2]
-    # Get the first letter of the pinyin for each character
+    # Get the first letter of the Pinyin for each character
     pinyin_list = lazy_pinyin(chars, style=Style.FIRST_LETTER)
     return ''.join(pinyin_list).upper()
 
-# --- Processing logic for "LED Screen" (放映时间核对表) ---
-def process_schedule_led(file):
-    """Processes the '放映时间核对表.xls' file."""
+def process_schedule(file):
+    """
+    Processes the uploaded Excel file to extract and clean the movie schedule data.
+    """
     try:
-        # Attempt to read the date from a specific cell
+        # Try to read the date from the Excel file
         date_df = pd.read_excel(file, header=None, skiprows=7, nrows=1, usecols=[3])
         date_str = pd.to_datetime(date_df.iloc[0, 0]).strftime('%Y-%m-%d')
         base_date = pd.to_datetime(date_str).date()
     except Exception:
-        # Fallback to the current date if reading fails
+        # Fallback to today's date if reading fails
         date_str = datetime.today().strftime('%Y-%m-%d')
         base_date = datetime.today().date()
+        file.seek(0) # Reset file pointer after failed read attempt
 
     try:
         df = pd.read_excel(file, header=9, usecols=[1, 2, 4, 5])
         df.columns = ['Hall', 'StartTime', 'EndTime', 'Movie']
+        
         df['Hall'] = df['Hall'].ffill()
         df.dropna(subset=['StartTime', 'EndTime', 'Movie'], inplace=True)
-        df['Hall'] = df['Hall'].astype(str).str.extract(r'(\d+号)')
+        
+        df['Hall_Num'] = df['Hall'].astype(str).str.extract(r'(\d+)').astype(int)
+        df['Hall'] = df['Hall_Num'].astype(str) + '号'
 
-        # Convert times to datetime objects, handling overnight screenings
+        # Convert times to datetime objects
         df['StartTime_dt'] = pd.to_datetime(df['StartTime'], format='%H:%M', errors='coerce').apply(
             lambda t: t.replace(year=base_date.year, month=base_date.month, day=base_date.day) if pd.notnull(t) else t
         )
         df['EndTime_dt'] = pd.to_datetime(df['EndTime'], format='%H:%M', errors='coerce').apply(
             lambda t: t.replace(year=base_date.year, month=base_date.month, day=base_date.day) if pd.notnull(t) else t
         )
+        
         df.loc[df['EndTime_dt'] < df['StartTime_dt'], 'EndTime_dt'] += timedelta(days=1)
-        df = df.sort_values(['Hall', 'StartTime_dt'])
-
+        df = df.sort_values(['Hall_Num', 'StartTime_dt'])
+        
         # Merge consecutive screenings of the same movie
         merged_rows = []
-        for hall, group in df.groupby('Hall'):
+        for _, group in df.groupby('Hall_Num'):
             group = group.sort_values('StartTime_dt')
             current = None
             for _, row in group.iterrows():
@@ -91,108 +84,135 @@ def process_schedule_led(file):
                         current = row.copy()
             if current is not None:
                 merged_rows.append(current)
+        
+        if not merged_rows:
+            return None, date_str
 
         merged_df = pd.DataFrame(merged_rows)
-
+        
         # Adjust start and end times
         merged_df['StartTime_dt'] = merged_df['StartTime_dt'] - timedelta(minutes=10)
         merged_df['EndTime_dt'] = merged_df['EndTime_dt'] - timedelta(minutes=5)
+        
+        # Create final data columns for the table
+        merged_df['Sequence'] = merged_df.groupby('Hall_Num').cumcount() + 1
+        merged_df['Pinyin'] = merged_df['Movie'].apply(get_pinyin_abbr)
+        merged_df['Time'] = merged_df['StartTime_dt'].dt.strftime('%H:%M') + ' - ' + merged_df['EndTime_dt'].dt.strftime('%H:%M')
+        
+        final_df = merged_df[['Hall', 'Hall_Num', 'Sequence', 'Movie', 'Pinyin', 'Time']].copy()
+        final_df = final_df.sort_values(['Hall_Num', 'Sequence']).reset_index(drop=True)
 
-        merged_df['StartTime_str'] = merged_df['StartTime_dt'].dt.strftime('%H:%M')
-        merged_df['EndTime_str'] = merged_df['EndTime_dt'].dt.strftime('%H:%M')
-
-        return merged_df[['Hall', 'Movie', 'StartTime_str', 'EndTime_str']], date_str
+        return final_df, date_str
     except Exception as e:
-        st.error(f"An error occurred during file processing: {e}")
+        st.error(f"An error occurred during data processing: {e}")
         return None, date_str
 
-# --- Layout generation for "LED Screen" (放映时间核对表) ---
-def create_print_layout_led(data, date_str):
-    """Generates PNG and PDF layouts for the 'LED Screen' schedule."""
+def create_print_layout(data, date_str):
+    """
+    Generates the print layout as PNG and PDF based on the processed data.
+    """
     if data is None or data.empty:
         return None
 
-    # Create figures for PNG and PDF output with A4 dimensions
-    png_fig = plt.figure(figsize=(8.27, 11.69), dpi=300)
-    png_ax = png_fig.add_subplot(111)
-    png_ax.set_axis_off()
-    png_fig.subplots_adjust(left=0.02, right=0.98, top=0.98, bottom=0.02)
-
-    pdf_fig = plt.figure(figsize=(8.27, 11.69), dpi=300)
-    pdf_ax = pdf_fig.add_subplot(111)
-    pdf_ax.set_axis_off()
-    pdf_fig.subplots_adjust(left=0.02, right=0.98, top=0.98, bottom=0.02)
-
-    def process_figure(fig, ax):
-        halls = sorted(data['Hall'].unique(), key=lambda h: int(h.replace('号','')) if h else 0)
-
-        num_separators = len(halls) - 1
-        total_layout_rows = len(data) + num_separators + 2
+    def draw_table_on_ax(fig, ax):
+        """Helper function to draw the table on a given Matplotlib axis."""
+        ax.set_axis_off()
         
-        available_height = 0.96
-        row_height = available_height / total_layout_rows
-
-        fig_height_inches = fig.get_figheight()
-        row_height_points = row_height * fig_height_inches * 72
-        font_size = row_height_points * 0.9
-
-        date_font = get_font(font_size * 0.8)
-        hall_font = get_font(font_size)
-        movie_font = get_font(font_size)
-
-        col_hall_left = 0.0
-        col_movie_right = 0.50
-        col_seq_left = 0.52
-        col_pinyin_left = 0.62
-        col_time_left = 0.75
-
-        ax.text(col_hall_left, 0.99, date_str, color='#A9A9A9',
-                ha='left', va='top', fontproperties=date_font, transform=ax.transAxes)
+        num_rows = len(data)
+        if num_rows == 0:
+            return
+
+        # --- Layout & Sizing Calculations ---
+        # Define printable area using relative coordinates (fractions of the page)
+        TOP_MARGIN, BOTTOM_MARGIN = 0.96, 0.04
+        LEFT_MARGIN, RIGHT_MARGIN = 0.04, 0.96
+        TABLE_HEIGHT = TOP_MARGIN - BOTTOM_MARGIN
+        TABLE_WIDTH = RIGHT_MARGIN - LEFT_MARGIN
+
+        # Total rows for calculation: content rows + 2 for top/bottom buffer
+        total_layout_rows = num_rows + 2
+        row_height = TABLE_HEIGHT / total_layout_rows
+        
+        # Font size is 90% of the calculated row height
+        # (row_height is a fraction of figure height, convert to points)
+        font_size_pt = (row_height * fig.get_figheight() * 0.9) * 72
+        font = get_font(size=font_size_pt)
+        
+        # Relative column widths
+        col_relative_widths = {'hall': 1.2, 'seq': 0.8, 'movie': 5.0, 'pinyin': 1.5, 'time': 2.5}
+        total_rel_width = sum(col_relative_widths.values())
         
-        y_position = 0.98 - row_height
+        col_widths = {k: (v / total_rel_width) * TABLE_WIDTH for k, v in col_relative_widths.items()}
         
-        for i, hall in enumerate(halls):
-            hall_data = data[data['Hall'] == hall]
+        # Calculate the absolute x-position for the left edge of each column
+        x_pos = {}
+        current_x = LEFT_MARGIN
+        col_order = ['hall', 'seq', 'movie', 'pinyin', 'time']
+        for col_name in col_order:
+            x_pos[col_name] = current_x
+            current_x += col_widths[col_name]
+        x_pos['end'] = current_x  # The right edge of the last column
+
+        # Add date header
+        ax.text(LEFT_MARGIN, TOP_MARGIN, date_str, fontsize=12, color='#A9A9A9',
+                ha='left', va='top', fontproperties=get_font(12), transform=ax.transAxes)
+
+        # --- Drawing Loop ---
+        for i, row in data.iterrows():
+            # Calculate y-position for the center of the current row
+            y_center = TOP_MARGIN - (i + 1.5) * row_height # +1.5 to account for header space
+            y_top = y_center + row_height / 2
+            y_bottom = y_center - row_height / 2
+
+            # --- 1. Draw Cell Content ---
+            # Column content is ordered as per requirement
+            ax.text(x_pos['hall'] + col_widths['hall']/2, y_center, f"{row['Hall']}", va='center', ha='center', fontproperties=font, transform=ax.transAxes)
+            ax.text(x_pos['seq'] + col_widths['seq']/2, y_center, f"{row['Sequence']}", va='center', ha='center', fontproperties=font, transform=ax.transAxes)
+            ax.text(x_pos['movie'] + 0.01, y_center, f"{row['Movie']}", va='center', ha='left', fontproperties=font, transform=ax.transAxes, clip_on=True)
+            ax.text(x_pos['pinyin'] + col_widths['pinyin']/2, y_center, f"{row['Pinyin']}", va='center', ha='center', fontproperties=font, transform=ax.transAxes)
+            ax.text(x_pos['time'] + col_widths['time']/2, y_center, f"{row['Time']}", va='center', ha='center', fontproperties=font, transform=ax.transAxes)
             
-            if i > 0:
-                ax.axhline(y=y_position + row_height / 2, xmin=col_hall_left, xmax=0.97, color='black', linewidth=0.7)
-                y_position -= row_height
-
-            movie_count = 1
-            for _, row in hall_data.iterrows():
-                if movie_count == 1:
-                    ax.text(col_hall_left, y_position, f"{hall.replace('号', '')}#",
-                            ha='left', va='center', fontweight='bold',
-                            fontproperties=hall_font, transform=ax.transAxes)
-                
-                ax.text(col_movie_right, y_position, row['Movie'],
-                        ha='right', va='center', fontproperties=movie_font, transform=ax.transAxes)
-
-                ax.text(col_seq_left, y_position, f"{movie_count}.",
-                        ha='left', va='center', fontproperties=movie_font, transform=ax.transAxes)
-
-                pinyin_abbr = get_pinyin_abbr(row['Movie'])
-                ax.text(col_pinyin_left, y_position, pinyin_abbr,
-                        ha='left', va='center', fontproperties=movie_font, transform=ax.transAxes)
-                
-                ax.text(col_time_left, y_position, f"{row['StartTime_str']}-{row['EndTime_str']}",
-                        ha='left', va='center', fontproperties=movie_font, transform=ax.transAxes)
-
-                y_position -= row_height
-                movie_count += 1
+            # --- 2. Draw Cell Borders ---
+            # Draw all vertical cell lines with gray dots
+            for col_name in col_order:
+                ax.plot([x_pos[col_name], x_pos[col_name]], [y_bottom, y_top], color='gray', linestyle=':', linewidth=0.7)
+            ax.plot([x_pos['end'], x_pos['end']], [y_bottom, y_top], color='gray', linestyle=':', linewidth=0.7)
+
+            # Draw top border of the cell
+            ax.plot([LEFT_MARGIN, x_pos['end']], [y_top, y_top], color='gray', linestyle=':', linewidth=0.7)
+            
+            # --- 3. Draw Hall Separator or Bottom Border ---
+            # Check if this is the last movie for the current hall
+            is_last_in_hall = (i == num_rows - 1) or (row['Hall_Num'] != data.iloc[i + 1]['Hall_Num'])
+            
+            if is_last_in_hall:
+                # If it's the last entry for a hall, draw a solid black line below it
+                ax.plot([LEFT_MARGIN, x_pos['end']], [y_bottom, y_bottom], color='black', linestyle='-', linewidth=1.2, zorder=3)
+            else:
+                # Otherwise, draw a standard gray dotted line
+                ax.plot([LEFT_MARGIN, x_pos['end']], [y_bottom, y_bottom], color='gray', linestyle=':', linewidth=0.7)
 
-    process_figure(png_fig, png_ax)
-    process_figure(pdf_fig, pdf_ax)
+    # --- Generate PNG and PDF Outputs ---
+    # Create a figure for PNG output
+    png_fig = plt.figure(figsize=(8.27, 11.69), dpi=300)
+    png_ax = png_fig.add_subplot(111)
+    draw_table_on_ax(png_fig, png_ax)
+    
+    # Create a separate figure for PDF output
+    pdf_fig = plt.figure(figsize=(8.27, 11.69), dpi=300)
+    pdf_ax = pdf_fig.add_subplot(111)
+    draw_table_on_ax(pdf_fig, pdf_ax)
     
+    # Save PNG to a buffer
     png_buffer = io.BytesIO()
     png_fig.savefig(png_buffer, format='png', bbox_inches='tight', pad_inches=0.05)
     png_buffer.seek(0)
     image_base64 = base64.b64encode(png_buffer.getvalue()).decode()
     plt.close(png_fig)
     
+    # Save PDF to a buffer
     pdf_buffer = io.BytesIO()
-    with PdfPages(pdf_buffer) as pdf:
-        pdf.savefig(pdf_fig, bbox_inches='tight', pad_inches=0.05)
+    pdf_fig.savefig(pdf_buffer, format='pdf', bbox_inches='tight', pad_inches=0.05)
     pdf_buffer.seek(0)
     pdf_base64 = base64.b64encode(pdf_buffer.getvalue()).decode()
     plt.close(pdf_fig)
@@ -202,252 +222,34 @@ def create_print_layout_led(data, date_str):
         'pdf': f"data:application/pdf;base64,{pdf_base64}"
     }
 
-# --- Processing logic for "Quick Print" (放映场次核对表) ---
-def process_schedule_quick(file):
-    """Processes the '放映场次核对表.xls' file."""
-    try:
-        df = pd.read_excel(file, skiprows=8)
-        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) + ' '
-        
-        base_date = datetime.today().date()
-        df['StartTime'] = pd.to_datetime(df['StartTime'])
-        df['EndTime'] = pd.to_datetime(df['EndTime'])
-
-        business_start = datetime.strptime(f"{base_date} {BUSINESS_START}", "%Y-%m-%d %H:%M")
-        business_end = datetime.strptime(f"{base_date} {BUSINESS_END}", "%Y-%m-%d %H:%M")
-        if business_end < business_start:
-            business_end += timedelta(days=1)
-
-        for idx, row in df.iterrows():
-            end_time = row['EndTime']
-            if end_time.hour < 9:
-                df.at[idx, 'EndTime'] = end_time + timedelta(days=1)
-            if row['StartTime'].hour >= 21 and end_time.hour < 9:
-                df.at[idx, 'EndTime'] = end_time + timedelta(days=1)
-        
-        df['time_for_comparison'] = df['EndTime'].apply(lambda x: datetime.combine(base_date, x.time()))
-        df.loc[df['time_for_comparison'].dt.hour < 9, 'time_for_comparison'] += timedelta(days=1)
-        
-        valid_times = (
-            (df['time_for_comparison'] >= datetime.combine(base_date, business_start.time())) &
-            (df['time_for_comparison'] <= datetime.combine(base_date + timedelta(days=1), business_end.time()))
-        )
-        df = df[valid_times]
-        df = df.sort_values('EndTime')
-        
-        split_time_dt = datetime.strptime(f"{base_date} {SPLIT_TIME}", "%Y-%m-%d %H:%M")
-        
-        part1 = df[df['time_for_comparison'] <= split_time_dt].copy()
-        part2 = df[df['time_for_comparison'] > split_time_dt].copy()
-
-        for part in [part1, part2]:
-            part['EndTime'] = part['EndTime'].dt.strftime('%-H:%M')
-        
-        date_df = pd.read_excel(file, skiprows=5, nrows=1, usecols=[2], header=None)
-        date_cell = date_df.iloc[0, 0]
-        
-        try:
-            if isinstance(date_cell, str):
-                date_str = datetime.strptime(date_cell, '%Y-%m-%d').strftime('%Y-%m-%d')
-            else:
-                date_str = pd.to_datetime(date_cell).strftime('%Y-%m-%d')
-        except:
-            date_str = datetime.today().strftime('%Y-%m-%d')
-            
-        return part1[['Hall', 'EndTime']], part2[['Hall', 'EndTime']], date_str
-
-    except Exception as e:
-        st.error(f"处理文件时出错: {str(e)}")
-        return None, None, None
-
-# --- Layout generation for "Quick Print" (放映场次核对表) ---
-def create_print_layout_quick(data, title, date_str):
-    """Creates print layout for the 'Quick Print' schedule."""
-    if data.empty:
-        return None
-
-    png_fig = plt.figure(figsize=(5.83, 8.27), dpi=300) # A5
-    png_fig.subplots_adjust(left=0.02, right=0.98, top=0.98, bottom=0.02)
-
-    pdf_fig = plt.figure(figsize=(5.83, 8.27), dpi=300) # A5
-    pdf_fig.subplots_adjust(left=0.02, right=0.98, top=0.98, bottom=0.02)
-
-    def process_figure(fig, is_pdf=False):
-        plt.rcParams['font.family'] = 'sans-serif'
-        plt.rcParams['font.sans-serif'] = ['Arial Unicode MS', 'Heiti TC', 'SimHei']
-
-        total_items = len(data)
-        num_cols = 3
-        num_rows = math.ceil(total_items / num_cols)
-
-        gs = gridspec.GridSpec(num_rows + 1, num_cols, hspace=0.05, wspace=0.05, height_ratios=[0.1] + [1] * num_rows, figure=fig)
-
-        target_width_px = 1
-        if total_items > 0:
-            ax_temp = fig.add_subplot(gs[1, 0])
-            fig.canvas.draw()
-            target_width_px = ax_temp.get_window_extent().width * 0.90
-            ax_temp.remove()
-
-        available_height_per_row = (8.27 * 0.9 * (1 / 1.2)) / num_rows if num_rows > 0 else 1
-        date_fontsize = min(40, max(10, available_height_per_row * 72 * 0.5))
-
-        data_values = data.values.tolist()
-        while len(data_values) % num_cols != 0:
-            data_values.append(['', ''])
-        rows_per_col_layout = math.ceil(len(data_values) / num_cols)
-
-        sorted_data = [['', '']] * len(data_values)
-        for i, item in enumerate(data_values):
-            if item[0] and item[1]:
-                row_in_col = i % rows_per_col_layout
-                col_idx = i // rows_per_col_layout
-                new_index = row_in_col * num_cols + col_idx
-                if new_index < len(sorted_data):
-                    sorted_data[new_index] = item
-
-        for idx, (hall, end_time) in enumerate(sorted_data):
-            if hall and end_time:
-                row_grid = idx // num_cols + 1
-                col_grid = idx % num_cols
-
-                if row_grid < num_rows + 1:
-                    ax = fig.add_subplot(gs[row_grid, col_grid])
-                    for spine in ax.spines.values():
-                        spine.set_visible(False)
-
-                    bbox = FancyBboxPatch(
-                        (0.01, 0.01), 0.98, 0.98,
-                        boxstyle="round,pad=0,rounding_size=0.02",
-                        edgecolor=BORDER_COLOR, facecolor='none',
-                        linewidth=0.5, transform=ax.transAxes, clip_on=False
-                    )
-                    ax.add_patch(bbox)
-
-                    display_text = f"{hall}{end_time}"
-                    t = ax.text(0.5, 0.5, display_text,
-                                fontweight='bold', ha='center', va='center',
-                                transform=ax.transAxes)
-                    
-                    current_size = 120
-                    while current_size > 1:
-                        t.set_fontsize(current_size)
-                        text_bbox = t.get_window_extent(renderer=fig.canvas.get_renderer())
-                        if text_bbox.width <= target_width_px:
-                            break
-                        current_size -= 2
-
-                    ax.set_xticks([])
-                    ax.set_yticks([])
-
-        ax_date = fig.add_subplot(gs[0, :])
-        ax_date.text(0.01, 0.5, f"{date_str} {title}",
-                     fontsize=date_fontsize * 0.5,
-                     color=DATE_COLOR, fontweight='bold',
-                     ha='left', va='center', transform=ax_date.transAxes)
-        for spine in ax_date.spines.values():
-            spine.set_visible(False)
-        ax_date.set_xticks([])
-        ax_date.set_yticks([])
-        ax_date.set_facecolor('none')
-
-    process_figure(png_fig)
-    process_figure(pdf_fig, is_pdf=True)
-
-    png_buffer = io.BytesIO()
-    png_fig.savefig(png_buffer, format='png', bbox_inches='tight', pad_inches=0.02)
-    png_buffer.seek(0)
-    png_base64 = base64.b64encode(png_buffer.getvalue()).decode()
-    plt.close(png_fig)
-
-    pdf_buffer = io.BytesIO()
-    with PdfPages(pdf_buffer) as pdf:
-        pdf.savefig(pdf_fig, bbox_inches='tight', pad_inches=0.02)
-    pdf_buffer.seek(0)
-    pdf_base64 = base64.b64encode(pdf_buffer.getvalue()).decode()
-    plt.close(pdf_fig)
-
-    return {
-        'png': f'data:image/png;base64,{png_base64}',
-        'pdf': f'data:application/pdf;base64,{pdf_base64}'
-    }
-
-# --- Generic Helper to Display PDF ---
 def display_pdf(base64_pdf):
-    """Generates the HTML to embed and display a PDF in Streamlit."""
-    pdf_display = f"""
-    <iframe src="{base64_pdf}" width="100%" height="800" type="application/pdf"></iframe>
-    """
+    """Embeds the PDF in the Streamlit app for display."""
+    pdf_display = f'<iframe src="{base64_pdf}" width="100%" height="800" type="application/pdf"></iframe>'
     return pdf_display
 
-# --- Main Streamlit App ---
-st.set_page_config(page_title="影院排期打印工具", layout="wide")
-st.title("影院排期打印工具")
+# --- Streamlit App UI ---
+st.set_page_config(page_title="LED 屏幕时间表打印", layout="wide")
+st.title("LED 屏幕时间表打印")
 
-uploaded_file = st.file_uploader(
-    "选择【放映时间核对表.xls】或【放映场次核对表.xls】文件",
-    accept_multiple_files=False,
-    type=["xls"]
-)
+uploaded_file = st.file_uploader("选择打开【放映时间核对表.xls】文件", accept_multiple_files=False, type=["xls", "xlsx"])
 
 if uploaded_file:
     with st.spinner("文件正在处理中，请稍候..."):
-        # --- Route to the correct processor based on filename ---
-
-        # 1. Logic for "LED 屏幕时间表打印"
-        if "放映时间核对表" in uploaded_file.name:
-            st.subheader("LED 屏幕时间表")
-            schedule, date_str = process_schedule_led(uploaded_file)
-            if schedule is not None:
-                output = create_print_layout_led(schedule, date_str)
-                if output:
-                    tab1, tab2 = st.tabs(["PDF 预览", "PNG 预览"])
-                    with tab1:
-                        st.markdown(display_pdf(output['pdf']), unsafe_allow_html=True)
-                    with tab2:
-                        st.image(output['png'], use_container_width=True)
-                else:
-                    st.info("没有可显示的数据。")
-            else:
-                st.error("无法处理文件，请检查文件格式或内容是否正确。")
-
-        # 2. Logic for "散厅时间快捷打印"
-        elif "放映场次核对表" in uploaded_file.name:
-            part1_data, part2_data, date_str = process_schedule_quick(uploaded_file)
-
-            if part1_data is not None and part2_data is not None:
-                part1_output = create_print_layout_quick(part1_data, "A", date_str)
-                part2_output = create_print_layout_quick(part2_data, "C", date_str)
-
-                col1, col2 = st.columns(2)
-
-                with col1:
-                    st.subheader("白班散场预览（时间 ≤ 17:30）")
-                    if part1_output:
-                        tab1_1, tab1_2 = st.tabs(["PDF 预览 ", "PNG 预览 "]) # Added space to make keys unique
-                        with tab1_1:
-                            st.markdown(display_pdf(part1_output['pdf']), unsafe_allow_html=True)
-                        with tab1_2:
-                            st.image(part1_output['png'])
-                    else:
-                        st.info("白班部分没有数据")
-
-                with col2:
-                    st.subheader("夜班散场预览（时间 > 17:30）")
-                    if part2_output:
-                        tab2_1, tab2_2 = st.tabs(["PDF 预览  ", "PNG 预览  "]) # Added spaces to make keys unique
-                        with tab2_1:
-                            st.markdown(display_pdf(part2_output['pdf']), unsafe_allow_html=True)
-                        with tab2_2:
-                            st.image(part2_output['png'])
-                    else:
-                        st.info("夜班部分没有数据")
+        schedule, date_str = process_schedule(io.BytesIO(uploaded_file.getvalue()))
+        if schedule is not None and not schedule.empty:
+            output = create_print_layout(schedule, date_str)
+            
+            if output:
+                # Create tabs to switch between PDF and PNG previews
+                tab1, tab2 = st.tabs(["PDF 预览", "PNG 预览"])
+                
+                with tab1:
+                    st.markdown(display_pdf(output['pdf']), unsafe_allow_html=True)
+                
+                with tab2:
+                    st.image(output['png'], use_container_width=True)
             else:
-                st.error("无法处理文件，请检查文件格式或内容是否正确。")
-        
-        # 3. Fallback for incorrect file
+                 st.error("生成打印布局时出错。")
         else:
-            st.warning("文件名不匹配。请上传名为【放映时间核对表.xls】或【放映场次核对表.xls】的文件。")
+            st.error("无法处理文件，或文件中没有找到有效排片数据。请检查文件格式或内容是否正确。")
+