1
0
mirror of https://github.com/proxysu/ProxySU.git synced 2024-12-02 01:56:06 +03:00

Compare commits

..

5 Commits

Author SHA1 Message Date
test
62403f68ca merge languate 2023-04-01 11:41:46 +08:00
test
eabd976de8 Merge branch 'master' of https://github.com/proxysu/ProxySU 2023-04-01 11:29:04 +08:00
test
6a67a3e685 merge hysteria 2023-04-01 11:29:01 +08:00
next-autumn
1e1cad2ad7
Merge pull request #340 from DanielBlackBeard/master
add Persian language
2023-04-01 08:48:59 +08:00
Persian Prince
b9ebd8700c add Persian language 2023-01-06 12:01:47 +03:30
18 changed files with 401 additions and 35 deletions

View File

@ -26,7 +26,7 @@ namespace ProxySuper.Core.Models.Projects
{ {
get get
{ {
return new List<int> { Port }; return new List<int> { Port, 80 };
} }
} }
} }

View File

@ -124,6 +124,7 @@
<Compile Include="ViewModels\BrookInstallViewModel.cs" /> <Compile Include="ViewModels\BrookInstallViewModel.cs" />
<Compile Include="ViewModels\EnableRootViewModel.cs" /> <Compile Include="ViewModels\EnableRootViewModel.cs" />
<Compile Include="ViewModels\HomeViewModel.cs" /> <Compile Include="ViewModels\HomeViewModel.cs" />
<Compile Include="ViewModels\HysteriaConfigViewModel.cs" />
<Compile Include="ViewModels\HysteriaEditorViewModel.cs" /> <Compile Include="ViewModels\HysteriaEditorViewModel.cs" />
<Compile Include="ViewModels\HysteriaInstallViewModel.cs" /> <Compile Include="ViewModels\HysteriaInstallViewModel.cs" />
<Compile Include="ViewModels\MTProtoGoConfigViewModel.cs" /> <Compile Include="ViewModels\MTProtoGoConfigViewModel.cs" />

View File

@ -23,6 +23,8 @@ namespace ProxySuper.Core.Services
public void Install() public void Install()
{ {
try try
{
Task.Factory.StartNew(() =>
{ {
Progress.Step = "安装Hysteria"; Progress.Step = "安装Hysteria";
Progress.Percentage = 0; Progress.Percentage = 0;
@ -58,6 +60,7 @@ namespace ProxySuper.Core.Services
Progress.Percentage = 100; Progress.Percentage = 100;
Progress.Step = "安装Hysteria成功"; Progress.Step = "安装Hysteria成功";
Progress.Desc = "安装Hysteria成功"; Progress.Desc = "安装Hysteria成功";
});
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -113,8 +116,8 @@ namespace ProxySuper.Core.Services
private void InstallHysteria() private void InstallHysteria()
{ {
Progress.Desc = "执行Hysteria安装文件"; Progress.Desc = "执行Hysteria安装文件";
string url = "https://github.com/apernet/hysteria/releases/download/v1.3.3/hysteria-linux-386"; string url = "https://github.com/apernet/hysteria/releases/download/v1.3.4/hysteria-linux-386";
string targetPath = "/user/bin/hysteria/hysteria-linux-386"; string targetPath = "/usr/bin/hysteria/hysteria-linux-386";
if (ArchType == ArchType.arm) if (ArchType == ArchType.arm)
{ {
@ -122,11 +125,11 @@ namespace ProxySuper.Core.Services
targetPath = targetPath.Replace("hysteria-linux-386", "hysteria-linux-arm"); targetPath = targetPath.Replace("hysteria-linux-386", "hysteria-linux-arm");
} }
RunCmd($"curl -L {url} -o /usr/bin/hysteria"); RunCmd($"curl -L {url} -o {targetPath}");
RunCmd("chmod +x /usr/bin/hysteria"); RunCmd($"chmod +x {targetPath}");
Progress.Desc = "设置Hysteria服务"; Progress.Desc = "设置Hysteria服务";
var cmd = targetPath + " server"; var cmd = targetPath + " -c /usr/bin/hysteria/config.json server";
var hysteriaService = HysteriaServiceTemp.Replace("##run_cmd##", cmd); var hysteriaService = HysteriaServiceTemp.Replace("##run_cmd##", cmd);
RunCmd("rm -rf /etc/systemd/system/hysteria.service"); RunCmd("rm -rf /etc/systemd/system/hysteria.service");
@ -149,7 +152,7 @@ namespace ProxySuper.Core.Services
var obj = JToken.FromObject(json) as dynamic; var obj = JToken.FromObject(json) as dynamic;
obj["listen"] = Settings.Port; obj["listen"] = $":{Settings.Port}";
obj["acme"]["domains"][0] = Settings.Domain; obj["acme"]["domains"][0] = Settings.Domain;
obj["email"] = Settings.Email; obj["email"] = Settings.Email;
obj["obfs"] = Settings.Obfs; obj["obfs"] = Settings.Obfs;
@ -162,7 +165,8 @@ namespace ProxySuper.Core.Services
NullValueHandling = NullValueHandling.Ignore NullValueHandling = NullValueHandling.Ignore
}); });
WriteToFile(configJson, "/user/bin/hysteria/config.json"); RunCmd("mkdir /usr/bin/hysteria");
WriteToFile(configJson, "/usr/bin/hysteria/config.json");
} }
} }
} }

