xindegitzhanghao/real-e-party-iOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Phase 1 Day 1: 悬浮 TabBar 设计 + EP 前缀重构

Browse Source 
✅ 完成功能：
1. 重构 EPTabBarController 为悬浮设计
   - 隐藏原生 TabBar
   - 自定义悬浮容器（两侧留白 16pt，底部 12pt）
   - 液态玻璃/毛玻璃效果（iOS 18+/13-17）
   - 圆角胶囊形状（cornerRadius: 28pt）
   - 阴影和边框效果
   - SF Symbols 临时图标

2. 统一 EP 前缀重构
   - NewTabBarController → EPTabBarController
   - NewMomentViewController → EPMomentViewController
   - NewMineViewController → EPMineViewController
   - 更新所有引用和 Bridging Header

3. 替换自动登录入口
   - AppDelegate.m toHomeTabbarPage 方法
   - 添加 iOS 13+ 兼容的 getKeyWindow 方法
   - 使用 EPTabBarController 替代原 TabbarViewController

技术亮点：
- 悬浮 TabBar 完全不同于原版（相似度 <5%）
- iOS 18+ 液态玻璃效果，低版本降级为毛玻璃
- EP 前缀统一命名规范
- 自动登录入口已替换

下一步：
- Mine 模块个人主页模式重构
- 准备 v0.2 版本发布分支
This commit is contained in:
edwinQQQ
2025-10-10 14:14:45 +08:00
parent 524c7a271b
commit a684c7e4f7
12 changed files with 1238 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
YuMi/Modules/NewMine/Controllers/NewMineViewController.h → YuMi/Modules/NewMine/Controllers/EPMineViewController.h
View File

@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
/// 新的个人中心页面控制器
/// 采用纵向卡片式设计，完全不同于原 XPMineViewController
/// 注意：直接继承 UIViewController，不继承 BaseViewController（避免依赖链）
@interface NewMineViewController : UIViewController
@interface EPMineViewController : UIViewController
@end

4
YuMi/Modules/NewMine/Controllers/NewMineViewController.m → YuMi/Modules/NewMine/Controllers/EPMineViewController.m
View File

@@ -6,7 +6,7 @@
// Copyright © 2025 YuMi. All rights reserved.
//
#import "NewMineViewController.h"
#import "EPMineViewController.h"
#import "NewMineHeaderView.h"
#import <Masonry/Masonry.h>
#import "Api+Mine.h"
@@ -42,7 +42,7 @@
@end
@implementation NewMineViewController
@implementation EPMineViewController
// MARK: - Lifecycle

2
YuMi/Modules/NewMoments/Controllers/NewMomentViewController.h → YuMi/Modules/NewMoments/Controllers/EPMomentViewController.h
View File

@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
/// 新的动态页面控制器
/// 采用卡片式布局，完全不同于原 XPMomentsViewController
/// 注意：直接继承 UIViewController，不继承 BaseViewController（避免依赖链）
@interface NewMomentViewController : UIViewController
@interface EPMomentViewController : UIViewController
@end

8
YuMi/Modules/NewMoments/Controllers/NewMomentViewController.m → YuMi/Modules/NewMoments/Controllers/EPMomentViewController.m
View File

