test

Author: ntminer

README.md

@@ -1,4 +1,4 @@
-点击加入 [NTMiner官方QQ群](https://jq.qq.com/?_wv=1027&k=k3hXnSsS): 775854760
+点击加入 [NTMiner官方QQ群](https://jq.qq.com/?_wv=1027&k=VhYXEDOG): 927979706
 
 1. 开源矿工内置的所有内核均为原版，开源矿工永远不会额外增加矿工支出；
 2. 开源矿工永远开源；
@@ -34,7 +34,7 @@
 
 类似开源矿工这些同类挖矿辅助工具降低了挖矿门槛帮助矿工管理矿机，获得一点收入是合理的，但是不能偷。
 
-点击加入 [NTMiner官方QQ群](https://jq.qq.com/?_wv=1027&k=k3hXnSsS): 775854760
+点击加入 [NTMiner官方QQ群](https://jq.qq.com/?_wv=1027&k=VhYXEDOG): 927979706
 
 # 授权协议
 The LGPL license。

src/AppModels/AppStatic.cs

@@ -226,7 +226,7 @@ public static Visibility IsAmdGpuVisible {
                 if (WpfUtil.IsInDesignMode) {
                     return Visibility.Visible;
                 }
-                if (NTMinerContext.Instance.GpuSet.GpuType == GpuType.AMD) {
+                if (NTMinerContext.Instance.GpuSet.GpuType.IsAmd()) {
                     return Visibility.Visible;
                 }
                 return Visibility.Collapsed;
@@ -248,7 +248,7 @@ public static Visibility IsMixedGpuVisible {
                 if (WpfUtil.IsInDesignMode) {
                     return Visibility.Visible;
                 }
-                return NTMinerContext.Instance.GpuSet.GpuType == GpuType.NVIDIA && AdlHelper.IsHasATIGpu ? Visibility.Visible : Visibility.Collapsed;
+                return NTMinerContext.Instance.GpuSet.GpuType.IsNvidia() && AdlHelper.IsHasATIGpu ? Visibility.Visible : Visibility.Collapsed;
             }
         }
 
@@ -701,7 +701,7 @@ public static string ExportServerJsonFileName {
             VirtualRoot.Execute(new UpgradeCommand(string.Empty, null));
         });
         public static ICommand ShowHelp { get; private set; } = new DelegateCommand(() => {
-            string url = "http://ntminer.com/";
+            string url = "http://dl.ntminer.top/";
             url = NTMinerContext.Instance.ServerContext.SysDicItemSet.TryGetDicItemValue(NTKeyword.ThisSystemSysDicCode, "HelpUrl", defaultValue: url);
             VirtualRoot.Execute(new UnTopmostCommand());
             Process.Start(url);
@@ -751,7 +751,7 @@ public static string QQGroup {
 
         public static string HomePageUrl {
             get {
-                string url = "https://ntminer.com";
+                string url = "http://dl.ntminer.top";
                 if (WpfUtil.IsInDesignMode) {
                     return url;
                 }

src/AppModels/Vms/CoinViewModel.cs

@@ -320,7 +320,7 @@ private set {
 
         public bool IsSupported {
             get {
-                if (this.Id == PleaseSelect.Id || NTMinerContext.Instance.GpuSet.GpuType == GpuType.Empty) {
+                if (this.Id == PleaseSelect.Id || NTMinerContext.Instance.GpuSet.GpuType.IsEmpty()) {
                     return true;
                 }
                 foreach (var coinKernel in NTMinerContext.Instance.ServerContext.CoinKernelSet.AsEnumerable().Where(a => a.CoinId == this.Id).ToArray()) {

src/AppModels/Vms/GpuStatusBarViewModel.cs

@@ -71,7 +71,7 @@ public string GpuSetName {
                 if (WpfUtil.IsInDesignMode) {
                     return string.Empty;
                 }
-                if (NTMinerContext.Instance.GpuSet.GpuType == GpuType.Empty) {
+                if (NTMinerContext.Instance.GpuSet.GpuType.IsEmpty()) {
                     return "没有矿卡或矿卡未驱动";
                 }
                 return NTMinerContext.Instance.GpuSet.GpuType.GetDescription();

src/AppModels/Vms/GpuViewModel.cs

@@ -533,6 +533,9 @@ public string TempLimitMinMaxText {
 
         public string VoltageMinMaxText {
             get {
+                if (NTMinerContext.Instance.GpuSet.GpuType.IsNvidia()) {
+                    return "对20系N卡和1660有效，通常设置成800，其它N卡填0";
+                }
                 if (Index == NTMinerContext.GpuAllId) {
                     if (_isGpuData) {
                         return $"{_gpuDatas.Max(a => a.VoltMin).ToString()} - {_gpuDatas.Min(a => a.VoltMax).ToString()}，默认：0";

src/AppViews0/MinerStudio/Views/MinerClientsWindow.xaml

@@ -4,7 +4,7 @@
 	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:blankWindow="http://NTMiner.com"
+	xmlns:blankWindow="http://dl.ntminer.top"
 	xmlns:sys="clr-namespace:System;assembly=mscorlib"
 	xmlns:controls="clr-namespace:NTMiner.Controls;assembly=NTMinerWpf"
 	xmlns:local="clr-namespace:NTMiner.Views"

src/AppViews0/MinerStudio/Views/Ucs/CalcConfig.xaml

@@ -4,7 +4,7 @@
 	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:blankWindow="http://NTMiner.com"
+	xmlns:blankWindow="http://dl.ntminer.top"
 	xmlns:controls="clr-namespace:NTMiner.Controls;assembly=NTMinerWpf"
 	xmlns:sys="clr-namespace:System;assembly=mscorlib"
 	xmlns:local="clr-namespace:NTMiner.Views.Ucs"

src/AppViews0/MinerStudio/Views/Ucs/ColumnsShowEdit.xaml

@@ -5,7 +5,7 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:sys="clr-namespace:System;assembly=mscorlib"
-	xmlns:blankWindow="http://NTMiner.com"
+	xmlns:blankWindow="http://dl.ntminer.top"
 	xmlns:controls="clr-namespace:NTMiner.Controls;assembly=NTMinerWpf"
 	xmlns:local="clr-namespace:NTMiner.Views.Ucs"
 	xmlns:vm="clr-namespace:NTMiner.MinerStudio.Vms;assembly=AppModels"

src/AppViews0/MinerStudio/Views/Ucs/ColumnsShowSelect.xaml

@@ -5,7 +5,7 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:sys="clr-namespace:System;assembly=mscorlib"
-	xmlns:blankWindow="http://NTMiner.com"
+	xmlns:blankWindow="http://dl.ntminer.top"
 	xmlns:controls="clr-namespace:NTMiner.Controls;assembly=NTMinerWpf"
 	xmlns:local="clr-namespace:NTMiner.Views.Ucs"
 	xmlns:vm="clr-namespace:NTMiner.MinerStudio.Vms;assembly=AppModels"

src/AppViews0/MinerStudio/Views/Ucs/LocalIpConfig.xaml

@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-	xmlns:blankWindow="http://NTMiner.com"
+	xmlns:blankWindow="http://dl.ntminer.top"
 	xmlns:controls="clr-namespace:NTMiner.Controls;assembly=NTMinerWpf"
 	xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:local="clr-namespace:NTMiner.MinerStudio.Views.Ucs"