View File

@ -276,6 +276,14 @@ namespace ProxySuper.Core.ViewModels
record.Host = result.Host; record.Host = result.Host;
record.MTProtoGoSettings = result.MTProtoGoSettings; record.MTProtoGoSettings = result.MTProtoGoSettings;
} }
if (record.Type == ProjectType.Hysteria)
{
result = await _navigationService.Navigate<HysteriaEditorViewModel, Record, Record>(record);
if (result == null) return;
record.Host = result.Host;
record.HysteriaSettings = result.HysteriaSettings;
}
SaveToJson(); SaveToJson();
} }
@ -324,6 +332,10 @@ namespace ProxySuper.Core.ViewModels
{ {
await _navigationService.Navigate<MTProtoGoConfigViewModel, MTProtoGoSettings>(record.MTProtoGoSettings); await _navigationService.Navigate<MTProtoGoConfigViewModel, MTProtoGoSettings>(record.MTProtoGoSettings);
} }
if (record.Type == ProjectType.Hysteria)
{
await _navigationService.Navigate<HysteriaConfigViewModel, HysteriaSettings>(record.HysteriaSettings);
}
} }
public async Task GoToInstall(string id) public async Task GoToInstall(string id)
@ -356,6 +368,10 @@ namespace ProxySuper.Core.ViewModels
{ {
await _navigationService.Navigate<MTProtoGoInstallViewModel, Record>(record); await _navigationService.Navigate<MTProtoGoInstallViewModel, Record>(record);
} }
if (record.Type == ProjectType.Hysteria)
{
await _navigationService.Navigate<HysteriaInstallViewModel, Record>(record);
}
SaveToJson(); SaveToJson();
} }

View File

@ -0,0 +1,45 @@
using MvvmCross.ViewModels;
using Newtonsoft.Json;
using ProxySuper.Core.Models.Projects;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProxySuper.Core.ViewModels
{
public class HysteriaConfigViewModel : MvxViewModel<HysteriaSettings>
{
public HysteriaSettings Settings { get; set; }
public override void Prepare(HysteriaSettings parameter)
{
Settings = parameter;
}
public string ClientJson {
get
{
var jsonData = new
{
server = $"{Settings.Domain}:{Settings.Port}",
obfs = Settings.Obfs,
up_mbps = 10,
down_mbps = 50,
socks5 = new
{
listen = "127.0.0.1:1080"
},
http = new
{
listen = "127.0.0.1:1081"
}
};
return JsonConvert.SerializeObject(jsonData, Formatting.Indented);
}
}
}
}

View File

@ -11,7 +11,6 @@
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<!--Language--> <!--Language-->
<ResourceDictionary Source="/Resources/Languages/zh_cn.xaml" /> <ResourceDictionary Source="/Resources/Languages/zh_cn.xaml" />
<!--style--> <!--style-->
<ResourceDictionary> <ResourceDictionary>
<Style TargetType="{x:Type TextBox}"> <Style TargetType="{x:Type TextBox}">

View File

