refactor: remove voice tab, merge chat to home, fix recent records HTML table, clean emoji

ui/app_builder.py

@@ -1,12 +1,11 @@
 """
 PregoPal - Gradio 界面构建
 ===========================
-5 个子页面 + 中英文切换 + 自定义 CSS：
-  1. 🏠 首页（语音启动 + 简报卡片 + AI 思考状态）
-  2. 🎙️ 语音交互（全双工 Chatbot + 声纹面板）
-  3. 👨‍👩‍👧‍👦 家庭饮食习惯
-  4. 📊 三天总结
-  5. 📈 营养报告
+4 个子页面 + 中英文切换 + 自定义 CSS：
+  1. 🏠 首页（对话 + AI 思考 + 最近记录）
+  2. 👨‍👩‍👧‍👦 家庭饮食习惯
+  3. 📊 三天总结
+  4. 📈 营养报告
 """
 
 import datetime
@@ -19,7 +18,7 @@ from modules.nutrition_analyzer import NutritionAnalyzer
 from modules.family_manager import RecipeManager, PreferenceManager, MemoryManager
 from modules.diet_extractor import DietExtractor
 from modules.nutrition_standards import DRIsParser
-from utils import t, ZH, EN, get_home_cards, CUSTOM_CSS
+from utils import t, ZH, EN, CUSTOM_CSS
 
 # ============================================================
 # 全局实例（单例）
@@ -31,183 +30,70 @@ nutrition_analyzer = NutritionAnalyzer()
 
 
 # ============================================================
-# Tab 1: 🏠 首页
+# 工具：最近记录渲染为 HTML 表格
 # ============================================================
-def _build_home_tab(loop, lang_state):
-    """构建首页（简洁对话入口 + AI 思考状态）"""
-    lang = lang_state.value if hasattr(lang_state, 'value') else "zh"
-
-    from modules.family_manager import MemoryManager
-
-    # ========== 语言相关文本 ==========
-    _home = {
-        "zh": {
-            "title": "# 🌸 PregoPal",
-            "subtitle": "你的孕期AI伴侣，用对话记录每一天",
-            "tap_speak": "🎙️ 开始对话",
-            "tap_hint": "说说今天吃了什么、心情怎么样...",
-            "thinking_label": "🤔 PregoPal 在想...",
-            "thinking_placeholder": "等待你的对话开启...",
-            "recent_log_label": "📝 最近的饮食记录",
-            "no_record": "还没有记录，开始对话吧！",
-        },
-        "en": {
-            "title": "# 🌸 PregoPal",
-            "subtitle": "Your pregnancy AI companion — just talk naturally",
-            "tap_speak": "🎙️ Start Talking",
-            "tap_hint": "Tell me what you ate, how you feel...",
-            "thinking_label": "🤔 PregoPal is thinking...",
-            "thinking_placeholder": "Waiting for you...",
-            "recent_log_label": "📝 Recent Logs",
-            "no_record": "No records yet. Start a conversation!",
-        }
-    }
-    T = _home[lang]
-
-    # 获取最近饮食摘要
-    records = DietLogger().get_recent_records(days=3)
-    if records:
-        recent_lines = []
-        for r in records[-4:]:
-            meals_str = "、".join(f"{k}:{v}" for k, v in r.get("meals", {}).items())
-            recent_lines.append(f"• {r['date']} {r.get('member_name','')} {meals_str}")
-        recent_display = "\n".join(recent_lines)
-    else:
-        recent_display = T["no_record"]
-
-    # ========== 布局：极简首页 ==========
-    with gr.Column(elem_classes=["home-container"]):
-        # 标题
-        gr.Markdown(T["title"])
-        gr.Markdown(T["subtitle"])
-
-        # 语音启动按钮（居中大按钮）
-        with gr.Row():
-            with gr.Column(scale=1):
-                pass
-            with gr.Column(scale=2):
-                gr.HTML(f"""
-                <div style="text-align: center; padding: 32px 0;">
-                    <button class="voice-main-btn" onclick="document.querySelectorAll('.tabs button')[1].click()">
-                        🎙️<br><span style="font-size:14px">{T['tap_speak']}</span>
-                    </button>
-                    <p style="margin-top: 16px; color: #888; font-size: 15px;">{T['tap_hint']}</p>
-                </div>
-                """)
-            with gr.Column(scale=1):
-                pass
-
-        # AI 思考状态（实时显示）
-        thinking_box = gr.Textbox(
-            value=f"{T['thinking_label']}\n{T['thinking_placeholder']}",
-            label="",
-            interactive=False,
-            lines=3,
-            elem_classes=["thinking-box"],
-        )
-
-        # 简短最近记录摘要
-        with gr.Group(elem_classes=["home-card"]):
-            gr.Markdown(f"### {T['recent_log_label']}")
-            gr.Markdown(recent_display)
-
-    return thinking_box
+def _render_recent_records_html(records, lang="zh"):
+    """用最可靠的 HTML 表格展示最近饮食记录，避免 Markdown 乱换行"""
+    if not records:
+        no_record = "还没有记录，开始对话吧！" if lang == "zh" else "No records yet. Start a conversation!"
+        return f'<div style="color:#999;padding:12px;text-align:center;font-size:15px;">{no_record}</div>'
+
+    rows = ""
+    for r in records[-6:]:
+        date = r.get("date", "")[-5:] if r.get("date") else ""
+        member = r.get("member_name", "") or ""
+        meals = r.get("meals", {})
+        meal_parts = []
+        for meal_time, food in meals.items():
+            meal_parts.append(f"<b>{meal_time}</b>&nbsp;{food}")
+        meal_str = "&nbsp;|&nbsp;".join(meal_parts) if meal_parts else "—"
+        rows += f"""
+        <tr>
+            <td style="white-space:nowrap;color:#E91E63;font-weight:500;">{date}</td>
+            <td style="white-space:nowrap;">{member}</td>
+            <td>{meal_str}</td>
+        </tr>"""
+
+    label_date = "日期" if lang == "zh" else "Date"
+    label_member = "成员" if lang == "zh" else "Member"
+    label_meals = "餐食" if lang == "zh" else "Meals"
+
+    return f"""
+    <div style="overflow-x:auto;">
+    <table style="width:100%;border-collapse:collapse;font-size:14px;font-family:inherit;">
+        <thead>
+            <tr style="background:#FCE4EC;color:#880E4F;">
+                <th style="padding:10px 12px;text-align:left;border-radius:8px 0 0 0;">{label_date}</th>
+                <th style="padding:10px 12px;text-align:left;">{label_member}</th>
+                <th style="padding:10px 12px;text-align:left;border-radius:0 8px 0 0;">{label_meals}</th>
+            </tr>
+        </thead>
+        <tbody>
+            {rows}
+        </tbody>
+    </table>
+    </div>
+    """
 
 
 # ============================================================
