From d8fc8d339ccba5f996731436b7603af03bf7f32c Mon Sep 17 00:00:00 2001
From: uye <2396806385@qq.com>
Date: Sun, 11 Dec 2022 22:34:25 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E9=9A=90=E8=97=8F=E5=B7=B2=E6=BB=A1?=
 =?UTF-8?q?=E5=91=98=E7=9A=84Q=E7=BE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Helper/MaaUrls.cs               |  15 +-
 src/MaaWpfGui/Main/VersionUpdateViewModel.cs  |   2 +-
 src/MaaWpfGui/Res/Localizations/en-us.xaml    |  12 +-
 src/MaaWpfGui/Res/Localizations/ja-jp.xaml    |  12 +-
 src/MaaWpfGui/Res/Localizations/ko-kr.xaml    |  12 +-
 src/MaaWpfGui/Res/Localizations/pallas.xaml   |  10 --
 src/MaaWpfGui/Res/Localizations/zh-cn.xaml    |  14 +-
 src/MaaWpfGui/Res/Localizations/zh-tw.xaml    |  14 +-
 src/MaaWpfGui/Views/ErrorView.xaml            |   2 +-
 .../Views/UserControl/AboutUserControl.xaml   | 128 +-----------------
 10 files changed, 14 insertions(+), 207 deletions(-)

diff --git a/src/MaaWpfGui/Helper/MaaUrls.cs b/src/MaaWpfGui/Helper/MaaUrls.cs
index 6785faa8b7..0c71578b54 100644
--- a/src/MaaWpfGui/Helper/MaaUrls.cs
+++ b/src/MaaWpfGui/Helper/MaaUrls.cs
@@ -32,19 +32,8 @@ namespace MaaWpfGui
 
         public static string CustomInfrastGenerator => "https://yituliu.site/riicCal";
 
-        public static List<string> QqGroups { get; } = new List<string>
-        {
-            "https://jq.qq.com/?k=xRh6gqQZ",
-            "https://jq.qq.com/?k=u9i2n7Sb",
-            "https://jq.qq.com/?k=mKdOnhWV",
-            "https://jq.qq.com/?k=h6FGp0qD",
-            "https://jq.qq.com/?k=To6b6H6m",
-            "https://jq.qq.com/?k=K8t6W7HZ",
-            "https://jq.qq.com/?k=gGRc2Rlw",
-            "https://jq.qq.com/?k=NOpUOidq",
-            "https://jq.qq.com/?k=ZK23XV7V",
-        };
+        public static string QqGroups => "https://ota.maa.plus/MaaAssistantArknights/api/qqgroup/";
 
-        public static string LatestQqGroup => QqGroups.Last();
+        public static string QQchannel => "https://pd.qq.com/s/4j1ju9z47";
     }
 }
diff --git a/src/MaaWpfGui/Main/VersionUpdateViewModel.cs b/src/MaaWpfGui/Main/VersionUpdateViewModel.cs
index c16cbe2ff0..c0bbebafa9 100644
--- a/src/MaaWpfGui/Main/VersionUpdateViewModel.cs
+++ b/src/MaaWpfGui/Main/VersionUpdateViewModel.cs
@@ -609,7 +609,7 @@ namespace MaaWpfGui
         /// </summary>
         /// <param name="url">API 地址</param>
         /// <returns>返回 API 的返回值，如出现错误则返回空字符串</returns>
