Merge branch 'dev' of http://123.132.248.154:10000/chenwei/FieldWorkClient into dev

ViewModel/Loyout/LoyoutViewModel.cs

@@ -521,6 +521,7 @@ namespace HeBianGu.App.Disk
             try
             {
                 while (true)
+                
                 {
                     // 获取所有未完成的上传项
                     var pendingItems = _sendViewModel.UpLoadItems
@@ -553,11 +554,12 @@ namespace HeBianGu.App.Disk
             }
             finally
             {
+                await Task.Delay(2000);
                 StopProgressTimer();
-                Application.Current.Dispatcher.Invoke(() =>
-                {
-                    _sendViewModel.Progress = 100;
-                });
+                //Application.Current.Dispatcher.Invoke(() =>
+                //{
+                //    _sendViewModel.Progress = 100;
+                //});
                 _isUploading = false;
 
                 if (MySetting.Instance.IsOn && !_sendViewModel.UpLoadItems.Any(item => !item.Bool1))
@@ -612,6 +614,7 @@ namespace HeBianGu.App.Disk
                         if (progressReport.Percentage == 100)
                         {
                             ut.Value3 = "已完成";
+
                             //_sendViewModel.UpLoadItems.Remove(ut);
                             //_sendViewModel.CompleteItems.Add(ut);
                         }
@@ -634,6 +637,7 @@ namespace HeBianGu.App.Disk
             {
                 Application.Current.Dispatcher.Invoke(() =>
                 {
+                    ut.Bool1 = false;   
                     ut.Value3 = $"上传失败: {ex.Message}";
                 });
             }

global.json

@@ -1,9 +1,16 @@
 {
+  //"Minio": {
+  //  "Endpoint": "192.168.20.239:9000",
+  //  "AccessKey": "cqlatqb0dgqdBRar7KVF",
+  //  "SecretKey": "FUFzd5VeoBeWhrpql6MBON5tQxNzcIgaK7vkvofX",
+  //  "BucketName": "drone"
+  //},
+
   "Minio": {
-    "Endpoint": "192.168.20.239:9000",
-    "AccessKey": "cqlatqb0dgqdBRar7KVF",
-    "SecretKey": "FUFzd5VeoBeWhrpql6MBON5tQxNzcIgaK7vkvofX",
-    "BucketName": "drone"
+    "Endpoint": "192.168.20.240:9107",
+    "AccessKey": "minioadmin",
+    "SecretKey": "minioadmin",
+    "BucketName": "test"
   }
 }
 /*{