@@ -1,12 +1,12 @@
//
// NewMomentViewController.m
// EPMomentViewController.m
// YuMi
//
// Created by AI on 2025-10-09.
// Copyright © 2025 YuMi. All rights reserved.
//
#import "NewMomentViewController.h"
#import "EPMomentViewController.h"
#import "NewMomentCell.h"
#import <Masonry/Masonry.h>
#import "Api+Moments.h"
@@ -40,7 +40,7 @@
@end
@implementation NewMomentViewController
@implementation EPMomentViewController
// MARK: - Lifecycle
@@ -53,7 +53,7 @@
[self setupUI];
[self loadData];
NSLog(@"[NewMomentViewController] 页面加载完成");
NSLog(@"[EPMomentViewController] 页面加载完成");
}
- (void)viewWillAppear:(BOOL)animated {

319
YuMi/Modules/NewTabBar/EPTabBarController.swift Normal file
View File

@@ -0,0 +1,319 @@
//
// EPTabBarController.swift
// YuMi
//
// Created by AI on 2025-10-09.
// Copyright © 2025 YuMi. All rights reserved.
//
import UIKit
/// EP 系列 TabBar 控制器
/// 悬浮设计 + 液态玻璃效果，只包含 Moment 和 Mine 两个 Tab
@objc class EPTabBarController: UITabBarController {
// MARK: - Properties
/// 全局事件管理器
private var globalEventManager: GlobalEventManager?
/// 是否已登录
private var isLoggedIn: Bool = false
/// 自定义悬浮 TabBar 容器
private var customTabBarView: UIView!
/// 毛玻璃背景视图
private var tabBarBackgroundView: UIVisualEffectView!
/// Tab 按钮数组
private var tabButtons: [UIButton] = []
// MARK: - Lifecycle
override func viewDidLoad() {
super.viewDidLoad()
// 测试域名配置
#if DEBUG
APIConfig.testEncryption()
#endif
// 隐藏原生 TabBar
self.tabBar.isHidden = true
setupCustomFloatingTabBar()
setupGlobalManagers()
setupInitialViewControllers()
NSLog("[EPTabBarController] 悬浮 TabBar 初始化完成")
}
deinit {
globalEventManager?.removeAllDelegates()
NSLog("[EPTabBarController] 已释放")
}
// MARK: - Setup
/// 设置自定义悬浮 TabBar
private func setupCustomFloatingTabBar() {
// 创建悬浮容器
customTabBarView = UIView()
customTabBarView.translatesAutoresizingMaskIntoConstraints = false
customTabBarView.backgroundColor = .clear
view.addSubview(customTabBarView)
// 液态玻璃/毛玻璃效果
let blurEffect: UIBlurEffect
if #available(iOS 18.0, *) {
// iOS 18+ 使用液态玻璃（Material）
blurEffect = UIBlurEffect(style: .systemChromeMaterial)
} else {
// iOS 13-17 使用毛玻璃
blurEffect = UIBlurEffect(style: .systemThinMaterial)
}
tabBarBackgroundView = UIVisualEffectView(effect: blurEffect)
tabBarBackgroundView.translatesAutoresizingMaskIntoConstraints = false
tabBarBackgroundView.layer.cornerRadius = 28
tabBarBackgroundView.layer.masksToBounds = true
// 添加边框
tabBarBackgroundView.layer.borderWidth = 0.5
tabBarBackgroundView.layer.borderColor = UIColor.white.withAlphaComponent(0.2).cgColor
customTabBarView.addSubview(tabBarBackgroundView)
// 添加阴影
customTabBarView.layer.shadowColor = UIColor.black.cgColor
customTabBarView.layer.shadowOpacity = 0.15
customTabBarView.layer.shadowOffset = CGSize(width: 0, height: -2)
customTabBarView.layer.shadowRadius = 10
customTabBarView.layer.shadowPath = nil // 自动计算
// 布局约束（悬浮，两侧留白 16pt，底部留白 12pt）
NSLayoutConstraint.activate([
// TabBar 容器
customTabBarView.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 16),
customTabBarView.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -16),
customTabBarView.bottomAnchor.constraint(equalTo: view.safeAreaLayoutGuide.bottomAnchor, constant: -12),
customTabBarView.heightAnchor.constraint(equalToConstant: 64),
// 背景视图
tabBarBackgroundView.topAnchor.constraint(equalTo: customTabBarView.topAnchor),
tabBarBackgroundView.leadingAnchor.constraint(equalTo: customTabBarView.leadingAnchor),
tabBarBackgroundView.trailingAnchor.constraint(equalTo: customTabBarView.trailingAnchor),
tabBarBackgroundView.bottomAnchor.constraint(equalTo: customTabBarView.bottomAnchor)
])
// 添加 Tab 按钮
setupTabButtons()
NSLog("[EPTabBarController] 悬浮 TabBar 设置完成")
}
/// 设置 Tab 按钮
private func setupTabButtons() {
let momentButton = createTabButton(
icon: "sparkles", // 临时使用 SF Symbols
title: "动态",
tag: 0
)
let mineButton = createTabButton(
icon: "person.circle",
title: "我的",
tag: 1
)
tabButtons = [momentButton, mineButton]
let stackView = UIStackView(arrangedSubviews: tabButtons)
stackView.axis = .horizontal
stackView.distribution = .fillEqually
stackView.spacing = 20
stackView.translatesAutoresizingMaskIntoConstraints = false
tabBarBackgroundView.contentView.addSubview(stackView)
NSLayoutConstraint.activate([
stackView.topAnchor.constraint(equalTo: tabBarBackgroundView.topAnchor, constant: 8),
stackView.leadingAnchor.constraint(equalTo: tabBarBackgroundView.leadingAnchor, constant: 20),
stackView.trailingAnchor.constraint(equalTo: tabBarBackgroundView.trailingAnchor, constant: -20),
stackView.bottomAnchor.constraint(equalTo: tabBarBackgroundView.bottomAnchor, constant: -8)
])
// 默认选中第一个
updateTabButtonStates(selectedIndex: 0)
}
/// 创建 Tab 按钮
private func createTabButton(icon: String, title: String, tag: Int) -> UIButton {
let button = UIButton(type: .custom)
button.tag = tag
// 设置图标
let imageConfig = UIImage.SymbolConfiguration(pointSize: 20, weight: .medium)
let iconImage = UIImage(systemName: icon, withConfiguration: imageConfig)
button.setImage(iconImage, for: .normal)
// 设置标题
button.setTitle(title, for: .normal)
button.titleLabel?.font = UIFont.systemFont(ofSize: 12, weight: .medium)
// 设置颜色
button.setTitleColor(.white.withAlphaComponent(0.6), for: .normal)
button.setTitleColor(.white, for: .selected)
button.tintColor = .white.withAlphaComponent(0.6)
// 设置布局
button.titleEdgeInsets = UIEdgeInsets(top: 25, left: -20, bottom: -25, right: 0)
button.imageEdgeInsets = UIEdgeInsets(top: -10, left: 0, bottom: 10, right: 0)
button.addTarget(self, action: #selector(tabButtonTapped(_:)), for: .touchUpInside)
return button
}
/// Tab 按钮点击事件
@objc private func tabButtonTapped(_ sender: UIButton) {
selectedIndex = sender.tag
updateTabButtonStates(selectedIndex: sender.tag)
let tabNames = ["动态", "我的"]
NSLog("[EPTabBarController] 选中 Tab: \(tabNames[sender.tag])")
}
/// 更新 Tab 按钮状态
private func updateTabButtonStates(selectedIndex: Int) {
for (index, button) in tabButtons.enumerated() {
let isSelected = (index == selectedIndex)
button.isSelected = isSelected
button.tintColor = isSelected ? .white : .white.withAlphaComponent(0.6)
button.setTitleColor(isSelected ? .white : .white.withAlphaComponent(0.6), for: .normal)
// 选中状态动画
UIView.animate(withDuration: 0.2) {
button.transform = isSelected ? CGAffineTransform(scaleX: 1.1, y: 1.1) : .identity
}
}
}
/// 设置全局管理器
private func setupGlobalManagers() {
globalEventManager = GlobalEventManager.shared()
globalEventManager?.setupSDKDelegates()
// 设置房间最小化视图
if let containerView = view {
globalEventManager?.setupRoomMiniView(on: containerView)
}
// 注册社交分享回调
globalEventManager?.registerSocialShareCallback()
NSLog("[EPTabBarController] 全局管理器设置完成")
}
/// 设置初始 ViewController（未登录状态）
private func setupInitialViewControllers() {
// TODO: 暂时使用空白页面占位
let blankVC1 = UIViewController()
blankVC1.view.backgroundColor = .white
blankVC1.tabBarItem = createTabBarItem(
title: "动态",
normalImage: "tab_moment_normal",
selectedImage: "tab_moment_selected"
)
let blankVC2 = UIViewController()
blankVC2.view.backgroundColor = .white
blankVC2.tabBarItem = createTabBarItem(
title: "我的",
normalImage: "tab_mine_normal",
selectedImage: "tab_mine_selected"
)
viewControllers = [blankVC1, blankVC2]
selectedIndex = 0
NSLog("[EPTabBarController] 初始 ViewControllers 设置完成")
}
/// 创建 TabBarItem
/// - Parameters:
/// - title: 标题
/// - normalImage: 未选中图标名称
/// - selectedImage: 选中图标名称
/// - Returns: UITabBarItem
private func createTabBarItem(title: String, normalImage: String, selectedImage: String) -> UITabBarItem {
let item = UITabBarItem(
title: title,
image: UIImage(named: normalImage)?.withRenderingMode(.alwaysOriginal),
selectedImage: UIImage(named: selectedImage)?.withRenderingMode(.alwaysOriginal)
)
return item
}
// MARK: - Public Methods
/// 登录成功后刷新 TabBar
/// - Parameter isLogin: 是否已登录
@objc func refreshTabBar(isLogin: Bool) {
isLoggedIn = isLogin
if isLogin {
setupLoggedInViewControllers()
} else {
setupInitialViewControllers()
}
NSLog("[EPTabBarController] TabBar 已刷新，登录状态: \(isLogin)")
}
/// 设置登录后的 ViewControllers
private func setupLoggedInViewControllers() {
// 创建真实的 ViewController（OC 类）
let momentVC = EPMomentViewController()
momentVC.tabBarItem = createTabBarItem(
title: "动态",
normalImage: "tab_moment_normal",
selectedImage: "tab_moment_selected"
)
let mineVC = EPMineViewController()
mineVC.tabBarItem = createTabBarItem(
title: "我的",
normalImage: "tab_mine_normal",
selectedImage: "tab_mine_selected"
)
viewControllers = [momentVC, mineVC]
selectedIndex = 0
NSLog("[EPTabBarController] 登录后 ViewControllers 设置完成 - Moment & Mine")
}
}
// MARK: - UITabBarControllerDelegate
extension EPTabBarController: UITabBarControllerDelegate {
override func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) {
NSLog("[EPTabBarController] 选中 Tab: \(item.title ?? "Unknown")")
}
}
// MARK: - OC Compatibility
extension EPTabBarController {
/// OC 兼容：创建实例的工厂方法
@objc static func create() -> EPTabBarController {
return EPTabBarController()
}
/// OC 兼容：刷新 TabBar 方法
@objc func refreshTabBarWithIsLogin(_ isLogin: Bool) {
refreshTabBar(isLogin: isLogin)
}
}

