Origin/ios/bugfix/czy by HoleonChen · Pull Request #573 · RedrockMobile/CyxbsMobile

HoleonChen · 2026-06-02T01:56:56Z

原iOS版修复了若干问题，具体可以查看提交日志

Copilot

Pull request overview

This iOS-only PR fixes a number of issues in the WeDate ("没课约") feature plus a few unrelated polishing items. The bulk of the change introduces a centralized WeDateTheme.swift palette and replaces ad-hoc hex/UIColor(.dm,...) literals across the WeDate UI to enable proper dark mode. It also rewrites the course-schedule loading path with caching, request throttling, deferred section reloads (so paging animation isn't interrupted), bounds checks, and a loading state.

Changes:

Add WeDateTheme.swift with semantic color tokens; refactor ~20 WeDate view/VC files to use them and add panel/page/text/separator coverage for dark mode.
Rework WeekMaping/ScheduleFact/WeDateCourseScheduleVC/CourseScheduleModel for cached + throttled per-student schedule requests, fallback student data, defer-reload-while-scrolling, and a new "课表加载中" loading view.
Misc: stop tracking Podfile.lock (gitignore + deletion), require interactive pop gesture in QAMainVC/ActivityMainViewController, fix wrong image name 我的返回 → Publish_backBtn, register WeDateTheme.swift in pbxproj.

Reviewed changes

Copilot reviewed 36 out of 38 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
.gitignore	Ignore `Podfile.lock` going forward.
cyxbs-applications/pro/iosApp/Podfile.lock	Removed from version control.
.../CyxbsMobile2019_iOS.xcodeproj/project.pbxproj	Add `WeDateTheme.swift` to project/build phases.
.../Discover_WeDate/WeDateTheme.swift	New centralized semantic color palette with light/dark values.
.../Discover_WeDate/WeDateVC.swift, WeDateTopView.swift	Switch backgrounds/title text to theme tokens; tweak title weight.
.../Discover_WeDate/TemporaryGroupVC.swift, FixedGroupVC.swift, GroupManageVC.swift	Theme adoption for search bar, table, prompt, swipe actions; small debug logging in fixed-group inquire.
.../Discover_WeDate/StudentTableViewCell.swift, GroupTableViewCell.swift, SearchResult/* cells & VCs	Apply panel/page background and themed text colors.
.../Discover_WeDate/RepeatName/*	Theme tokens for panel, table, buttons, text.
.../Discover_WeDate/CreateGroup/	Theme tokens for alert/sheet UI.
.../Discover_WeDate/ChooseGroup/*	Theme tokens for sheet, indicators, finish button states.
.../Discover_WeDate/BatchAdd/BatchAddVC.swift	Theme tokens incl. text view, separators, example labels.
.../Discover_WeDate/AddArrange/*	Theme tokens for collection cells and step VCs.
.../Discover_WeDate/BusyDetail/BusyDetailVC.swift	Theme tokens for panel, attributed strings, page control, separator.
.../Discover_WeDate/CourseSchedule/CourseScheduleModel.swift	Add fallback student, masked debug logs; failure callbacks no longer propagate errors.
.../Discover_WeDate/CourseSchedule/WeekMaping.swift	Add static cache + throttled `OperationQueue` request pipeline, bounds-checked period filling, debug summary log; merge moved to dedicated serial queue.
.../Discover_WeDate/CourseSchedule/ScheduleFact.swift	Loading flags, deferred section reloads while scrolling, bounded `currentPage`, themed today highlight, `loadInitialSchedules` API.
.../Discover_WeDate/CourseSchedule/ScheduleCollectionViewLayout.swift	Clamp landing page index into `[0, numberOfPages-1]`.
.../Discover_WeDate/CourseSchedule/ScheduleCollectionViewCell.swift	Theme tokens for busy/leisure/today cell variants.
.../Discover_WeDate/CourseSchedule/WeDateCourseScheduleVC.swift	Loading view, weak-self async, cache schedule for first stuNum, clamp "回到本周" target, gradient via theme.
.../Discover_SchoolBus/Views/SchoolBusMapView.m	Fix back-button image name to existing asset `Publish_backBtn`.
.../Center/QA/QA_Main/VC/QAMainVC.swift, .../Center/Activity/.../ActivityMainViewController.swift	Make inner list pan gesture require nav controller's interactive pop gesture to fail.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@@ -57,12 +76,15 @@ class CourseScheduleModel {
                let student = StudentResultItem(dictionary: dic)
                courseScheduleModel.student = student
            }
+            debugLog("student success resolved=\(!courseScheduleModel.student.studentID.isEmpty)", stuNum: stuNum)
            group.leave()
        },
                                 failure: { task, error in
-            failure?(error)
+            debugLog("student failure error=\(error.localizedDescription), use fallback student", stuNum: stuNum)
+            group.leave()
        })


+    private static func enqueueCourseScheduleRequest(stuNum: String) {
+        requestQueue.addOperation {
+            let semaphore = DispatchSemaphore(value: 0)
+            CourseScheduleModel.requestWithStuNum(stuNum) { courseScheduleModel in
+                cacheQueue.async {
+                    courseScheduleCache[stuNum] = courseScheduleModel
+                    let completions = pendingCourseScheduleCompletions.removeValue(forKey: stuNum) ?? []
+                    completions.forEach { $0(courseScheduleModel) }
+                    semaphore.signal()
+                }
+            } failure: { error in
+                print(error)
+                cacheQueue.async {
+                    let completions = pendingCourseScheduleCompletions.removeValue(forKey: stuNum) ?? []
+                    completions.forEach { $0(nil) }
+                    semaphore.signal()
+                }
+            }
+            semaphore.wait()
+            Thread.sleep(forTimeInterval: 0.12)
        }
    }


+    private static func requestCourseSchedule(stuNum: String, completion: @escaping (CourseScheduleModel?) -> Void) {
+        cacheQueue.async {
+            if let cachedModel = courseScheduleCache[stuNum] {
+                completion(cachedModel)
+                return
+            }
+
+            if pendingCourseScheduleCompletions[stuNum] != nil {
+                pendingCourseScheduleCompletions[stuNum]?.append(completion)
+                return
+            }
+
+            pendingCourseScheduleCompletions[stuNum] = [completion]
+            enqueueCourseScheduleRequest(stuNum: stuNum)
+        }
+    }


• CourseScheduleModel.swift：恢复 failure 契约。课表接口失败会走 failure；学生信息接口失败仍用学号 fallback，不再导致成员被丢。 • WeekMaping.swift：去掉 OperationQueue + semaphore + Thread.sleep，改成非阻塞 FIFO 限流队列。 • WeekMaping.swift：缓存命中和请求完成的 completion 统一投递到 userInitiated 全局队列，不再直接在 cacheQueue 上执行外部闭包。 • 限流仍保留：最多 3 个课表请求同时进行，请求启动间隔至少 0.12s。

Copilot

Pull request overview

Copilot reviewed 36 out of 38 changed files in this pull request and generated 2 comments.

+    private static func requestCourseSchedule(stuNum: String, completion: @escaping (CourseScheduleModel?) -> Void) {
+        cacheQueue.async {
+            if let cachedModel = courseScheduleCache[stuNum] {
+                callbackQueue.async {
+                    completion(cachedModel)
+                }
+                return
+            }
+
+            if pendingCourseScheduleCompletions[stuNum] != nil {
+                pendingCourseScheduleCompletions[stuNum]?.append(completion)
+                return
+            }
+
+            pendingCourseScheduleCompletions[stuNum] = [completion]
+            pendingRequestStuNums.append(stuNum)
+            scheduleNextCourseScheduleRequestIfNeeded()
+        }
+    }


+                if self.shouldWaitForInitialSchedules {
+                    self.fact?.loadInitialSchedules { [weak self] in
+                        self?.showScheduleContent()
+                    }
+                } else {
+                    self.showScheduleContent()
+                    self.fact?.loadInitialSchedules {}
+                }


• WeekMaping.swift：callbackQueue 从全局并发队列改成串行后台队列，cached/non-cached completion 都按确定顺序回调，避免未来调用方在回调里做共享状态写入时踩并发问题。 • WeDateCourseScheduleVC.swift：人数大于 5 时，loadInitialSchedules 前先实例化 collectionView，但仍然等加载完成后才加入视图层级展示。

Copilot

Pull request overview

Copilot reviewed 39 out of 41 changed files in this pull request and generated 1 comment.

+        if !stuNumAry.isEmpty {
+            CourseScheduleModel.requestWithStuNum(stuNumAry[0]) { [weak self] courseScheduleModel in
+                guard let self = self else { return }
                self.nowWeek = courseScheduleModel.nowWeek
+                WeekMaping.cacheCourseSchedule(courseScheduleModel, for: self.stuNumAry[0])
                self.fact = ScheduleFact(stuNumAry: self.stuNumAry, dateVersion: courseScheduleModel.dateVersion, nowWeek: self.nowWeek)
                self.fact?.delegate = self
-                // 添加回到本周按钮时需确保fact有值，否则点击会崩溃
-                self.view.addSubview(self.button)
-                // 添加collectionView时需确保fact有值，否则会崩溃
-                self.view.addSubview(self.collectionView)
-            } failure: { error in
+
+                if self.shouldWaitForInitialSchedules {
+                    _ = self.collectionView
+                    self.fact?.loadInitialSchedules { [weak self] in
+                        self?.showScheduleContent()
+                    }
+                } else {
+                    self.showScheduleContent()
+                    self.fact?.loadInitialSchedules {}
+                }
+            } failure: { [weak self] error in
                print(error)
+                self?.hideLoadingView()
            }
+        } else {
+            hideLoadingView()
        }


HoleonChen added 5 commits June 1, 2026 20:23

🐛 修复了没课约课表查询导致的卡顿问题

2157b98

✨ 为"没课约"适配了暗夜模式,并修改了部分样式

7b7641e

🐛 修复了部分页面左划返回逻辑

9188cf3

🐛 修复了暗夜模式下校车界面返回按钮显示不清晰的问题

65ef117

🐛 修复了没课约查询人数过多触发并发查询限制导致数据加载不完全的问题

1e9ce47

Copilot AI review requested due to automatic review settings June 2, 2026 01:56

Copilot started reviewing on behalf of HoleonChen June 2, 2026 01:57 View session

Copilot AI reviewed Jun 2, 2026

View reviewed changes

HoleonChen requested a review from Copilot June 2, 2026 02:27

Copilot started reviewing on behalf of HoleonChen June 2, 2026 02:27 View session

Copilot AI reviewed Jun 2, 2026

View reviewed changes

HoleonChen added 3 commits June 2, 2026 11:30

🐛 修复了首页课表下拉刷新的动画抽搐问题（虽然是通过关闭表格的下拉动画实现的）

24a38e9

✨ 首页课表课程详情点击教室就可以在重邮地图中找到教学楼在哪里了

bc2a643

HoleonChen requested a review from Copilot June 2, 2026 05:27

Copilot started reviewing on behalf of HoleonChen June 2, 2026 05:27 View session

Copilot AI reviewed Jun 2, 2026

View reviewed changes

HoleonChen added 2 commits June 2, 2026 15:07

🐛 修复了因为会退到通过学号请求课程列表时在日程详情页面显示学号而非名字的问题

8b68d79

🐛 彻底移除了手动刷新的渠道，主页课表改成了普通的下拉回弹

91bf1b0

HoleonChen merged commit 03c1af4 into develop Jun 2, 2026
3 checks passed

HoleonChen deleted the origin/ios/bugfix/czy branch June 2, 2026 07:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Origin/ios/bugfix/czy#573

Origin/ios/bugfix/czy#573
HoleonChen merged 11 commits into
developfrom
origin/ios/bugfix/czy

HoleonChen commented Jun 2, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

HoleonChen commented Jun 2, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants