Skip to content

Commit 2234c7f

Browse files
author
ntminer
committed
test
1 parent c160427 commit 2234c7f

21 files changed

+377
-26
lines changed

‎docs/WebSite/index.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<div>
3030
<div class="col-6 col-xl-12 col-md-8 col-sm-8 header-icon navbar-collapse navbar-brand"></div>
3131
<div class="download col-sm-12 col-6">
32-
<a href="https://zhuanlan.zhihu.com/p/360330252" target="_blank">下载地址</a>
32+
<a href="https://ntminer.coding.net/s/7eb98771-054c-485d-862a-3bbeea629a43/1" target="_blank">下载地址</a>
3333
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsibleNavbar">
3434
<span class="navbar-toggler-icon"></span>
3535
</button>
@@ -53,7 +53,7 @@
5353
<a class="nav-link" href="https://github.com/ntminer/NtMiner" target="_blank">源码</a>
5454
</li>
5555
<li class="nav-item align-items-center big-screen-down">
56-
<a class="nav-link" href="https://zhuanlan.zhihu.com/p/360330252" target="_blank">下载地址</a>
56+
<a class="nav-link" href="https://ntminer.coding.net/s/7eb98771-054c-485d-862a-3bbeea629a43/1" target="_blank">下载地址</a>
5757
</li>
5858
</ul>
5959
</div>
@@ -67,7 +67,7 @@ <h1 class="title-text">开源矿工——做最好的挖矿软件</h1>
6767
<p class="title-p">开源矿工永远开源；</p>
6868
<p class="title-p">开源矿工永不破解国人开发的内核；</p>
6969
<div class="row banner-btn-content">
70-
<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>
70+
<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>
7171
</div>
7272
<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>
7373
</div>
@@ -206,8 +206,8 @@ <h2 class="section-title-h2 message-partner aos-init" data-aos="zoom-in" data-ao
206206
</section>
207207

208208
<div class="wechat">
209-
<a href="https://jq.qq.com/?_wv=1027&k=k3hXnSsS" target="_blank">
210-
<img src="https://ntwebsite.oss-cn-beijing.aliyuncs.com/img/NTMiner_QQGroupQrCode.png#20210518" alt="wechat">
209+
<a href="https://jq.qq.com/?_wv=1027&k=rHE4P02o" target="_blank">
210+
<img src="https://ntwebsite.oss-cn-beijing.aliyuncs.com/img/NTMiner_QQGroupQrCode.png#20210928" style="width:280px;" alt="QQ群">
211211
</a>
212212
</div>
213213
</div>
@@ -223,7 +223,7 @@ <h6>相关链接</h6>
223223
</div>
224224
<div class="col-sm-3 col-md-2 col-xl-2 footer-item ">
225225
<h6>下载</h6>
226-
<p><a href="https://zhuanlan.zhihu.com/p/360330252" target="_blank">下载地址</a></p>
226+
<p><a href="https://ntminer.coding.net/s/7eb98771-054c-485d-862a-3bbeea629a43/1" target="_blank">下载地址</a></p>
227227
<p><a href="https://github.com/ntminer/NtMiner" target="_blank">源代码</a></p>
228228
</div>
229229
<div class="col-sm-3 footer-item col-md-2">
@@ -232,7 +232,7 @@ <h6>帮助中心</h6>
232232
</div>
233233
<div class="col-sm-4 footer-item col-xl-3 col-md-4">
234234
<h6>联系方式</h6>
235-
<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; ">
235+
<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; ">
236236
<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;">
237237
</div>
238238
</div>

‎src/AppModels/AppStatic.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -740,6 +740,11 @@ public static string ExportServerJsonFileName {
740740
Process.Start(url);
741741
});
742742

