3

2025-11-18 20:53:47 +08:00
parent 254e65906a
commit 3dcc4932c3
109 changed files with 1432 additions and 84 deletions
--- a/keyBoard/Class/Home/VC/FunctionTest/KBSkinCenterVC.m
+++ b/keyBoard/Class/Home/VC/FunctionTest/KBSkinCenterVC.m
@@ -7,6 +7,8 @@
 #import "KBNetworkManager.h"
 #import "KBSkinManager.h"
 #import "KBHUD.h"
+#import "KBConfig.h"
+#import "KBSkinService.h"

@interface KBSkinCell : UITableViewCell
@property (nonatomic, strong) UIButton *applyBtn;
@@ -34,7 +36,7 @@

@interface KBSkinCenterVC () <UITableViewDelegate, UITableViewDataSource>
@property (nonatomic, strong) UITableView *tableView;
-@property (nonatomic, copy) NSArray<NSDictionary *> *skins; // id, name, img(url relative to KB_BASE_URL)
+@property (nonatomic, copy) NSArray<NSDictionary *> *skins; // 每个元素即一套皮肤的 JSON（与后端约定格式一致）
@end

@implementation KBSkinCenterVC
@@ -43,12 +45,103 @@
    [super viewDidLoad];
 //    self.title = KBLocalized(@"皮肤中心");
    self.view.backgroundColor = [UIColor whiteColor];
-    // 绝对 URL 的测试皮肤图片（无需 KB_BASE_URL）。
-    // 调整为较小尺寸，避免下载与存储过大（手机上预览已足够清晰）。
+
+    // 本地测试用的皮肤数据：结构与后端最终返回的 JSON 一致。
+    // 说明：
+    // - background_image：背景大图 URL（此处仍使用 picsum 测试）
+    // - 颜色字段：background/key_bg/key_text/key_highlight/accent 与 KBSkinManager.applyThemeFromJSON 一致
+    // - hidden_keys：需要隐藏文字的按键 identifier
+    // - key_icons：
+    //   * 当 KB_SKIN_ICON_USE_REMOTE==0 时，value 写本地 Assets 名称（如 "kb_space_melon"）
+    //   * 当 KB_SKIN_ICON_USE_REMOTE==1 时，value 写远程图标 URL（如 "https://.../icons/space.png"）
    self.skins = @[
-        @{ @"id": @"aurora", @"name": KBLocalized(@"极光"),   @"img": @"https://picsum.photos/id/1018/800/450.jpg" },
-        @{ @"id": @"alps",   @"name": KBLocalized(@"雪山"),   @"img": @"https://picsum.photos/id/1016/800/450.jpg" },
-        @{ @"id": @"lake",   @"name": KBLocalized(@"湖面"),   @"img": @"https://picsum.photos/id/1039/800/450.jpg" },
+        @{
+            @"id": @"melon",
+            @"name": KBLocalized(@"蜜瓜主题"),
+            @"background_image": @"https://picsum.photos/id/1018/800/450.jpg",
+            @"background": @"#F5FFE8",
+            @"key_bg": @"#FFFFFF",
+            @"key_text": @"#4A4A4A",
+            @"key_highlight": @"#D9F4C4",
+            @"accent": @"#A4D68A",
+            @"hidden_keys": @[
+                @"letter_q",@"letter_w",@"letter_e",@"letter_r",@"letter_t",
+                @"letter_y",@"letter_u",@"letter_i",@"letter_o",@"letter_p",
+                @"letter_a",@"letter_s",@"letter_d",@"letter_f",@"letter_g",
+                @"letter_h",@"letter_j",@"letter_k",@"letter_l",
+                @"letter_z",@"letter_x",@"letter_c",@"letter_v",
+                @"letter_b",@"letter_n",@"letter_m",
+                @"space"
+            ],
+            // 默认假设本地测试：这里的值写 Assets 名称。
+            // 如果开启远程图标模式，可改为实际的图标 URL。
+            @"key_icons": @{
+                // 字母键：大小写共用一套本地图（演示用）
+                // 若后续需要不同图，只需改为 *_lower / *_upper 对应不同资源名即可。
+                @"letter_q_lower": @"key_q",
+                @"letter_q_upper": @"key_q",
+                @"letter_w_lower": @"key_w",
+                @"letter_w_upper": @"key_w",
+                @"letter_e_lower": @"key_e",
+                @"letter_e_upper": @"key_e",
+                @"letter_r_lower": @"key_r",
+                @"letter_r_upper": @"key_r",
+                @"letter_t_lower": @"key_t",
+                @"letter_t_upper": @"key_t",
+                @"letter_y_lower": @"key_y",
+                @"letter_y_upper": @"key_y",
+                @"letter_u_lower": @"key_u",
+                @"letter_u_upper": @"key_u",
+                @"letter_i_lower": @"key_i",
+                @"letter_i_upper": @"key_i",
+                @"letter_o_lower": @"key_o",
+                @"letter_o_upper": @"key_o",
+                @"letter_p_lower": @"key_p",
+                @"letter_p_upper": @"key_p",
+
+                @"letter_a_lower": @"key_a",
+                @"letter_a_upper": @"key_a",
+                @"letter_s_lower": @"key_s",
+                @"letter_s_upper": @"key_s",
+                @"letter_d_lower": @"key_d",
+                @"letter_d_upper": @"key_d",
+                @"letter_f_lower": @"key_f",
+                @"letter_f_upper": @"key_f",
+                @"letter_g_lower": @"key_g",
+                @"letter_g_upper": @"key_g",
+                @"letter_h_lower": @"key_h",
+                @"letter_h_upper": @"key_h",
+                @"letter_j_lower": @"key_j",
+                @"letter_j_upper": @"key_j",
+                @"letter_k_lower": @"key_k",
+                @"letter_k_upper": @"key_k",
+                @"letter_l_lower": @"key_l",
+                @"letter_l_upper": @"key_l",
+
+                @"letter_z_lower": @"key_z",
+                @"letter_z_upper": @"key_z",
+                @"letter_x_lower": @"key_x",
+                @"letter_x_upper": @"key_x",
+                @"letter_c_lower": @"key_c",
+                @"letter_c_upper": @"key_c",
+                @"letter_v_lower": @"key_v",
+                @"letter_v_upper": @"key_v",
+                @"letter_b_lower": @"key_b",
+                @"letter_b_upper": @"key_b",
+                @"letter_n_lower": @"key_n",
+                @"letter_n_upper": @"key_n",
+                @"letter_m_lower": @"key_m",
+                @"letter_m_upper": @"key_m",
+
+                // 功能键（无大小写变体）
+                @"space":     @"key_space", // 空格键
+                @"backspace": @"key_del",   // 删除键
+                @"shift":     @"key_up",    // Shift（上箭头）
+                @"mode_123":  @"key_123",   // 字母面板左下角 "123"
+                @"ai":        @"key_ai",    // 自定义 AI 键
+                @"return":    @"key_send"   // 发送/换行键
+            }
+        }
    ];

    self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, KB_NAV_TOTAL_HEIGHT, KB_SCREEN_WIDTH, KB_SCREEN_HEIGHT - KB_NAV_TOTAL_HEIGHT) style:UITableViewStyleInsetGrouped];
