edit hawk version

ferventdesert · Dec 21, 2019 · fb96f7c · fb96f7c
1 parent 579fa22
commit fb96f7c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/Hawk.ETL/Managements/DataProcessManager.cs b/Hawk.ETL/Managements/DataProcessManager.cs
@@ -628,15 +628,11 @@ public override bool Init()
             {
                 GitHubApi.Connect(ConfigFile.GetConfig().Get<string>("Login"), ConfigFile.GetConfig().Get<string>("Password"));
                 MarketProjects.Clear();
-                if (DataMiningConfig.GetConfig<DataMiningConfig>().AutoConnectGithub)
-                {
-
 
                 ControlExtended.SetBusy(ProgressBarState.Indeterminate,message:GlobalHelper.Get("get_remote_projects"));
-
                 MarketProjects.AddRange(await GitHubApi.GetProjects(ConfigFile.GetConfig().Get<string>("MarketUrl")));
+                OnPropertyChanged("MarketProjects");
                 ControlExtended.SetBusy(ProgressBarState.NoProgress);
-}
 
             }, icon: "refresh"));
 
@@ -866,26 +862,27 @@ private void PrintReferenced(IDataProcess obj)
         public ListCollectionView ProcessCollectionView { get; set; }
         private ListCollectionView marketCollectionView;
         public ListCollectionView MarketProjectList {
-            get
+             get
             {
                 if (marketCollectionView == null)
                 {
-                    if (!DataMiningConfig.GetConfig<DataMiningConfig>().AutoConnectGithub)
-                    {
-                        return null;
-                    }
-                    GitHubApi.Connect(ConfigFile.GetConfig().Get<string>("Login"), ConfigFile.GetConfig().Get<string>("Password"));
-                    var result = GitHubApi.GetProjects(ConfigFile.GetConfig().Get<string>("MarketUrl")).Result;
+
+
                     ControlExtended.SafeInvoke(
                         () =>
                         {
-                            MarketProjects.Clear();
-                            MarketProjects.AddRange(result);
                             marketCollectionView = new ListCollectionView(MarketProjects);
                         }
                     ,LogType.Info, GlobalHelper.Get("market_login"),true);
-
-
+                    if (DataMiningConfig.GetConfig<DataMiningConfig>().AutoConnectGithub)
+                    {
+                        GitHubApi.Connect(ConfigFile.GetConfig().Get<string>("Login"),
+                            ConfigFile.GetConfig().Get<string>("Password"));
+                        var result =GitHubApi.GetProjects(ConfigFile.GetConfig().Get<string>("MarketUrl")).Result;
+                        MarketProjects.AddRange(result);
+                    }
+
+
                 }
                 return marketCollectionView;
             }

diff --git a/Hawk/Properties/AssemblyInfo.cs b/Hawk/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.0.0.0")]
+[assembly: AssemblyVersion("5.2.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]