@ -158,9 +158,15 @@
<Compile Include="Views\HomeView.xaml.cs"> <Compile Include="Views\HomeView.xaml.cs">
<DependentUpon>HomeView.xaml</DependentUpon> <DependentUpon>HomeView.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Views\Hysteria\HysteriaConfigView.xaml.cs">
<DependentUpon>HysteriaConfigView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\Hysteria\HysteriaEditorView.xaml.cs"> <Compile Include="Views\Hysteria\HysteriaEditorView.xaml.cs">
<DependentUpon>HysteriaEditorView.xaml</DependentUpon> <DependentUpon>HysteriaEditorView.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Views\Hysteria\HysteriaInstallView.xaml.cs">
<DependentUpon>HysteriaInstallView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\MTProxyGo\MTProxyGoConfigView.xaml.cs"> <Compile Include="Views\MTProxyGo\MTProxyGoConfigView.xaml.cs">
<DependentUpon>MTProxyGoConfigView.xaml</DependentUpon> <DependentUpon>MTProxyGoConfigView.xaml</DependentUpon>
</Compile> </Compile>
@ -311,6 +317,11 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Page> </Page>
<Page Include="Resources\Languages\fa_IR.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Page>
<Page Include="Resources\Languages\zh_cn.xaml"> <Page Include="Resources\Languages\zh_cn.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
@ -321,10 +332,18 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Page> </Page>
<Page Include="Views\Hysteria\HysteriaConfigView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\Hysteria\HysteriaEditorView.xaml"> <Page Include="Views\Hysteria\HysteriaEditorView.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Include="Views\Hysteria\HysteriaInstallView.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Views\MTProxyGo\MTProxyGoConfigView.xaml"> <Page Include="Views\MTProxyGo\MTProxyGoConfigView.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>

View File

@ -22,6 +22,7 @@
<sys:String x:Key="MainMenuLanguageEn">English</sys:String> <sys:String x:Key="MainMenuLanguageEn">English</sys:String>
<sys:String x:Key="MainMenuLanguageCn">中文</sys:String> <sys:String x:Key="MainMenuLanguageCn">中文</sys:String>
<sys:String x:Key="MainMenuLanguageTw">正體</sys:String> <sys:String x:Key="MainMenuLanguageTw">正體</sys:String>
<sys:String x:Key="MainMenuLanguageFr">Fr</sys:String>
<sys:String x:Key="MainMenuHelper">Helper</sys:String> <sys:String x:Key="MainMenuHelper">Helper</sys:String>
<sys:String x:Key="MainMenuHelperGithub">Github</sys:String> <sys:String x:Key="MainMenuHelperGithub">Github</sys:String>

View File