-# Tab 2: 🎙️ 语音交互
+# 工具：对话处理函数（首页共用）
 # ============================================================
-def _build_voice_tab(lang_state):
-    """构建语音交互页面（全双工 Chatbot + 折叠声纹面板）"""
-    lang = lang_state.value if hasattr(lang_state, 'value') else "zh"
-
-    # ========== 顶部：全双工状态指示器 ==========
-    with gr.Row():
-        full_duplex_status = gr.HTML("""
-        <div style="padding: 8px 16px; text-align: center;">
-            <span class="status-dot idle"></span>
-            <span style="color: #666; font-size: 14px;">⏸️ 待命中 — 输入文字或点击下方麦克风开始对话</span>
-        </div>
-        """)
-
-    # ========== 中部：Chatbot 对话历史 ==========
-    chatbot = gr.Chatbot(
-        label=t("chat_label", lang),
-        height=420,
-        avatar_images=(None, "🌸"),
-    )
-
-    # ========== 底部：输入区域（文字 + 二合一语音按钮） ==========
-    with gr.Row():
-        msg = gr.Textbox(
-            label="",
-            placeholder=t("msg_placeholder", lang),
-            scale=5,
-            show_label=False,
-            elem_classes=["chat-input"],
-        )
-        send_btn = gr.Button(t("btn_send", lang), variant="primary", scale=1)
-
-    with gr.Row():
-        with gr.Column(scale=4):
-            audio_input = gr.Audio(
-                label="🎤 语音输入",
-                type="filepath",
-                sources=["microphone", "upload"],
-            )
-        with gr.Column(scale=1):
-            clear_btn = gr.Button(t("btn_clear", lang), size="sm")
-            auto_process = gr.Checkbox(label="自动发送", value=True, scale=0)
+def _build_respond_fn(lang):
+    """返回对话处理函数"""
 