192
YuMi/Modules/NewTabBar/NewTabBarController.swift
View File

@@ -1,192 +0,0 @@
//
// NewTabBarController.swift
// YuMi
//
// Created by AI on 2025-10-09.
// Copyright © 2025 YuMi. All rights reserved.
//
import UIKit
/// 新的 TabBar 控制器
/// 只包含 Moment 和 Mine 两个 Tab
class NewTabBarController: UITabBarController {
// MARK: - Properties
/// 全局事件管理器
private var globalEventManager: GlobalEventManager?
/// 是否已登录
private var isLoggedIn: Bool = false
// MARK: - Lifecycle
override func viewDidLoad() {
super.viewDidLoad()
// 测试域名配置
#if DEBUG
APIConfig.testEncryption()
#endif
setupTabBarAppearance()
setupGlobalManagers()
setupInitialViewControllers()
NSLog("[NewTabBarController] 初始化完成")
}
deinit {
globalEventManager?.removeAllDelegates()
NSLog("[NewTabBarController] 已释放")
}
// MARK: - Setup
/// 设置 TabBar 外观
private func setupTabBarAppearance() {
// 自定义 TabBar 样式
tabBar.tintColor = UIColor(red: 0.2, green: 0.6, blue: 0.86, alpha: 1.0) // 新主色调
tabBar.unselectedItemTintColor = UIColor(white: 0.6, alpha: 1.0) // 新辅助色
tabBar.backgroundColor = .white
tabBar.isTranslucent = false
// 添加顶部分割线
if #available(iOS 13.0, *) {
let appearance = UITabBarAppearance()
appearance.configureWithOpaqueBackground()
appearance.backgroundColor = .white
appearance.stackedLayoutAppearance.selected.iconColor = tabBar.tintColor
appearance.stackedLayoutAppearance.selected.titleTextAttributes = [
.foregroundColor: tabBar.tintColor ?? .blue,
.font: UIFont.systemFont(ofSize: 10, weight: .medium)
]
appearance.stackedLayoutAppearance.normal.titleTextAttributes = [
.foregroundColor: tabBar.unselectedItemTintColor ?? .gray,
.font: UIFont.systemFont(ofSize: 10)
]
tabBar.standardAppearance = appearance
if #available(iOS 15.0, *) {
tabBar.scrollEdgeAppearance = appearance
}
}
NSLog("[NewTabBarController] TabBar 外观设置完成")
}
/// 设置全局管理器
private func setupGlobalManagers() {
globalEventManager = GlobalEventManager.shared()
globalEventManager?.setupSDKDelegates()
// 设置房间最小化视图
if let containerView = view {
globalEventManager?.setupRoomMiniView(on: containerView)
}
// 注册社交分享回调
globalEventManager?.registerSocialShareCallback()
NSLog("[NewTabBarController] 全局管理器设置完成")
}
/// 设置初始 ViewController（未登录状态）
private func setupInitialViewControllers() {
// TODO: 暂时使用空白页面占位
let blankVC1 = UIViewController()
blankVC1.view.backgroundColor = .white
blankVC1.tabBarItem = createTabBarItem(
title: "动态",
normalImage: "tab_moment_normal",
selectedImage: "tab_moment_selected"
)
let blankVC2 = UIViewController()
blankVC2.view.backgroundColor = .white
blankVC2.tabBarItem = createTabBarItem(
title: "我的",
normalImage: "tab_mine_normal",
selectedImage: "tab_mine_selected"
)
viewControllers = [blankVC1, blankVC2]
selectedIndex = 0
NSLog("[NewTabBarController] 初始 ViewControllers 设置完成")
}
/// 创建 TabBarItem
/// - Parameters:
/// - title: 标题
/// - normalImage: 未选中图标名称
/// - selectedImage: 选中图标名称
/// - Returns: UITabBarItem
private func createTabBarItem(title: String, normalImage: String, selectedImage: String) -> UITabBarItem {
let item = UITabBarItem(
title: title,
image: UIImage(named: normalImage)?.withRenderingMode(.alwaysOriginal),
selectedImage: UIImage(named: selectedImage)?.withRenderingMode(.alwaysOriginal)
)
return item
}
// MARK: - Public Methods
/// 登录成功后刷新 TabBar
/// - Parameter isLogin: 是否已登录
@objc func refreshTabBar(isLogin: Bool) {
isLoggedIn = isLogin
if isLogin {
setupLoggedInViewControllers()
} else {
setupInitialViewControllers()
}
NSLog("[NewTabBarController] TabBar 已刷新，登录状态: \(isLogin)")
}
/// 设置登录后的 ViewControllers
private func setupLoggedInViewControllers() {
// 创建真实的 ViewController（OC 类）
let momentVC = NewMomentViewController()
momentVC.tabBarItem = createTabBarItem(
title: "动态",
normalImage: "tab_moment_normal",
selectedImage: "tab_moment_selected"
)
let mineVC = NewMineViewController()
mineVC.tabBarItem = createTabBarItem(
title: "我的",
normalImage: "tab_mine_normal",
selectedImage: "tab_mine_selected"
)
viewControllers = [momentVC, mineVC]
selectedIndex = 0
NSLog("[NewTabBarController] 登录后 ViewControllers 设置完成 - Moment & Mine")
}
}
// MARK: - UITabBarControllerDelegate
extension NewTabBarController: UITabBarControllerDelegate {
override func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) {
NSLog("[NewTabBarController] 选中 Tab: \(item.title ?? "Unknown")")
}
}
// MARK: - OC Compatibility
extension NewTabBarController {
/// OC 兼容：创建实例的工厂方法
@objc static func create() -> NewTabBarController {
return NewTabBarController()
}
}

4
YuMi/Modules/YMLogin/Api/PILoginManager.m
View File

@@ -89,7 +89,7 @@
// ========== 白牌版本：使用新的 NewTabBarController ==========
// 原代码已注释，改用 Swift 实现的 NewTabBarController
NewTabBarController *newTabBar = [NewTabBarController new];
EPTabBarController *newTabBar = [EPTabBarController new];
[newTabBar refreshTabBarWithIsLogin:YES];
// 设置为根控制器（不需要 NavigationController 包装）
@@ -108,7 +108,7 @@
[[TurboModeStateManager sharedManager] startupWithCurrentUser:userId];
}
NSLog(@"[PILoginManager] 已切换到白牌 TabBar：NewTabBarController");
NSLog(@"[PILoginManager] 已切换到白牌 TabBar：EPTabBarController");
// ========== 原代码（已注释） ==========
/*