test

src/AppModels/AppContext.partials.CoinGroupViewModels.cs

@@ -2,6 +2,7 @@
 using NTMiner.Vms;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace NTMiner {
     public partial class AppContext {
@@ -93,6 +94,14 @@ namespace NTMiner {
                 }
                 return _listByGroupId[groupId];
             }
+
+            public CoinGroupViewModel GetNextOne(Guid groupId, int sortNumber) {
+                return GetCoinGroupsByGroupId(groupId).OrderBy(a => a.SortNumber).FirstOrDefault(a => a.SortNumber > sortNumber);
+            }
+
+            public CoinGroupViewModel GetUpOne(Guid groupId, int sortNumber) {
+                return GetCoinGroupsByGroupId(groupId).OrderByDescending(a => a.SortNumber).FirstOrDefault(a => a.SortNumber < sortNumber);
+            }
         }
     }
 }

src/AppModels/AppContext.partials.GroupViewModels.cs

@@ -89,6 +89,14 @@ namespace NTMiner {
                 }
             }
 
+            public GroupViewModel GetNextOne(int sortNumber) {
+                return List.OrderBy(a => a.SortNumber).FirstOrDefault(a => a.SortNumber > sortNumber);
+            }
+
+            public GroupViewModel GetUpOne(int sortNumber) {
+                return List.OrderByDescending(a => a.SortNumber).FirstOrDefault(a => a.SortNumber < sortNumber);
+            }
+
             private IEnumerable<GroupViewModel> GetSelectionItems() {
                 yield return GroupViewModel.PleaseSelect;
                 foreach (var item in _dicById.Values.OrderBy(a => a.SortNumber)) {

src/AppModels/AppContext.partials.KernelOutputTranslaterViewModels.cs

@@ -92,6 +92,14 @@ namespace NTMiner {
                 }
                 return new List<KernelOutputTranslaterViewModel>();
             }
+
+            public KernelOutputTranslaterViewModel GetNextOne(Guid kernelOutputId, int sortNumber) {
+                return GetListByKernelId(kernelOutputId).OrderBy(a => a.SortNumber).FirstOrDefault(a => a.SortNumber > sortNumber);
+            }
+
+            public KernelOutputTranslaterViewModel GetUpOne(Guid kernelOutputId, int sortNumber) {
+                return GetListByKernelId(kernelOutputId).OrderByDescending(a => a.SortNumber).FirstOrDefault(a => a.SortNumber < sortNumber);
+            }
         }
     }
 }

src/AppModels/AppContext.partials.PoolViewModels.cs

@@ -71,6 +71,14 @@ namespace NTMiner {
                     return _dicById.Values.ToList();
                 }
             }
+
+            public PoolViewModel GetNextOne(Guid coinId, int sortNumber) {
+                return AllPools.OrderBy(a => a.SortNumber).FirstOrDefault(a => a.CoinId == coinId && a.SortNumber > sortNumber);
+            }
+
+            public PoolViewModel GetUpOne(Guid coinId, int sortNumber) {
+                return AllPools.OrderByDescending(a => a.SortNumber).FirstOrDefault(a => a.CoinId == coinId && a.SortNumber < sortNumber);
+            }
         }
     }
 }

src/AppModels/AppContext.partials.SysDicItemViewModels.cs

@@ -142,6 +142,14 @@ namespace NTMiner {
                     return _dicById.Values.ToList();
                 }
             }
+
+            public SysDicItemViewModel GetUpOne(int sortNumber) {
+                return List.OrderByDescending(a => a.SortNumber).FirstOrDefault(a => a.SortNumber < sortNumber);
+            }
+
+            public SysDicItemViewModel GetNextOne(int sortNumber) {
+                return List.OrderBy(a => a.SortNumber).FirstOrDefault(a => a.SortNumber > sortNumber);
+            }
         }
     }
 }

src/AppModels/AppContext.partials.SysDicViewModels.cs

@@ -96,6 +96,14 @@ namespace NTMiner {
                     return _dicById.Values.OrderBy(a => a.SortNumber).ToList();
                 }
             }
+
+            public SysDicViewModel GetUpOne(int sortNumber) {
+                return List.OrderByDescending(a => a.SortNumber).FirstOrDefault(a => a.SortNumber < sortNumber); ;
+            }
+
+            public SysDicViewModel GetNextOne(int sortNumber) {
+                return List.OrderBy(a => a.SortNumber).FirstOrDefault(a => a.SortNumber > sortNumber);
+            }
         }
     }
 }

src/AppModels/AppContext.partials.WalletViewModels.cs

@@ -62,6 +62,14 @@ namespace NTMiner {
                     return _dicById.Values.ToList();
                 }
             }
+
+            public WalletViewModel GetUpOne(Guid coinId, int sortNumber) {
+                return WalletList.OrderByDescending(a => a.SortNumber).FirstOrDefault(a => a.CoinId == coinId && a.SortNumber < sortNumber);
+            }
+
+            public WalletViewModel GetNextOne(Guid coinId, int sortNumber) {
+                return WalletList.OrderBy(a => a.SortNumber).FirstOrDefault(a => a.CoinId == coinId && a.SortNumber > sortNumber);
+            }
         }
     }
 }