-    # ========== 右侧折叠面板：声纹管理 ==========
-    with gr.Accordion(t("voice_title", lang) if "###" not in t("voice_title", lang) else "🔊 声纹识别", open=False):
-        with gr.Row():
-            # 注册区
-            with gr.Column(scale=1):
-                gr.Markdown("#### 📝 注册新成员")
-                member_name = gr.Textbox(label=t("member_name", lang), placeholder="小明")
-                member_relation = gr.Dropdown(
-                    label=t("member_relation", lang),
-                    choices=ZH["relation_choices"] if lang == "zh" else EN["relation_choices"],
-                    value=ZH["relation_choices"][0] if lang == "zh" else EN["relation_choices"][0],
-                )
-                audio_register = gr.Audio(label="录制声纹", type="filepath", sources=["microphone"])
-                register_btn = gr.Button(t("btn_register", lang), variant="primary", size="sm")
-                register_result = gr.Textbox(label="", interactive=False, lines=1, show_label=False)
-
-            # 识别区
-            with gr.Column(scale=1):
-                gr.Markdown("#### 🔍 识别说话人")
-                audio_identify = gr.Audio(label="上传语音", type="filepath", sources=["upload", "microphone"])
-                identify_btn = gr.Button(t("btn_identify", lang), variant="primary", size="sm")
-                identify_result = gr.Textbox(label="", interactive=False, lines=1, show_label=False)
-
-    # ========== 底部：今日简报 JSON ==========
-    with gr.Accordion(t("briefing_title", lang) if "###" not in t("briefing_title", lang) else "📋 今日简报", open=False):
-        briefing_display = gr.JSON(value={}, label="")
-
-    # ========== 对话事件处理 ==========
     def respond(message, chat_history):
-        if not message:
-            return "", chat_history, full_duplex_status.value
-
-        # 更新状态为活跃
-        active_status = """
-        <div style="padding: 8px 16px; text-align: center;">
-            <span class="status-dot active"></span>
-            <span style="color: #4CAF50; font-size: 14px;">🔄 处理中...</span>
-        </div>
-        """
+        if not message or not message.strip():
+            return "", chat_history
 
         extracted = DietExtractor.robust_extract(message)
         response_parts = []
 
         if lang == "zh":
-            greeting = "👋 收到！我来帮你处理..."
             if extracted["diets"]:
                 for diet in extracted["diets"]:
                     meals_str = "、".join(f"{k}: {v}" for k, v in diet.get("meals", {}).items())
-                    response_parts.append(f"✅ 已记录饮食：{meals_str}")
+                    response_parts.append(f"已记录饮食：{meals_str}")
                     date_str = diet.get("日期", datetime.date.today().isoformat())
                     diet_logger.add_record(
                         member_name=diet.get("记录人", "用户"),
@@ -228,7 +114,7 @@ def _build_voice_tab(lang_state):
                             ingredients=recipe.get("食材", ""),
                             notes=recipe.get("备注", ""),
                         )
-                        response_parts.append(f"✅ 已收藏菜谱：{name}")
+                        response_parts.append(f"已收藏菜谱：{name}")
 
             if extracted["preferences"]:
                 for pref in extracted["preferences"]:
@@ -239,31 +125,19 @@ def _build_voice_tab(lang_state):
                         avoid=pref.get("内容", "") if pref.get("类型") == "忌口" else "",
                         allergies=pref.get("内容", "") if pref.get("类型") == "过敏" else "",
                     )
-                response_parts.append("✅ 已保存饮食偏好")
+                response_parts.append("已保存饮食偏好")
 
             if extracted["weights"]:
                 for w in extracted["weights"]:
