From 030c5fa7d4978863121ad12e22cf86e765b4ae47 Mon Sep 17 00:00:00 2001 From: WindowsMEMZ Date: Thu, 21 Mar 2024 22:13:55 +0800 Subject: [PATCH] fix: small issue --- DarockBili.xcodeproj/project.pbxproj | 24 +- .../xcshareddata/swiftpm/Package.resolved | 213 ------------------ Localizable.xcstrings | 10 + MeowBili/Errors/FeedbackView.swift | 2 +- MeowBili/MeowBiliApp.swift | 2 +- 5 files changed, 24 insertions(+), 227 deletions(-) delete mode 100644 DarockBili.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/DarockBili.xcodeproj/project.pbxproj b/DarockBili.xcodeproj/project.pbxproj index e32047d82..0f2c0cf06 100644 --- a/DarockBili.xcodeproj/project.pbxproj +++ b/DarockBili.xcodeproj/project.pbxproj @@ -1579,7 +1579,7 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 912; + CURRENT_PROJECT_VERSION = 913; DEVELOPMENT_TEAM = B57D8PP775; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = SafariExtension/Info.plist; @@ -1610,7 +1610,7 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 912; + CURRENT_PROJECT_VERSION = 913; DEVELOPMENT_TEAM = B57D8PP775; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = SafariExtension/Info.plist; @@ -1646,7 +1646,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_ENTITLEMENTS = "MeowBili/MeowBili Vision App.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 912; + CURRENT_PROJECT_VERSION = 913; DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\""; DEVELOPMENT_TEAM = B57D8PP775; ENABLE_PREVIEWS = YES; @@ -1681,7 +1681,7 @@ ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; CODE_SIGN_ENTITLEMENTS = "MeowBili/MeowBili Vision App.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 912; + CURRENT_PROJECT_VERSION = 913; DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\""; DEVELOPMENT_TEAM = B57D8PP775; ENABLE_PREVIEWS = YES; @@ -1718,7 +1718,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = MeowBili/MeowBili.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 912; + CURRENT_PROJECT_VERSION = 913; DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\""; DEVELOPMENT_TEAM = B57D8PP775; ENABLE_PREVIEWS = YES; @@ -1765,7 +1765,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = MeowBili/MeowBili.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 912; + CURRENT_PROJECT_VERSION = 913; DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\""; DEVELOPMENT_TEAM = B57D8PP775; ENABLE_PREVIEWS = YES; @@ -1809,7 +1809,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIconWatch; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 912; + CURRENT_PROJECT_VERSION = 913; DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview\\ Content\""; DEVELOPMENT_TEAM = B57D8PP775; ENABLE_PREVIEWS = YES; @@ -1845,7 +1845,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIconWatch; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 912; + CURRENT_PROJECT_VERSION = 913; DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview\\ Content\""; DEVELOPMENT_TEAM = B57D8PP775; ENABLE_PREVIEWS = YES; @@ -1884,7 +1884,7 @@ CODE_SIGN_ENTITLEMENTS = "MeowBili/MeowBili Mac App.entitlements"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 912; + CURRENT_PROJECT_VERSION = 913; DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\""; DEVELOPMENT_TEAM = B57D8PP775; ENABLE_HARDENED_RUNTIME = YES; @@ -1917,7 +1917,7 @@ CODE_SIGN_ENTITLEMENTS = "MeowBili/MeowBili Mac App.entitlements"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 912; + CURRENT_PROJECT_VERSION = 913; DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\""; DEVELOPMENT_TEAM = B57D8PP775; ENABLE_HARDENED_RUNTIME = YES; @@ -1946,7 +1946,7 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 912; + CURRENT_PROJECT_VERSION = 913; DEVELOPMENT_TEAM = B57D8PP775; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 16.0; @@ -1969,7 +1969,7 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 912; + CURRENT_PROJECT_VERSION = 913; DEVELOPMENT_TEAM = B57D8PP775; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 16.0; diff --git a/DarockBili.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DarockBili.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved deleted file mode 100644 index 43703d1b4..000000000 --- a/DarockBili.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ /dev/null @@ -1,213 +0,0 @@ -{ - "originHash" : "322fc8364c187b0a5b1349b7587b8e4846e99669d42067e6fcd5ba29b281e908", - "pins" : [ - { - "identity" : "alamofire", - "kind" : "remoteSourceControl", - "location" : "https://github.com/Alamofire/Alamofire", - "state" : { - "revision" : "723fa5a6c65812aec4a0d7cc432ee198883b6e00", - "version" : "5.9.0" - } - }, - { - "identity" : "alertkit", - "kind" : "remoteSourceControl", - "location" : "https://github.com/sparrowcode/AlertKit", - "state" : { - "revision" : "3d35de60ad26aab58395ebecdd63b533546862ed", - "version" : "5.1.8" - } - }, - { - "identity" : "alerttoast", - "kind" : "remoteSourceControl", - "location" : "https://github.com/elai950/AlertToast", - "state" : { - "revision" : "b39252eacd159904afd7d718bba0afabb87f2f2f", - "version" : "1.3.9" - } - }, - { - "identity" : "azvideoplayer", - "kind" : "remoteSourceControl", - "location" : "https://github.com/adamzarn/AZVideoPlayer", - "state" : { - "revision" : "277226551a519a3dcd8de09c2741a4b61c4c95db", - "version" : "1.1.0" - } - }, - { - "identity" : "darockkit", - "kind" : "remoteSourceControl", - "location" : "https://github.com/Darock-Studio/DarockKit", - "state" : { - "branch" : "main", - "revision" : "b4d26e8c8c37572708f2aa13eb6377c55f18dabc" - } - }, - { - "identity" : "dynamic", - "kind" : "remoteSourceControl", - "location" : "https://github.com/mhdhejazi/Dynamic", - "state" : { - "revision" : "ab9a2570862d54aed2663691bb767f881226a12f", - "version" : "1.2.0" - } - }, - { - "identity" : "efqrcode", - "kind" : "remoteSourceControl", - "location" : "https://github.com/EFPrefix/EFQRCode", - "state" : { - "revision" : "2991c2f318ad9529d93b2a73a382a3f9c72c64ce", - "version" : "6.2.2" - } - }, - { - "identity" : "libwebp-xcode", - "kind" : "remoteSourceControl", - "location" : "https://github.com/SDWebImage/libwebp-Xcode.git", - "state" : { - "revision" : "b2b1d20a90b14d11f6ef4241da6b81c1d3f171e4", - "version" : "1.3.2" - } - }, - { - "identity" : "marquee", - "kind" : "remoteSourceControl", - "location" : "https://github.com/SwiftUIKit/Marquee", - "state" : { - "revision" : "69d7b7c6c34ed41d9299cfa8406f91f529c4fef3", - "version" : "0.3.0" - } - }, - { - "identity" : "mixpanel-swift", - "kind" : "remoteSourceControl", - "location" : "https://github.com/mixpanel/mixpanel-swift", - "state" : { - "branch" : "master", - "revision" : "4fa0f5d257f2df4b451450564390d827a7053aec" - } - }, - { - "identity" : "screenshotableview", - "kind" : "remoteSourceControl", - "location" : "https://github.com/RickeyBoy/ScreenshotableView", - "state" : { - "revision" : "3c140215fb12c7e8aef78e853006110350455c5b", - "version" : "1.0.0" - } - }, - { - "identity" : "sdwebimage", - "kind" : "remoteSourceControl", - "location" : "https://github.com/SDWebImage/SDWebImage.git", - "state" : { - "revision" : "73b9397cfbd902f606572964055464903b1d84c6", - "version" : "5.19.0" - } - }, - { - "identity" : "sdwebimagepdfcoder", - "kind" : "remoteSourceControl", - "location" : "https://github.com/SDWebImage/SDWebImagePDFCoder", - "state" : { - "revision" : "2aecb0a16e4d054c7f36a140f7feef6e1ede7bb6", - "version" : "1.0.1" - } - }, - { - "identity" : "sdwebimagesvgcoder", - "kind" : "remoteSourceControl", - "location" : "https://github.com/SDWebImage/SDWebImageSVGCoder", - "state" : { - "revision" : "950167445ab703740569869c8b7510efc9d09a26", - "version" : "1.7.0" - } - }, - { - "identity" : "sdwebimageswiftui", - "kind" : "remoteSourceControl", - "location" : "https://github.com/SDWebImage/SDWebImageSwiftUI.git", - "state" : { - "revision" : "53573d6dd017e354c0e7d8f1c86b77ef1383c996", - "version" : "2.2.7" - } - }, - { - "identity" : "sdwebimagewebpcoder", - "kind" : "remoteSourceControl", - "location" : "https://github.com/SDWebImage/SDWebImageWebPCoder", - "state" : { - "revision" : "8a33fb3ca75a01267f775f891f7d61f675e95072", - "version" : "0.14.5" - } - }, - { - "identity" : "sfsymbol", - "kind" : "remoteSourceControl", - "location" : "https://github.com/Nirma/SFSymbol", - "state" : { - "revision" : "1b127194b976a58ea460a2cbe10f00fa994b1ece", - "version" : "2.3.0" - } - }, - { - "identity" : "swift_qrcodejs", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ApolloZhu/swift_qrcodejs.git", - "state" : { - "revision" : "374dc7f7b9e76c6aeb393f6a84590c6d387e1ecb", - "version" : "2.2.2" - } - }, - { - "identity" : "swiftdate", - "kind" : "remoteSourceControl", - "location" : "https://github.com/malcommac/SwiftDate", - "state" : { - "revision" : "5d943224c3bb173e6ecf27295611615eba90c80e", - "version" : "7.0.0" - } - }, - { - "identity" : "swiftsoup", - "kind" : "remoteSourceControl", - "location" : "https://github.com/scinfu/SwiftSoup", - "state" : { - "revision" : "1d39e56d364cba79ce43b341f9661b534cccb18d", - "version" : "2.7.1" - } - }, - { - "identity" : "swiftui-cached-async-image", - "kind" : "remoteSourceControl", - "location" : "https://github.com/lorenzofiamingo/swiftui-cached-async-image", - "state" : { - "revision" : "467a3d17479887943ab917a379e62bbaff60ac8a", - "version" : "2.1.1" - } - }, - { - "identity" : "swiftyjson", - "kind" : "remoteSourceControl", - "location" : "https://github.com/SwiftyJSON/SwiftyJSON.git", - "state" : { - "revision" : "2b6054efa051565954e1d2b9da831680026cd768", - "version" : "4.3.0" - } - }, - { - "identity" : "ziparchive", - "kind" : "remoteSourceControl", - "location" : "https://github.com/ZipArchive/ZipArchive", - "state" : { - "revision" : "79d4dc9729096c6ad83dd3cee2b9f354d1b4ab7b", - "version" : "2.5.5" - } - } - ], - "version" : 3 -} diff --git a/Localizable.xcstrings b/Localizable.xcstrings index 4f16024aa..7a1974006 100644 --- a/Localizable.xcstrings +++ b/Localizable.xcstrings @@ -1688,6 +1688,7 @@ } }, "Darock 会收集必要的诊断信息以便进行改进，信息不会关联到您个人。如果您不愿意被收集信息，请勿发送。" : { + "extractionState" : "stale", "localizations" : { "zh-Hant" : { "stringUnit" : { @@ -1696,6 +1697,9 @@ } } } + }, + "Darock 会收集必要的诊断信息以便进行改进。如果您不愿意被收集信息，请勿发送。" : { + }, "Darock-studio" : { "localizations" : { @@ -8195,6 +8199,9 @@ }, "分析与改进" : { + }, + "加群248036605查看群公告以申请解封" : { + }, "动态" : { "localizations" : { @@ -8719,6 +8726,9 @@ } } } + }, + "您已被 Darock 永久封禁且在设备上施行" : { + }, "我的收藏" : { "localizations" : { diff --git a/MeowBili/Errors/FeedbackView.swift b/MeowBili/Errors/FeedbackView.swift index 401b28eb3..a774e1dbd 100644 --- a/MeowBili/Errors/FeedbackView.swift +++ b/MeowBili/Errors/FeedbackView.swift @@ -142,7 +142,7 @@ struct InAppFeedbackView: View { Time：\(Date.now.timeIntervalSince1970) Sender: User BanID：\(banId) - BanUID：\(UserDefaults.standard.string(forKey: "DedeUserId") ?? "Empty") + BanUID：\(UserDefaults.standard.string(forKey: "DedeUserID") ?? "Empty") """ DarockKit.Network.shared.requestString("https://api.darock.top/feedback/submit/anony/喵哩喵哩/\(msgToSend.base64Encoded().replacingOccurrences(of: "/", with: "{slash}"))") { respStr, isSuccess in if isSuccess { diff --git a/MeowBili/MeowBiliApp.swift b/MeowBili/MeowBiliApp.swift index 803fa3503..0493017f1 100644 --- a/MeowBili/MeowBiliApp.swift +++ b/MeowBili/MeowBiliApp.swift @@ -503,7 +503,7 @@ struct DarockBili_Watch_AppApp: App { } } } - if let uid = UserDefaults.standard.string(forKey: "DedeUserId") { + if let uid = UserDefaults.standard.string(forKey: "DedeUserID") { DarockKit.Network.shared.requestString("https://api.darock.top/banner/check/\(uid)") { respStr, isSuccess in if isSuccess { if respStr == "1" {