src/AppModels/Vms/CoinGroupViewModel.cs

@@ -1,6 +1,5 @@
 using NTMiner.Core;
 using System;
-using System.Linq;
 using System.Windows.Input;
 
 namespace NTMiner.Vms {
@@ -31,7 +30,7 @@ namespace NTMiner.Vms {
                 }, icon: IconConst.IconConfirm);
             });
             this.SortUp = new DelegateCommand(() => {
-                CoinGroupViewModel upOne = AppContext.Instance.CoinGroupVms.GetCoinGroupsByGroupId(this.GroupId).OrderByDescending(a => a.SortNumber).FirstOrDefault(a => a.SortNumber < this.SortNumber);
+                CoinGroupViewModel upOne = AppContext.Instance.CoinGroupVms.GetUpOne(this.GroupId, this.SortNumber);
                 if (upOne != null) {
                     int sortNumber = upOne.SortNumber;
                     upOne.SortNumber = this.SortNumber;
@@ -45,7 +44,7 @@ namespace NTMiner.Vms {
                 }
             });
             this.SortDown = new DelegateCommand(() => {
-                CoinGroupViewModel nextOne = AppContext.Instance.CoinGroupVms.GetCoinGroupsByGroupId(this.GroupId).OrderBy(a => a.SortNumber).FirstOrDefault(a => a.SortNumber > this.SortNumber);
+                CoinGroupViewModel nextOne = AppContext.Instance.CoinGroupVms.GetNextOne(this.GroupId, this.SortNumber);
                 if (nextOne != null) {
                     int sortNumber = nextOne.SortNumber;
                     nextOne.SortNumber = this.SortNumber;

src/AppModels/Vms/GroupViewModel.cs

@@ -64,7 +64,7 @@ namespace NTMiner.Vms {
                 }, icon: IconConst.IconConfirm);
             });
             this.SortUp = new DelegateCommand(() => {
-                GroupViewModel upOne = AppContext.Instance.GroupVms.List.OrderByDescending(a => a.SortNumber).FirstOrDefault(a => a.SortNumber < this.SortNumber);
+                GroupViewModel upOne = AppContext.Instance.GroupVms.GetUpOne(this.SortNumber);
                 if (upOne != null) {
                     int sortNumber = upOne.SortNumber;
                     upOne.SortNumber = this.SortNumber;
@@ -75,7 +75,7 @@ namespace NTMiner.Vms {
                 }
             });
             this.SortDown = new DelegateCommand(() => {
-                GroupViewModel nextOne = AppContext.Instance.GroupVms.List.OrderBy(a => a.SortNumber).FirstOrDefault(a => a.SortNumber > this.SortNumber);
+                GroupViewModel nextOne = AppContext.Instance.GroupVms.GetNextOne(this.SortNumber);
                 if (nextOne != null) {
                     int sortNumber = nextOne.SortNumber;
                     nextOne.SortNumber = this.SortNumber;

src/AppModels/Vms/KernelOutputTranslaterViewModel.cs

@@ -70,7 +70,7 @@ namespace NTMiner.Vms {
                 }, icon: IconConst.IconConfirm);
             });
             this.SortUp = new DelegateCommand(() => {
-                KernelOutputTranslaterViewModel upOne = AppContext.Instance.KernelOutputTranslaterVms.GetListByKernelId(this.KernelOutputId).OrderByDescending(a => a.SortNumber).FirstOrDefault(a => a.SortNumber < this.SortNumber);
+                KernelOutputTranslaterViewModel upOne = AppContext.Instance.KernelOutputTranslaterVms.GetUpOne(this.KernelOutputId, this.SortNumber);
                 if (upOne != null) {
                     int sortNumber = upOne.SortNumber;
                     upOne.SortNumber = this.SortNumber;
@@ -84,7 +84,7 @@ namespace NTMiner.Vms {
                 }
             });
             this.SortDown = new DelegateCommand(() => {
-                KernelOutputTranslaterViewModel nextOne = AppContext.Instance.KernelOutputTranslaterVms.GetListByKernelId(this.KernelOutputId).OrderBy(a => a.SortNumber).FirstOrDefault(a => a.SortNumber > this.SortNumber);
+                KernelOutputTranslaterViewModel nextOne = AppContext.Instance.KernelOutputTranslaterVms.GetNextOne(this.KernelOutputId, this.SortNumber);
                 if (nextOne != null) {
                     int sortNumber = nextOne.SortNumber;
                     nextOne.SortNumber = this.SortNumber;

src/AppModels/Vms/PoolViewModel.cs

@@ -107,7 +107,7 @@ namespace NTMiner.Vms {
                 }, icon: IconConst.IconConfirm);
             });
             this.SortUp = new DelegateCommand(() => {
-                PoolViewModel upOne = AppContext.Instance.PoolVms.AllPools.OrderByDescending(a => a.SortNumber).FirstOrDefault(a => a.CoinId == this.CoinId && a.SortNumber < this.SortNumber);
+                PoolViewModel upOne = AppContext.Instance.PoolVms.GetUpOne(this.CoinId, this.SortNumber);
                 if (upOne != null) {
                     int sortNumber = upOne.SortNumber;
                     upOne.SortNumber = this.SortNumber;
@@ -121,7 +121,7 @@ namespace NTMiner.Vms {
                 }
             });
             this.SortDown = new DelegateCommand(() => {
-                PoolViewModel nextOne = AppContext.Instance.PoolVms.AllPools.OrderBy(a => a.SortNumber).FirstOrDefault(a => a.CoinId == this.CoinId && a.SortNumber > this.SortNumber);
+                PoolViewModel nextOne = AppContext.Instance.PoolVms.GetNextOne(this.CoinId, this.SortNumber);
                 if (nextOne != null) {
                     int sortNumber = nextOne.SortNumber;
                     nextOne.SortNumber = this.SortNumber;

src/AppModels/Vms/SysDicItemViewModel.cs

@@ -68,7 +68,7 @@ namespace NTMiner.Vms {
                 }, icon: IconConst.IconConfirm);
             });
             this.SortUp = new DelegateCommand(() => {
-                SysDicItemViewModel upOne = AppContext.Instance.SysDicItemVms.List.OrderByDescending(a => a.SortNumber).FirstOrDefault(a => a.SortNumber < this.SortNumber);
+                SysDicItemViewModel upOne = AppContext.Instance.SysDicItemVms.GetUpOne(this.SortNumber);
                 if (upOne != null) {
                     int sortNumber = upOne.SortNumber;
                     upOne.SortNumber = this.SortNumber;
@@ -82,7 +82,7 @@ namespace NTMiner.Vms {
                 }
             });
             this.SortDown = new DelegateCommand(() => {
-                SysDicItemViewModel nextOne = AppContext.Instance.SysDicItemVms.List.OrderBy(a => a.SortNumber).FirstOrDefault(a => a.SortNumber > this.SortNumber);
+                SysDicItemViewModel nextOne = AppContext.Instance.SysDicItemVms.GetNextOne(this.SortNumber);
                 if (nextOne != null) {
                     int sortNumber = nextOne.SortNumber;
                     nextOne.SortNumber = this.SortNumber;

src/AppModels/Vms/SysDicViewModel.cs

@@ -60,7 +60,7 @@ namespace NTMiner.Vms {
                 }, icon: IconConst.IconConfirm);
             });
             this.SortUp = new DelegateCommand(() => {
-                SysDicViewModel upOne = AppContext.Instance.SysDicVms.List.OrderByDescending(a => a.SortNumber).FirstOrDefault(a => a.SortNumber < this.SortNumber);
+                SysDicViewModel upOne = AppContext.Instance.SysDicVms.GetUpOne(this.SortNumber);
                 if (upOne != null) {
                     int sortNumber = upOne.SortNumber;
                     upOne.SortNumber = this.SortNumber;
@@ -71,7 +71,7 @@ namespace NTMiner.Vms {
                 }
             });
             this.SortDown = new DelegateCommand(() => {
-                SysDicViewModel nextOne = AppContext.Instance.SysDicVms.List.OrderBy(a => a.SortNumber).FirstOrDefault(a => a.SortNumber > this.SortNumber);
+                SysDicViewModel nextOne = AppContext.Instance.SysDicVms.GetNextOne(this.SortNumber);
                 if (nextOne != null) {
                     int sortNumber = nextOne.SortNumber;
                     nextOne.SortNumber = this.SortNumber;

src/AppModels/Vms/WalletViewModel.cs

@@ -80,7 +80,7 @@ namespace NTMiner.Vms {
                 }, icon: IconConst.IconConfirm);
             });
             this.SortUp = new DelegateCommand(() => {
-                WalletViewModel upOne = AppContext.Instance.WalletVms.WalletList.OrderByDescending(a => a.SortNumber).FirstOrDefault(a => a.CoinId == this.CoinId && a.SortNumber < this.SortNumber);
+                WalletViewModel upOne = AppContext.Instance.WalletVms.GetUpOne(this.CoinId, this.SortNumber);
                 if (upOne != null) {
                     int sortNumber = upOne.SortNumber;
                     upOne.SortNumber = this.SortNumber;
@@ -95,7 +95,7 @@ namespace NTMiner.Vms {
                 }
             });
             this.SortDown = new DelegateCommand(() => {
-                WalletViewModel nextOne = AppContext.Instance.WalletVms.WalletList.OrderBy(a => a.SortNumber).FirstOrDefault(a => a.CoinId == this.CoinId && a.SortNumber > this.SortNumber);
+                WalletViewModel nextOne = AppContext.Instance.WalletVms.GetNextOne(this.CoinId, this.SortNumber);
                 if (nextOne != null) {
                     int sortNumber = nextOne.SortNumber;
                     nextOne.SortNumber = this.SortNumber;