@ -0,0 +1,162 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:sys="clr-namespace:System;assembly=mscorlib">
<!--common-->
<sys:String x:Key="Random">Random</sys:String>
<sys:String x:Key="Save">ذخیره</sys:String>
<sys:String x:Key="SaveAndInstall">ذخیره و نصب</sys:String>
<sys:String x:Key="SaveAs">ذخیره به عنوان</sys:String>
<sys:String x:Key="Install">نصب</sys:String>
<sys:String x:Key="Settings">تنظیمات</sys:String>
<sys:String x:Key="ReadmeWebsiteDemo">The following is a static web page connection provided by netizens, please check whether there is an index.html file by yourself</sys:String>
<!--Main Menu-->
<sys:String x:Key="MainMenuAddHost">Add Host</sys:String>
<sys:String x:Key="MainMenuActions">Actions</sys:String>
<sys:String x:Key="MainMenuActionsExportSettings">Export Settings</sys:String>
<sys:String x:Key="MainMenuActionsExportSubscribe">Export Subscribe</sys:String>
<sys:String x:Key="MainMenuActionsGetRoot">Get Root</sys:String>
<sys:String x:Key="MainMenuLanguage">زبان</sys:String>
<sys:String x:Key="MainMenuLanguageEn">English</sys:String>
<sys:String x:Key="MainMenuLanguageCn">中文</sys:String>
<sys:String x:Key="MainMenuLanguageTw">正體</sys:String>
<sys:String x:Key="MainMenuLanguageFr">Fr</sys:String>
<sys:String x:Key="MainMenuHelper">Helper</sys:String>
<sys:String x:Key="MainMenuHelperGithub">Github</sys:String>
<sys:String x:Key="MainMenuHelperUseRoot">UseRoot</sys:String>
<sys:String x:Key="MainMenuHelperCertQuestion">CertQuestion</sys:String>
<sys:String x:Key="MainMenuHelperPrivateKey">PrivateKey</sys:String>
<!--Main DataGrid-->
<sys:String x:Key="MainDataGridColumnTag">برچسب</sys:String>
<sys:String x:Key="MainDataGridColumnAddress">آدرس</sys:String>
<sys:String x:Key="MainDataGridColumnType">نوع</sys:String>
<sys:String x:Key="MainDataGridColumnAction">Action</sys:String>
<sys:String x:Key="MainDataGridColumnActionInstall">نصب</sys:String>
<sys:String x:Key="MainDataGridColumnActionEdit">ویرایش</sys:String>
<sys:String x:Key="MainDataGridColumnActionViewConfig">ViewConfig</sys:String>
<sys:String x:Key="MainDataGridColumnActionDelete">Delete</sys:String>
<sys:String x:Key="MainDataGridColumnActionSortUp">Up</sys:String>
<sys:String x:Key="MainDataGridColumnActionSortDone">Done</sys:String>
<!--Editor Window-->
<sys:String x:Key="HostGroupName">هاست</sys:String>
<sys:String x:Key="HostTag">برچسب</sys:String>
<sys:String x:Key="HostAddress">آدرس</sys:String>
<sys:String x:Key="HostUserName">نام کاربری</sys:String>
<sys:String x:Key="HostPassword">رمز عبور</sys:String>
<sys:String x:Key="HostPort">پورت</sys:String>
<sys:String x:Key="HostSecretType">SecretType</sys:String>
<sys:String x:Key="HostUploadSecretKey">UploadKey</sys:String>
<sys:String x:Key="HostSertTypePassword">رمز عبور</sys:String>
<sys:String x:Key="HostSertTypePrivateKey">PrivateKey</sys:String>
<sys:String x:Key="ProxyGroupName">پروکسی</sys:String>
<sys:String x:Key="ProxyAddress">آدرس</sys:String>
<sys:String x:Key="ProxyPort">پورت</sys:String>
<sys:String x:Key="ProxyUserName">نام کاربری</sys:String>
<sys:String x:Key="ProxyPassword">رمز عبور</sys:String>
<sys:String x:Key="ProxyType">نوع</sys:String>
<sys:String x:Key="ProxyTypeNone">None</sys:String>
<sys:String x:Key="ProxyTypeHttp">Http</sys:String>
<sys:String x:Key="ProxyTypeSocks5">ساکس5</sys:String>
<!--editor-->
<sys:String x:Key="EditorProxyType" xml:space="preserve">نوع پروکسی</sys:String>
<sys:String x:Key="EditorProxyParams" xml:space="preserve">Params</sys:String>
<!--Xray-->
<sys:String x:Key="VlessXtlsDesc" xml:space="preserve">VLESS XTLS</sys:String>
<sys:String x:Key="VlessTcpDesc" xml:space="preserve">VLESS TCP</sys:String>
<sys:String x:Key="VlessWsDesc" xml:space="preserve">VLESS WS</sys:String>
<sys:String x:Key="VlessRpcDesc" xml:space="preserve">VLESS gRPC</sys:String>
<sys:String x:Key="VlessKcpDesc" xml:space="preserve">VLESS mKCP</sys:String>
<sys:String x:Key="VlessQuicDesc" xml:space="preserve">VLESS QUIC</sys:String>
<sys:String x:Key="VmessWsDesc" xml:space="preserve">VMESS WS</sys:String>
<sys:String x:Key="VmessKcpDesc" xml:space="preserve">VMESS mKCP</sys:String>
<sys:String x:Key="VmessQuicDesc" xml:space="preserve">VMESS QUIC</sys:String>
<sys:String x:Key="SSDesc" xml:space="preserve">ShadowSocks</sys:String>
<sys:String x:Key="TrojanDesc" xml:space="preserve">Trojan</sys:String>
<sys:String x:Key="XrayDomain">Domain/IP</sys:String>
<sys:String x:Key="XrayMarkDomain">Redir Url</sys:String>
<sys:String x:Key="XrayWithTLS">With TLS</sys:String>
<sys:String x:Key="XrayWithTLSDesc">Unchecked means upload your own TLS.</sys:String>
<sys:String x:Key="XrayUUID">UUID</sys:String>
<sys:String x:Key="Flow">Flow</sys:String>
<sys:String x:Key="UTLS">uTLS</sys:String>
<sys:String x:Key="MultiUser">Multi User</sys:String>
<sys:String x:Key="MultiUserHelp">Multi Id split with ","</sys:String>
<sys:String x:Key="VlessWsPath">VLESS WS Path</sys:String>
<sys:String x:Key="VlessKcpSeed">VLESS KCP Seed</sys:String>
<sys:String x:Key="VlessKcpType">VLESS KCP Type</sys:String>
<sys:String x:Key="VlessKcpPort">VLESS KCP Port</sys:String>
<sys:String x:Key="VlessQuicPort">VLESS QUIC Port</sys:String>
<sys:String x:Key="VlessQuicKey">VLESS QUIC Key</sys:String>
<sys:String x:Key="VlessQuicSecurity">VLESS QUIC Security</sys:String>
<sys:String x:Key="VlessQuicType">VLESS QUIC Type</sys:String>
<sys:String x:Key="VlessRPCName">gRPC Service Name</sys:String>
<sys:String x:Key="VlessRPCPort">gRPC Port</sys:String>
<sys:String x:Key="VmessWsPath">VMESS WS Path</sys:String>
<sys:String x:Key="VmessKcpSeed">VMESS KCP Seed</sys:String>
<sys:String x:Key="VmessKcpType">VMESS KCP Type</sys:String>
<sys:String x:Key="VmessKcpPort">VMESS KCP Port</sys:String>
<sys:String x:Key="VmessQuicKey">VMESS QUIC Key</sys:String>
<sys:String x:Key="VmessQuicPort">VMESS QUIC Port</sys:String>
<sys:String x:Key="VmessQuicSecurity">VMESS QUIC Security</sys:String>
<sys:String x:Key="VmessQuicType">VMESS QUIC Type</sys:String>
<sys:String x:Key="SSPassword">SS Pwd</sys:String>
<sys:String x:Key="SSMethods">SS Method</sys:String>
<sys:String x:Key="SSPort">SS Port</sys:String>
<sys:String x:Key="TrojanPassword">Trojan Pwd</sys:String>
<sys:String x:Key="TrojanPort">پورت تروجان</sys:String>
<sys:String x:Key="V2rayPort">v2ray Port</sys:String>
<sys:String x:Key="XrayPort">xray Port</sys:String>
<sys:String x:Key="XrayPortDefault">default port is 443</sys:String>
<!--xray installer-->
<sys:String x:Key="XrayInstallerInstall">نصب</sys:String>
<sys:String x:Key="XrayInstallerUpdateSettings">بروزرسانی تنظیمات</sys:String>
<sys:String x:Key="XrayInstallerUpdateCore">بروزرسانی هسته</sys:String>
<sys:String x:Key="XrayInstallerUninstall">Uninstall</sys:String>
<sys:String x:Key="XrayInstallerInstallCert">InstallCert</sys:String>
<sys:String x:Key="XrayInstallerUploadWeb">UploadWeb</sys:String>
<sys:String x:Key="XrayInstallerUploadCert">UploadCert</sys:String>
<!--Trojan-GO-->
<sys:String x:Key="TrojanGoWithTLS">With TLS</sys:String>
<sys:String x:Key="TrojanGoWithTLSDesc">Unchecked means upload your own TLS.</sys:String>
<sys:String x:Key="TrojanGoDomain">آدرس</sys:String>
<sys:String x:Key="TrojanGoPort">پورت</sys:String>
<sys:String x:Key="TrojanGoPassword">رمزعبور</sys:String>
<sys:String x:Key="TrojanGoMaskDomain">GuiseHost</sys:String>
<sys:String x:Key="TrojanGoWebSocketPath">WS Path</sys:String>
<sys:String x:Key="TrojanGoWebSocketDomain">WS Domain</sys:String>
<!--Naive Proxy-->
<sys:String x:Key="NaiveProxyDomain">آدرس</sys:String>
<sys:String x:Key="NaiveProxyPort">پورت</sys:String>
<sys:String x:Key="NaiveProxyUserName">نام کاربری</sys:String>
<sys:String x:Key="NaiveProxyPassword">رمز عبور</sys:String>
<sys:String x:Key="NaiveProxyMaskDomain">GuiseHost</sys:String>
<!--MTProto Go-->
<sys:String x:Key="MTProtoDomain">آدرس</sys:String>
<sys:String x:Key="MTProtoPort">پورت</sys:String>
<sys:String x:Key="MTProtoCleartext">Cleantext</sys:String>
<sys:String x:Key="MTProtoSecretText">رمز</sys:String>
<!--Hysteria-->
<sys:String x:Key="HysteriaDomain">آدرس</sys:String>
<sys:String x:Key="HysteriaPort">پورت</sys:String>
<sys:String x:Key="HysteriaObfs">OBFS</sys:String>
<sys:String x:Key="HysteriaProtocol">Protocol</sys:String>
<sys:String x:Key="HysteriaEmail">ایمیل</sys:String>
<sys:String x:Key="HysteriaUpMbps">UpMbps</sys:String>
<sys:String x:Key="HysteriaDownMbps">DownMbps</sys:String>
</ResourceDictionary>

