Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
ntminer committed Sep 27, 2021
1 parent c160427 commit 2234c7f
Show file tree
Hide file tree
Showing 21 changed files with 377 additions and 26 deletions.
14 changes: 7 additions & 7 deletions docs/WebSite/index.html
View file
Expand Up @@ -29,7 +29,7 @@
<div>
<div class="col-6 col-xl-12 col-md-8 col-sm-8 header-icon navbar-collapse navbar-brand"></div>
<div class="download col-sm-12 col-6">
<a href="https://zhuanlan.zhihu.com/p/360330252" target="_blank">下载地址</a>
<a href="https://ntminer.coding.net/s/7eb98771-054c-485d-862a-3bbeea629a43/1" target="_blank">下载地址</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsibleNavbar">
<span class="navbar-toggler-icon"></span>
</button>
Expand All @@ -53,7 +53,7 @@
<a class="nav-link" href="https://github.com/ntminer/NtMiner" target="_blank">源码</a>
</li>
<li class="nav-item align-items-center big-screen-down">
<a class="nav-link" href="https://zhuanlan.zhihu.com/p/360330252" target="_blank">下载地址</a>
<a class="nav-link" href="https://ntminer.coding.net/s/7eb98771-054c-485d-862a-3bbeea629a43/1" target="_blank">下载地址</a>
</li>
</ul>
</div>
Expand All @@ -67,7 +67,7 @@ <h1 class="title-text">开源矿工——做最好的挖矿软件</h1>
<p class="title-p">开源矿工永远开源；</p>
<p class="title-p">开源矿工永不破解国人开发的内核；</p>
<div class="row banner-btn-content">
<a href="https://zhuanlan.zhihu.com/p/360330252" target="_blank" class="btn col-xl-3 col-md-4 col-sm-4 col-5"> <img src="https://ntwebsite.oss-cn-beijing.aliyuncs.com/img/Windows.png" alt="download button icon"> 下载地址</a>
<a href="https://ntminer.coding.net/s/7eb98771-054c-485d-862a-3bbeea629a43/1" target="_blank" class="btn col-xl-3 col-md-4 col-sm-4 col-5"> <img src="https://ntwebsite.oss-cn-beijing.aliyuncs.com/img/Windows.png" alt="download button icon"> 下载地址</a>
</div>
<a href="https://ntwebsite.oss-cn-beijing.aliyuncs.com/img/index-pic.png?1" target="_blank"><img class="banner-pic col-xl-10 col-md-10 col-sm-12 col-12" src="https://ntwebsite.oss-cn-beijing.aliyuncs.com/img/index-pic.png?20200501" alt="index"></a>
</div>
Expand Down Expand Up @@ -206,8 +206,8 @@ <h2 class="section-title-h2 message-partner aos-init" data-aos="zoom-in" data-ao
</section>

