test

src/AppModels/AppContext.partials.CoinViewModels.cs

@@ -116,7 +116,7 @@ namespace NTMiner {
 
             public List<CoinViewModel> AllCoins {
                 get {
-                    return _dicById.Values.OrderBy(a => a.SortNumber).ToList();
+                    return _dicById.Values.OrderBy(a => a.Code).ToList();
                 }
             }
 
@@ -146,7 +146,7 @@ namespace NTMiner {
             }
             public List<CoinViewModel> MainCoinPleaseSelect {
                 get {
-                    return GetMainCoinPleaseSelect().OrderBy(a => a.SortNumber).ToList();
+                    return GetMainCoinPleaseSelect().OrderBy(a => a.Code).ToList();
                 }
             }
 
@@ -161,7 +161,7 @@ namespace NTMiner {
             }
             public List<CoinViewModel> DualPleaseSelect {
                 get {
-                    return GetDualPleaseSelect().Distinct().OrderBy(a => a.SortNumber).ToList();
+                    return GetDualPleaseSelect().Distinct().OrderBy(a => a.Code).ToList();
                 }
             }
         }

src/AppModels/Vms/ChartsWindowViewModel.cs

@@ -46,7 +46,7 @@ namespace NTMiner.Vms {
             get {
                 if (_chartVms == null) {
                     _chartVms = new List<ChartViewModel>();
-                    foreach (var coinVm in AppContext.Instance.MinerClientsWindowVm.MineCoinVms.AllCoins.OrderBy(a => a.SortNumber)) {
+                    foreach (var coinVm in AppContext.Instance.MinerClientsWindowVm.MineCoinVms.AllCoins.OrderBy(a => a.Code)) {
                         _chartVms.Add(new ChartViewModel(coinVm));
                     }
                 }

src/AppModels/Vms/CoinPageViewModel.cs

@@ -19,10 +19,7 @@ namespace NTMiner.Vms {
                 return;
             }
             this.Add = new DelegateCommand(() => {
-                int sortNumber = NTMinerRoot.Instance.CoinSet.Count == 0 ? 1 : NTMinerRoot.Instance.CoinSet.Max(a => a.SortNumber) + 1;
-                new CoinViewModel(Guid.NewGuid()) {
-                    SortNumber = sortNumber
-                }.Edit.Execute(FormType.Add);
+                new CoinViewModel(Guid.NewGuid()).Edit.Execute(FormType.Add);
             });
             this.AddHidedCoin = new DelegateCommand(() => {
 
@@ -50,7 +47,7 @@ namespace NTMiner.Vms {
                 if (_coinKeyword != value) {
                     _coinKeyword = value;
                     OnPropertyChanged(nameof(CoinKeyword));
-                    OnPropertyChanged(nameof(List));
+                    OnPropertyChanged(nameof(QueryResults));
                 }
             }
         }
@@ -69,16 +66,16 @@ namespace NTMiner.Vms {
             }
         }
 
-        public List<CoinViewModel> List {
+        public List<CoinViewModel> QueryResults {
             get {
                 List<CoinViewModel> list;
                 if (!string.IsNullOrEmpty(CoinKeyword)) {
                     list = AppContext.Instance.CoinVms.AllCoins.
                         Where(a => (!string.IsNullOrEmpty(a.Code) && a.Code.IgnoreCaseContains(CoinKeyword))
-                            || (!string.IsNullOrEmpty(a.EnName) && a.EnName.IgnoreCaseContains(CoinKeyword))).OrderBy(a => a.SortNumber).ToList();
+                            || (!string.IsNullOrEmpty(a.EnName) && a.EnName.IgnoreCaseContains(CoinKeyword))).OrderBy(a => a.Code).ToList();
                 }
                 else {
-                    list = AppContext.Instance.CoinVms.AllCoins.OrderBy(a => a.SortNumber).ToList();
+                    list = AppContext.Instance.CoinVms.AllCoins.OrderBy(a => a.Code).ToList();
                 }
                 if (list.Count == 1) {
                     CurrentCoin = list.FirstOrDefault();

src/AppModels/Vms/CoinSelectViewModel.cs

@@ -55,9 +55,9 @@ namespace NTMiner.Vms {
                     return _coins.Where(a => 
                         (a.Code != null && a.Code.IgnoreCaseContains(Keyword)) || 
                         (a.CnName != null && a.CnName.IgnoreCaseContains(Keyword)) || 
-                        (a.EnName != null && a.EnName.IgnoreCaseContains(Keyword))).OrderBy(a => a.SortNumber).ToList();
+                        (a.EnName != null && a.EnName.IgnoreCaseContains(Keyword))).OrderBy(a => a.Code).ToList();
                 }
-                return _coins.OrderBy(a => a.SortNumber).ToList();
+                return _coins.OrderBy(a => a.Code).ToList();
             }
         }
     }

src/AppModels/Vms/CoinViewModel.cs

@@ -20,7 +20,6 @@ namespace NTMiner.Vms {
             _icon = string.Empty,
             _id = Guid.Empty,
             _testWallet = string.Empty,
-            _sortNumber = 0,
             _justAsDualCoin = false,
             _walletRegexPattern = string.Empty,
             _notice = string.Empty,
@@ -36,7 +35,6 @@ namespace NTMiner.Vms {
 
         private Guid _id;
         private string _code;
-        private int _sortNumber;
         private Guid _algoId;
         private string _testWallet;
         private string _enName;
@@ -63,8 +61,6 @@ namespace NTMiner.Vms {
 
         public ICommand Remove { get; private set; }
         public ICommand Edit { get; private set; }
-        public ICommand SortUp { get; private set; }
-        public ICommand SortDown { get; private set; }
         public ICommand AddPool { get; private set; }
         public ICommand AddWallet { get; private set; }
         public ICommand Save { get; private set; }
@@ -92,7 +88,6 @@ namespace NTMiner.Vms {
 
         public CoinViewModel(ICoin data) : this(data.GetId()) {
             _code = data.Code;
-            _sortNumber = data.SortNumber;
             _algoId = data.AlgoId;
             _testWallet = data.TestWallet;
             _enName = data.EnName;
@@ -225,30 +220,6 @@ namespace NTMiner.Vms {
                     VirtualRoot.Execute(new RemoveCoinCommand(this.Id));
                 }, icon: IconConst.IconConfirm);
             });
-            this.SortUp = new DelegateCommand(() => {
-                CoinViewModel upOne = AppContext.Instance.CoinVms.AllCoins.OrderByDescending(a => a.SortNumber).FirstOrDefault(a => a.SortNumber < this.SortNumber);
-                if (upOne != null) {
-                    int sortNumber = upOne.SortNumber;
-                    upOne.SortNumber = this.SortNumber;
-                    VirtualRoot.Execute(new UpdateCoinCommand(upOne));
-                    this.SortNumber = sortNumber;
-                    VirtualRoot.Execute(new UpdateCoinCommand(this));
-                    AppContext.Instance.CoinVms.OnPropertyChanged(nameof(AppContext.CoinViewModels.MainCoins));
-                    AppContext.Instance.CoinVms.OnPropertyChanged(nameof(AppContext.CoinViewModels.AllCoins));
-                }
-            });
-            this.SortDown = new DelegateCommand(() => {
-                CoinViewModel nextOne = AppContext.Instance.CoinVms.AllCoins.OrderBy(a => a.SortNumber).FirstOrDefault(a => a.SortNumber > this.SortNumber);
-                if (nextOne != null) {
-                    int sortNumber = nextOne.SortNumber;
-                    nextOne.SortNumber = this.SortNumber;
-                    VirtualRoot.Execute(new UpdateCoinCommand(nextOne));
-                    this.SortNumber = sortNumber;
-                    VirtualRoot.Execute(new UpdateCoinCommand(this));
-                    AppContext.Instance.CoinVms.OnPropertyChanged(nameof(AppContext.CoinViewModels.MainCoins));
-                    AppContext.Instance.CoinVms.OnPropertyChanged(nameof(AppContext.CoinViewModels.AllCoins));
-                }
-            });
 
             this.AddPool = new DelegateCommand(() => {
                 int sortNumber = this.Pools.Count == 0 ? 1 : this.Pools.Max(a => a.SortNumber) + 1;
@@ -484,16 +455,6 @@ namespace NTMiner.Vms {
             }
         }
 
-        public int SortNumber {
-            get => _sortNumber;
-            set {
-                if (_sortNumber != value) {
-                    _sortNumber = value;
-                    OnPropertyChanged(nameof(SortNumber));
-                }
-            }
-        }
-
         public string TestWallet {
             get => _testWallet;
             set {

src/AppModels/Vms/GroupViewModel.cs

@@ -115,14 +115,14 @@ namespace NTMiner.Vms {
                         list.Add(item);
                     }
                 }
-                return list.OrderBy(a => a.SortNumber).ToList();
+                return list.OrderBy(a => a.Code).ToList();
             }
         }
 
         public List<CoinViewModel> DualCoinVms {
             get {
                 var coinGroupVms = AppContext.Instance.CoinGroupVms.GetCoinGroupsByGroupId(this.Id);
-                return coinGroupVms.Where(a => a.CoinVm != CoinViewModel.Empty).Select(a => a.CoinVm).OrderBy(a => a.SortNumber).ToList();
+                return coinGroupVms.Where(a => a.CoinVm != CoinViewModel.Empty).Select(a => a.CoinVm).OrderBy(a => a.Code).ToList();
             }
         }
 

src/AppModels/Vms/KernelViewModel.cs

@@ -228,7 +228,7 @@ namespace NTMiner.Vms {
                         list.Add(item);
                     }
                 }
-                return list.OrderBy(a => a.SortNumber).ToList();
+                return list.OrderBy(a => a.Code).ToList();
             }
         }
 
@@ -387,7 +387,7 @@ namespace NTMiner.Vms {
             get {
                 StringBuilder sb = new StringBuilder();
                 int len = sb.Length;
-                foreach (var coinVm in SupportedCoinVms.OrderBy(a => a.SortNumber)) {
+                foreach (var coinVm in SupportedCoinVms.OrderBy(a => a.Code)) {
                     if (len != sb.Length) {
                         sb.Append(",");
                     }

src/AppModels/Vms/MinerProfileViewModel.cs

@@ -615,7 +615,7 @@ namespace NTMiner.Vms {
             }
             set {
                 if (value == null) {
-                    value = AppContext.Instance.CoinVms.MainCoins.Where(a => a.IsSupported).OrderBy(a => a.SortNumber).FirstOrDefault();
+                    value = AppContext.Instance.CoinVms.MainCoins.Where(a => a.IsSupported).OrderBy(a => a.Code).FirstOrDefault();
                 }
                 if (value != null) {
                     this.CoinId = value.Id;

src/AppViews0/Ucs/CoinPage.xaml

@@ -59,7 +59,7 @@
 			</WrapPanel>
 			<DataGrid 
 				Grid.Row="1"
-				ItemsSource="{Binding List}" 
+				ItemsSource="{Binding QueryResults}" 
 				BorderThickness="0 0 1 0" 
 				BorderBrush="{StaticResource LineColor}"
 				SelectedItem="{Binding CurrentCoin}" AutoGenerateColumns="False"
@@ -164,7 +164,7 @@
 						<DataGridTemplateColumn.Header>
 							<WrapPanel>
 								<TextBlock Text="中文名"></TextBlock>
-								<TextBlock Margin="4 0 0 0" Text="{Binding Data.List.Count, Source={StaticResource proxy}}"></TextBlock>
+                                <TextBlock Margin="4 0 0 0" Text="{Binding Data.QueryResults.Count, Source={StaticResource proxy}}"></TextBlock>
 							</WrapPanel>
 						</DataGridTemplateColumn.Header>
 						<DataGridTemplateColumn.CellTemplate>
@@ -204,7 +204,7 @@
 					</DataGridTemplateColumn>
 				</DataGrid.Columns>
 			</DataGrid>
-			<TextBlock Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{Binding List, Converter={StaticResource NoRecordVisibilityConverter}}" Foreground="Red" Text="沒有记录"></TextBlock>
+            <TextBlock Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" Visibility="{Binding QueryResults, Converter={StaticResource NoRecordVisibilityConverter}}" Foreground="Red" Text="沒有记录"></TextBlock>
             <WrapPanel Grid.Row="1" Visibility="{x:Static app:AppStatic.IsDevModeVisible}" HorizontalAlignment="Left" VerticalAlignment="Top">
                 <controls:KbButton  
 				    Margin="4"
@@ -220,34 +220,6 @@
 						    Stretch="Fill" />
                     </WrapPanel>
                 </controls:KbButton>
-                <controls:KbButton 
-					Margin="2 0"
-					Command="{Binding CurrentCoin.SortDown}" ToolTip="下移" 
-					Background="Transparent" BorderThickness="0"
-					CornerRadius="2">
-                    <WrapPanel>
-                        <Path
-							Width="8"
-							Height="18"
-							Data="{StaticResource Icon_SortDown}"
-							Fill="{StaticResource IconFillColor}"
-							Stretch="Fill" />
-                    </WrapPanel>
-                </controls:KbButton>
-                <controls:KbButton 
-					Margin="2 0"
-					Command="{Binding CurrentCoin.SortUp}" ToolTip="上移" 
-					Background="Transparent" BorderThickness="0"
-					CornerRadius="2">
-                    <WrapPanel>
-                        <Path
-							Width="8"
-							Height="18"
-							Data="{StaticResource Icon_SortUp}"
-							Fill="{StaticResource IconFillColor}"
-							Stretch="Fill" />
-                    </WrapPanel>
-                </controls:KbButton>
             </WrapPanel>
 		</Grid>
 

src/AppViews0/Ucs/CoinPage.xaml.cs

@@ -52,7 +52,7 @@ namespace NTMiner.Views.Ucs {
 
         private void Current_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) {
             if (e.PropertyName == nameof(AppContext.Instance.CoinVms.AllCoins)) {
-                Vm.OnPropertyChanged(nameof(Vm.List));
+                Vm.OnPropertyChanged(nameof(Vm.QueryResults));
             }
         }
 

src/AppViews0/Ucs/CoinSelect.xaml

@@ -76,6 +76,7 @@
 					<TextBlock Margin="4 0 0 0" Text="管理" Foreground="{StaticResource ThemeForeground}"></TextBlock>
 				</WrapPanel>
 			</controls:KbButton>
+            <TextBlock VerticalAlignment="Center" Foreground="Red">按字母表排序</TextBlock>
 		</WrapPanel>
 		<controls:KbButton 
 			Background="Transparent" 

src/NTMiner.Core/Core/Impl/CalcConfigSet.cs

@@ -32,7 +32,7 @@ namespace NTMiner.Core.Impl {
         }
 
         private void Init(List<CalcConfigData> data) {
-            var list = _root.CoinSet.OrderBy(a => a.SortNumber).Select(a => new CalcConfigData {
+            var list = _root.CoinSet.OrderBy(a => a.Code).Select(a => new CalcConfigData {
                 CoinCode = a.Code,
                 CreatedOn = DateTime.Now,
                 IncomePerDay = 0,

src/NTMiner.Core/Core/Profiles/MinerProfile.cs

@@ -41,7 +41,7 @@ namespace NTMiner.Core.Profiles {
             }
             if (_data == null) {
                 Guid coinId = Guid.Empty;
-                ICoin coin = root.CoinSet.OrderBy(a => a.SortNumber).FirstOrDefault();
+                ICoin coin = root.CoinSet.OrderBy(a => a.Code).FirstOrDefault();
                 if (coin != null) {
                     coinId = coin.GetId();
                 }

src/NTMinerDataObjects/Core/CoinData.cs

@@ -10,7 +10,6 @@ namespace NTMiner.Core {
             Icon = string.Empty,
             AlgoId = Guid.Empty,
             Algo = string.Empty,
-            SortNumber = 0,
             TestWallet = string.Empty,
             WalletRegexPattern = string.Empty,
             JustAsDualCoin = false,
@@ -40,8 +39,6 @@ namespace NTMiner.Core {
 
         public string Algo { get; set; }
 
-        public int SortNumber { get; set; }
-
         public string TestWallet { get; set; }
 
         public string WalletRegexPattern { get; set; }

src/NTMinerDataObjects/Core/ICoin.cs

@@ -9,7 +9,6 @@ namespace NTMiner.Core {
         Guid AlgoId { get; }
         // json向后兼容
         string Algo { get; }
-        int SortNumber { get; }
         string TestWallet { get; }
         string WalletRegexPattern { get; }
         bool JustAsDualCoin { get; }