Skip to content

Commit

Permalink
Merge pull request #365 from Darock-Studio/feat/csupport
Browse files Browse the repository at this point in the history 
feat: Online Chatting Support
  • Loading branch information
@WindowsMEMZ
WindowsMEMZ authored May 12, 2024
2 parents a9d5695 + 9105001 commit 83fdea6
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 20 deletions.
53 changes: 35 additions & 18 deletions DarockBili.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
8C9776092BCECBC3006EDB58 /* Audio.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C9776072BCECBC3006EDB58 /* Audio.swift */; };
8C97760A2BCECBC3006EDB58 /* Audio.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C9776072BCECBC3006EDB58 /* Audio.swift */; };
8C97760B2BCECBC3006EDB58 /* Audio.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C9776072BCECBC3006EDB58 /* Audio.swift */; };
8CA164852BF12731000065D8 /* SupportsUICore in Frameworks */ = {isa = PBXBuildFile; productRef = 8CA164842BF12731000065D8 /* SupportsUICore */; };
8CA1BA112BD2AF9E009BCDFB /* PrivateSymbols.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CA1BA102BD2AF9E009BCDFB /* PrivateSymbols.m */; };
8CA1BA122BD2AF9E009BCDFB /* PrivateSymbols.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CA1BA102BD2AF9E009BCDFB /* PrivateSymbols.m */; };
8CA1BA132BD2AF9E009BCDFB /* PrivateSymbols.m in Sources */ = {isa = PBXBuildFile; fileRef = 8CA1BA102BD2AF9E009BCDFB /* PrivateSymbols.m */; };
Expand Down Expand Up @@ -574,6 +575,7 @@
8CA7CBED2B77AC8A008E587F /* ZipArchive in Frameworks */,
8CA7CBF72B77AC8A008E587F /* SDWebImagePDFCoder in Frameworks */,
8CA7CBF52B77AC8A008E587F /* SDWebImageSVGCoder in Frameworks */,
8CA164852BF12731000065D8 /* SupportsUICore in Frameworks */,
8CA370D62B82691100CE0E9E /* Mixpanel in Frameworks */,
8CA7CBE72B77AC8A008E587F /* Marquee in Frameworks */,
8CBCBAEF2BE5351100DF017E /* CepheusKeyboardKit in Frameworks */,
Expand Down Expand Up @@ -1066,6 +1068,7 @@
8CB176A62BB8189300CEC05C /* SDWebImageSwiftUI */,
8CB176AF2BB8421300CEC05C /* DarockKit */,
8CBCBAEE2BE5351100DF017E /* CepheusKeyboardKit */,
8CA164842BF12731000065D8 /* SupportsUICore */,
);
productName = "MeowBili Watch App";
productReference = 8CA7CBCF2B77AC4C008E587F /* 喵哩喵哩.app */;
Expand Down Expand Up @@ -1189,6 +1192,7 @@
8CB176A32BB8188600CEC05C /* XCRemoteSwiftPackageReference "SDWebImageSwiftUI" */,
8CB176AC2BB8420A00CEC05C /* XCRemoteSwiftPackageReference "DarockKit" */,
8CBCBAED2BE5351100DF017E /* XCRemoteSwiftPackageReference "Cepheus" */,
8CA164812BF1270D000065D8 /* XCRemoteSwiftPackageReference "SupportsUICore" */,
);
productRefGroup = B44689CB2B4FC15A002CCEB2 /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -1645,7 +1649,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_TEAM = B57D8PP775;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = SafariExtension/Info.plist;
Expand Down Expand Up @@ -1676,7 +1680,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_TEAM = B57D8PP775;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = SafariExtension/Info.plist;
Expand Down Expand Up @@ -1773,7 +1777,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = MeowBili/MeowBiliAlternative.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\"";
DEVELOPMENT_TEAM = B38QUJMY47;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -1818,7 +1822,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconWatch;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview\\ Content\"";
DEVELOPMENT_TEAM = B38QUJMY47;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -1858,7 +1862,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
CODE_SIGN_ENTITLEMENTS = "MeowBili/MeowBili Vision App.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\"";
DEVELOPMENT_TEAM = B57D8PP775;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -1894,7 +1898,7 @@
CODE_SIGN_ENTITLEMENTS = "MeowBili/MeowBili Mac App.entitlements";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\"";
DEVELOPMENT_TEAM = B57D8PP775;
ENABLE_HARDENED_RUNTIME = YES;
Expand Down Expand Up @@ -1923,7 +1927,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_TEAM = B57D8PP775;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
Expand All @@ -1947,7 +1951,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_TEAM = B38QUJMY47;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = SafariExtension/Info.plist;
Expand Down Expand Up @@ -2014,7 +2018,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
CODE_SIGN_ENTITLEMENTS = "MeowBili/MeowBili Vision App.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\"";
DEVELOPMENT_TEAM = B57D8PP775;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -2049,7 +2053,7 @@
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
CODE_SIGN_ENTITLEMENTS = "MeowBili/MeowBili Vision App.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\"";
DEVELOPMENT_TEAM = B57D8PP775;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -2086,7 +2090,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = MeowBili/MeowBili.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\"";
DEVELOPMENT_TEAM = B57D8PP775;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -2133,7 +2137,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = MeowBili/MeowBili.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\"";
DEVELOPMENT_TEAM = B57D8PP775;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -2178,7 +2182,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconWatch;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview\\ Content\"";
DEVELOPMENT_TEAM = B57D8PP775;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -2214,7 +2218,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIconWatch;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview\\ Content\"";
DEVELOPMENT_TEAM = B57D8PP775;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -2254,7 +2258,7 @@
CODE_SIGN_ENTITLEMENTS = "MeowBili/MeowBili Mac App.entitlements";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\"";
DEVELOPMENT_TEAM = B57D8PP775;
ENABLE_HARDENED_RUNTIME = YES;
Expand Down Expand Up @@ -2287,7 +2291,7 @@
CODE_SIGN_ENTITLEMENTS = "MeowBili/MeowBili Mac App.entitlements";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\"";
DEVELOPMENT_TEAM = B57D8PP775;
ENABLE_HARDENED_RUNTIME = YES;
Expand Down Expand Up @@ -2316,7 +2320,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_TEAM = B57D8PP775;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
Expand All @@ -2339,7 +2343,7 @@
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1238;
CURRENT_PROJECT_VERSION = 1239;
DEVELOPMENT_TEAM = B57D8PP775;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
Expand Down Expand Up @@ -2579,6 +2583,14 @@
minimumVersion = 1.0.0;
};
};
8CA164812BF1270D000065D8 /* XCRemoteSwiftPackageReference "SupportsUICore" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/Darock-Studio/SupportsUICore";
requirement = {
branch = main;
kind = branch;
};
};
8CA370D22B82690700CE0E9E /* XCRemoteSwiftPackageReference "mixpanel-swift" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/mixpanel/mixpanel-swift";
Expand Down Expand Up @@ -2723,6 +2735,11 @@
package = 8C0557DD2B791B84009D9CD0 /* XCRemoteSwiftPackageReference "AZVideoPlayer" */;
productName = AZVideoPlayer;
};
8CA164842BF12731000065D8 /* SupportsUICore */ = {
isa = XCSwiftPackageProductDependency;
package = 8CA164812BF1270D000065D8 /* XCRemoteSwiftPackageReference "SupportsUICore" */;
productName = SupportsUICore;
};
8CA370D32B82690700CE0E9E /* Mixpanel */ = {
isa = XCSwiftPackageProductDependency;
package = 8CA370D22B82690700CE0E9E /* XCRemoteSwiftPackageReference "mixpanel-swift" */;
Expand Down
13 changes: 11 additions & 2 deletions DarockBili.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/SDWebImage/SDWebImageWebPCoder",
"state" : {
"revision" : "f534cfe830a7807ecc3d0332127a502426cfa067",
"version" : "0.14.6"
"revision" : "8a33fb3ca75a01267f775f891f7d61f675e95072",
"version" : "0.14.5"
}
},
{
Expand All @@ -162,6 +162,15 @@
"version" : "2.3.0"
}
},
{
"identity" : "supportsuicore",
"kind" : "remoteSourceControl",
"location" : "https://github.com/Darock-Studio/SupportsUICore",
"state" : {
"branch" : "main",
"revision" : "2460d64cf0419fd2606b08f24558496d8fe8a360"
}
},
{
"identity" : "swift_qrcodejs",
"kind" : "remoteSourceControl",
Expand Down
3 changes: 3 additions & 0 deletions Localizable.xcstrings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9404,6 +9404,9 @@
},
"请将恢复密钥保存到安全的位置" : {

},
"请求在线支持 (Beta)" : {

},
"调试构建" : {

Expand Down
8 changes: 8 additions & 0 deletions MeowBili/Errors/FeedbackView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
import SwiftUI
import DarockKit
import EFQRCode
#if os(watchOS)
import SupportsUICore
#endif

#if os(watchOS)
struct FeedbackView: View {
Expand Down Expand Up @@ -68,6 +71,11 @@ struct InAppFeedbackView: View {
NavigationLink(destination: { NewFeedbackView() }, label: {
Label("新建反馈", systemImage: "exclamationmark.bubble.fill")
})
#if os(watchOS)
NavigationLink(destination: { SUICChatSupportView(projName: "喵哩喵哩") }, label: {
Label("请求在线支持 (Beta)", systemImage: "bubble.left.and.text.bubble.right")
})
#endif
}
if feedbackIds.count != 0 {
Section {
Expand Down

0 comments on commit 83fdea6

Please sign in to comment.