-                    response_parts.append(f"✅ 已记录体重：{w.get('体重', '')}kg")
-
-            if extracted["thinking"]:
-                step = extracted["thinking"].get("当前步骤", "")
-                next_step = extracted["thinking"].get("下一步", "")
-                response_parts.append(f"🤔 当前：{step} → {next_step}")
-
-            if len(response_parts) == 0:
-                response_parts.append(greeting)
-                if any(kw in message for kw in ["吃了", "想吃", "午餐", "晚餐", "早餐"]):
-                    response_parts.append("我来帮你记录！下次可以直接说「我吃了...」我会自动记录。")
-                elif any(kw in message for kw in ["菜谱", "会做", "做饭"]):
-                    response_parts.append("好的，我来记录家庭菜谱！")
-                else:
-                    response_parts.append("有什么我可以帮你的吗？比如记录饮食、推荐食谱、或者聊聊今天的感受。")
+                    response_parts.append(f"已记录体重：{w.get('体重', '')}kg")
+
+            if not response_parts:
+                response_parts.append("收到！有什么我可以帮你的吗？\n比如记录饮食、推荐食谱、或者聊聊今天的感受。")
         else:
-            greeting = "👋 Got it! Let me help..."
             if extracted["diets"]:
                 for diet in extracted["diets"]:
                     meals_str = ", ".join(f"{k}: {v}" for k, v in diet.get("meals", {}).items())
-                    response_parts.append(f"✅ Logged diet: {meals_str}")
+                    response_parts.append(f"Logged diet: {meals_str}")
                     date_str = diet.get("日期", datetime.date.today().isoformat())
                     diet_logger.add_record(
                         member_name=diet.get("记录人", "User"),
@@ -284,7 +158,7 @@ def _build_voice_tab(lang_state):
                             ingredients=recipe.get("食材", ""),
                             notes=recipe.get("备注", ""),
                         )
-                        response_parts.append(f"✅ Saved recipe: {name}")
+                        response_parts.append(f"Saved recipe: {name}")
 
             if extracted["preferences"]:
                 for pref in extracted["preferences"]:
@@ -295,90 +169,99 @@ def _build_voice_tab(lang_state):
                         avoid=pref.get("内容", "") if pref.get("类型") == "忌口" else "",
                         allergies=pref.get("内容", "") if pref.get("类型") == "过敏" else "",
                     )
-                response_parts.append("✅ Saved preferences")
+                response_parts.append("Saved preferences")
 
             if extracted["weights"]:
                 for w in extracted["weights"]:
-                    response_parts.append(f"✅ Logged weight: {w.get('体重', '')}kg")
-
-            if extracted["thinking"]:
-                step = extracted["thinking"].get("当前步骤", "")
-                next_step = extracted["thinking"].get("下一步", "")
-                response_parts.append(f"🤔 Current: {step} → {next_step}")
+                    response_parts.append(f"Logged weight: {w.get('体重', '')}kg")
 
-            if len(response_parts) == 0:
-                response_parts.append(greeting)
-                response_parts.append("How can I help? Record your diet, recommend recipes, or just chat!")
+            if not response_parts:
+                response_parts.append("Got it! How can I help? Record your diet, recommend recipes, or just chat!")
 
         response = "\n\n".join(response_parts)
         chat_history.append((message, response))
+        return "", chat_history
 
-        # 回到待命状态
-        idle_status = """
-        <div style="padding: 8px 16px; text-align: center;">
-            <span class="status-dot idle"></span>
-            <span style="color: #666; font-size: 14px;">⏸️ 待命中</span>
-        </div>
-        """
-
-        return "", chat_history, idle_status
-
-    def process_audio(audio_path, auto_send, chat_history):
-        """处理语音输入（预留 AI 语音识别接口）"""
-        if not audio_path:
-            return None, chat_history, full_duplex_status.value
-
-        # TODO: 对接 core/voice_processor.py 的 ASR
-        # 当前返回提示信息等待 AI 接入
-        active_status = """
-        <div style="padding: 8px 16px; text-align: center;">
-            <span class="status-dot active"></span>
-            <span style="color: #4CAF50; font-size: 14px;">🔊 语音识别中...</span>
-        </div>
-        """
-
-        response = "🎤 语音已接收！（语音识别模块开发中，请暂时使用文字输入）"
-
-        if auto_send:
-            # 模拟：将音频作为消息处理
-            pass  # 后续接入 ASR 后替换此逻辑
-
-        idle_status = """
-        <div style="padding: 8px 16px; text-align: center;">
-            <span class="status-dot idle"></span>
-            <span style="color: #666; font-size: 14px;">⏸️ 待命中</span>
-        </div>
-        """
-
-        return None, chat_history, idle_status
+    return respond
 