View File

@ -22,6 +22,8 @@
<sys:String x:Key="MainMenuLanguageEn">English</sys:String> <sys:String x:Key="MainMenuLanguageEn">English</sys:String>
<sys:String x:Key="MainMenuLanguageCn">中文</sys:String> <sys:String x:Key="MainMenuLanguageCn">中文</sys:String>
<sys:String x:Key="MainMenuLanguageTw">正體</sys:String> <sys:String x:Key="MainMenuLanguageTw">正體</sys:String>
<sys:String x:Key="MainMenuLanguageFr">法语</sys:String>
<sys:String x:Key="MainMenuHelper">幫助</sys:String> <sys:String x:Key="MainMenuHelper">幫助</sys:String>
<sys:String x:Key="MainMenuHelperGithub">Github</sys:String> <sys:String x:Key="MainMenuHelperGithub">Github</sys:String>
<sys:String x:Key="MainMenuHelperUseRoot">啓用Root賬戶</sys:String> <sys:String x:Key="MainMenuHelperUseRoot">啓用Root賬戶</sys:String>

View File

@ -22,6 +22,8 @@
<sys:String x:Key="MainMenuLanguageEn">English</sys:String> <sys:String x:Key="MainMenuLanguageEn">English</sys:String>
<sys:String x:Key="MainMenuLanguageCn">中文</sys:String> <sys:String x:Key="MainMenuLanguageCn">中文</sys:String>
<sys:String x:Key="MainMenuLanguageTw">正體</sys:String> <sys:String x:Key="MainMenuLanguageTw">正體</sys:String>
<sys:String x:Key="MainMenuLanguageFr">法语</sys:String>
<sys:String x:Key="MainMenuHelper">帮助</sys:String> <sys:String x:Key="MainMenuHelper">帮助</sys:String>
<sys:String x:Key="MainMenuHelperGithub">Github</sys:String> <sys:String x:Key="MainMenuHelperGithub">Github</sys:String>
<sys:String x:Key="MainMenuHelperUseRoot">启用Root账户</sys:String> <sys:String x:Key="MainMenuHelperUseRoot">启用Root账户</sys:String>