<div class="wechat">
<a href="https://jq.qq.com/?_wv=1027&k=k3hXnSsS" target="_blank">
<img src="https://ntwebsite.oss-cn-beijing.aliyuncs.com/img/NTMiner_QQGroupQrCode.png#20210518" alt="wechat">
<a href="https://jq.qq.com/?_wv=1027&k=rHE4P02o" target="_blank">
<img src="https://ntwebsite.oss-cn-beijing.aliyuncs.com/img/NTMiner_QQGroupQrCode.png#20210928" style="width:280px;" alt="QQ群">
</a>
</div>
</div>
Expand All @@ -223,7 +223,7 @@ <h6>相关链接</h6>
</div>
<div class="col-sm-3 col-md-2 col-xl-2 footer-item ">
<h6>下载</h6>
<p><a href="https://zhuanlan.zhihu.com/p/360330252" target="_blank">下载地址</a></p>
<p><a href="https://ntminer.coding.net/s/7eb98771-054c-485d-862a-3bbeea629a43/1" target="_blank">下载地址</a></p>
<p><a href="https://github.com/ntminer/NtMiner" target="_blank">源代码</a></p>
</div>
<div class="col-sm-3 footer-item col-md-2">
Expand All @@ -232,7 +232,7 @@ <h6>帮助中心</h6>
</div>
<div class="col-sm-4 footer-item col-xl-3 col-md-4">
<h6>联系方式</h6>
<img data-toggle="tooltip" data-placement="top" title="" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMCIgaGVpZ2h0PSIzMCIgdmlld0JveD0iMCAwIDMwIDMwIj4KICAgIDxwYXRoIGZpbGw9IiM3NzciIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTQuNzU2IDE2Ljg1NWMtLjg2OSAyLjExMy0xLjAxIDQuMTI4LS4zMTMgNC41MDUuNDgxLjI2IDEuMjM1LS4zMyAxLjk0LTEuNDE1LjI4IDEuMTgxLjk3IDIuMjUgMS45NTggMy4xMDgtMS4wMzUuMzk1LTEuNzEyIDEuMDQtMS43MTIgMS43NzIgMCAxLjIwMiAxLjgzIDIuMTc1IDQuMDkgMi4xNzUgMi4wMzggMCAzLjcyNi0uNzkgNC4wMzctMS44M2guNDg2Yy4zMTMgMS4wNCAyLjAwMyAxLjgzIDQuMDM5IDEuODMgMi4yNiAwIDQuMDktLjk3NCA0LjA5LTIuMTc1IDAtLjczLS42NzYtMS4zNzctMS43MTMtMS43NzIuOTg3LS44NTggMS42OC0xLjkyNyAxLjk1OS0zLjEwOC43MDUgMS4wODQgMS40NTcgMS42NzUgMS45MzggMS40MTUuNjk4LS4zNzcuNTYtMi4zOTMtLjMxMS00LjUwNS0uNjgyLTEuNjYtMS42MDgtMi44ODItMi4zMTYtMy4xNTIuMDEtLjEwNS4wMTUtLjIxMi4wMTUtLjMyIDAtLjY0LS4xNzItMS4yMzMtLjQ2Ny0xLjcxNi4wMDUtLjAzOC4wMDUtLjA3Ni4wMDUtLjExNGExLjg2IDEuODYgMCAwIDAtLjE4NC0uODFDMjIuMTIgNi40MjYgMTkuNCAzIDE1IDNjLTQuNDAyIDAtNy4xMjIgMy40MjctNy4zIDcuNzQyYTEuODUzIDEuODUzIDAgMCAwLS4xODQuODExYzAgLjAzOC4wMDMuMDc2LjAwNC4xMTRhMy4zMTkgMy4zMTkgMCAwIDAtLjQ2NSAxLjcxN2MwIC4xMDcuMDA0LjIxMy4wMTMuMzItLjcwMy4yNjktMS42MzIgMS40OTQtMi4zMTIgMy4xNTF6Ii8+Cjwvc3ZnPgo=" data-html="true" alt="QQ icon" data-original-title="&lt;img src=&#39;https://ntwebsite.oss-cn-beijing.aliyuncs.com/img/NTMiner_QQGroupQrCode.png#20210414&#39; width=&#39;190px&#39;&gt; ">
<img data-toggle="tooltip" data-placement="top" title="" src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMCIgaGVpZ2h0PSIzMCIgdmlld0JveD0iMCAwIDMwIDMwIj4KICAgIDxwYXRoIGZpbGw9IiM3NzciIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTQuNzU2IDE2Ljg1NWMtLjg2OSAyLjExMy0xLjAxIDQuMTI4LS4zMTMgNC41MDUuNDgxLjI2IDEuMjM1LS4zMyAxLjk0LTEuNDE1LjI4IDEuMTgxLjk3IDIuMjUgMS45NTggMy4xMDgtMS4wMzUuMzk1LTEuNzEyIDEuMDQtMS43MTIgMS43NzIgMCAxLjIwMiAxLjgzIDIuMTc1IDQuMDkgMi4xNzUgMi4wMzggMCAzLjcyNi0uNzkgNC4wMzctMS44M2guNDg2Yy4zMTMgMS4wNCAyLjAwMyAxLjgzIDQuMDM5IDEuODMgMi4yNiAwIDQuMDktLjk3NCA0LjA5LTIuMTc1IDAtLjczLS42NzYtMS4zNzctMS43MTMtMS43NzIuOTg3LS44NTggMS42OC0xLjkyNyAxLjk1OS0zLjEwOC43MDUgMS4wODQgMS40NTcgMS42NzUgMS45MzggMS40MTUuNjk4LS4zNzcuNTYtMi4zOTMtLjMxMS00LjUwNS0uNjgyLTEuNjYtMS42MDgtMi44ODItMi4zMTYtMy4xNTIuMDEtLjEwNS4wMTUtLjIxMi4wMTUtLjMyIDAtLjY0LS4xNzItMS4yMzMtLjQ2Ny0xLjcxNi4wMDUtLjAzOC4wMDUtLjA3Ni4wMDUtLjExNGExLjg2IDEuODYgMCAwIDAtLjE4NC0uODFDMjIuMTIgNi40MjYgMTkuNCAzIDE1IDNjLTQuNDAyIDAtNy4xMjIgMy40MjctNy4zIDcuNzQyYTEuODUzIDEuODUzIDAgMCAwLS4xODQuODExYzAgLjAzOC4wMDMuMDc2LjAwNC4xMTRhMy4zMTkgMy4zMTkgMCAwIDAtLjQ2NSAxLjcxN2MwIC4xMDcuMDA0LjIxMy4wMTMuMzItLjcwMy4yNjktMS42MzIgMS40OTQtMi4zMTIgMy4xNTF6Ii8+Cjwvc3ZnPgo=" data-html="true" alt="QQ icon" data-original-title="&lt;img src=&#39;https://ntwebsite.oss-cn-beijing.aliyuncs.com/img/NTMiner_QQGroupQrCode.png#20210928&#39; width=&#39;190px&#39;&gt; ">
<img style="margin-left:8px" data-toggle="tooltip" data-placement="top" title="" src="https://ntwebsite.oss-cn-beijing.aliyuncs.com/img/footer-icon-wechat.svg?v=01692ab" data-html="true" alt="WeChat icon" data-original-title="&lt;img src=&#39;https://ntwebsite.oss-cn-beijing.aliyuncs.com/img/wechat-pic.jpg&#39; width=&#39;190px&#39;&gt;">
</div>
</div>
Expand Down
5 changes: 5 additions & 0 deletions src/AppModels/AppStatic.cs
View file
Expand Up @@ -740,6 +740,11 @@ public static class AppStatic {
Process.Start(url);
});