743+
public static ICommand OpenDualMineDescription { get; private set; } = new DelegateCommand(() => {
744+
string url = "https://zhuanlan.zhihu.com/p/346734794";
745+
Process.Start(url);
746+
});
747+
743748
public static string QQGroup {
744749
get {
745750
if (WpfUtil.IsInDesignMode) {

‎src/AppModels/Vms/MinerProfileViewModel.cs‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -988,6 +988,72 @@ public int CpuLETemperatureSeconds {
988988
}
989989
}
990990

991+
public bool IsAutoStopByGpu {
992+
get => NTMinerContext.Instance.MinerProfile.IsAutoStopByGpu;
993+
set {
994+
if (NTMinerContext.Instance.MinerProfile.IsAutoStopByGpu != value) {
995+
NTMinerContext.Instance.GpuTemperatureReset();
996+
NTMinerContext.Instance.MinerProfile.SetMinerProfileProperty(nameof(IsAutoStopByGpu), value);
997+
OnPropertyChanged(nameof(IsAutoStopByGpu));
998+
}
999+
}
1000+
}
1001+
1002+
public int GpuStopTemperature {
1003+
get => NTMinerContext.Instance.MinerProfile.GpuStopTemperature;
1004+
set {
1005+
if (NTMinerContext.Instance.MinerProfile.GpuStopTemperature != value) {
1006+
NTMinerContext.Instance.GpuTemperatureReset();
1007+
NTMinerContext.Instance.MinerProfile.SetMinerProfileProperty(nameof(GpuStopTemperature), value);
1008+
OnPropertyChanged(nameof(GpuStopTemperature));
1009+
}
1010+
}
1011+
}
1012+
1013+
public int GpuGETemperatureSeconds {
1014+
get => NTMinerContext.Instance.MinerProfile.GpuGETemperatureSeconds;
1015+
set {
1016+
if (NTMinerContext.Instance.MinerProfile.GpuGETemperatureSeconds != value) {
1017+
NTMinerContext.Instance.GpuTemperatureReset();
1018+
NTMinerContext.Instance.MinerProfile.SetMinerProfileProperty(nameof(GpuGETemperatureSeconds), value);
1019+
OnPropertyChanged(nameof(GpuGETemperatureSeconds));
1020+
}
1021+
}
1022+
}
1023+
1024+
public bool IsAutoStartByGpu {
1025+
get => NTMinerContext.Instance.MinerProfile.IsAutoStartByGpu;
1026+
set {
1027+
if (NTMinerContext.Instance.MinerProfile.IsAutoStartByGpu != value) {
1028+
NTMinerContext.Instance.GpuTemperatureReset();
1029+
NTMinerContext.Instance.MinerProfile.SetMinerProfileProperty(nameof(IsAutoStartByGpu), value);
1030+
OnPropertyChanged(nameof(IsAutoStartByGpu));
1031+
}
1032+
}
1033+
}
1034+
1035+
public int GpuStartTemperature {
1036+
get => NTMinerContext.Instance.MinerProfile.GpuStartTemperature;
1037+
set {
1038+
if (NTMinerContext.Instance.MinerProfile.GpuStartTemperature != value) {
1039+
NTMinerContext.Instance.GpuTemperatureReset();
1040+
NTMinerContext.Instance.MinerProfile.SetMinerProfileProperty(nameof(GpuStartTemperature), value);
1041+
OnPropertyChanged(nameof(GpuStartTemperature));
1042+
}
1043+
}
1044+
}
1045+
1046+
public int GpuLETemperatureSeconds {
1047+
get => NTMinerContext.Instance.MinerProfile.GpuLETemperatureSeconds;
1048+
set {
1049+
if (NTMinerContext.Instance.MinerProfile.GpuLETemperatureSeconds != value) {
1050+
NTMinerContext.Instance.GpuTemperatureReset();
1051+
NTMinerContext.Instance.MinerProfile.SetMinerProfileProperty(nameof(GpuLETemperatureSeconds), value);
1052+
OnPropertyChanged(nameof(GpuLETemperatureSeconds));
1053+
}
1054+
}
1055+
}
1056+
9911057
public bool IsRaiseHighCpuEvent {
9921058
get => NTMinerContext.Instance.MinerProfile.IsRaiseHighCpuEvent;
9931059
set {

‎src/AppModels/Vms/SysDicPageViewModel.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
11
using System.Linq;
2+
using System.Windows.Input;
23

34
namespace NTMiner.Vms {
45
public class SysDicPageViewModel : ViewModelBase {
6+
public ICommand ClearAlgo { get; private set; }
7+
58
public SysDicPageViewModel() {
69
if (WpfUtil.IsInDesignMode) {
710
return;
811
}
12+
this.ClearAlgo = new DelegateCommand(() => {
13+
this.ShowSoftDialog(new DialogWindowViewModel(message: $"确定清理未使用的算法字典项吗？", title: "确认", onYes: () => {
14+
var items = NTMinerContext.Instance.ServerContext.SysDicItemSet.GetSysDicItems("Algo");
15+
if (items != null) {
16+
var toClearItemIds = items.Where(a => NTMinerContext.Instance.ServerContext.CoinSet.AsEnumerable().All(c => c.AlgoId != a.GetId())).Select(a => a.GetId()).ToArray();
17+
foreach (var id in toClearItemIds) {
18+
VirtualRoot.Execute(new RemoveSysDicItemCommand(id));
19+
}
20+
}
21+
}));
22+
});
923
this._currentSysDic = SysDicVms.List.FirstOrDefault();
1024
}
1125

@@ -16,7 +30,17 @@ public SysDicViewModel CurrentSysDic {
1630
if (_currentSysDic != value) {
1731
_currentSysDic = value;
1832
OnPropertyChanged(nameof(CurrentSysDic));
33+
OnPropertyChanged(nameof(IsAlgoDic));
34+
}
35+
}
36+
}
37+
38+
public bool IsAlgoDic {
39+
get {
40+
if (CurrentSysDic == null) {
41+
return false;
1942
}
43+
return CurrentSysDic.Code == "Algo";
2044
}
2145
}
2246

‎src/AppViews0/Views/Ucs/CoinPage.xaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -684,8 +684,14 @@
684684
</DataGridTemplateColumn>
685685
<DataGridTemplateColumn IsReadOnly="True">
686686
<DataGridTemplateColumn.Header>
687-
<TextBlock Text="双挖币组"></TextBlock>
688-
</DataGridTemplateColumn.Header>
687+
<controls:KbLinkButton
688+
Command="{x:Static app:AppStatic.OpenDualMineDescription}"
689+
KbDisplayLine="False"
690+
HorizontalAlignment="Left"
691+
Background="Transparent">
692+
<TextBlock Text="关于双挖"></TextBlock>
693+
</controls:KbLinkButton>
694+
</DataGridTemplateColumn.Header>
689695
<DataGridTemplateColumn.CellTemplate>
690696
<DataTemplate>
691697
<TextBlock Text="{Binding SelectedDualCoinGroup.Name}"></TextBlock>

‎src/AppViews0/Views/Ucs/MinerProfileDual.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
</ContextMenu>
9393
</controls:KbButton.ContextMenu>
9494
<WrapPanel>
95-
<TextBlock Width="121" Padding="0 0 10 0" Foreground="Black" Text="{Binding CoinVm.CoinKernel.CoinKernelProfile.SelectedDualCoin.CoinProfile.DualCoinPool.Name}"></TextBlock>
95+
<TextBlock Width="120" Padding="0 0 10 0" Foreground="Black" Text="{Binding CoinVm.CoinKernel.CoinKernelProfile.SelectedDualCoin.CoinProfile.DualCoinPool.Name}"></TextBlock>
9696
<Path
9797
Margin="0 2 0 0"
9898
Width="12"
@@ -121,7 +121,7 @@
121121
<WrapPanel>
122122
<controls:KbButton
123123
x:Name="ButtonDualCoinWallet"
124-
Width="284"
124+
Width="283"
125125
Padding="4"
126126
BorderThickness="1"
127127
BorderBrush="{StaticResource LightLineColor}"

‎src/AppViews0/Views/Ucs/MinerProfileIndex.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
</ContextMenu>
9191
</controls:KbButton.ContextMenu>
9292
<WrapPanel>
93-
<TextBlock Width="121" Padding="0 0 10 0" Foreground="Black" Text="{Binding MinerProfile.CoinVm.CoinKernel.Kernel.FullName}"></TextBlock>
93+
<TextBlock Width="120" Padding="0 0 10 0" Foreground="Black" Text="{Binding MinerProfile.CoinVm.CoinKernel.Kernel.FullName}"></TextBlock>
9494
<Path
9595
Margin="0 2 0 0"
9696
Width="12"
@@ -336,7 +336,7 @@
336336
<WrapPanel>
337337
<controls:KbButton
338338
x:Name="ButtonMainCoinWallet"
339-
Width="284"
339+
Width="283"
340340
Padding="4"
341341
ToolTip="请注意一定要填自己的钱包地址，不填也能挖是因为不填时会自动使用默认的测试钱包地址，这是为了方便大家测试。"
342342
BorderThickness="1"
@@ -494,7 +494,7 @@
494494
Padding="2 0"
495495
Text="高级参数" />
496496
<TextBox
497-
Width="284"
497+
Width="283"
498498
Height="30"
499499
VerticalContentAlignment="Center"
500500
ToolTip="这是高级用户的工具，通常我们无需关心这一块。"

0 commit comments

Comments
 (0)