1

CustomKeyboard/KeyboardAssets.xcassets/ai_key_icon.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "切图 270@2x.png",
+      "filename" : "切图 271@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "切图 270@3x.png",
+      "filename" : "切图 271@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

CustomKeyboard/KeyboardViewController.m

@@ -22,6 +22,7 @@
 #import "KBBackspaceUndoManager.h"
 #import "KBInputBufferManager.h"
 #import "KBSuggestionEngine.h"
+//#import "KBLog.h"
 
 // 提前声明一个类别，使编译器在 static 回调中识别 kb_consumePendingShopSkin 方法。
 @interface KeyboardViewController (KBSkinShopBridge)
@@ -729,6 +730,7 @@ static void KBSkinInstallNotificationCallback(CFNotificationCenterRef center,
     KBSkinTheme *t = [KBSkinManager shared].current;
     UIImage *img = [[KBSkinManager shared] currentBackgroundImage];
     NSLog(@"⌨️[Keyboard] apply theme id=%@ hasBg=%d", t.skinId, (img != nil));
+    [self kb_logSkinDiagnosticsWithTheme:t backgroundImage:img];
     self.bgImageView.image = img;
     BOOL hasImg = (img != nil);
     self.view.backgroundColor = hasImg ? [UIColor clearColor] : t.keyboardBackground;
@@ -750,6 +752,46 @@ static void KBSkinInstallNotificationCallback(CFNotificationCenterRef center,
     }
 }
 
+- (void)kb_logSkinDiagnosticsWithTheme:(KBSkinTheme *)theme
+                       backgroundImage:(UIImage *)image {
+#if DEBUG
+    NSString *skinId = theme.skinId ?: @"";
+    NSString *name = theme.name ?: @"";
+    NSMutableArray<NSString *> *roots = [NSMutableArray array];
+    NSURL *containerURL = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:AppGroup];
+    if (containerURL.path.length > 0) {
+        [roots addObject:containerURL.path];
+    }
+    NSString *cacheRoot = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES).firstObject;
+    if (cacheRoot.length > 0) {
+        [roots addObject:cacheRoot];
+    }
+
+    NSFileManager *fm = [NSFileManager defaultManager];
+    NSMutableArray<NSString *> *lines = [NSMutableArray array];
+    for (NSString *root in roots) {
+        NSString *iconsDir = [[root stringByAppendingPathComponent:@"Skins"]
+                              stringByAppendingPathComponent:skinId];
+        iconsDir = [iconsDir stringByAppendingPathComponent:@"icons"];
+        BOOL isDir = NO;
+        BOOL exists = [fm fileExistsAtPath:iconsDir isDirectory:&isDir] && isDir;
+        NSArray *contents = exists ? [fm contentsOfDirectoryAtPath:iconsDir error:nil] : nil;
+        NSUInteger count = contents.count;
+        BOOL hasQ = exists && [fm fileExistsAtPath:[iconsDir stringByAppendingPathComponent:@"key_q.png"]];
+        BOOL hasQUp = exists && [fm fileExistsAtPath:[iconsDir stringByAppendingPathComponent:@"key_q_up.png"]];
+        BOOL hasDel = exists && [fm fileExistsAtPath:[iconsDir stringByAppendingPathComponent:@"key_del.png"]];
+        BOOL hasShift = exists && [fm fileExistsAtPath:[iconsDir stringByAppendingPathComponent:@"key_up.png"]];
+        BOOL hasShiftUpper = exists && [fm fileExistsAtPath:[iconsDir stringByAppendingPathComponent:@"key_up_upper.png"]];
+        NSString *line = [NSString stringWithFormat:@"root=%@ icons=%@ exist=%d count=%tu key_q=%d key_q_up=%d key_del=%d key_up=%d key_up_upper=%d",
+                          root, iconsDir, exists, count, hasQ, hasQUp, hasDel, hasShift, hasShiftUpper];
+        [lines addObject:line];
+    }
+
+    NSLog(@"[Keyboard] theme id=%@ name=%@ hasBg=%d\n%@",
+          skinId, name, (image != nil), [lines componentsJoinedByString:@"\n"]);
+#endif
+}
+
 - (void)kb_consumePendingShopSkin {
     KBWeakSelf
     [KBSkinInstallBridge consumePendingRequestFromBundle:NSBundle.mainBundle

CustomKeyboard/Resource/KBSkinIconMap.strings

@@ -71,7 +71,7 @@
 /* 字母 g（小写） */
 "letter_g_lower" = "key_g";
 /* 字母 G（大写） */
-"letter_g_upper" = "key_f_up";
+"letter_g_upper" = "key_g_up";
 
 /* 字母 h（小写） */
 "letter_h_lower" = "key_h";
@@ -246,4 +246,3 @@
 "emoji_panel" = "key_emoji";
 /* 发送/换行键 */
 "return" = "key_send";
-

CustomKeyboard/View/KBKeyboardView.m

@@ -845,7 +845,6 @@ edgeSpacerMultiplier:(CGFloat)edgeSpacerMultiplier {
     }
 
     [btn applyThemeForCurrentKey];
-    [self kb_applySymbolIfNeededForButton:btn keyDef:def fontSize:fontSize];
     [btn addTarget:self action:@selector(onKeyTapped:) forControlEvents:UIControlEventTouchUpInside];
 
     if (key.type == KBKeyTypeBackspace) {
@@ -854,6 +853,7 @@ edgeSpacerMultiplier:(CGFloat)edgeSpacerMultiplier {
     if (key.type == KBKeyTypeShift) {
         btn.selected = self.shiftOn;
     }
+    [self kb_applySymbolIfNeededForButton:btn keyDef:def fontSize:fontSize];
     return btn;
 }
 
@@ -1052,7 +1052,11 @@ edgeSpacerMultiplier:(CGFloat)edgeSpacerMultiplier {
     }
 
     KBKey *k = [KBKey keyWithIdentifier:finalId title:title output:output type:type];
-    k.caseVariant = KBKeyCaseVariantNone;
+    if (type == KBKeyTypeShift) {
+        k.caseVariant = self.shiftOn ? KBKeyCaseVariantUpper : KBKeyCaseVariantLower;
+    } else {
+        k.caseVariant = KBKeyCaseVariantNone;
+    }
     return k;
 }