개정판 f65e6c02
debug_SNI 추가
Change-Id: I46d431ca15362882a9ab7e8dd7600371f47471de
KCOM/Controls/Symbol.xaml.cs | ||
---|---|---|
11 | 11 |
using System.ComponentModel; |
12 | 12 |
using System.Linq; |
13 | 13 |
using System.Text; |
14 |
using System.Threading.Tasks; |
|
14 | 15 |
using System.Windows; |
15 | 16 |
using System.Windows.Controls; |
16 | 17 |
using System.Windows.Data; |
... | ... | |
41 | 42 |
bool IsMouseDown = false; |
42 | 43 |
string moveItem_id = ""; |
43 | 44 |
public string filename { get; set; } |
45 |
bool _Initialize = false; |
|
44 | 46 |
|
45 | 47 |
public Symbol() |
46 | 48 |
{ |
47 |
App.splashString(ISplashMessage.SYMBOL); |
|
49 |
//App.splashString(ISplashMessage.SYMBOL);
|
|
48 | 50 |
InitializeComponent(); |
49 | 51 |
|
50 | 52 |
//RadDragAndDropManager.AddDragInfoHandler(lstSymbolPrivate, OnDragPrivateInfo); |
51 | 53 |
//RadDragAndDropManager.AddDragQueryHandler(lstSymbolPrivate, OnDragPrivateQuery); |
52 | 54 |
//RadDragAndDropManager.SetAllowDrag(lstSymbolPrivate, true); |
55 |
this.Loaded += Symbol_Loaded; |
|
56 |
|
|
57 |
} |
|
58 |
|
|
59 |
|
|
53 | 60 |
|
54 |
DataBind(); |
|
61 |
private async void Symbol_Loaded(object sender, RoutedEventArgs e) |
|
62 |
{ |
|
63 |
if (!_Initialize) |
|
64 |
{ |
|
65 |
_Initialize = true; |
|
66 |
await DataBindAsync(); |
|
67 |
|
|
68 |
} |
|
55 | 69 |
} |
56 | 70 |
|
57 | 71 |
private void OnDragPrivateInfo(object sender, DragDropEventArgs e) |
... | ... | |
88 | 102 |
e.Handled = true; |
89 | 103 |
} |
90 | 104 |
|
91 |
private void DataBind()
|
|
105 |
private async Task DataBindAsync()
|
|
92 | 106 |
{ |
93 | 107 |
//lstSymbolPrivate.ItemsSource = null; |
94 | 108 |
//lstSymbolPublic.ItemsSource = null; |
... | ... | |
99 | 113 |
try |
100 | 114 |
{ |
101 | 115 |
|
102 |
var symbol_Private = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetSymbolList(App.ViewInfo.UserID); |
|
103 |
|
|
116 |
var symbol_Private = await ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.GetSymbolListAsync(App.ViewInfo.UserID); |
|
104 | 117 |
|
105 | 118 |
foreach (var item in symbol_Private) |
106 | 119 |
{ |
... | ... | |
120 | 133 |
Custom = new Symbol_Custom(); |
121 | 134 |
Custom_List = new List<Symbol_Custom>(); |
122 | 135 |
|
123 |
deptlist.ItemsSource = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetPublicSymbolDeptList();
|
|
136 |
deptlist.ItemsSource = await ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.GetPublicSymbolDeptListAsync();
|
|
124 | 137 |
|
125 | 138 |
List<SYMBOL_PUBLIC> symbol_Public; |
126 | 139 |
|
127 | 140 |
|
128 | 141 |
if (deptlist.SelectedValue != null) |
129 | 142 |
{ |
130 |
symbol_Public = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetPublicSymbolList(deptlist.SelectedValue.ToString());
|
|
143 |
symbol_Public = await ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.GetPublicSymbolListAsync(deptlist.SelectedValue.ToString());
|
|
131 | 144 |
} |
132 | 145 |
else |
133 | 146 |
{ |
134 |
symbol_Public = ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetPublicSymbolList(null);
|
|
147 |
symbol_Public = await ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.GetPublicSymbolListAsync(null);
|
|
135 | 148 |
} |
136 | 149 |
|
137 | 150 |
foreach (var item in symbol_Public) |
... | ... | |
142 | 155 |
Custom_List.Add(Custom); |
143 | 156 |
Custom = new Symbol_Custom(); |
144 | 157 |
} |
158 |
|
|
145 | 159 |
lstSymbolPublic.ItemsSource = Custom_List; |
146 | 160 |
} |
147 | 161 |
|
... | ... | |
262 | 276 |
#endregion |
263 | 277 |
|
264 | 278 |
#region Symbol Add Close Event |
265 |
private void MarkupNamePromptClose(string data, WindowClosedEventArgs args) |
|
279 |
private async void MarkupNamePromptClose(string data, WindowClosedEventArgs args)
|
|
266 | 280 |
{ |
267 | 281 |
try |
268 | 282 |
{ |
... | ... | |
290 | 304 |
SymbolSave_Public(args.PromptResult, filename, data, Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.userData.DEPARTMENT); |
291 | 305 |
} |
292 | 306 |
|
293 |
DataBind();
|
|
307 |
await DataBindAsync();
|
|
294 | 308 |
} |
295 | 309 |
} |
296 | 310 |
} |
... | ... | |
346 | 360 |
} |
347 | 361 |
} |
348 | 362 |
|
349 |
private void BaseClient_AddPublicSymbolCompleted(object sender, ServiceDeepView.AddPublicSymbolCompletedEventArgs e) |
|
363 |
private async void BaseClient_AddPublicSymbolCompleted(object sender, ServiceDeepView.AddPublicSymbolCompletedEventArgs e)
|
|
350 | 364 |
{ |
351 | 365 |
Logger.sendResLog("AddPublicSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1); |
352 |
DataBind();
|
|
366 |
await DataBindAsync();
|
|
353 | 367 |
} |
354 | 368 |
|
355 |
private void BaseClient_SaveSymbolCompleted(object sender, ServiceDeepView.SaveSymbolCompletedEventArgs e) |
|
369 |
private async void BaseClient_SaveSymbolCompleted(object sender, ServiceDeepView.SaveSymbolCompletedEventArgs e)
|
|
356 | 370 |
{ |
357 | 371 |
Logger.sendResLog("RenameSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1); |
358 |
DataBind();
|
|
372 |
await DataBindAsync();
|
|
359 | 373 |
} |
360 | 374 |
|
361 | 375 |
#region Private Symbol Delete Event |
... | ... | |
388 | 402 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.DeleteSymbolAsync(delItem_ID, RadTab.SelectedIndex); |
389 | 403 |
} |
390 | 404 |
|
391 |
private void BaseClient_DeleteSymbolCompleted(object sender, ServiceDeepView.DeleteSymbolCompletedEventArgs e) |
|
405 |
private async void BaseClient_DeleteSymbolCompleted(object sender, ServiceDeepView.DeleteSymbolCompletedEventArgs e)
|
|
392 | 406 |
{ |
393 | 407 |
Logger.sendResLog("DeleteSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1); |
394 |
DataBind();
|
|
408 |
await DataBindAsync();
|
|
395 | 409 |
} |
396 | 410 |
#endregion |
397 | 411 |
|
... | ... | |
809 | 823 |
} |
810 | 824 |
} |
811 | 825 |
|
812 |
private void BaseClient_RenameSymbolCompleted(object sender, ServiceDeepView.RenameSymbolCompletedEventArgs e) |
|
826 |
private async void BaseClient_RenameSymbolCompleted(object sender, ServiceDeepView.RenameSymbolCompletedEventArgs e)
|
|
813 | 827 |
{ |
814 | 828 |
Logger.sendResLog("RenameSymbolCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1); |
815 |
DataBind();
|
|
829 |
await DataBindAsync();
|
|
816 | 830 |
} |
817 | 831 |
#endregion |
818 | 832 |
|
... | ... | |
839 | 853 |
#endregion |
840 | 854 |
|
841 | 855 |
#region Department Selection Event |
842 |
private void deptlist_SelectionChanged(object sender, SelectionChangedEventArgs e) |
|
856 |
private async void deptlist_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
|
843 | 857 |
{ |
844 |
DataBind();
|
|
858 |
await DataBindAsync();
|
|
845 | 859 |
} |
846 | 860 |
#endregion |
847 | 861 |
|
내보내기 Unified diff