From 651d1f87d2e0e26021c20f3667e1db7b1349b478 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 23 九月 2024 10:27:44 +0800
Subject: [PATCH] 冲突缺少文件补充
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-GeneralProject/GenerateXhsProjectWizardPage.cs | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-GeneralProject/GenerateXhsProjectWizardPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-GeneralProject/GenerateXhsProjectWizardPage.cs
index cadf451..28ee611 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-GeneralProject/GenerateXhsProjectWizardPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/04-GeneralProject/GenerateXhsProjectWizardPage.cs
@@ -12,22 +12,38 @@
/// 鐘舵�佹敼鍙樹簨浠�
/// </summary>
public event Action PageStateChangedEvent;
+
private bool _isInitialize = false;//鏄惁鍒濆鍖�
private bool _importResult = false;//瀵煎叆缁撴灉
private ImportXhsProjectViewModel _vm = null;//鎿嶄綔瀵硅薄
+ private class ListItemWithColor
+ {
+ public string Text { get; set; }
+ public Color Color { get; set; }
+
+ public override string ToString()
+ {
+ return null;
+ }
+ }
/// <summary>
- ///
+ ///
/// </summary>
public async void InitialPage(ImportXhsProjectViewModel vm)
{
_vm = vm;
_isInitialize = false;
_importResult = false;
- _importResult = await ImportXhsProjectHelper.Import(vm, (msg) =>
+ _importResult = await ImportXhsProjectHelper.Import(vm, (msg, color) =>
{
- this.listBoxControl1.Items.Add(msg);
+ ListItemWithColor itemWithColor = new ListItemWithColor
+ {
+ Text = msg,
+ Color = color
+ };
+ this.listBoxControl1.Items.Add(itemWithColor);
}, (max, current) =>
{
this.progressBarControl1.Properties.Maximum = max;
@@ -140,10 +156,23 @@
return false;
}
+ private void listBoxControl1_DrawItem(object sender, DevExpress.XtraEditors.ListBoxDrawItemEventArgs e)
+ {
+ // 鑾峰彇褰撳墠椤圭洰鐨勭储寮�
+ int index = e.Index;
+ // 妫�鏌ユ槸鍚︽槸鏈夋晥鐨勯」鐩储寮�
+ if (index >= 0)
+ {
+ // 鑾峰彇褰撳墠椤圭洰
+ ListItemWithColor item = (ListItemWithColor)listBoxControl1.Items[index];
-
-
-
+ // 璁剧疆瀛椾綋鍜岄鑹�
+ Font font = new Font("Arial", 15);
+ Brush brush = new SolidBrush(item.Color);
+ // 缁樺埗鏂囨湰
+ e.Graphics.DrawString(item.Text, font, brush, e.Bounds);
+ }
+ }
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3