-    # 绑定事件
-    send_btn.click(respond, inputs=[msg, chatbot], outputs=[msg, chatbot, full_duplex_status])
-    msg.submit(respond, inputs=[msg, chatbot], outputs=[msg, chatbot, full_duplex_status])
-    clear_btn.click(lambda: ([], full_duplex_status.value), outputs=[chatbot, full_duplex_status])
-
-    audio_input.stop_recording(
-        fn=process_audio,
-        inputs=[audio_input, auto_process, chatbot],
-        outputs=[audio_input, chatbot, full_duplex_status],
-    )
 
-    register_btn.click(
-        fn=lambda name, rel, audio: voiceprint_mgr.register_member(name, rel, audio),
-        inputs=[member_name, member_relation, audio_register],
-        outputs=[register_result],
-    )
-    identify_btn.click(
-        fn=lambda audio: voiceprint_mgr.identify_speaker(audio),
-        inputs=[audio_identify],
-        outputs=[identify_result],
-    )
+# ============================================================
+# Tab 1: 🏠 首页（对话 + 最近记录）
+# ============================================================
+def _build_home_tab(lang_state):
+    """构建首页：对话输入 + AI 回复 + 最近饮食记录表格"""
+    lang = lang_state.value if hasattr(lang_state, 'value') else "zh"
+
+    _home = {
+        "zh": {
+            "title": "#   PregoPal",
+            "subtitle": "你的孕期AI伴侣，用对话记录每一天",
+            "chat_label": "对话",
+            "msg_placeholder": "说说今天吃了什么、心情怎么样...",
+            "btn_send": "发送",
+            "btn_clear": "清空对话",
+            "recent_log_label": "最近的饮食记录",
+            "thinking_placeholder": "等待你的对话...",
+        },
+        "en": {
+            "title": "#   PregoPal",
+            "subtitle": "Your pregnancy AI companion — just talk naturally",
+            "chat_label": "Chat",
+            "msg_placeholder": "Tell me what you ate, how you feel...",
+            "btn_send": "Send",
+            "btn_clear": "Clear",
+            "recent_log_label": "Recent Diet Records",
+            "thinking_placeholder": "Waiting for you...",
+        }
+    }
+    T = _home[lang]
+
+    # 最近记录
+    records = DietLogger().get_recent_records(days=3)
+    recent_html = _render_recent_records_html(records, lang)
+
+    # 对话处理函数
+    respond = _build_respond_fn(lang)
+
+    with gr.Column(elem_classes=["home-container"]):
+        # 标题
+        gr.Markdown(T["title"])
+        gr.Markdown(T["subtitle"])
+
+        # Chatbot 对话历史
+        chatbot = gr.Chatbot(
+            label=T["chat_label"],
+            height=380,
+            avatar_images=(None, None),
+        )
+
+        # 输入行
+        with gr.Row():
+            msg = gr.Textbox(
+                label="",
+                placeholder=T["msg_placeholder"],
+                scale=5,
+                show_label=False,
+                elem_classes=["chat-input"],
+            )
+            send_btn = gr.Button(T["btn_send"], variant="primary", scale=1)
+            clear_btn = gr.Button(T["btn_clear"], size="sm", scale=1)
+
+        # 最近饮食记录
+        with gr.Group(elem_classes=["home-card"]):
+            gr.Markdown(f"### {T['recent_log_label']}")
+            gr.HTML(recent_html)
 
-    return chatbot, msg, send_btn, clear_btn, briefing_display
+    # 绑定事件
+    send_btn.click(respond, inputs=[msg, chatbot], outputs=[msg, chatbot])
+    msg.submit(respond, inputs=[msg, chatbot], outputs=[msg, chatbot])
+    clear_btn.click(lambda: [], outputs=[chatbot])
+
+    return chatbot, msg, send_btn, clear_btn
 
 
 # ============================================================
-# Tab 3: 👨‍👩‍👧‍👦 家庭饮食习惯（保持原有逻辑，微调配色）
+# Tab 2: 👨‍👩‍👧‍👦 家庭饮食习惯
 # ============================================================
 def _build_family_tab(lang_state):
     """构建家庭饮食习惯页面（动态语言）"""
@@ -490,7 +373,7 @@ def _build_family_tab(lang_state):
 
 
 # ============================================================