@@ -78,55 +171,8 @@
    NSInteger idx = sender.tag;
    if (idx < 0 || idx >= self.skins.count) return;
    NSDictionary *skin = self.skins[idx];
-    NSString *path = skin[@"img"] ?: @""; // 相对 KB_BASE_URL
-
-    // 下载图片数据（非 JSON 将以 NSData 返回）
-    [[KBNetworkManager shared] GET:path parameters:nil headers:nil completion:^(id jsonOrData, NSURLResponse *response, NSError *error) {
-        NSData *data = ([jsonOrData isKindOfClass:NSData.class] ? (NSData *)jsonOrData : nil);
-        // 尝试压缩尺寸，避免 Keychain 过大：将宽度限制到 1500px
-        if (data && data.length > 0) {
-            UIImage *img = [UIImage imageWithData:data];
-            if (img) {
-                CGFloat maxW = 1500.0;
-                if (img.size.width > maxW) {
-                    CGFloat scale = maxW / img.size.width;
-                    CGSize newSize = CGSizeMake(maxW, floor(img.size.height * scale));
-                    UIGraphicsBeginImageContextWithOptions(newSize, YES, 1.0);
-                    [img drawInRect:CGRectMake(0, 0, newSize.width, newSize.height)];
-                    UIImage *resized = UIGraphicsGetImageFromCurrentImageContext();
-                    UIGraphicsEndImageContext();
-                    img = resized ?: img;
-                }
-                data = UIImageJPEGRepresentation(img, 0.85) ?: data; // 压成 JPEG
-            }
-        }
-        dispatch_async(dispatch_get_main_queue(), ^{
-            NSData *payload = data;
-            if (payload.length == 0) {
-                // 兜底：生成一张简单渐变图片
-                CGSize size = CGSizeMake(1200, 600);
-                UIGraphicsBeginImageContextWithOptions(size, YES, 1.0);
-                CGContextRef ctx = UIGraphicsGetCurrentContext();
-                UIColor *c1 = [UIColor colorWithRed:0.76 green:0.91 blue:0.86 alpha:1];
-                UIColor *c2 = [UIColor colorWithRed:0.93 green:0.97 blue:0.91 alpha:1];
-                if ([skin[@"id"] hasPrefix:@"dark"]) {
-                    c1 = [UIColor colorWithRed:0.1 green:0.12 blue:0.16 alpha:1];
-                    c2 = [UIColor colorWithRed:0.22 green:0.24 blue:0.28 alpha:1];
-                }
-                CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
-                NSArray *colors = @[(__bridge id)c1.CGColor, (__bridge id)c2.CGColor];
-                CGFloat locs[] = {0,1};
-                CGGradientRef grad = CGGradientCreateWithColors(space, (__bridge CFArrayRef)colors, locs);
-                CGContextDrawLinearGradient(ctx, grad, CGPointZero, CGPointMake(size.width, size.height), 0);
-                CGGradientRelease(grad); CGColorSpaceRelease(space);
-                UIImage *img = UIGraphicsGetImageFromCurrentImageContext();
-                UIGraphicsEndImageContext();
-                payload = UIImageJPEGRepresentation(img, 0.9);
-            }
-            BOOL ok = (payload.length > 0) ? [[KBSkinManager shared] applyImageSkinWithData:payload skinId:skin[@"id"] name:skin[@"name"]] : NO;
-            [KBHUD showInfo:(ok ? KBLocalized(@"已应用，切到键盘查看") : KBLocalized(@"应用失败"))];
-        });
-    }];
+    if (!skin) return;
+    [[KBSkinService shared] applySkinWithJSON:skin fromViewController:self completion:nil];
 }

@end