merge master

@@ -3,5 +3,5 @@
   <component name="Black">
   <component name="Black">
     <option name="sdkName" value="Python 3.9 (GoogleNanoBananaApp) (2)" />
     <option name="sdkName" value="Python 3.9 (GoogleNanoBananaApp) (2)" />
   </component>
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (Nano_Banana_App)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (GoogleNanoBananaApp)" project-jdk-type="Python SDK" />
 </project>
 </project>
\ No newline at end of file

@@ -5,7 +5,7 @@ a = Analysis(
     ['image_generator.py'],
     ['image_generator.py'],
     pathex=[],
     pathex=[],
     binaries=[],
     binaries=[],
-    datas=[('config.json', '.'), ('zb100_windows.ico', '.')],
+    datas=[('config.json', '.')],
     hiddenimports=[],
     hiddenimports=[],
     hookspath=[],
     hookspath=[],
     hooksconfig={},
     hooksconfig={},
@@ -32,7 +32,7 @@ exe = EXE(
     target_arch=None,
     target_arch=None,
     codesign_identity=None,
     codesign_identity=None,
     entitlements_file=None,
     entitlements_file=None,
-    icon=['zb100_windows.ico'],
+    icon=['zb100_mac.icns'],
 )
 )
 coll = COLLECT(
 coll = COLLECT(
     exe,
     exe,
@@ -43,3 +43,9 @@ coll = COLLECT(
     upx_exclude=[],
     upx_exclude=[],
     name='ZB100ImageGenerator',
     name='ZB100ImageGenerator',
 )
 )
+app = BUNDLE(
+    coll,
+    name='ZB100ImageGenerator.app',
+    icon='zb100_mac.icns',
+    bundle_identifier=None,
+)

-{
-  "主石形状": [
-    "圆形",
-    "椭圆形",
-    "梨形",
-    "马眼形",
-    "子弹形（Baguette 子弹刻面）",
-    "垫形",
-    "公主方形",
-    "祖母绿形",
-    "心形",
-    "风筝形",
-    "棺材形（Coffin Cut）",
-    "菱形（Rhombus）",
-    "正六边形",
-    "四叶草形",
-    "梯方形（Tapered Step）",
-    "阿斯切形",
-    "平底刻面风格"
-  ],
-  "主石材质": [
-    "莫桑石",
-    "钻石",
-    "黑发晶",
-    "蓝宝石",
-    "红宝石",
-    "粉蓝宝石",
-    "绿碧玺",
-    "黄水晶（天然包体）",
-    "月光石",
-    "摩根石",
-    "海蓝宝",
-    "天然白玉髓",
-    "金绿宝石（猫眼）"
-  ],
-  "金属": [
-    "14K黄金",
-    "14K白金",
-    "14K玫瑰金",
-    "18K黄金",
-    "18K白金",
-    "18K玫瑰金",
-    "双色金（白金+黄金）",
-    "950铂金",
-    "925银镀铑",
-    "钛金属",
-    "定制复古做旧金"
-  ],
-  "花头形式": [
-    "全halo光环",
-    "半halo光环",
-    "双层halo",
-    "花卉风格光环",
-    "围圈雕刻光环",
-    "围圈密钉镶",
-    "经典圆形光环",
-    "几何六边形光环",
-    "非对称光环",
-    "三石花头（cluster 结构）",
-    "五石花头",
-    "cluster堆砌花头（大小堆/不规则）",
-    "双石结构（Two-stone）",
-    "单石无光环（爪镶/包镶）",
-    "花头侧面结构",
-    "高耸花头（Cathedral halo）"
-  ],
-  "戒臂结构": [
-    "直臂",
-    "xox扭臂（交叉扭绞）",
-    ">O< 戒臂结构",
-    "<O> 戒臂结构",
-    "V字戒臂",
-    "交叉戒臂",
-    "overlap重叠戒臂",
-    "wave波浪戒臂",
-    "刀锋臂",
-    "大教堂戒臂（高肩设计）",
-    "三股编织戒臂",
-    "分裂戒臂（split shank）",
-    "戒臂夹层",
-    "小夹层戒臂（如莲花夹层设计）",
-    "不对称戒臂"
-  ],
-  "戒臂处理": [
-    "密钉镶戒臂",
-    "微密钉镶",
-    "镶石虎爪镶/逼镶",
-    "抛光平滑戒臂",
-    "珠边戒臂（milgrain）",
-    "光金戒臂",
-    "雕刻镂空花丝",
-    "浮雕雕刻（凸雕）",
-    "凹刻雕刻（内刻）",
-    "几何雕刻纹理",
-    "复古米粒边装饰（milgrain）",
-    "编织纹理戒臂",
-    "穿孔镂空细节",
-    "锤纹处理"
-  ],
-  "辅石镶嵌": [
-    "三石结构",
-    "五石结构",
-    "cluster自由堆砌侧石",
-    "大小堆组合",
-    "共爪镶侧钻",
-    "包镶侧钻",
-    "轨道镶",
-    "槽镶"
-  ],
-  "特殊元素": [
-    "花朵元素",
-    "月亮元素",
-    "星星元素",
-    "日月星组合",
-    "凯尔特结",
-    "叶子图案",
-    "自然植物藤蔓纹理",
-    "蝴蝶结元素",
-    "装饰艺术几何元素",
-    "复古花纹",
-    "哥特式结构元素"
-  ]
-}
\ No newline at end of file

@@ -450,7 +450,16 @@ class TaskQueueManager(QObject):
 
 
         except Exception as e:
         except Exception as e:
             # 日志记录失败不应影响主流程
             # 日志记录失败不应影响主流程
-            self.logger.error(f"记录使用日志失败: {e}", exc_info=False)
+            self.logger.error(f"记录使用日志失败: {e}", exc_info=True)
+
+            # 在Mac打包版本中输出到控制台进行调试
+            import sys
+            import platform
+            if getattr(sys, 'frozen', False) and platform.system() == 'Darwin':
+                print(f"DEBUG - 数据库记录失败: {e}")
+                print(f"DEBUG - 用户名: {user_name}")
+                print(f"DEBUG - 设备名: {device_name}")
+                print(f"DEBUG - 提示词: {task.prompt[:50]}...")
 
 
 
 
 class TaskQueueWidget(QWidget):
 class TaskQueueWidget(QWidget):