-        private string RequestApi(string url)
+        public string RequestApi(string url)
         {
             try
             {
diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index bc104953b4..93512908b4 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -467,17 +467,7 @@
     <system:String x:Key="PrtsPlus">Copilot Json sharing site</system:String>
     <system:String x:Key="MapPrts">Copilot Map and Coordinate</system:String>
     <system:String x:Key="CustomInfrastGenerator">Custom Base Json Generator</system:String>
-    <system:String x:Key="QQgroup">QQ group:</system:String>
-    <system:String x:Key="QQgroup1">group 1</system:String>
-    <system:String x:Key="QQgroup2">group 2</system:String>
-    <system:String x:Key="QQgroup3">group 3</system:String>
-    <system:String x:Key="QQgroup4">group 4</system:String>
-    <system:String x:Key="QQgroup5">group 5</system:String>
-    <system:String x:Key="QQgroup6">group 6</system:String>
-    <system:String x:Key="QQgroup7">group 7</system:String>
-    <system:String x:Key="QQgroup8">group 8</system:String>
-    <system:String x:Key="QQgroup9">group 9</system:String>
-    <system:String x:Key="QQgroupfull">(Full)</system:String>
+    <system:String x:Key="QQgroup">QQ group</system:String>
     <system:String x:Key="QQchannel">QQ channel</system:String>
     <system:String x:Key="Telegram">Telegram</system:String>
     <system:String x:Key="Help">FAQ</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index 6c87ddddd8..b780e2672e 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -434,17 +434,7 @@
     <system:String x:Key="PrtsPlus">自動攻略ファイルシェアWebサイト</system:String>
     <system:String x:Key="MapPrts">Copilot Map and Coordinate</system:String>
     <system:String x:Key="CustomInfrastGenerator">Custom Base Json Generator</system:String>
-    <system:String x:Key="QQgroup">QQグループ：</system:String>
-    <system:String x:Key="QQgroup1">グループ1</system:String>
-    <system:String x:Key="QQgroup2">グループ2</system:String>
-    <system:String x:Key="QQgroup3">グループ3</system:String>
-    <system:String x:Key="QQgroup4">グループ4</system:String>
-    <system:String x:Key="QQgroup5">グループ5</system:String>
-    <system:String x:Key="QQgroup6">グループ6</system:String>
-    <system:String x:Key="QQgroup7">グループ7</system:String>
-    <system:String x:Key="QQgroup8">グループ8</system:String>
-    <system:String x:Key="QQgroup9">グループ9</system:String>
-    <system:String x:Key="QQgroupfull">(満員)</system:String>
+    <system:String x:Key="QQgroup">QQグループ</system:String>
     <system:String x:Key="Telegram">Telegram</system:String>
     <system:String x:Key="Help">よくある質問</system:String>
     <uri:Uri x:Key="HelpUri">https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/docs/ja-jp/1.2-%E3%82%88%E3%81%8F%E3%81%82%E3%82%8B%E8%B3%AA%E5%95%8F.md</uri:Uri>
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index 0549e8f360..7cd29cbd57 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -466,17 +466,7 @@
     <system:String x:Key="PrtsPlus">자동 전투 전략 공유 웹사이트</system:String>
     <system:String x:Key="MapPrts">자동 전투 맵과 좌표</system:String>
     <system:String x:Key="CustomInfrastGenerator">커스텀 기반시설 JSON 생성기</system:String>
-    <system:String x:Key="QQgroup">QQ 그룹:</system:String>
-    <system:String x:Key="QQgroup1">그룹 1</system:String>
-    <system:String x:Key="QQgroup2">그룹 2</system:String>
-    <system:String x:Key="QQgroup3">그룹 3</system:String>
-    <system:String x:Key="QQgroup4">그룹 4</system:String>
-    <system:String x:Key="QQgroup5">그룹 5</system:String>
-    <system:String x:Key="QQgroup6">그룹 6</system:String>
-    <system:String x:Key="QQgroup7">그룹 7</system:String>
-    <system:String x:Key="QQgroup8">그룹 8</system:String>
-    <system:String x:Key="QQgroup9">그룹 9</system:String>
-    <system:String x:Key="QQgroupfull">(만원)</system:String>
+    <system:String x:Key="QQgroup">QQ 그룹</system:String>
     <system:String x:Key="QQchannel">QQ 채널</system:String>
     <system:String x:Key="Telegram">Telegram</system:String>
     <system:String x:Key="Help">자주 묻는 질문</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/pallas.xaml b/src/MaaWpfGui/Res/Localizations/pallas.xaml
index ec108ae840..a470ad8f71 100644
--- a/src/MaaWpfGui/Res/Localizations/pallas.xaml
+++ b/src/MaaWpfGui/Res/Localizations/pallas.xaml
@@ -416,16 +416,6 @@
     <system:String x:Key="MapPrts">🍻🍷🍻🍸🍺🍻🍷🍺🍺🍸</system:String>
     <system:String x:Key="CustomInfrastGenerator">🍸🍺🍷🍸🍺🍺🍸🍻🕺🕺🍻</system:String>
     <system:String x:Key="QQgroup">💃🍺🍷🍺💃</system:String>
-    <system:String x:Key="QQgroup1">🍺🍻🍸</system:String>
-    <system:String x:Key="QQgroup2">🍷🍷🍷</system:String>
-    <system:String x:Key="QQgroup3">🍺🍷🍻</system:String>
-    <system:String x:Key="QQgroup4">🍷🍺🍺</system:String>
-    <system:String x:Key="QQgroup5">🍻💃💃</system:String>
-    <system:String x:Key="QQgroup6">🍻💃🍻</system:String>
-    <system:String x:Key="QQgroup7">🍻💃💃</system:String>
-    <system:String x:Key="QQgroup8">🍻🍺🍺</system:String>
-    <system:String x:Key="QQgroup9">🍺🍺💃</system:String>
-    <system:String x:Key="QQgroupfull">🍸🍸🕺🕺🍺</system:String>
     <system:String x:Key="Telegram">🍷🍷🍷🍺</system:String>
     <system:String x:Key="Help">🍸🍺🍺🍻🍺</system:String>
     <uri:Uri x:Key="HelpUri">https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/docs/1.2-%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98.md</uri:Uri>
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 830ad388fc..1eb6a388a3 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -467,18 +467,8 @@
     <system:String x:Key="PrtsPlus">自动战斗作业分享</system:String>
     <system:String x:Key="MapPrts">自动战斗地图坐标</system:String>
     <system:String x:Key="CustomInfrastGenerator">自定义基建排班制作器</system:String>
-    <system:String x:Key="QQgroup">Q 群：</system:String>
-    <system:String x:Key="QQgroup1">一群</system:String>
-    <system:String x:Key="QQgroup2">二群</system:String>
-    <system:String x:Key="QQgroup3">三群</system:String>
-    <system:String x:Key="QQgroup4">四群</system:String>
-    <system:String x:Key="QQgroup5">五群</system:String>
-    <system:String x:Key="QQgroup6">六群</system:String>
-    <system:String x:Key="QQgroup7">七群</system:String>
-    <system:String x:Key="QQgroup8">八群</system:String>
-    <system:String x:Key="QQgroup9">九群</system:String>
-    <system:String x:Key="QQgroupfull">(已满)</system:String>
-    <system:String x:Key="QQchannel">QQ频道</system:String>
+    <system:String x:Key="QQgroup">QQ 群</system:String>
+    <system:String x:Key="QQchannel">QQ 频道</system:String>
     <system:String x:Key="Telegram">Telegram</system:String>
     <system:String x:Key="Help">常见问题</system:String>
     <uri:Uri x:Key="HelpUri">https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/docs/1.2-%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98.md</uri:Uri>
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index 93159411ec..35f8ffcd06 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -419,18 +419,8 @@
     <system:String x:Key="PrtsPlus">自動戰鬥作業分享</system:String>
     <system:String x:Key="MapPrts">自動戰鬥地圖座標</system:String>
     <system:String x:Key="CustomInfrastGenerator">自定義基建排班製作器</system:String>
-    <system:String x:Key="QQgroup">Q 群：</system:String>
-    <system:String x:Key="QQgroup1">一群</system:String>
-    <system:String x:Key="QQgroup2">二群</system:String>
-    <system:String x:Key="QQgroup3">三群</system:String>
-    <system:String x:Key="QQgroup4">四群</system:String>
-    <system:String x:Key="QQgroup5">五群</system:String>
-    <system:String x:Key="QQgroup6">六群</system:String>
-    <system:String x:Key="QQgroup7">七群</system:String>
-    <system:String x:Key="QQgroup8">八群</system:String>
-    <system:String x:Key="QQgroup9">九群</system:String>
-    <system:String x:Key="QQgroupfull">(已滿)</system:String>
-    <system:String x:Key="QQchannel">QQ頻道</system:String>
+    <system:String x:Key="QQgroup">QQ 群</system:String>
+    <system:String x:Key="QQchannel">QQ 頻道</system:String>
     <system:String x:Key="Telegram">Telegram</system:String>
     <system:String x:Key="Help">常見問題</system:String>
     <uri:Uri x:Key="HelpUri">https://github.com/MaaAssistantArknights/MaaAssistantArknights/blob/master/docs/zh-tw/1.2-%E5%B8%B8%E8%A6%8B%E5%95%8F%E9%A1%8C.md</uri:Uri>
diff --git a/src/MaaWpfGui/Views/ErrorView.xaml b/src/MaaWpfGui/Views/ErrorView.xaml
index 91e9707fd2..3696e59533 100644
--- a/src/MaaWpfGui/Views/ErrorView.xaml
+++ b/src/MaaWpfGui/Views/ErrorView.xaml
@@ -119,7 +119,7 @@
                 Name="LinkToJoinQqGroup"
                 Click="Hyperlink_OnClick"
                 FontSize="10.667"
-                NavigateUri="{Binding Source={x:Static local:MaaUrls.LatestQqGroup}}">
+                NavigateUri="{Binding Source={x:Static local:MaaUrls.QqGroups}}">
                 <Run Text="{DynamicResource ErrorQqGroupLinkText}" />
             </Hyperlink>
         </TextBlock>
diff --git a/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml b/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml
index 6e33f40838..00025306db 100644
--- a/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml
@@ -44,134 +44,12 @@
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             Style="{StaticResource TextBlockDefault}">
-            <TextBlock Text="{DynamicResource QQgroup}" />
-            <Hyperlink
-                Click="Hyperlink_Click"
-                NavigateUri="{Binding Source={x:Static local:MaaUrls.QqGroups}, Path=[0]}"
-                TextDecorations="None">
-                <Hyperlink.Style>
-                    <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="Hyperlink">
-                        <Setter Property="Foreground" Value="#666" />
-                    </Style>
-                </Hyperlink.Style>
-                <TextBlock Text="{DynamicResource QQgroup1}" />
-            </Hyperlink>
-            <TextBlock Text="{DynamicResource QQgroupfull}" />
-            <Hyperlink
-                Click="Hyperlink_Click"
-                NavigateUri="{Binding Source={x:Static local:MaaUrls.QqGroups}, Path=[1]}"
-                TextDecorations="None">
-                <Hyperlink.Style>
-                    <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="Hyperlink">
-                        <Setter Property="Foreground" Value="#666" />
-                    </Style>
-                </Hyperlink.Style>
-                <TextBlock Text="{DynamicResource QQgroup2}" />
-            </Hyperlink>
-            <TextBlock Text="{DynamicResource QQgroupfull}" />
             <Hyperlink
                 Click="Hyperlink_Click"
                 Cursor="Hand"
-                NavigateUri="{Binding Source={x:Static local:MaaUrls.QqGroups}, Path=[2]}"
+                NavigateUri="{Binding Source={x:Static local:MaaUrls.QqGroups}}"
                 TextDecorations="None">
-                <Hyperlink.Style>
-                    <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="Hyperlink">
-                        <Setter Property="Foreground" Value="#666" />
-                    </Style>
-                </Hyperlink.Style>
-                <TextBlock Text="{DynamicResource QQgroup3}" />
-            </Hyperlink>
-            <TextBlock Text="{DynamicResource QQgroupfull}" />
-            <Hyperlink
-                Click="Hyperlink_Click"
-                Cursor="Hand"
-                NavigateUri="{Binding Source={x:Static local:MaaUrls.QqGroups}, Path=[3]}"
-                TextDecorations="None">
-                <Hyperlink.Style>
-                    <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="Hyperlink">
-                        <Setter Property="Foreground" Value="#666" />
-                    </Style>
-                </Hyperlink.Style>
-                <TextBlock Text="{DynamicResource QQgroup4}" />
-            </Hyperlink>
-            <TextBlock Text="{DynamicResource QQgroupfull}" />
-        </TextBlock>
-
-        <TextBlock
-            Margin="5"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Style="{StaticResource TextBlockDefault}">
-            <Hyperlink
-                Click="Hyperlink_Click"
-                Cursor="Hand"
-                NavigateUri="{Binding Source={x:Static local:MaaUrls.QqGroups}, Path=[4]}"
-                TextDecorations="None">
-                <Hyperlink.Style>
-                    <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="Hyperlink">
-                        <Setter Property="Foreground" Value="#666" />
-                    </Style>
-                </Hyperlink.Style>
-                <TextBlock Text="{DynamicResource QQgroup5}" />
-            </Hyperlink>
-            <TextBlock Text="{DynamicResource QQgroupfull}" />
-            <Hyperlink
-                Click="Hyperlink_Click"
-                Cursor="Hand"
-                NavigateUri="{Binding Source={x:Static local:MaaUrls.QqGroups}, Path=[5]}"
-                TextDecorations="None">
-                <Hyperlink.Style>
-                    <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="Hyperlink">
-                        <Setter Property="Foreground" Value="#666" />
-                    </Style>
-                </Hyperlink.Style>
-                <TextBlock Text="{DynamicResource QQgroup6}" />
-            </Hyperlink>
-            <TextBlock Text="{DynamicResource QQgroupfull}" />
-            <Hyperlink
-                Click="Hyperlink_Click"
-                Cursor="Hand"
-                NavigateUri="{Binding Source={x:Static local:MaaUrls.QqGroups}, Path=[6]}"
-                TextDecorations="None">
-                <Hyperlink.Style>
-                    <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="Hyperlink">
-                        <Setter Property="Foreground" Value="#666" />
-                    </Style>
-                </Hyperlink.Style>
-                <TextBlock Text="{DynamicResource QQgroup7}" />
-            </Hyperlink>
-            <TextBlock Text="{DynamicResource QQgroupfull}" />
-            <Hyperlink
-                Click="Hyperlink_Click"
-                Cursor="Hand"
-                NavigateUri="{Binding Source={x:Static local:MaaUrls.QqGroups}, Path=[7]}"
-                TextDecorations="None">
-                <Hyperlink.Style>
-                    <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="Hyperlink">
-                        <Setter Property="Foreground" Value="#666" />
-                    </Style>
-                </Hyperlink.Style>
-                <TextBlock Text="{DynamicResource QQgroup8}" />
-            </Hyperlink>
-            <TextBlock Text="{DynamicResource QQgroupfull}" />
-        </TextBlock>
-
-        <TextBlock
-            Margin="5"
-            HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Style="{StaticResource TextBlockDefault}">
-            <Hyperlink
-                Click="Hyperlink_Click"
-                Cursor="Hand"
-                NavigateUri="{Binding Source={x:Static local:MaaUrls.QqGroups}, Path=[8]}"
-                TextDecorations="None">
-                <Hyperlink.Style>
-                    <Style BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="Hyperlink">
-                        <Setter Property="Foreground" Value="#06C" />
-                    </Style>
-                </Hyperlink.Style>
-                <TextBlock Text="{DynamicResource QQgroup9}" />
+                <TextBlock Text="{DynamicResource QQgroup}" />
             </Hyperlink>
         </TextBlock>
 
@@ -182,7 +60,7 @@
             Style="{StaticResource TextBlockDefault}">
             <Hyperlink
                 Click="Hyperlink_Click"
-                NavigateUri="https://pd.qq.com/s/4j1ju9z47"
+                NavigateUri="{Binding Source={x:Static local:MaaUrls.QQchannel}}"
                 TextDecorations="None">
                 <TextBlock Text="{DynamicResource QQchannel}" />
             </Hyperlink>