Merge pull request #272 from Darock-Studio/opt/channelview

在关于页添加频道显示
Darock-Studio · Feb 23, 2024 · 57bf19b · 57bf19b
2 parents 67f0c78 + 90647ab
commit 57bf19b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 11 deletions.
diff --git a/DarockBili.xcodeproj/project.pbxproj b/DarockBili.xcodeproj/project.pbxproj
@@ -1459,7 +1459,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CODE_SIGN_ENTITLEMENTS = "MeowBili/MeowBili Vision App.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 816;
+				CURRENT_PROJECT_VERSION = 817;
 				DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\"";
 				DEVELOPMENT_TEAM = B57D8PP775;
 				ENABLE_PREVIEWS = YES;
@@ -1494,7 +1494,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CODE_SIGN_ENTITLEMENTS = "MeowBili/MeowBili Vision App.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 816;
+				CURRENT_PROJECT_VERSION = 817;
 				DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\"";
 				DEVELOPMENT_TEAM = B57D8PP775;
 				ENABLE_PREVIEWS = YES;
@@ -1531,7 +1531,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = MeowBili/MeowBili.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 816;
+				CURRENT_PROJECT_VERSION = 817;
 				DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\"";
 				DEVELOPMENT_TEAM = B57D8PP775;
 				ENABLE_PREVIEWS = YES;
@@ -1578,7 +1578,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = MeowBili/MeowBili.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 816;
+				CURRENT_PROJECT_VERSION = 817;
 				DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\"";
 				DEVELOPMENT_TEAM = B57D8PP775;
 				ENABLE_PREVIEWS = YES;
@@ -1622,7 +1622,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconWatch;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 816;
+				CURRENT_PROJECT_VERSION = 817;
 				DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview\\ Content\"";
 				DEVELOPMENT_TEAM = B57D8PP775;
 				ENABLE_PREVIEWS = YES;
@@ -1658,7 +1658,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconWatch;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 816;
+				CURRENT_PROJECT_VERSION = 817;
 				DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview\\ Content\"";
 				DEVELOPMENT_TEAM = B57D8PP775;
 				ENABLE_PREVIEWS = YES;
@@ -1697,7 +1697,7 @@
 				CODE_SIGN_ENTITLEMENTS = "MeowBili/MeowBili Mac App.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 816;
+				CURRENT_PROJECT_VERSION = 817;
 				DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\"";
 				DEVELOPMENT_TEAM = B57D8PP775;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -1730,7 +1730,7 @@
 				CODE_SIGN_ENTITLEMENTS = "MeowBili/MeowBili Mac App.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 816;
+				CURRENT_PROJECT_VERSION = 817;
 				DEVELOPMENT_ASSET_PATHS = "\"MeowBili/Preview Content\"";
 				DEVELOPMENT_TEAM = B57D8PP775;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -1759,7 +1759,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 816;
+				CURRENT_PROJECT_VERSION = 817;
 				DEVELOPMENT_TEAM = B57D8PP775;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;
@@ -1782,7 +1782,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 816;
+				CURRENT_PROJECT_VERSION = 817;
 				DEVELOPMENT_TEAM = B57D8PP775;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.0;

diff --git a/Localizable.xcstrings b/Localizable.xcstrings
@@ -256,6 +256,9 @@
           }
         }
       }
+    },
+    "%@ Channel" : {
+
     },
     "%@ 人在看" : {
       "localizations" : {
@@ -344,6 +347,9 @@
           }
         }
       }
+    },
+    "%@ 频道" : {
+
     },
     "%@MB / %@MB" : {
       "localizations" : {

diff --git a/MeowBili/Others/AboutView.swift b/MeowBili/Others/AboutView.swift
@@ -72,7 +72,7 @@ struct AboutApp: View {
             Group {
                 Text("v\(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String) Build \(Bundle.main.infoDictionary?["CFBundleVersion"] as! String)")
                     .font(.system(size: 18))
-                Text("\(Bundle.main.url(forResource: "CurrentChannel", withExtension: "drkdatac")!)")
+                Text("\(String(try! String(contentsOf: Bundle.main.url(forResource: "CurrentChannel", withExtension: "drkdatac")!).split(separator: "\n")[0])) 频道")
                     .font(.system(size: 18))
                 Group {
                     if debug {
@@ -190,6 +190,7 @@ struct AboutApp: View {
                 .font(.title3)
             Group {
                 Text("v\(Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String) Build \(Bundle.main.infoDictionary?["CFBundleVersion"] as! String)")
+                Text("\(String(try! String(contentsOf: Bundle.main.url(forResource: "CurrentChannel", withExtension: "drkdatac")!).split(separator: "\n")[0])) 频道")
                 if debug {
                     Text(CodingTime.getCodingTime())
                 } else {

diff --git a/ci_scripts/ci_pre_xcodebuild.sh b/ci_scripts/ci_pre_xcodebuild.sh
@@ -1,3 +1,16 @@
 #!/bin/zsh
 
+if [ "$CI_WORKFLOW" = "Canary Deploy" ]; then
+    NEW_TEXT="Canary"
+elif [ "$CI_WORKFLOW" = "Dev Deploy" ]; then
+    NEW_TEXT="Dev"
+elif [ "$CI_WORKFLOW" = "Public Release" ]; then
+    NEW_TEXT="Stable"
+else
+    # 默认值，如果 CI_WORKFLOW 不匹配上述条件
+    NEW_TEXT="Unknown"
+fi
+
+sed -i '' "s|.*|${NEW_TEXT}|" ../CurrentChannel.drkdatac
+
 brew install swiftlint