-# Tab 4: 📊 三天总结（保持原有逻辑）
+# Tab 3: 📊 三天总结
 # ============================================================
 def _build_summary_tab(lang_state):
     """构建三天总结页面（动态语言）"""
@@ -523,13 +406,13 @@ def _build_summary_tab(lang_state):
 
         suggestions = []
         if deficits:
-            suggestions.append("📋 建议增加以下食材到家庭菜单：")
+            suggestions.append("建议增加以下食材到家庭菜单：")
             for n in deficits[:3]:
                 foods = DRIsParser.RICH_FOODS.get(n, [])
                 if foods:
-                    suggestions.append(f"  • {n} → {'、'.join(foods[:4])}")
+                    suggestions.append(f"  * {n} -> {'、'.join(foods[:4])}")
         else:
-            suggestions.append("✅ 近三天营养状况良好！")
+            suggestions.append("近三天营养状况良好！")
 
         return report, "\n".join(suggestions)
 
@@ -541,7 +424,7 @@ def _build_summary_tab(lang_state):
 
 
 # ============================================================
-# Tab 5: 📈 营养报告（保持原有逻辑）
+# Tab 4: 📈 营养报告
 # ============================================================
 def _build_report_tab(lang_state):
     """构建营养报告页面（动态语言）"""
@@ -573,7 +456,8 @@ def _build_report_tab(lang_state):
         records = diet_logger.get_recent_records(days=int(days))
         analysis = nutrition_analyzer.analyze_diet(records)
         md_path = nutrition_analyzer.export_report_markdown(analysis)
-        return f"✅ {t('btn_export_md', lang) if lang == 'zh' else 'Exported'}: {md_path.name}"
+        prefix = "导出成功" if lang == "zh" else "Exported"
+        return f"{prefix}: {md_path.name}"
 
     generate_btn.click(fn=generate_report, inputs=[analysis_days], outputs=[report_text, report_plot])
     export_md_btn.click(fn=export_report, inputs=[analysis_days], outputs=export_result)
@@ -583,7 +467,7 @@ def _build_report_tab(lang_state):
 # 主入口：创建应用
 # ============================================================
 def create_app(loop=None):
-    """创建主应用（5 Tab + 中英文切换 + 自定义 CSS）"""
+    """创建主应用（4 Tab + 中英文切换 + 自定义 CSS）"""
 
     with gr.Blocks(
         title="PregoPal - 孕期陪护AI助手",
@@ -606,7 +490,7 @@ def create_app(loop=None):
                 background: var(--card-bg) !important;
                 border: 1px solid var(--card-border) !important;
                 box-shadow: 0 2px 12px rgba(255, 105, 135, 0.08) !important;
-                min-height: 140px;
+                min-height: 60px;
             }
             .thinking-box textarea {
                 background: linear-gradient(135deg, #F3E5F5, #FFF) !important;
@@ -633,13 +517,13 @@ def create_app(loop=None):
             with gr.Column(scale=4):
                 gr.Markdown(f"""
                 <div style="text-align: left; padding: 8px 0;">
-                    <h1 style="margin: 0;">🌸 PregoPal</h1>
+                    <h1 style="margin: 0;">  PregoPal</h1>
                     <p style="color: #999; margin: 4px 0 0 0; font-size: 16px;">孕期陪护AI助手 — 温馨的家庭式伴侣</p>
                 </div>
                 """)
             with gr.Column(scale=1, min_width=120):
                 lang_selector = gr.Radio(
-                    label="🌐 Language",
+                    label="  Language",
                     choices=["中文", "English"],
                     value="中文",
                     interactive=True,
@@ -651,14 +535,11 @@ def create_app(loop=None):
         lang_selector.change(fn=switch_lang, inputs=[lang_selector], outputs=[lang_state])
 
         # ============================================================
-        # 5 个 Tab
+        # 4 个 Tab
         # ============================================================
         with gr.Tabs():
-            with gr.Tab("🏠 首页", id="tab_home"):
-                _build_home_tab(loop, lang_state)
-
-            with gr.Tab(t("tab_voice", "zh"), id="tab_voice"):
-                _build_voice_tab(lang_state)
+            with gr.Tab("  首页", id="tab_home"):
+                _build_home_tab(lang_state)
 
             with gr.Tab(t("tab_family", "zh"), id="tab_family"):
                 _build_family_tab(lang_state)