fix 3

app/src/main/java/com/ouxuan/oxface/orderOX/OrderSelectionActivity.java

@@ -22,6 +22,10 @@ import com.ouxuan.oxface.R;
 import com.ouxuan.oxface.orderOX.adapter.OrderSelectionAdapter;
 import com.ouxuan.oxface.orderOX.model.OrderVerificationData;
 import com.ouxuan.oxface.utils.LogManager;
+import com.ouxuan.oxface.data.LoginDataManager;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.CircleCrop;
+import com.bumptech.glide.request.RequestOptions;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -42,6 +46,7 @@ public class OrderSelectionActivity extends AppCompatActivity {
     private RecyclerView rvOrderList;
     private Button btnConfirm, btnCancel;
     private TextView tvBackHome, tvStoreName, tvVerificationDate;
+    private ImageView ivStoreIcon; // 添加店铺图标ImageView
     
     private OrderSelectionAdapter adapter;
     private List<OrderVerificationData.OrderItem> orderList;
@@ -53,6 +58,9 @@ public class OrderSelectionActivity extends AppCompatActivity {
     // 强制关闭广播接收器
     private BroadcastReceiver forceCloseReceiver;
     
+    // 登录数据管理器
+    private LoginDataManager loginDataManager;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -75,6 +83,9 @@ public class OrderSelectionActivity extends AppCompatActivity {
         setupListeners();
         startCountdown();
         
+        // 初始化登录数据管理器
+        loginDataManager = LoginDataManager.getInstance(this);
+        
         // 注册强制关闭广播接收器
         registerForceCloseReceiver();
         
@@ -88,6 +99,7 @@ public class OrderSelectionActivity extends AppCompatActivity {
         tvBackHome = findViewById(R.id.tv_back_home);
         tvStoreName = findViewById(R.id.tv_store_name);
         tvVerificationDate = findViewById(R.id.tv_verification_date);
+        ivStoreIcon = findViewById(R.id.iv_store_icon); // 初始化店铺图标
         
         // 设置当前日期
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd", Locale.getDefault());
@@ -96,6 +108,9 @@ public class OrderSelectionActivity extends AppCompatActivity {
         
         // 设置RecyclerView
         rvOrderList.setLayoutManager(new LinearLayoutManager(this));
+        
+        // 更新店铺信息
+        updateStoreInfo();
     }
     
     private void initData() {
@@ -289,7 +304,7 @@ public class OrderSelectionActivity extends AppCompatActivity {
      */
     private void updateCountdown() {
         if (countdown > 0) {
-            tvBackHome.setText("返回识别(0" + countdown + "s)");
+            tvBackHome.setText("返回识别(" + countdown + "s)");
             countdown--;
             
             if (countdownHandler != null) {
@@ -347,6 +362,58 @@ public class OrderSelectionActivity extends AppCompatActivity {
         LogManager.logInfo(TAG, "强制关闭广播接收器已注册");
     }
     
+    /**
+     * 更新店铺信息（店铺名称和Logo）
+     */
+    private void updateStoreInfo() {
+        try {
+            // 获取登录数据
+            if (loginDataManager != null) {
+                String storeName = loginDataManager.getStoreName();
+                String logoUrl = loginDataManager.getStoreLogo();
+                
+                // 更新店铺名称
+                if (storeName != null && !storeName.isEmpty()) {
+                    tvStoreName.setText(storeName);
+                    LogManager.logInfo(TAG, "成功更新店铺名称: " + storeName);
+                } else {
+                    tvStoreName.setText("Test门店"); // 默认名称
+                    LogManager.logWarning(TAG, "未获取到店铺名称，使用默认名称");
+                }
+                
+                // 更新店铺 Logo
+                if (logoUrl != null && !logoUrl.isEmpty() && ivStoreIcon != null) {
+                    LogManager.logInfo(TAG, "加载店铺 Logo: " + logoUrl);
+                    
+                    // 使用 Glide 加载网络图片，设置圆形裁剪和默认图片
+                    Glide.with(this)
+                        .load(logoUrl)
+                        .apply(RequestOptions.bitmapTransform(new CircleCrop()))
+                        .placeholder(R.drawable.ic_warriors_logo) // 加载中显示默认图片
+                        .error(R.drawable.ic_warriors_logo) // 加载失败显示默认图片
+                        .into(ivStoreIcon);
+                } else {
+                    LogManager.logInfo(TAG, "Logo URL为空或ImageView为空，使用默认图标");
+                    if (ivStoreIcon != null) {
+                        ivStoreIcon.setImageResource(R.drawable.ic_warriors_logo);
+                    }
+                }
+            } else {
+                LogManager.logError(TAG, "LoginDataManager为空，无法获取店铺信息");
+                tvStoreName.setText("Test门店"); // 默认名称
+                if (ivStoreIcon != null) {
+                    ivStoreIcon.setImageResource(R.drawable.ic_warriors_logo);
+                }
+            }
+        } catch (Exception e) {
+            LogManager.logError(TAG, "更新店铺信息失败", e);
+            tvStoreName.setText("Test门店"); // 默认名称
+            if (ivStoreIcon != null) {
+                ivStoreIcon.setImageResource(R.drawable.ic_warriors_logo);
+            }
+        }
+    }
+    
     @Override
     public void onBackPressed() {
         super.onBackPressed();