public static ICommand OpenDualMineDescription { get; private set; } = new DelegateCommand(() => {
string url = "https://zhuanlan.zhihu.com/p/346734794";
Process.Start(url);
});

public static string QQGroup {
get {
if (WpfUtil.IsInDesignMode) {
Expand Down
66 changes: 66 additions & 0 deletions src/AppModels/Vms/MinerProfileViewModel.cs
View file
Expand Up @@ -988,6 +988,72 @@ public class MinerProfileViewModel : ViewModelBase, IMinerProfile, IWsStateViewM
}
}

public bool IsAutoStopByGpu {
get => NTMinerContext.Instance.MinerProfile.IsAutoStopByGpu;
set {
if (NTMinerContext.Instance.MinerProfile.IsAutoStopByGpu != value) {
NTMinerContext.Instance.GpuTemperatureReset();
NTMinerContext.Instance.MinerProfile.SetMinerProfileProperty(nameof(IsAutoStopByGpu), value);
OnPropertyChanged(nameof(IsAutoStopByGpu));
}
}
}

public int GpuStopTemperature {
get => NTMinerContext.Instance.MinerProfile.GpuStopTemperature;
set {
if (NTMinerContext.Instance.MinerProfile.GpuStopTemperature != value) {
NTMinerContext.Instance.GpuTemperatureReset();
NTMinerContext.Instance.MinerProfile.SetMinerProfileProperty(nameof(GpuStopTemperature), value);
OnPropertyChanged(nameof(GpuStopTemperature));
}
}
}

public int GpuGETemperatureSeconds {
get => NTMinerContext.Instance.MinerProfile.GpuGETemperatureSeconds;
set {
if (NTMinerContext.Instance.MinerProfile.GpuGETemperatureSeconds != value) {
NTMinerContext.Instance.GpuTemperatureReset();
NTMinerContext.Instance.MinerProfile.SetMinerProfileProperty(nameof(GpuGETemperatureSeconds), value);
OnPropertyChanged(nameof(GpuGETemperatureSeconds));
}
}
}

public bool IsAutoStartByGpu {
get => NTMinerContext.Instance.MinerProfile.IsAutoStartByGpu;
set {
if (NTMinerContext.Instance.MinerProfile.IsAutoStartByGpu != value) {
NTMinerContext.Instance.GpuTemperatureReset();
NTMinerContext.Instance.MinerProfile.SetMinerProfileProperty(nameof(IsAutoStartByGpu), value);
OnPropertyChanged(nameof(IsAutoStartByGpu));
}
}
}

public int GpuStartTemperature {
get => NTMinerContext.Instance.MinerProfile.GpuStartTemperature;
set {
if (NTMinerContext.Instance.MinerProfile.GpuStartTemperature != value) {
NTMinerContext.Instance.GpuTemperatureReset();
NTMinerContext.Instance.MinerProfile.SetMinerProfileProperty(nameof(GpuStartTemperature), value);
OnPropertyChanged(nameof(GpuStartTemperature));
}
}
}

public int GpuLETemperatureSeconds {
get => NTMinerContext.Instance.MinerProfile.GpuLETemperatureSeconds;
set {
if (NTMinerContext.Instance.MinerProfile.GpuLETemperatureSeconds != value) {
NTMinerContext.Instance.GpuTemperatureReset();
NTMinerContext.Instance.MinerProfile.SetMinerProfileProperty(nameof(GpuLETemperatureSeconds), value);
OnPropertyChanged(nameof(GpuLETemperatureSeconds));
}
}
}

public bool IsRaiseHighCpuEvent {
get => NTMinerContext.Instance.MinerProfile.IsRaiseHighCpuEvent;
set {
Expand Down
24 changes: 24 additions & 0 deletions src/AppModels/Vms/SysDicPageViewModel.cs
View file
@@ -1,11 +1,25 @@
using System.Linq;
using System.Windows.Input;

namespace NTMiner.Vms {
public class SysDicPageViewModel : ViewModelBase {
public ICommand ClearAlgo { get; private set; }

public SysDicPageViewModel() {
if (WpfUtil.IsInDesignMode) {
return;
}
this.ClearAlgo = new DelegateCommand(() => {
this.ShowSoftDialog(new DialogWindowViewModel(message: $"确定清理未使用的算法字典项吗？", title: "确认", onYes: () => {
var items = NTMinerContext.Instance.ServerContext.SysDicItemSet.GetSysDicItems("Algo");
if (items != null) {
var toClearItemIds = items.Where(a => NTMinerContext.Instance.ServerContext.CoinSet.AsEnumerable().All(c => c.AlgoId != a.GetId())).Select(a => a.GetId()).ToArray();
foreach (var id in toClearItemIds) {
VirtualRoot.Execute(new RemoveSysDicItemCommand(id));
}
}
}));
});
this._currentSysDic = SysDicVms.List.FirstOrDefault();
}

Expand All @@ -16,7 +30,17 @@ public class SysDicPageViewModel : ViewModelBase {
if (_currentSysDic != value) {
_currentSysDic = value;
OnPropertyChanged(nameof(CurrentSysDic));
OnPropertyChanged(nameof(IsAlgoDic));
}
}
}

public bool IsAlgoDic {
get {
if (CurrentSysDic == null) {
return false;
}
return CurrentSysDic.Code == "Algo";
}
}

Expand Down
10 changes: 8 additions & 2 deletions src/AppViews0/Views/Ucs/CoinPage.xaml
View file
Expand Up @@ -684,8 +684,14 @@
</DataGridTemplateColumn>
<DataGridTemplateColumn IsReadOnly="True">
<DataGridTemplateColumn.Header>
<TextBlock Text="双挖币组"></TextBlock>
</DataGridTemplateColumn.Header>
<controls:KbLinkButton
Command="{x:Static app:AppStatic.OpenDualMineDescription}"
KbDisplayLine="False"
HorizontalAlignment="Left"
Background="Transparent">
<TextBlock Text="关于双挖"></TextBlock>
</controls:KbLinkButton>
</DataGridTemplateColumn.Header>
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding SelectedDualCoinGroup.Name}"></TextBlock>
Expand Down
4 changes: 2 additions & 2 deletions src/AppViews0/Views/Ucs/MinerProfileDual.xaml
View file
Expand Up @@ -92,7 +92,7 @@
</ContextMenu>
</controls:KbButton.ContextMenu>
<WrapPanel>
<TextBlock Width="121" Padding="0 0 10 0" Foreground="Black" Text="{Binding CoinVm.CoinKernel.CoinKernelProfile.SelectedDualCoin.CoinProfile.DualCoinPool.Name}"></TextBlock>
<TextBlock Width="120" Padding="0 0 10 0" Foreground="Black" Text="{Binding CoinVm.CoinKernel.CoinKernelProfile.SelectedDualCoin.CoinProfile.DualCoinPool.Name}"></TextBlock>
<Path
Margin="0 2 0 0"
Width="12"
Expand Down Expand Up @@ -121,7 +121,7 @@
<WrapPanel>
<controls:KbButton
x:Name="ButtonDualCoinWallet"
Width="284"
Width="283"
Padding="4"
BorderThickness="1"
BorderBrush="{StaticResource LightLineColor}"
Expand Down
6 changes: 3 additions & 3 deletions src/AppViews0/Views/Ucs/MinerProfileIndex.xaml
View file
Expand Up @@ -90,7 +90,7 @@
</ContextMenu>
</controls:KbButton.ContextMenu>
<WrapPanel>
<TextBlock Width="121" Padding="0 0 10 0" Foreground="Black" Text="{Binding MinerProfile.CoinVm.CoinKernel.Kernel.FullName}"></TextBlock>
<TextBlock Width="120" Padding="0 0 10 0" Foreground="Black" Text="{Binding MinerProfile.CoinVm.CoinKernel.Kernel.FullName}"></TextBlock>
<Path
Margin="0 2 0 0"
Width="12"
Expand Down Expand Up @@ -336,7 +336,7 @@
<WrapPanel>
<controls:KbButton
x:Name="ButtonMainCoinWallet"
Width="284"
Width="283"
Padding="4"
ToolTip="请注意一定要填自己的钱包地址，不填也能挖是因为不填时会自动使用默认的测试钱包地址，这是为了方便大家测试。"
BorderThickness="1"
Expand Down Expand Up @@ -494,7 +494,7 @@
Padding="2 0"
Text="高级参数" />
<TextBox
Width="284"
Width="283"
Height="30"
VerticalContentAlignment="Center"
ToolTip="这是高级用户的工具，通常我们无需关心这一块。"
Expand Down

0 comments on commit 2234c7f

Please sign in to comment.