View File

@ -33,6 +33,7 @@
<MenuItem Padding="0,5" Header="{DynamicResource MainMenuLanguageEn}" Click="SetEnglish"></MenuItem> <MenuItem Padding="0,5" Header="{DynamicResource MainMenuLanguageEn}" Click="SetEnglish"></MenuItem>
<MenuItem Padding="0,5" Header="{DynamicResource MainMenuLanguageTw}" Click="SetTwCN"></MenuItem> <MenuItem Padding="0,5" Header="{DynamicResource MainMenuLanguageTw}" Click="SetTwCN"></MenuItem>
<MenuItem Padding="0,5" Header="{DynamicResource MainMenuLanguageCn}" Click="SetSimpleChinese"></MenuItem> <MenuItem Padding="0,5" Header="{DynamicResource MainMenuLanguageCn}" Click="SetSimpleChinese"></MenuItem>
<MenuItem Padding="0,5" Header="{DynamicResource MainMenuLanguageFr}" Click="SetIrFA"></MenuItem>
</MenuItem> </MenuItem>
<MenuItem Header="{DynamicResource MainMenuHelper}" Padding="10,3"> <MenuItem Header="{DynamicResource MainMenuHelper}" Padding="10,3">

View File

@ -69,7 +69,11 @@ namespace ProxySuper.WPF.Views
resource.Source = new Uri(@"Resources\Languages\zh_cn.xaml", UriKind.Relative); resource.Source = new Uri(@"Resources\Languages\zh_cn.xaml", UriKind.Relative);
Application.Current.Resources.MergedDictionaries[0] = resource; Application.Current.Resources.MergedDictionaries[0] = resource;
} }
private void SetIrFA(object sender, RoutedEventArgs e)
{
resource.Source = new Uri(@"Resources\Languages\fa_IR.xaml", UriKind.Relative);
Application.Current.Resources.MergedDictionaries[0] = resource;
}
private void SetEnglish(object sender, RoutedEventArgs e) private void SetEnglish(object sender, RoutedEventArgs e)
{ {
resource.Source = new Uri(@"Resources\Languages\en.xaml", UriKind.Relative); resource.Source = new Uri(@"Resources\Languages\en.xaml", UriKind.Relative);

View File

@ -0,0 +1,14 @@
<views:MvxWindow x:Class="ProxySuper.WPF.Views.Hysteria.HysteriaConfigView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:ProxySuper.WPF.Views.Hysteria"
xmlns:views="clr-namespace:MvvmCross.Platforms.Wpf.Views;assembly=MvvmCross.Platforms.Wpf"
mc:Ignorable="d"
WindowStartupLocation="CenterScreen"
Title="Hysteria配置" Height="450" Width="800">
<StackPanel Margin="20">
<TextBox Height="360" Text="{Binding ClientJson, Mode=OneWay}" IsReadOnly="True" />
</StackPanel>
</views:MvxWindow>

View File

@ -0,0 +1,30 @@
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace ProxySuper.WPF.Views.Hysteria
{
/// <summary>
/// HysteriaConfigView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class HysteriaConfigView : MvxWindow
{
public HysteriaConfigView()
{
InitializeComponent();
}
}
}

View File

@ -23,5 +23,7 @@ namespace ProxySuper.WPF.Views.Hysteria
{ {
InitializeComponent(); InitializeComponent();
} }
} }
} }

