From 962e180bcd08c6d4922260e6b2be6e9fa343e428 Mon Sep 17 00:00:00 2001
From: ZhuoZhou <zhuo.zhou@castbox.fm>
Date: Tue, 28 Oct 2025 11:51:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=91=E6=8E=A7=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=A4=B1=E8=B4=A5=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Tools/config_convert/gen_levels_db.py     | 15 +++++++++++---
 .../Tools/firebase/firebase_helper.py         | 20 ++++++++++++++-----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/FindObjectBundleBuilder/Tools/config_convert/gen_levels_db.py b/FindObjectBundleBuilder/Tools/config_convert/gen_levels_db.py
index c0b439f..422cb85 100644
--- a/FindObjectBundleBuilder/Tools/config_convert/gen_levels_db.py
+++ b/FindObjectBundleBuilder/Tools/config_convert/gen_levels_db.py
@@ -440,9 +440,18 @@ def update_main_level_db(platform, mode):
     # 更新Remote Config
     condition = config.remote_condition_android if platform == "Android" else config.remote_condition_ios
     value = f"{config.cdn}/Configs/{config_json_filename}?generation={generation}"
-    firebase_helper.update_remote_config(None, condition, config.remote_key_main_db,
-                                         f"main_{mode}", value)
-    return value,level_count
+    
+    # 检查上传结果
+    upload_success = firebase_helper.update_remote_config(None, condition, config.remote_key_main_db,
+                                                          f"main_{mode}", value)
+    if not upload_success:
+        error_msg = f"上传 Remote Config 到 Firebase 失败: platform={platform}, mode={mode}"
+        print(error_msg)
+        config.notification_helper.append_msg(error_msg)
+        raise Exception(error_msg)
+    else:
+        config.notification_helper.append_msg(f"成功上传 Remote Config: platform={platform}, mode={mode}, 关卡数={level_count}")
+    return value, level_count
 
 
 def update_main_country_level_db(platform, mode, all_country_list):
diff --git a/FindObjectBundleBuilder/Tools/firebase/firebase_helper.py b/FindObjectBundleBuilder/Tools/firebase/firebase_helper.py
index 6ca73a0..ca01839 100644
--- a/FindObjectBundleBuilder/Tools/firebase/firebase_helper.py
+++ b/FindObjectBundleBuilder/Tools/firebase/firebase_helper.py
@@ -218,6 +218,10 @@ class FirebaseHelper:
         ## sub_key 该云控里面的json的某个参数的key
         try:
             etag = self.get_remote_value()
+            if etag is None:
+                print("获取 ETag 失败，无法更新 Remote Config")
+                return False
+                
             online_txt = ""
             with open(REMOTE_CONFIG_FILE, "r") as f:
                 online_txt = f.read()
@@ -251,10 +255,18 @@ class FirebaseHelper:
                 print("\n\n")
                 # 将online_json写入到remote_config.json文件
                 utils.write_json(REMOTE_CONFIG_FILE, online_json)
-                self.upload_remote_config_value(etag)
+                
+                # 检查上传结果
+                upload_success = self.upload_remote_config_value(etag)
+                if upload_success:
+                    print(f"Remote Config 更新成功: {main_key}/{sub_key}")
+                    return True
+                else:
+                    print(f"Remote Config 更新失败: {main_key}/{sub_key}")
+                    return False
         except Exception as e:
-            print(e)
-            raise Exception("更新失败")
+            print(f"更新 Remote Config 异常: {repr(e)}")
+            return False
 
 if __name__ == "__main__":
     helper = FirebaseHelper()
@@ -264,5 +276,3 @@ if __name__ == "__main__":
     # print(blob2 is None)
     etag = helper.get_remote_value()
     print(etag)
-
-