Release V1.5.3 build 135

sauchye · sauchye · commit f6591fc60777 · 2025-03-20T19:17:45.000+08:00
diff --git a/Guozaoke.xcodeproj/project.pbxproj b/Guozaoke.xcodeproj/project.pbxproj
@@ -448,8 +448,8 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 133;
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 135;
 				DEVELOPMENT_ASSET_PATHS = "\"Guozaoke/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
@@ -468,7 +468,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.guozaoke.app.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -488,10 +488,10 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = Guozaoke/GuozaokeRelease.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 133;
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 135;
 				DEVELOPMENT_ASSET_PATHS = "\"Guozaoke/Preview Content\"";
-				DEVELOPMENT_TEAM = 63K948ZA2P;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Guozaoke/Info.plist;
@@ -508,7 +508,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.2;
+				MARKETING_VERSION = 1.5.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.guozaoke.app.ios;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/Guozaoke.xcodeproj/xcshareddata/xcschemes/Guozaoke.xcscheme b/Guozaoke.xcodeproj/xcshareddata/xcschemes/Guozaoke.xcscheme
@@ -55,7 +55,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/Guozaoke/APIService/APIService.swift b/Guozaoke/APIService/APIService.swift
@@ -58,7 +58,8 @@ struct DeveloperInfo {
 
 /// App 版本信息
 struct AppInfo {
-    static let univerLink = "www.guozaoke.com"
+    static let appleEula = "https://www.apple.com/legal/internet-services/itunes/dev/stdeula/"
+    static let univerLink   = "www.guozaoke.com"
     static let scheme = "guozaoke"
     static let appIntro = "过早客是源自武汉的高端社交网络，这里有关于创业、创意、IT、金融等最热话题的交流，也有招聘问答、活动交友等最新资讯的发布。"
     static let AppBeiAnText = "粤ICP备2025374276号-2A"
@@ -120,7 +121,9 @@ struct APIService {
     static let faq = "/faq"
     static let members = "/members"
     static let blockedUser = "/setting/blockedUser"
-
+    /// baseUrlString + feedback
+    static let feedbackAllLink = baseUrlString + feedback
+    
     private init() {}
     
     
diff --git a/Guozaoke/AppDelegate.swift b/Guozaoke/AppDelegate.swift
@@ -3,8 +3,7 @@
 //  Guozaoke
 //
 //  Created by scy on 2025/1/21.
-//
-
+// 
 // com.guozaoke.app.ios
 // 
 
diff --git a/Guozaoke/Common/SFSymbol.swift b/Guozaoke/Common/SFSymbol.swift
@@ -8,6 +8,10 @@
 import SwiftUI
 
 enum SFSymbol: String {
+    /// 􀓣
+    case personCircle = "person.circle"
+    /// 􀷊
+    case handRaisedCircle = "hand.raised.circle"
     case checkmarkSealFill = "checkmark.seal.fill"
     case circle = "circle"
     case checkmarkCircleFill = "checkmark.circle.fill"
diff --git a/Guozaoke/Common/Utils.swift b/Guozaoke/Common/Utils.swift
@@ -108,3 +108,18 @@ extension String {
 }
 
 
+extension UIApplication {
+    /// 去设置 UIApplication.openSettingsURLString
+    static func toSettingUrl() {
+        openUrl(UIApplication.openSettingsURLString)
+    }
+    
+    static func openUrl(_ string: String?) {
+        guard let string = string else { return  }
+        if let url = URL(string: string) {
+            if UIApplication.shared.canOpenURL(url) {
+                UIApplication.shared.open(url, options: [:], completionHandler: nil)
+            }
+        }
+    }
+}
diff --git a/Guozaoke/GuozaokeApp.swift b/Guozaoke/GuozaokeApp.swift
@@ -127,16 +127,16 @@ private extension GuozaokeApp {
         NotificationCenter.default.addObserver(forName: .purchaseSuccessNoti, object: nil, queue: .main) { _ in
             purchaseAppState.savePurchaseStatus(isPurchased: true)
         }
-        
+        // TODO: Universal Links 如果guozaoke.com 可以配置这里就可以支持跳转个人详情，主题详情，甚至节点详情
         NotificationCenter.default.addObserver(forName: .openAppNotification, object: nil, queue: .main) { notification in
             if let userInfo = notification.userInfo,
                let user = userInfo as? Dictionary<String, Any> {
                 let id  = user["id"] as? String ?? ""
                 let isUser  = user["isUser"] as? Bool ?? false
                 if isUser {
-                    //UserInfoView(userId: id)
+                    
                 } else {
-                    //PostDetailView(postId: id)
+                    
                 }
             }
         }
diff --git a/Guozaoke/View/Home/PostRowView.swift b/Guozaoke/View/Home/PostRowView.swift
@@ -16,7 +16,7 @@ struct PostRowView: View {
     @State private var isUserAvatarViewActive = false
     @State private var isLastReplyUserInfoViewActive = false
     @State private var isUserNameInfoViewActive = false
-
+    
     var body: some View {
         VStack(alignment: .leading, spacing: 8) {
             HStack(alignment: .top) {
@@ -38,10 +38,21 @@ struct PostRowView: View {
                 VStack(alignment: .leading, spacing: 4) {
                     HStack {
                         //let content = post.title + (post.postType == .elite ? Text(Image(systemName: SFSymbol.bookmark.rawValue)) : Text(""))
-                        Text(post.title)
-                            .titleFontStyle()
-                            .padding(.horizontal, 2)
-                            .lineLimit(2)
+                        if post.isJHTopic {
+                            HStack(spacing: 2) {
+                                Text(post.title)
+                                    .titleFontStyle()
+                                
+                                SFSymbol.bookmark.image
+                                    .resizable()
+                                    .scaledToFit()
+                                    .frame(width: 15, height: 15)
+                            }
+                        } else {
+                            Text(post.title)
+                                .titleFontStyle()
+                                .padding(.horizontal, 2)
+                        }
                     }
                     HStack {
                         Text(post.author)
diff --git a/Guozaoke/View/Login/LoginView.swift b/Guozaoke/View/Login/LoginView.swift
@@ -11,7 +11,6 @@ import SwiftSoup
 // MARK: - 登录视图
 
 struct LoginView: View {
-    let agreementUrl = "https://www.apple.com/legal/internet-services/itunes/dev/stdeula/"
     @StateObject private var loginService = LoginService()
     @Binding var isPresented: Bool
     let onLoginSuccess: () -> Void
@@ -53,15 +52,21 @@ struct LoginView: View {
 
                 Section {
                     HStack {
-                        Image(systemName: isAgreed ? "checkmark.circle.fill" : "circle")
+                        
+                        Image(systemName: isAgreed ? SFSymbol.checkmarkCircleFill.rawValue : SFSymbol.circle.rawValue)
                             .onTapGesture {
                                 isAgreed.toggle()
                             }
                         
                         Text("我已阅读并同意")
                             .subTitleFontStyle()
                         
-                        Link("《用户使用协议》", destination: URL(string: agreementUrl)!)
+                        Link("《使用条款》", destination: URL(string: AppInfo.appleEula)!)
+                            .subTitleFontStyle()
+                            .foregroundColor(.blue)
+                        Text("和")
+                            .subTitleFontStyle()
+                        Link("《隐私协议》", destination: URL(string: APIService.feedbackAllLink)!)
                             .subTitleFontStyle()
                             .foregroundColor(.blue)
                     }
diff --git a/Guozaoke/View/Me/AboutView.swift b/Guozaoke/View/Me/AboutView.swift
@@ -18,7 +18,7 @@ struct AboutView: View {
                
                    enjoy，欢迎反馈 ━(*｀∀´*)ノ亻!~
                
-                   在社区发帖或是邮件\(DeveloperInfo.email)
+                   在社区发帖或是邮件反馈
                """
     
     @State private var showMailView = false
@@ -75,7 +75,7 @@ struct AboutView: View {
                             showMailView.toggle()
                         } else {
                             DeveloperInfo.email.copyToClipboard()
-                            ToastView.toastText("拷贝邮箱发送")
+                            ToastView.toastText("邮箱地址已拷贝")
                         }
                     }) {
                         Text("发送邮件")
diff --git a/Guozaoke/View/Me/MoreView.swift b/Guozaoke/View/Me/MoreView.swift
@@ -10,41 +10,41 @@ import SwiftUI
 struct MoreView: View {
     @State var showBase64View: Bool = false
     var body: some View {
-        NavigationView {
-            VStack {
-                List {
-                    Section {
-                        NavigationLink(destination: UserInfoView(userId: "isau")) {
-                            OneTextView(title: "过早客iOS开发者「非官方」")
-                        }
-                        
-                        NavigationLink(destination: UserInfoView(userId: "Mario")) {
-                            OneTextView(title: "网站管理大大：Mario")
-                        }
+        VStack {
+            List {
+                Section {
+                    NavigationLink(destination: UserInfoView(userId: "isau")) {
+                        OneTextView(title: "过早客iOS开发者「非官方」")
+                    }
+                    
+                    NavigationLink(destination: UserInfoView(userId: "Mario")) {
+                        OneTextView(title: "网站管理大大：Mario")
+                    }
 
-                        NavigationLink(destination: PostDetailView(postId: APIService.androidUpdateTopicInfo)) {
-                            OneTextView(title: "mzlogin大大：mzlogin")
-                        }
-                        
-                        NavigationLink(destination: PostDetailView(postId: APIService.iosUpdateTopicInfo)) {
-                            OneTextView(title: "更新说明")
-                        }
+                    NavigationLink(destination: PostDetailView(postId: APIService.androidUpdateTopicInfo)) {
+                        OneTextView(title: "mzlogin大大：mzlogin")
                     }
                     
-                    Section {
-                        OneTextView(title: "Base64加密解密")
-                            .onTapGesture {
-                                showBase64View.toggle()
-                            }
+                    NavigationLink(destination: PostDetailView(postId: APIService.iosUpdateTopicInfo)) {
+                        OneTextView(title: "更新说明")
                     }
                 }
-                .sheet(isPresented: $showBase64View) {
-                    Base64View(isPresented: $showBase64View)
-                        .presentationDragIndicator(.visible)
+                
+                Section {
+                    Button {
+                        showBase64View.toggle()
+                    } label: {
+                        OneTextView(title: "Base64加密解密")
+                    }
+                        
                 }
             }
-            .navigationTitleStyle("更多")
+            .sheet(isPresented: $showBase64View) {
+                Base64View(isPresented: $showBase64View)
+                    .presentationDragIndicator(.visible)
+            }
         }
+        .navigationTitleStyle("更多")
     }
 }
 
diff --git a/Guozaoke/View/Me/Setting/SettingView.swift b/Guozaoke/View/Me/Setting/SettingView.swift
@@ -43,11 +43,17 @@ struct SettingView: View {
 //            }
             Section {
                 Toggle(isOn: $pushNotificationsEnabled) {
-                    Text(pushNotificationsEnabled ? "接收推送消息" : "关闭推送消息")
+                    Text(pushNotificationsEnabled ? "一天一条" : "不推送消息")
                         .titleFontStyle()
                 }.onChange(of: pushNotificationsEnabled) { newValue in
+                    if !NotificationManager.shared.notificationGranted {
+                        pushNotificationsEnabled = false
+                        UIApplication.toSettingUrl()
+                        return
+                    }
                     handlePushNotificationToggle(newValue: newValue)
                 }
+                
                 .toggleStyle(SwitchToggleStyle(tint: .blue))
                 
                 Toggle(isOn: $hapticFeedbackEnabled) {
diff --git a/Guozaoke/View/MeView.swift b/Guozaoke/View/MeView.swift
@@ -30,7 +30,7 @@ struct MeView: View {
     @EnvironmentObject var purchaseAppState: PurchaseAppState
     @State var showPurchaseView: Bool = false
     var body: some View {
-        ZStack() {
+        VStack() {
             MyProfileView()
         }
         .navigationBarBackButtonHidden(true)
@@ -165,29 +165,7 @@ struct MyProfileView: View {
                 NavigationLink(destination: FontSizePreviewView()) {
                     ProfileRow(icon: SFSymbol.textformatSize.rawValue, title: "字体大小")
                 }
-                //                HStack {
-                //                    ProfileRow(icon: SFSymbol.moonphase.rawValue, title: "模式切换")
-                //                    Spacer()
-                //                    Picker("主题", selection: $appearanceMode) {
-                //                        ForEach(ModeTypeEnum.allCases, id: \.self) { mode in
-                //                            Text(mode.name)
-                //                                .tag(mode)
-                //                        }
-                //                    }
-                //                    .padding()
-                //                   .pickerStyle(DefaultPickerStyle())
-                //                   .onChange(of: currentMode) { newMode in
-                //                       appearanceMode = newMode.rawValue
-                //                       applyAppearanceMode(newMode)
-                //                   }
-                //                   .padding()
-                //                }
-                //                .onAppear {
-                //                    if let savedMode = ModeTypeEnum(rawValue: appearanceMode) {
-                //                        currentMode = savedMode
-                //                        applyAppearanceMode(currentMode)
-                //                    }
-                //                }
+                
                 NavigationLink(destination: SettingView()) {
                     ProfileRow(icon: SFSymbol.setting.rawValue, title: "设置")
                 }
@@ -206,6 +184,18 @@ struct MyProfileView: View {
                 } label: {
                     ProfileRow(icon: SFSymbol.heartCircle.rawValue, title: "给我们鼓励")
                 }
+                
+                Button {
+                    AppInfo.appleEula.openURL()
+                } label: {
+                    ProfileRow(icon: SFSymbol.personCircle.rawValue, title: "使用条款「EULA」")
+                }
+                
+                Button {
+                    APIService.feedbackAllLink.openURL()
+                } label: {
+                    ProfileRow(icon: SFSymbol.handRaisedCircle.rawValue, title: "隐私协议")
+                }
             }
             
             HStack {
diff --git a/Guozaoke/View/Node/NodeInfoView.swift b/Guozaoke/View/Node/NodeInfoView.swift
@@ -17,11 +17,6 @@ struct NodeInfoView: View {
 
     var body: some View {
         VStack {
-            if viewModel.isLoading {
-                ProgressView()
-                    .frame(maxWidth: .infinity)
-                    .listRowSeparator(.hidden)
-            }
             
             if viewModel.posts.isEmpty, !viewModel.isLoading {
                 HStack {
@@ -61,6 +56,7 @@ struct NodeInfoView: View {
         .toolbar {
             ToolbarItem(placement: .navigationBarTrailing) {
                 Button(action: {
+                    hapticFeedback()
                 }) {
                     Menu {
                         Button {
diff --git a/Guozaoke/ViewModel/PostListParser.swift b/Guozaoke/ViewModel/PostListParser.swift
diff --git a/Guozaoke/ViewModel/UserInfoParser.swift b/Guozaoke/ViewModel/UserInfoParser.swift
diff --git a/README.md b/README.md

Original file line number	Diff line number	Diff line change
`@@ -127,16 +127,16 @@ private extension GuozaokeApp {`
`127`	`127`	`NotificationCenter.default.addObserver(forName: .purchaseSuccessNoti, object: nil, queue: .main) { _ in`
`128`	`128`	`purchaseAppState.savePurchaseStatus(isPurchased: true)`
`129`	`129`	`}`
`130`		`-`
	`130`	`+ // TODO: Universal Links 如果guozaoke.com 可以配置这里就可以支持跳转个人详情，主题详情，甚至节点详情`
`131`	`131`	`NotificationCenter.default.addObserver(forName: .openAppNotification, object: nil, queue: .main) { notification in`
`132`	`132`	`if let userInfo = notification.userInfo,`
`133`	`133`	`let user = userInfo as? Dictionary<String, Any> {`
`134`	`134`	`let id = user["id"] as? String ?? ""`
`135`	`135`	`let isUser = user["isUser"] as? Bool ?? false`
`136`	`136`	`if isUser {`
`137`		`- //UserInfoView(userId: id)`
	`137`	`+`
`138`	`138`	`} else {`
`139`		`- //PostDetailView(postId: id)`
	`139`	`+`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`	`}`