View File

@ -0,0 +1,34 @@
<views:MvxWindow x:Class="ProxySuper.WPF.Views.Hysteria.HysteriaInstallView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:ProxySuper.WPF.Views.Hysteria"
xmlns:ctrl="clr-namespace:ProxySuper.WPF.Controls"
xmlns:views="clr-namespace:MvvmCross.Platforms.Wpf.Views;assembly=MvvmCross.Platforms.Wpf"
mc:Ignorable="d"
WindowStartupLocation="CenterScreen"
Title="Hysteria安装" Height="450" Width="800">
<StackPanel>
<ctrl:ProgressControl />
<StackPanel Orientation="Horizontal" Margin="20,0,0,0">
<Label Content="{DynamicResource Install}" FontWeight="Bold" FontSize="14" />
<Button Content="{DynamicResource XrayInstallerInstall}"
Command="{Binding Path=InstallCommand}"
Padding="10,3"
Margin="10,0,0,0" />
<!--<Button Content="{DynamicResource XrayInstallerUpdateSettings}"
Command="{Binding Path=UpdateSettingsCommand}"
Padding="10,3"
Margin="10,0,0,0" />-->
<Button Content="{DynamicResource XrayInstallerUninstall}"
Command="{Binding Path=UninstallCommand}"
Padding="10,3"
Margin="10,0,0,0" />
</StackPanel>
</StackPanel>
</views:MvxWindow>

View File

@ -0,0 +1,30 @@
using MvvmCross.Platforms.Wpf.Presenters.Attributes;
using MvvmCross.Platforms.Wpf.Views;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace ProxySuper.WPF.Views.Hysteria
{
/// <summary>
/// HysteriaInstallView.xaml 的交互逻辑
/// </summary>
[MvxWindowPresentation]
public partial class HysteriaInstallView : MvxWindow
{
public HysteriaInstallView()
{
InitializeComponent();
}
}
}