diff --git a/.gitignore b/.gitignore index 5373576..6954ea5 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,8 @@ Thumbs.db # 参考用的第三方源码包（设计 token 已提取到 docs/winisland-design-tokens.md） WinIsland-master.zip +releases/ + +# AI 浼氳瘽浜х墿锛圸Code 璁″垝/閰嶇疆锛屼笉灞炰簬浜у搧浠ｇ爜锛 +.zcode/ +.zcodeignore diff --git a/packages/classisland-plugin/scripts/verify.mjs b/packages/classisland-plugin/scripts/verify.mjs index e954376..a2cd289 100644 --- a/packages/classisland-plugin/scripts/verify.mjs +++ b/packages/classisland-plugin/scripts/verify.mjs @@ -295,6 +295,57 @@ check( bridgeSource.includes('NotificationPollSeconds'), ); +/* ------------------------------------------------------------ 8. 鍥炲綊鎶ゆ爮锛氭湰娆′慨澶嶈繃鐨勫潙 */ + +check( + '璇捐〃閰嶅鐢ㄥ師濮 TimeType==0 鍒楄〃锛**涓嶇敤** ValidTimeLayoutItems锛堝悗鑰呬細鍓旈櫎琚仠鐢ㄧ殑鑺傛锛屽鑷存暣浠借琛ㄩ敊浣嶏級', + // 鍙煡浠ｇ爜褰㈡侊紙`.Count`锛夛紝鍥犱负婧愮爜娉ㄩ噴閲岀壒鎰忕偣鍚嶄簡杩欎釜灞炴ф潵璇存槑"涓轰粈涔堜笉鑳界敤瀹" + mapperSource.includes('classPoints[index]') && !mapperSource.includes('.ValidTimeLayoutItems.Count'), +); +check( + '涓婃姤瀛楁鎸夋湇鍔＄ zod 涓婇檺鎴柇锛堜竴涓秴闀垮悕瀛椾細璁╂暣鎵逛笂鎶 400锛岃繛鐘舵佷笌蹇冭烦涓璧蜂涪鎺夛級', + mapperSource.includes('Truncate(') && + mapperSource.includes('SubjectMaxLength') && + mapperSource.includes('PlanNameMaxLength'), +); +check( + '璇捐〃闀滃儚鍦 UI 绾跨▼鏀瑰啓妗ｆ锛堢嚎绋嬫睜涓婃敼 Observable 闆嗗悎浼氫笌钀界洏骞跺彂锛屽彲鑳藉啓鍧忔。妗堬級', + bridgeSource.includes('Dispatcher.UIThread.InvokeAsync') && bridgeSource.includes('SaveProfile()'), +); +check( + '闀滃儚鍐呭鏈彉鍖栨椂璺宠繃锛堝惁鍒欐瘡娆′笂鎶ラ兘閲嶅缓璇捐〃骞跺叏閲忚惤鐩橈級', + bridgeSource.includes('_lastMirrorSignature') && bridgeSource.includes('MirrorSignature('), +); +check( + '涓婃姤寮傚父鏈 catch锛坒ire-and-forget 鐨勫紓甯镐細琚潤榛樺悶鎺夛級', + bridgeSource.includes('catch (Exception exception)') && bridgeSource.includes('涓婃姤寮傚父'), +); +check( + '闀滃儚鍓嶈繃婊ゆ椂闂撮潪娉曠殑鏉＄洰锛堥伩鍏嶆。妗堥噷鍑虹幇 00:00 鐨勮娆★紝涓斿繀椤讳笌 Classes 鍚屾杩囨护锛', + read('src/Services/ClassPlanWriter.cs').includes('IsValidTime'), +); +check( + '涓婃姤浣撳甫涓 deviceKey锛屼笖鏈嶅姟绔 schema 涔熷０鏄庝簡璇ュ瓧娈碉紙鍥炲～鏈哄櫒鐮佺殑濂戠害涓ょ涓鑷达級', + clientSource.includes('"deviceKey"') && serverSchemas.includes('deviceKey:'), +); +check( + '2xx 浣嗕笉鏄湰鏈嶅姟鍝嶅簲浣撴椂缁欏嚭鍘熷洜锛堣屼笉鏄"鎴愬姛浣嗘棤鏁版嵁 + 绌烘秷鎭"锛夛紝骞堕檺鍒跺搷搴斾綋澶у皬', + clientSource.includes('鍝嶅簲涓嶆槸鐝骇灏忓姪鎵嬬殑鏍囧噯鏍煎紡') && + clientSource.includes('MaxResponseContentBufferSize'), +); +check( + '鎻愰啋鎻愪緵鏂规儼鎬ц幏鍙栬绋嬫湇鍔″苟閲嶈瘯锛堟嬁涓嶅埌鏈嶅姟鏃"涓婅鏆傚瓨"浼氭案涔呭け鏁堜笖闈欓粯锛', + providerSource.includes('EnsureLessons') && providerSource.includes('_lessonsHooked'), +); +check( + '璁剧疆钀界洏鍏堝啓涓存椂鏂囦欢鍐嶅師瀛愭浛鎹紙閫愬瓧绗﹀啓鐩 + 鎴柇寮忓啓鍏ヤ細鐣欎笅鍧 JSON锛', + pluginSource.includes('File.Move(temp, path, overwrite: true)'), +); +check( + '鏈嶅姟鍣ㄥ湴鍧鍙帴鍙 http/https锛堣８ Uri.TryCreate 浼氭斁杩 file:// / ftp://锛', + settingsSource.includes('TryGetServerUri') && settingsSource.includes('UriSchemeHttp'), +); + /* ------------------------------------------------------------ 缁撴灉 */ const failed = results.filter((item) => !item.ok); diff --git a/packages/classisland-plugin/src/Interop/ClassHelperClient.cs b/packages/classisland-plugin/src/Interop/ClassHelperClient.cs index 54c391d..9e85bbb 100644 --- a/packages/classisland-plugin/src/Interop/ClassHelperClient.cs +++ b/packages/classisland-plugin/src/Interop/ClassHelperClient.cs @@ -69,6 +69,8 @@ public class ReportRequestDto { [JsonPropertyName("pluginVersion")] public string PluginVersion { get; set; } = ""; [JsonPropertyName("classIslandVersion")] public string ClassIslandVersion { get; set; } = ""; + /// 鏈満鏈哄櫒鐮侊細璁惧鍒涘缓鏃舵湇鍔＄杩樹笉鐭ラ亾瀹冿紝闈犺繖閲屽洖濉紙瑙佹湇鍔＄ syncDeviceKey锛夈 + [JsonPropertyName("deviceKey")] public string DeviceKey { get; set; } = ""; [JsonPropertyName("state")] public StateDto? State { get; set; } [JsonPropertyName("schedule")] public SchedulePayloadDto? Schedule { get; set; } [JsonPropertyName("timeLayout")] public TimeLayoutPayloadDto? TimeLayout { get; set; } @@ -198,6 +200,12 @@ public sealed class ClassHelperClient : IDisposable /// private static readonly TimeSpan Timeout = TimeSpan.FromSeconds(12); + /// + /// 鍝嶅簲浣撲笂闄愶紙4MB锛夈傞粯璁ゆ槸 2GB 鈥斺 鏈嶅姟鍣ㄥ湴鍧濉敊锛堟寚鍒颁竴涓細鍚愬ぇ椤甸潰鐨勫湴鍧锛夋椂锛 + /// 涓娆¤姹傚氨鑳藉湪 12 绉掑唴鎶婂唴瀛樺悆鍏夈 + /// + private const long MaxResponseBytes = 4 * 1024 * 1024; + private static readonly JsonSerializerOptions JsonOptions = new() { PropertyNameCaseInsensitive = true, @@ -216,6 +224,7 @@ public sealed class ClassHelperClient : IDisposable private readonly HttpClient _http = new(new SocketsHttpHandler { Proxy = new LocalAwareProxy() }) { Timeout = Timeout, + MaxResponseContentBufferSize = MaxResponseBytes, }; public string LastError { get; private set; } = ""; @@ -334,6 +343,17 @@ public sealed class ClassHelperClient : IDisposable return envelope ?? new ApiEnvelope { Success = false, Message = message! }; } + if (envelope is null) + { + // 2xx 浣嗗搷搴斾笉鏄湰鏈嶅姟鐨勭粺涓鍝嶅簲浣擄紙缃戝叧/鍙嶄唬鐨 HTML 閿欒椤点佸湴鍧鎸囧埌浜嗗埆鐨勬湇鍔＄瓑锛夈 + // 蹇呴』鐣欎笅鍘熷洜锛氬惁鍒欒皟鐢ㄦ柟鎷垮埌鐨勬槸"鎴愬姛浣嗘棤鏁版嵁 + 绌洪敊璇秷鎭"锛 + // 璁剧疆椤垫樉绀"杩炴帴寮傚父"鍗存病鏈夊師鍥狅紝涓庝笂闈笓闂ㄤ负浠ｇ悊閿欒椤靛啓鐨勮瘖鏂嚜鐩哥煕鐩俱 + LastError = + $"HTTP {(int)response.StatusCode}锛坽method.Method} {request.RequestUri}锛夆斺" + + "鍝嶅簲涓嶆槸鐝骇灏忓姪鎵嬬殑鏍囧噯鏍煎紡锛岃妫鏌ユ湇鍔″櫒鍦板潃鏄惁姝ｇ‘锛屾垨璇ョ郴缁熶唬鐞嗘槸鍚︽嫤鎴簡鍐呯綉璇锋眰"; + return new ApiEnvelope { Success = false, Message = LastError }; + } + LastError = ""; LastSuccessAt = DateTimeOffset.Now; return envelope; diff --git a/packages/classisland-plugin/src/Models/PluginSettings.cs b/packages/classisland-plugin/src/Models/PluginSettings.cs index 34dfb7d..37c5b8f 100644 --- a/packages/classisland-plugin/src/Models/PluginSettings.cs +++ b/packages/classisland-plugin/src/Models/PluginSettings.cs @@ -40,7 +40,10 @@ public class PluginSettings : ObservableObject public string DeviceToken { get => _deviceToken; - set => SetProperty(ref _deviceToken, value); + // 鍦 setter 閲屽氨鍘绘帀棣栧熬绌虹櫧锛氱矘璐翠护鐗屾椂甯﹀墠瀵肩┖鏍奸潪甯稿父瑙侊紝 + // 鑰 Normalize() 鍙湪鍚姩鍔犺浇鏃惰窇涓娆 鈥斺 杩愯鏈熺矘杩涙潵鐨勮剰鍊间細璁 IsConfigured + // 涓鐩翠负 false锛岀敤鎴风湅鐫鏄庢槑濉ソ浜嗗嵈鏌ヤ笉鍑哄師鍥犮 + set => SetProperty(ref _deviceToken, (value ?? "").Trim()); } /// @@ -154,5 +157,20 @@ public class PluginSettings : ObservableObject /// 鏄惁宸茬粡閰嶇疆濂斤紙鍦板潃 + 浠ょ墝閮藉～浜嗭級銆 public bool IsConfigured => - Uri.TryCreate(ServerUrl, UriKind.Absolute, out _) && DeviceToken.StartsWith("chci_", StringComparison.Ordinal); + TryGetServerUri(out _) && DeviceToken.StartsWith("chci_", StringComparison.Ordinal); + + /// + /// 瑙ｆ瀽鏈嶅姟鍣ㄥ湴鍧锛**鍙帴鍙 http/https 缁濆鍦板潃**銆 + /// + /// 涓嶇敤瑁哥殑 `Uri.TryCreate(..., UriKind.Absolute)`锛氬畠浼氭帴鍙 `file://` / `ftp://`锛 + /// 閭ｇ鍦板潃浼氬湪鍙戣姹傛椂鎶涗竴鍙ラ毦浠ョ悊瑙ｇ殑 NotSupportedException锛岀敤鎴锋牴鏈寽涓嶅埌鏄湴鍧濉敊浜嗐 + /// + public bool TryGetServerUri(out Uri uri) + { + uri = null!; + if (!Uri.TryCreate((ServerUrl ?? "").Trim(), UriKind.Absolute, out var parsed)) return false; + if (parsed.Scheme != Uri.UriSchemeHttp && parsed.Scheme != Uri.UriSchemeHttps) return false; + uri = parsed; + return true; + } } diff --git a/packages/classisland-plugin/src/Plugin.cs b/packages/classisland-plugin/src/Plugin.cs index 6726bb6..000416c 100644 --- a/packages/classisland-plugin/src/Plugin.cs +++ b/packages/classisland-plugin/src/Plugin.cs @@ -127,9 +127,15 @@ public class Plugin : PluginBase settings.Normalize(); if (needGenerateKey) { - // 鏈哄櫒鍚 + 闅忔満鐭爜锛氭棦鏄汉鐪煎彲璇荤殑"杩欏彴鏈哄櫒"锛屽張涓嶄細涓ゅ彴鍚屽悕鏈哄櫒鎾炶溅 + // 鏈哄櫒鍚 + 闅忔満鐭爜锛氭棦鏄汉鐪煎彲璇荤殑"杩欏彴鏈哄櫒"锛屽張涓嶄細涓ゅ彴鍚屽悕鏈哄櫒鎾炶溅銆 + // 娉ㄦ剰闀垮害锛氬師鍏堝啓鐨勬槸 `[..Math.Min(24, machine.Length + 33)]`锛岃 machine.Length + 33 + // 鎭掑ぇ浜 24锛屾墍浠ュ疄闄**姘歌繙鍙彇鍓 24 涓瓧绗** 鈥斺 鏈哄櫒鍚嶇◢闀垮氨鎶婇殢鏈烘鏁翠釜鍒囨帀锛 + // "鍚屽悕鏈哄櫒涓嶆挒杞"鐨勪繚闅滃氨娌′簡銆傝繖閲屾敼鎴"鏈哄櫒鍚嶆寜闇鎴煭 + 淇濈暀 8 浣嶉殢鏈烘"銆 var machine = Environment.MachineName.ToLowerInvariant(); - settings.DeviceKey = $"{machine}-{Guid.NewGuid():N}"[..Math.Min(24, machine.Length + 33)]; + var suffix = Guid.NewGuid().ToString("N")[..8]; + var maxMachineLength = Math.Max(4, 24 - suffix.Length - 1); + if (machine.Length > maxMachineLength) machine = machine[..maxMachineLength]; + settings.DeviceKey = $"{machine}-{suffix}"; } Settings = settings; @@ -146,7 +152,15 @@ public class Plugin : PluginBase { var folder = Path.GetDirectoryName(path); if (!string.IsNullOrEmpty(folder)) Directory.CreateDirectory(folder); - File.WriteAllText(path, JsonSerializer.Serialize(settings, JsonOptions)); + // 鍏堝啓涓存椂鏂囦欢鍐嶅師瀛愭浛鎹€ + // + // 璁剧疆椤电殑鍦板潃/浠ょ墝杈撳叆妗嗘槸 TwoWay 缁戝畾锛堥愬瓧绗︽彁浜わ級锛岀洿鎺 `File.WriteAllText` + // 浼氬氨鍦版埅鏂師鏂囦欢锛涗竴鏃︽鍒昏繘绋嬭鏉鎴栨柇鐢碉紝鐣欎笅鐨勬槸鍗婃埅 JSON锛岃 LoadSettings 鐨 + // catch 浼**闈欓粯鍥為鍒伴粯璁よ缃** 鈥斺 鐢ㄦ埛鐪嬪埌鐨勬槸"浠ょ墝鍜屽湴鍧鑾悕鍏跺娌′簡"锛 + // 鑰屼笖鍘熸枃浠跺凡琚鐩栵紝鏃犱粠鎭㈠銆 + var temp = path + ".tmp"; + File.WriteAllText(temp, JsonSerializer.Serialize(settings, JsonOptions)); + File.Move(temp, path, overwrite: true); } catch (Exception exception) { diff --git a/packages/classisland-plugin/src/Services/BridgeService.cs b/packages/classisland-plugin/src/Services/BridgeService.cs index 8bf97e7..90d6a71 100644 --- a/packages/classisland-plugin/src/Services/BridgeService.cs +++ b/packages/classisland-plugin/src/Services/BridgeService.cs @@ -1,5 +1,7 @@ using System.ComponentModel; using System.Runtime.CompilerServices; +using System.Text; +using Avalonia.Threading; using ClassHelper.ClassIslandPlugin.Interop; using ClassHelper.ClassIslandPlugin.Models; using ClassIsland.Core; @@ -39,6 +41,11 @@ public sealed class BridgeService : INotifyPropertyChanged, IDisposable private bool _reporting; private bool _pulling; private bool _eventsHooked; + /// + /// 涓婃鎴愬姛闀滃儚鐨勮琛ㄥ唴瀹规寚绾广傚唴瀹规病鍙樺氨瀹屽叏璺宠繃闀滃儚锛氭棦鐪佹帀姣忓垎閽熶竴娆＄殑鍏ㄩ噺閲嶅缓 + 钀界洏锛 + /// 涔熸妸"璺ㄧ嚎绋嬫敼妗ｆ"鐨勭獥鍙ｄ粠"姣忓垎閽熶竴娆"闄嶅洖"鍙湪璇捐〃鐪熺殑鍙樺寲鏃"銆 + /// + private volatile string? _lastMirrorSignature; public BridgeService(PluginSettings settings, ILogger logger) { @@ -237,6 +244,8 @@ public sealed class BridgeService : INotifyPropertyChanged, IDisposable { PluginVersion = PluginVersion, ClassIslandVersion = SafeAppVersion(), + // 鏈哄櫒鐮侊細璁惧鍒涘缓鏃舵湇鍔＄鍙兘鐢 pending-鈥 鍗犱綅锛岄潬杩欓噷鍥炲～锛學eb 绔澶囧垪琛ㄦ墠鑳戒笌鏁欏鏈哄櫒瀵逛笂 + DeviceKey = _settings.DeviceKey, State = BuildState(lessons), }; @@ -274,7 +283,9 @@ public sealed class BridgeService : INotifyPropertyChanged, IDisposable layoutCount = items.Count; request.TimeLayout = new TimeLayoutPayloadDto { - Name = string.IsNullOrWhiteSpace(layout.Name) ? "ClassIsland 鏃堕棿琛" : layout.Name, + Name = ScheduleMapper.Truncate( + string.IsNullOrWhiteSpace(layout.Name) ? "ClassIsland 鏃堕棿琛" : layout.Name, + ScheduleMapper.PlanNameMaxLength)!, Mode = "replace", Items = items, }; @@ -321,6 +332,16 @@ public sealed class BridgeService : INotifyPropertyChanged, IDisposable return true; } + catch (Exception exception) + { + // ReportAsync 鏄氳繃 `_ = ReportAsync(reason)` 杩欑 fire-and-forget 鏂瑰紡鍙戣捣鐨 + // 锛堜簨浠跺洖璋冧笌瀹氭椂鍣ㄩ兘鏄級锛屾病鏈夎繖涓 catch锛屼腑閫旀姏鍑虹殑寮傚父锛堜緥濡傝法绾跨▼鏀规。妗堟椂鐨 + // "Collection was modified"锛変細琚 unobserved task 闈欓粯鍚炴帀锛氭棩蹇楅噷涓鏉￠兘娌℃湁锛 + // 鑰 LastReportMessage 杩樺仠鍦ㄤ笂涓娆＄殑鎴愬姛缁撴灉锛岀敤鎴蜂互涓轰竴鍒囨甯搞 + _logger.LogError(exception, "鐝骇灏忓姪鎵嬭仈鍔細涓婃姤寮傚父锛坽Reason}锛", reason); + SetState(false, $"涓婃姤寮傚父锛歿exception.Message}", 0, 0, null); + return false; + } finally { Busy = false; @@ -397,23 +418,48 @@ public sealed class BridgeService : INotifyPropertyChanged, IDisposable return; } + // 鍐呭娌″彉灏辩洿鎺ヨ繑鍥烇細涓婃姤鏄"鍚姩 + 姣忎釜璇剧▼浜嬩欢 + 姣 N 绉"瑙﹀彂鐨勶紝鍘熷厛姣忔閮借 + // 閲嶅缓鍏ㄩ儴璇捐〃瀵硅薄骞舵暣浣撹惤鐩 鈥斺 鏃犺皳鐨勭綉缁/纾佺洏 I/O锛岃繕浼氭妸妗ｆ椤靛埛寰椾笉鍋滈噸缁樸 + var signature = MirrorSignature(plan); + if (signature == _lastMirrorSignature) + { + _logger.LogDebug("鐝骇灏忓姪鎵嬭仈鍔細璇捐〃鍐呭涓庝笂娆′竴鑷达紝璺宠繃闀滃儚"); + return; + } + try { - var applied = ClassPlanWriter.Apply(profile, plan); - if (!applied.Applied) + // **蹇呴』鍦 UI 绾跨▼涓婃敼鍐欐。妗**锛欳lassIsland 鐨勬。妗堟槸 ObservableDictionary / + // ObservableCollection锛岃惤鐩樻槸"灞炴у彉鍖栧嵆鏁翠綋搴忓垪鍖 + FileStream 灏卞湴鎴柇"銆 + // 鑰屾湰鏂规硶鏄粠绾跨▼姹犵嚎绋嬬户缁墽琛岀殑锛圧eportAsync 閲 ConfigureAwait(false) 涔嬪悗锛 + // 瀹氭椂鍣ㄥ洖璋冩湰灏卞湪绾跨▼姹犱笂锛夛紝鍦ㄧ嚎绋嬫睜涓婃敼闆嗗悎浼氫笌 UI 绾跨▼鐨勪繚瀛/缁戝畾骞跺彂锛 + // 杞诲垯 InvalidOperationException锛圕ollection was modified锛夛紝閲嶅垯涓ゆ鍐欏叆浜掔浉鎴柇锛 + // **鎶婃暣涓。妗堝啓鎴愬崐鎴 JSON**锛堣佸笀鐨勮琛/绉戠洰鍏ㄤ涪锛屽彧鑳介潬 .bak 鍏滃簳锛夈 + var outcome = await Dispatcher.UIThread.InvokeAsync(() => + { + var applied = ClassPlanWriter.Apply(profile, plan); + if (!applied.Applied) + { + return applied; + } + + // 鏀瑰啓鐨勬槸 Profile 閲岀殑闆嗗悎锛孋lassIsland 浼氶潬 INotifyCollectionChanged 钀界洏锛 + // 杩欓噷鏄惧紡 SaveProfile() 鏄负浜"鎵撳紑寮鍏抽┈涓婂氨鑳藉湪璇捐〃閲岀湅鍒"锛屼笉鐢ㄧ瓑涓嬩竴娆¤嚜鍔ㄤ繚瀛樸 + IAppHost.TryGetService()?.SaveProfile(); + return applied; + }); + + if (!outcome.Applied) { _logger.LogInformation("鐝骇灏忓姪鎵嬭仈鍔細璇捐〃闀滃儚鏈敓鏁堬紙{Reason}锛", - applied.Warnings.FirstOrDefault() ?? "鏈嶅姟绔琛ㄤ负绌"); + outcome.Warnings.FirstOrDefault() ?? "鏈嶅姟绔琛ㄤ负绌"); return; } - // 鏀瑰啓鐨勬槸 Profile 閲岀殑闆嗗悎锛孋lassIsland 浼氶潬 INotifyCollectionChanged 钀界洏锛 - // 杩欓噷鏄惧紡 SaveProfile() 鏄负浜"鎵撳紑寮鍏抽┈涓婂氨鑳藉湪璇捐〃閲岀湅鍒"锛屼笉鐢ㄧ瓑涓嬩竴娆¤嚜鍔ㄤ繚瀛樸 - IAppHost.TryGetService()?.SaveProfile(); - + _lastMirrorSignature = signature; _logger.LogInformation("鐝骇灏忓姪鎵嬭仈鍔細宸叉妸鐝骇璇捐〃鍐欏叆 ClassIsland锛坽Plans}锛", - string.Join("銆", applied.PlanNames.Select(name => $"銆寋name}銆"))); - foreach (var warning in applied.Warnings) + string.Join("銆", outcome.PlanNames.Select(name => $"銆寋name}銆"))); + foreach (var warning in outcome.Warnings) { _logger.LogWarning("鐝骇灏忓姪鎵嬭仈鍔ㄩ暅鍍忔彁绀猴細{Warning}", warning); } @@ -424,6 +470,28 @@ public sealed class BridgeService : INotifyPropertyChanged, IDisposable } } + /// 闀滃儚杞借嵎鐨勫唴瀹规寚绾癸紙鍙敤浜"鍐呭娌″彉灏辫烦杩"锛屼笉鍙備笌浠讳綍涓氬姟鍒ゆ柇锛 + private static string MirrorSignature(ClassPlanMirrorDto plan) + { + var builder = new StringBuilder(); + foreach (var entry in plan.Entries) + { + builder.Append(entry.WeekDay).Append('|').Append(entry.WeekCountDiv).Append('|') + .Append(entry.WeekCountDivTotal).Append('|').Append(entry.Subject).Append('|') + .Append(entry.StartTime).Append('|').Append(entry.EndTime).Append(';'); + } + foreach (var layout in plan.TimeLayouts) + { + builder.Append('#').Append(layout.Id).Append(':'); + foreach (var item in layout.Layouts) + { + builder.Append(item.StartTime).Append('-').Append(item.EndTime).Append('@') + .Append(item.TimeType).Append(','); + } + } + return builder.ToString(); + } + /* ---------------------------------------------------------------- 鍐呴儴瀹炵幇 */ /// 鎻掍欢鐗堟湰锛堜笌 manifest.yml / csproj 淇濇寔涓鑷达級銆 diff --git a/packages/classisland-plugin/src/Services/ClassHelperNotificationProvider.cs b/packages/classisland-plugin/src/Services/ClassHelperNotificationProvider.cs index 0bfeb65..85a04f1 100644 --- a/packages/classisland-plugin/src/Services/ClassHelperNotificationProvider.cs +++ b/packages/classisland-plugin/src/Services/ClassHelperNotificationProvider.cs @@ -63,6 +63,7 @@ public sealed class ClassHelperNotificationProvider : NotificationProviderBase private readonly List _deferred = new(); private ILessonsService? _lessons; + private bool _lessonsHooked; public ClassHelperNotificationProvider( BridgeService bridge, @@ -74,26 +75,43 @@ public sealed class ClassHelperNotificationProvider : NotificationProviderBase _logger = logger; _bridge.NotificationReceived += OnNotificationReceived; - // 璁㈤槄璇剧▼浜嬩欢锛氫笅璇惧悗鎶婁笂璇炬椂娈垫殏瀛樼殑鎻愰啋琛ュ脊鍑烘潵 + // 灏藉姏鑰屼负鍦板厛璁㈤槄涓娆★紱鎷夸笉鍒颁篃娌″叧绯伙紝鍚庨潰姣忔闇瑕佸垽瀹氭椂閮戒細閲嶈瘯 + // 锛堟湰绫荤殑鏋勯犲嚱鏁板彲鑳藉湪璇剧▼鏈嶅姟寤哄ソ涔嬪墠灏辫 DI 璋冪敤锛 + EnsureLessons(); + } + + /// + /// 鎯版ц幏鍙栬绋嬫湇鍔″苟**鍙闃呬竴娆**璇剧▼浜嬩欢锛堜笅璇惧悗琛ュ脊涓婅鏃舵鏆傚瓨鐨勬彁閱掞級銆 + /// + /// 涓轰粈涔堜笉鑳藉彧鍦ㄦ瀯閫犲嚱鏁伴噷璁㈤槄锛氭彁渚涙柟鏄殢涓绘満鍚姩琚瀯閫犵殑锛岃岃绋嬫湇鍔″湪鍚姩娴佺▼閲岀殑 + /// 鍒涘缓鏃舵満骞朵笉鍥哄畾銆備竴鏃︽瀯閫犲嚱鏁伴噷鎷垮埌 null锛屽師鍏堢殑瀹炵幇鏃笉閲嶈瘯銆佷篃涓嶆墦鏃ュ織锛 + /// 浜庢槸 `IsInClass()` 鎭掍负 false 鈥斺 "涓婅鏃舵鍏堟殏瀛樸佷笅璇惧啀琛ュ脊"杩欐潯瑙勫垯**姘镐箙澶辨晥**锛 + /// 鑰佸笀鍦ㄨ涓婂彂鐨勯氱煡浼氱洿鎺ュ叏灞忔墦鏂鍫傦紝鑰屼笖瀹屽叏闈欓粯銆佹棤浠庢帓鏌ャ + /// + private void EnsureLessons() + { + if (_lessonsHooked) return; try { _lessons = IAppHost.TryGetService(); - if (_lessons is not null) - { - _lessons.OnBreakingTime += (_, _) => Dispatcher.UIThread.Post(FlushDeferred); - _lessons.OnAfterSchool += (_, _) => Dispatcher.UIThread.Post(FlushDeferred); - _lessons.CurrentTimeStateChanged += (_, _) => Dispatcher.UIThread.Post(FlushDeferred); - } + if (_lessons is null) return; + + _lessons.OnBreakingTime += (_, _) => Dispatcher.UIThread.Post(FlushDeferred); + _lessons.OnAfterSchool += (_, _) => Dispatcher.UIThread.Post(FlushDeferred); + _lessons.CurrentTimeStateChanged += (_, _) => Dispatcher.UIThread.Post(FlushDeferred); + _lessonsHooked = true; + _logger.LogInformation("鐝骇灏忓姪鎵嬭仈鍔細鎻愰啋鎻愪緵鏂瑰凡璁㈤槄璇剧▼浜嬩欢锛堜笂璇炬椂娈垫殏瀛樸佷笅璇捐ˉ寮癸級"); } catch (Exception exception) { - _logger.LogWarning(exception, "鐝骇灏忓姪鎵嬭仈鍔細璁㈤槄璇剧▼浜嬩欢澶辫触锛屼笂璇炬殏瀛樺皢閫鍖栦负銆岀珛鍗冲脊鍑恒"); + _logger.LogWarning(exception, "鐝骇灏忓姪鎵嬭仈鍔細璁㈤槄璇剧▼浜嬩欢澶辫触锛屽皢鍦ㄤ笅娆℃彁閱掓椂閲嶈瘯"); } } /// 褰撳墠鏄惁澶勪簬涓婅鏃舵锛堣涓嶅埌璇剧▼鏈嶅姟鏃舵寜"涓嶅湪涓婅"澶勭悊锛屽畞鍙脊涔熶笉闈欓粯涓級 private bool IsInClass() { + EnsureLessons(); try { return _lessons?.CurrentState == TimeState.OnClass; diff --git a/packages/classisland-plugin/src/Services/ClassPlanWriter.cs b/packages/classisland-plugin/src/Services/ClassPlanWriter.cs index a09759e..8d0f62e 100644 --- a/packages/classisland-plugin/src/Services/ClassPlanWriter.cs +++ b/packages/classisland-plugin/src/Services/ClassPlanWriter.cs @@ -79,9 +79,22 @@ public static class ClassPlanWriter { var planName = BuildPlanName(source.ProfileName, group.WeekDay, group.WeekCountDiv, group.WeekCountDivTotal, groups.Count); + + // 鏃堕棿闈炴硶鐨勬潯鐩繀椤**鍦ㄨ繖閲**灏辨暣鎵逛涪鎺夛細`Classes` 涓庢椂闂磋〃閲岀殑涓婅鐐瑰繀椤荤瓑闀夸笖鍚屽簭锛 + // 鍙湪涓澶勮烦杩囦細璁╂暣浠借琛ㄩ敊浣嶃傚師鍏 ParseTime 鎶婃棤娉曡В鏋愮殑鍊兼倓鎮勫彉鎴 00:00锛 + // 浜庢槸妗ｆ閲屽嚟绌哄嚭鐜 00:00-00:00 鐨勮娆★紙鏃堕棿杞存樉绀轰笌褰撳墠鑺傛鍒ゆ柇閮戒細涔憋級锛岃繕娌℃湁浠讳綍鏃ュ織銆 + var usable = group.Entries + .Where(entry => IsValidTime(entry.StartTime) && IsValidTime(entry.EndTime)) + .ToList(); + if (usable.Count < group.Entries.Count) + { + result.Warnings.Add( + $"銆寋planName}銆嶆湁 {group.Entries.Count - usable.Count} 鑺傜殑鏃堕棿鏃犳硶瑙ｆ瀽锛堥渶瑕 HH:mm锛夛紝宸茶烦杩"); + } + if (usable.Count == 0) continue; + var planId = FindPlanId(profile, planName); - var (timeLayoutId, timeLayout) = BuildTimeLayout( - profile, planName, group.Entries); + var (timeLayoutId, timeLayout) = BuildTimeLayout(profile, planName, usable); var plan = profile.ClassPlans.TryGetValue(planId, out var existing) ? existing @@ -102,7 +115,7 @@ public static class ClassPlanWriter // 妗ｆ涓嶄細閲嶆柊瑙﹀彂鍒锋柊锛岃娆″氨浼氬仠鐣欏湪鏃ф椂闂寸偣涓娿 var classes = new ObservableCollection(); var index = 0; - foreach (var entry in group.Entries) + foreach (var entry in usable) { var subjectId = profile.Subjects .FirstOrDefault(pair => pair.Value.Name == entry.Subject).Key; @@ -251,4 +264,19 @@ public static class ClassPlanWriter { return TimeSpan.TryParse(value, out var parsed) ? parsed : TimeSpan.Zero; } + + /// + /// 鏃堕棿瀛楃涓叉槸鍚﹀彲鐢紙HH:mm / HH:mm:ss锛夈 + /// + /// 鏈嶅姟绔緭鍑轰晶娌℃湁鏍￠獙 `Schedule.startTime`锛堣佹暟鎹/寮傚父鏁版嵁鍙兘鏄┖涓诧級锛 + /// 鑰 浼氭妸闈炴硶鍊煎彉鎴 0 鐐 鈥斺 鍥犳璋冪敤鏂瑰繀椤诲厛鐢ㄦ湰鏂规硶杩囨护锛 + /// 骞舵妸 Classes 涓庢椂闂磋〃**鍚屾椂**鎸夎繃婊ゅ悗鐨勫垪琛ㄦ瀯閫狅紝淇濊瘉绱㈠紩浠嶇劧涓鑷淬 + /// + private static bool IsValidTime(string? value) + { + if (string.IsNullOrWhiteSpace(value)) return false; + return TimeSpan.TryParse(value, out var parsed) + && parsed >= TimeSpan.Zero + && parsed < TimeSpan.FromDays(1); + } } diff --git a/packages/classisland-plugin/src/Services/ScheduleMapper.cs b/packages/classisland-plugin/src/Services/ScheduleMapper.cs index 3282b6f..335c0bc 100644 --- a/packages/classisland-plugin/src/Services/ScheduleMapper.cs +++ b/packages/classisland-plugin/src/Services/ScheduleMapper.cs @@ -61,9 +61,16 @@ public static class ScheduleMapper /// 鎶婃。妗堥噷鐨勪竴寮犺琛紙ClassPlan锛夊睍寮鎴"姣忎釜涓婅鏃堕棿鐐逛竴鏉"鐨勮琛ㄦ潯鐩 /// /// 涓 ClassIsland 鐨勮涔変弗鏍煎榻愶細ClassPlan.Classes[i] 瀵瑰簲 - /// TimeLayout.Layouts 閲**绗 i 涓 TimeType=0锛堜笂璇撅級鐨勭偣**锛 - /// 璇鹃棿 / 鍒嗗壊绾 / 琛屽姩涓嶅崰 Classes 鐨勪綅缃傚洜姝よ繖閲屽繀椤绘寜 TimeType 杩囨护鍚庡啀閰嶅锛 - /// 鍚﹀垯鏁村紶璇捐〃浼氶敊浣嶃 + /// TimeLayout.Layouts 閲**绗 i 涓 TimeType=0锛堜笂璇撅級鐨勭偣**锛岃闂 / 鍒嗗壊绾 / 琛屽姩涓嶅崰浣嶃 + /// + /// **娉ㄦ剰涓嶈鐢 `plan.ValidTimeLayoutItems`**锛氬畠鐨勫彛寰勪笌 `Classes` 涓嶅悓 鈥斺 + /// `GetValidTimeLayoutItems()`锛圕lassIsland ClassPlan.cs锛変細姝ｅ弽涓ら亶鎵弿锛 + /// 鎶 `ClassInfo.IsEnabled == false`锛堣佸笀鍦ㄨ琛ㄧ紪杈戦噷"鍋滅敤"杩欎竴鑺傦級鐨勮**杩炲悓鍏跺悗鐨勮闂** + /// 涓璧蜂粠缁撴灉閲屽墧闄わ紱鑰 `RefreshClassesList()` 鍙寜 `TimeType == 0` 鐨**鎬绘暟**瀵归綈 + /// `Classes` 鐨勯暱搴︼紝`ClassInfo.CurrentTimeLayoutItem` 涔熸槸鎸夊師濮嬪垪琛ㄧ殑绗 `Index` 涓彇鐨勩 + /// 浜庢槸鍙鍋滅敤杩囦换鎰忎竴鑺傦紝鐢 ValidTimeLayoutItems 閰嶅灏变細璁╃储寮曟暣浣撳墠绉伙細 + /// 绗 i 鑺傞厤涓婄 i+1 鑺傜殑鏃堕棿鐐广佹渶鍚庝竴鑺備涪澶憋紝涓 `Math.Min` 浼氭妸缂哄彛闈欓粯鍚冩帀 鈥斺 + /// 琛ㄧ幇灏辨槸"璇捐〃鐪嬬潃鏈夊唴瀹广佹瘡鑺傝閮藉涓嶄笂"锛屾瀬闅炬帓鏌ャ /// public static List MapClassPlan(ClassPlan plan, Profile profile, out string? warning) { @@ -77,11 +84,8 @@ public static class ScheduleMapper return entries; } - // 鍙繚鐣欎笂璇剧被鍨嬬殑鏃堕棿鐐癸紝椤哄簭蹇呴』涓 Classes 鐨勭储寮曚竴鑷 + // 鍙繚鐣欎笂璇剧被鍨嬬殑鏃堕棿鐐癸紝椤哄簭蹇呴』涓 Classes 鐨勭储寮曚竴鑷达紙瑙佷笂闈㈡敞閲婏級 var classPoints = timeLayout.Layouts.Where(item => item.TimeType == 0).ToList(); - var validPoints = plan.ValidTimeLayoutItems.Count > 0 - ? plan.ValidTimeLayoutItems.Where(item => item.TimeType == 0).ToList() - : classPoints; var weekDay = ToServerDayOfWeek(plan.TimeRule.WeekDay); var parity = ToWeekParity(plan.TimeRule.WeekCountDiv, plan.TimeRule.WeekCountDivTotal); @@ -91,12 +95,15 @@ public static class ScheduleMapper } var classes = plan.Classes; - var count = Math.Min(classes.Count, validPoints.Count); + var count = Math.Min(classes.Count, classPoints.Count); for (var index = 0; index < count; index++) { var info = classes[index]; - var point = validPoints[index]; + // 绱㈠紩蹇呴』涓 Classes 瀵归綈锛氳繖閲屾寜涓嬫爣鍙栨椂闂寸偣锛**涓嶈兘**鍏堢敤 Where 杩囨护鍐嶅彇 + var point = classPoints[index]; if (info is null) continue; + // 鑰佸笀鍋滅敤鐨勪竴鑺傦細鏈郴缁熸病鏈"鍋滅敤"姒傚康锛屼笉涓婃姤锛堝惁鍒欏鐢熺浼氱湅鍒颁竴鑺傚疄闄呬笂涓嶄笂鐨勮锛 + if (!info.IsEnabled) continue; // 绌鸿锛堟湭瀹夋帓绉戠洰锛変笉涓婃姤锛氭湇鍔＄鐨勭鐩槸蹇呭～鐨勶紝绌鸿鐢辫琛ㄩ噷鐨勭己甯〃杈 var subject = ResolveSubjectName(info.SubjectId, profile); @@ -107,18 +114,33 @@ public static class ScheduleMapper DayOfWeek = weekDay, StartTime = ToHhMm(point.StartTime), EndTime = ToHhMm(point.EndTime), - Subject = subject, - TeacherName = ResolveSubjectTeacher(info.SubjectId, profile), + // 鏈嶅姟绔杩欏嚑涓瓧娈垫湁 zod 闀垮害涓婇檺锛屼笖鏄**鏁存壒**鏍￠獙锛氫竴涓秴闀垮悕瀛椾細璁╂暣娆′笂鎶 + // 400锛岃繛"鐜板湪涓婁粈涔堣"鐨勭姸鎬佷笌蹇冭烦閮戒笉鏇存柊锛學eb 绔妸鏁欏鏄剧ず鎴愮绾裤 + Subject = Truncate(subject, SubjectMaxLength)!, + TeacherName = Truncate(ResolveSubjectTeacher(info.SubjectId, profile), NameMaxLength), WeekParity = parity, WeekCountDiv = plan.TimeRule.WeekCountDiv, WeekCountDivTotal = plan.TimeRule.WeekCountDivTotal, - PlanName = plan.Name, + PlanName = Truncate(plan.Name, PlanNameMaxLength), }); } return entries; } + /// 鏈嶅姟绔 zod 瀵瑰悇绫诲悕绉扮殑闀垮害涓婇檺锛堣秴鍑轰細璁╂暣鎵逛笂鎶 400锛屾墍浠ヨ鎴柇锛 */ + public const int SubjectMaxLength = 40; + public const int NameMaxLength = 40; + public const int PlanNameMaxLength = 60; + + /// 鎸夋湇鍔＄涓婇檺鎴柇锛坣ull / 绌轰覆鍘熸牱杩斿洖锛 + public static string? Truncate(string? value, int max) + { + if (string.IsNullOrEmpty(value)) return value; + var trimmed = value.Trim(); + return trimmed.Length <= max ? trimmed : trimmed[..max]; + } + /// 鎶婃椂闂磋〃锛圱imeLayout锛夎浆鎴愭湰绯荤粺鐨勮妭娆℃椂闂撮厤缃 public static List MapTimeLayout(TimeLayout layout) { @@ -131,7 +153,8 @@ public static class ScheduleMapper items.Add(new TimeLayoutItemDto { Index = index + 1, - Name = BuildTimePointName(point, ref classPointIndex), + // 鑺傛鍚嶅悓鏍锋槸鏈嶅姟绔湁涓婇檺鐨勫瓧娈碉紙max 40锛夛紝瓒呴暱浼氳鏁存壒涓婃姤澶辫触 + Name = Truncate(BuildTimePointName(point, ref classPointIndex), NameMaxLength)!, StartTime = ToHhMm(point.StartTime), EndTime = ToHhMm(point.EndTime), Type = ToTimeLayoutType(point.TimeType), diff --git a/packages/classisland-plugin/src/Views/BridgeSettingsPage.axaml b/packages/classisland-plugin/src/Views/BridgeSettingsPage.axaml index 862f109..8103e67 100644 --- a/packages/classisland-plugin/src/Views/BridgeSettingsPage.axaml +++ b/packages/classisland-plugin/src/Views/BridgeSettingsPage.axaml @@ -26,6 +26,10 @@ Watermark="chci_..." PasswordChar="鈼" Text="{Binding Settings.DeviceToken, Mode=TwoWay}" /> + +