From 9bf5956ae39daceb4bf70867233145b22dfd280d Mon Sep 17 00:00:00 2001
From: MT <3075067877@qq.com>
Date: Mon, 15 Sep 2025 18:16:30 +0800
Subject: [PATCH] fix 3

---
 .../orderOX/OrderVerificationResultActivity.java   | 51 ++++++++++------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java b/app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java
index a1ec558..567fe07 100644
--- a/app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java
+++ b/app/src/main/java/com/ouxuan/oxface/orderOX/OrderVerificationResultActivity.java
@@ -100,16 +100,12 @@ public class OrderVerificationResultActivity extends AppCompatActivity {
         scrollContent = findViewById(R.id.scroll_content);
         layoutContent = findViewById(R.id.layout_content);
         
-        // 初始化倒计时显示
-        tvCountdown = findViewById(R.id.tv_countdown);
-        if (tvCountdown == null) {
-            // 如果布局文件中没有倒计时文本，动态创建一个
-            tvCountdown = new TextView(this);
-            tvCountdown.setTextSize(16);
-            tvCountdown.setTextColor(getResources().getColor(android.R.color.darker_gray));
-            tvCountdown.setGravity(android.view.Gravity.CENTER);
-            tvCountdown.setPadding(0, 20, 0, 20);
-        }
+        // 初始化倒计时显示（动态创建）
+        tvCountdown = new TextView(this);
+        tvCountdown.setTextSize(16);
+        tvCountdown.setTextColor(getResources().getColor(android.R.color.darker_gray));
+        tvCountdown.setGravity(android.view.Gravity.CENTER);
+        tvCountdown.setPadding(0, 20, 0, 20);
     }
     
     private void getIntentData() {
@@ -673,24 +669,25 @@ public class OrderVerificationResultActivity extends AppCompatActivity {
      */
     private void addCountdownToLayout() {
         try {
-            // 查找主布局容器
-            ViewGroup mainLayout = findViewById(R.id.main_content);
-            if (mainLayout == null) {
-                // 如果找不到，尝试使用根布局
-                mainLayout = (ViewGroup) findViewById(android.R.id.content);
-            }
-            
-            if (mainLayout != null && tvCountdown != null) {
-                // 设置倒计时的布局参数
-                ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.WRAP_CONTENT
-                );
-                tvCountdown.setLayoutParams(params);
+            // 查找布局容器，将倒计时添加到确认按钮下方
+            Button btnConfirm = findViewById(R.id.btn_confirm_result);
+            if (btnConfirm != null && btnConfirm.getParent() instanceof ViewGroup) {
+                ViewGroup parentLayout = (ViewGroup) btnConfirm.getParent();
                 
-                // 将倒计时文本添加到布局中
-                mainLayout.addView(tvCountdown);
-                LogManager.logInfo(TAG, "倒计时显示已添加到布局中");
+                if (tvCountdown != null && tvCountdown.getParent() == null) {
+                    // 设置倒计时的布局参数（RelativeLayout参数）
+                    android.widget.RelativeLayout.LayoutParams params = new android.widget.RelativeLayout.LayoutParams(
+                        android.widget.RelativeLayout.LayoutParams.MATCH_PARENT,
+                        android.widget.RelativeLayout.LayoutParams.WRAP_CONTENT
+                    );
+                    params.addRule(android.widget.RelativeLayout.BELOW, R.id.btn_confirm_result);
+                    params.setMargins(0, 20, 0, 0);
+                    tvCountdown.setLayoutParams(params);
+                    
+                    // 将倒计时文本添加到布局中
+                    parentLayout.addView(tvCountdown);
+                    LogManager.logInfo(TAG, "倒计时显示已添加到布局中");
+                }
             }
         } catch (Exception e) {
             LogManager.logError(TAG, "添加倒计时显示失败", e);