From 3fec42c6383aa3b8d65f744a93b8a918d7cc6e02 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 23 七月 2024 10:15:54 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/BimfaceFileMgrPage.cs | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/BimfaceFileMgrPage.cs b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/BimfaceFileMgrPage.cs
index 8a6067a..965b551 100644
--- a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/BimfaceFileMgrPage.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/02-file/BimfaceFileMgrPage.cs
@@ -1,6 +1,4 @@
-锘縰sing DevExpress.CodeParser;
-using Mapster;
-using Yw.BIMFace;
+锘縰sing Mapster;
namespace Yw.WinFrmUI
{
@@ -268,7 +266,7 @@
var task = Task.Run(() => bimfaceClient.TranslateRvtFileReturnStatus(vm.BimfaceId, eRvtTranslateStyle.Real));
await task;
- if (task.Result == eTranslateStatus.ProcessingStatus)
+ if (task.Result == eTranslateStatus.Processing)
{
vm.FileStatus = eFileStatus.Converting;
this.bimfaceFileViewModelBindingSource.ResetBindings(false);
@@ -284,7 +282,7 @@
{
Thread.Sleep(3000);
var result = await bimfaceClient.GetFileTranslateStatusReturnStatus(vm.BimfaceId);
- if (result == eTranslateStatus.ProcessingStatus)
+ if (result == eTranslateStatus.Processing)
{
vm.FileStatus = eFileStatus.ConvertSucceed;
}
--
Gitblit v1.9.3