From 9b673ca69c30616b5e5807d665ed8efa2720e1c8 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 17:57:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs | 60 +++++++++++++++++-------------------------------------------
1 files changed, 17 insertions(+), 43 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
index 9c8b3e7..fb1c2bd 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
@@ -37,7 +37,7 @@
feedBackProgress?.Invoke(100, 5);
- #endregion 绗竴姝� 涓存椂鏂囦欢澶勭悊锛堣繘搴�5%锛�
+ #endregion
#region 绗簩姝� 鍒涘缓椤圭洰锛堣繘搴� 10%锛�
@@ -74,7 +74,7 @@
feedBackProgress?.Invoke(100, 10);
- #endregion 绗簩姝� 鍒涘缓椤圭洰锛堣繘搴� 10%锛�
+ #endregion
#region 绗笁姝� 璁剧疆鍦板浘浣嶇疆锛堣繘搴� 20%锛�
@@ -115,7 +115,7 @@
feedBackProgress?.Invoke(100, 20);
- #endregion 绗笁姝� 璁剧疆鍦板浘浣嶇疆锛堣繘搴� 20%锛�
+ #endregion
#region 绗洓姝� 鍘嬬缉鏂囦欢瑙ｆ瀽 锛堣繘搴�30%锛�
@@ -154,7 +154,7 @@
feedBackProgress?.Invoke(100, 30);
- #endregion 绗洓姝� 鍘嬬缉鏂囦欢瑙ｆ瀽 锛堣繘搴�30%锛�
+ #endregion
#region 绗簲姝� 瑙ｆ瀽姘村姏缁撴瀯鏂囦欢 锛堣繘搴�40%锛�
@@ -292,7 +292,7 @@
await BLLFactory<Yw.BLL.HydroDecoratorInfo>.Instance.Save(vm.HydroInfo.ID, HStation.Revit.ConstParas.Scene, allDecoratorList);
}
- #endregion 绗簲姝� 瑙ｆ瀽姘村姏缁撴瀯鏂囦欢 锛堣繘搴�40%锛�
+ #endregion
#region 绗叚姝� 鍏宠仈姘村姏缁撴瀯妯″瀷锛堣繘搴� 50%锛�
@@ -319,7 +319,7 @@
feedBackMsg?.Invoke("鍏宠仈姘村姏缁撴瀯妯″瀷鎴愬姛銆傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 50);
- #endregion 绗叚姝� 鍏宠仈姘村姏缁撴瀯妯″瀷锛堣繘搴� 50%锛�
+ #endregion
#region 绗竷姝� 涓婁紶Revit妯″瀷鏂囦欢锛堣繘搴� 60%锛�
@@ -333,8 +333,7 @@
return true;
}
- //var bimfaceId = await Yw.WinFrmUI.BimfaceHelper.UploadFile(rvtFileInfo.FullName);//姝ｅ紡浠ｇ爜
- var bimfaceId = 10000896755736;//娴嬭瘯鐢ㄤ緥 10000884893369 10000894297457 10000895957527 10000896316958 10000896755736
+ var bimfaceId = await Yw.WinFrmUI.BimfaceHelper.UploadFile(rvtFileInfo.FullName);//姝ｅ紡浠ｇ爜
if (bimfaceId < 1)
{
feedBackMsg?.Invoke("Revit妯″瀷鏂囦欢涓婁紶澶辫触锛侊紒锛�", Color.Red);
@@ -346,7 +345,7 @@
feedBackMsg?.Invoke("瑙ｆ瀽Revit妯″瀷鏂囦欢鎴愬姛銆傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 60);
- #endregion 绗竷姝� 涓婁紶Revit妯″瀷鏂囦欢锛堣繘搴� 60%锛�
+ #endregion
#region 绗叓姝� 淇濆瓨Bimface鏂囦欢 锛堣繘搴� 65%锛�
@@ -373,7 +372,7 @@
feedBackMsg?.Invoke("Bimface鏂囦欢淇濆瓨鎴愬姛銆傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 65);
- #endregion 绗叓姝� 淇濆瓨Bimface鏂囦欢 锛堣繘搴� 65%锛�
+ #endregion
#region 绗節姝� 鍏宠仈Bimface鏂囦欢锛堣繘搴� 70%锛�
@@ -398,48 +397,21 @@
feedBackMsg?.Invoke("Bimface鏂囦欢鍏宠仈鎴愬姛銆傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 70);
- #endregion 绗節姝� 鍏宠仈Bimface鏂囦欢锛堣繘搴� 70%锛�
+ #endregion
#region 绗崄姝� 鍙戣捣妯″瀷杞崲锛堣繘搴� 90%锛�
feedBackProgress?.Invoke(100, 60);
feedBackMsg?.Invoke("姝ｅ湪杩涜妯″瀷杞婚噺鍖�...", Color.Black);
- //var bimfaceTranslateStatus = await Yw.WinFrmUI.BimfaceHelper.TranslateRvtFile(bimfaceId);//鍙戣捣杞崲
- var bimfaceTranslateStatus = Yw.BIMFace.eTranslateStatus.Processing;//娴嬭瘯浠ｇ爜
-
+ var bimfaceTranslateStatus = await Yw.WinFrmUI.BimfaceHelper.TranslateRvtFile(bimfaceId);//鍙戣捣杞崲
if (bimfaceTranslateStatus != Yw.BIMFace.eTranslateStatus.Success)
{
- var dlgResult = XtraMessageBox.Show("Bimface妯″瀷杞婚噺鍖栭渶瑕佷竴瀹氱殑鏃堕棿锛屾槸鍚︾户缁瓑寰咃紵", "璇㈤棶", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
- if (dlgResult == DialogResult.Yes)
- {
- await Yw.WinFrmUI.BimfaceHelper.WaitFileTranslateStatusUntilSuccess(bimfaceId, 3000);
- feedBackMsg?.Invoke("妯″瀷杞婚噺鍖栧畬鎴愩�傘�傘��", Color.Green);
- }
- else
- {
- bol = await BLLFactory<Yw.BLL.BimfaceFile>.Instance.UpdateFileStatus(vm.BimfaceFile.ID, (int)Yw.Bimface.eFileStatus.Converting);
- if (bol)
- {
- vm.BimfaceFile.FileStatus = (int)Yw.Bimface.eFileStatus.Converting;
- }
- else
- {
- feedBackMsg?.Invoke("妯″瀷鏂囦欢鐘舵�佹洿鏂板け璐ワ紒锛侊紒", Color.Red);
- }
- feedBackMsg?.Invoke("璺宠繃妯″瀷杞婚噺鍖栫瓑寰呫�傘�傘��", Color.Black);
- feedBackMsg?.Invoke("椤圭洰瀵煎叆缁撴潫銆傘�傘��", Color.Blue);
- feedBackProgress?.Invoke(100, 100);
- return true;
- }
+ await Yw.WinFrmUI.BimfaceHelper.WaitFileTranslateStatusUntilSuccess(bimfaceId, 3000);
}
- else
- {
- feedBackMsg?.Invoke("妯″瀷杞婚噺鍖栧畬鎴愩�傘�傘��", Color.Green);
- }
-
+ feedBackMsg?.Invoke("妯″瀷杞婚噺鍖栧畬鎴愩�傘�傘��", Color.Green);
feedBackProgress?.Invoke(100, 90);
- #endregion 绗崄姝� 鍙戣捣妯″瀷杞崲锛堣繘搴� 90%锛�
+ #endregion
#region 绗崄涓�姝� 鏇存柊妯″瀷鏂囦欢鐘舵�侊紙杩涘害 100%锛�
@@ -461,7 +433,9 @@
feedBackMsg?.Invoke("椤圭洰瀵煎叆瀹屾垚銆傘�傘��", Color.Green);
return true;
- #endregion 绗崄涓�姝� 鏇存柊妯″瀷鏂囦欢鐘舵�侊紙杩涘害 100%锛�
+ #endregion
+
+
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3