개정판 ef9ddca4
Fix: 심볼을 캡쳐 후에 BaseClient를 닫아 오류 발생. BaseClient를 닫지 않도록 수정
Change-Id: I3dbf1d72c5a8987a04abbe05853704cdd4f6e77d
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 69 | 69 |
//BaseTaskClient = new KcomService.ServiceDeepViewClient(App._binding, App._EndPoint); |
| 70 | 70 |
BaseClient = new ServiceDeepViewClient(App._binding, App._EndPoint); |
| 71 | 71 |
|
| 72 |
#region 이벤트 핸들러 등록 |
|
| 72 | 73 |
BaseClient.GetDocInfoCompleted += BaseClient_GetDocInfoCompleted; //문서 섬네일, 페이지크기, 마크업 정보 [3] |
| 73 | 74 |
BaseClient.GetConversionStateCompleted += BaseClient_GetConversionStateCompleted; //컨버팅의 여부 [2] |
| 74 | 75 |
BaseClient.GetSystemDataCompleted += BaseClient_GetSystemDataCompleted; //시스템 정보 [1] |
| ... | ... | |
| 82 | 83 |
BaseClient.DeleteMarkupCompleted += BaseClient_DeleteMarkupCompleted; |
| 83 | 84 |
BaseClient.DelFavoriteVPCompleted += BaseClient_DelFavoriteVPCompleted; |
| 84 | 85 |
BaseClient.EditFavoriteVPCompleted += BaseClient_EditFavoriteVPCompleted; |
| 86 |
|
|
| 87 |
BaseClient.SaveSymbolCompleted += BaseClient_SaveSymbolCompleted; |
|
| 88 |
BaseClient.AddPublicSymbolCompleted += BaseClient_AddPublicSymbolCompleted; |
|
| 89 |
#endregion |
|
| 85 | 90 |
} |
| 86 | 91 |
|
| 87 | 92 |
private void BaseClient_EditFavoriteVPCompleted(object sender, EditFavoriteVPCompletedEventArgs e) |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 5626 | 5626 |
} |
| 5627 | 5627 |
} |
| 5628 | 5628 |
|
| 5629 |
/// <summary> |
|
| 5630 |
/// 개인 심볼을 저장한다. |
|
| 5631 |
/// </summary> |
|
| 5632 |
/// <param name="Name"></param> |
|
| 5633 |
/// <param name="Url"></param> |
|
| 5634 |
/// <param name="Data"></param> |
|
| 5629 | 5635 |
public void SavePrivateSymbol(string Name, string Url, string Data) |
| 5630 | 5636 |
{
|
| 5631 | 5637 |
try |
| ... | ... | |
| 5639 | 5645 |
DATA = Data |
| 5640 | 5646 |
}; |
| 5641 | 5647 |
|
| 5642 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveSymbolCompleted += BaseClient_SaveSymbolCompleted; |
|
| 5648 |
///Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveSymbolCompleted += BaseClient_SaveSymbolCompleted;
|
|
| 5643 | 5649 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.SaveSymbolAsync(symbol_private); |
| 5644 | 5650 |
} |
| 5645 |
catch (Exception) |
|
| 5651 |
catch (Exception ex)
|
|
| 5646 | 5652 |
{
|
| 5647 |
throw; |
|
| 5653 |
throw new InvalidOperationException(ex.Message);
|
|
| 5648 | 5654 |
} |
| 5649 | 5655 |
} |
| 5650 | 5656 |
|
| 5657 |
/// <summary> |
|
| 5658 |
/// 공용 심볼을 저장한다. |
|
| 5659 |
/// </summary> |
|
| 5660 |
/// <param name="Name"></param> |
|
| 5661 |
/// <param name="Url"></param> |
|
| 5662 |
/// <param name="Data"></param> |
|
| 5663 |
/// <param name="Department"></param> |
|
| 5651 | 5664 |
public void SavePublicSymbol(string Name, string Url, string Data, string Department) |
| 5652 | 5665 |
{
|
| 5653 | 5666 |
try |
| ... | ... | |
| 5660 | 5673 |
IMAGE_URL = Url, |
| 5661 | 5674 |
DATA = Data |
| 5662 | 5675 |
}; |
| 5663 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddPublicSymbolCompleted += BaseClient_AddPublicSymbolCompleted; |
|
| 5664 |
//Logger.sendReqLog("AddPublicSymbol: ", symbol_public.ID + "," + symbol_public.DEPARTMENT + "," + symbol_public.NAME + "," + symbol_public.IMAGE_URL + "," + symbol_public.DATA, 1);
|
|
| 5676 |
///Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddPublicSymbolCompleted += BaseClient_AddPublicSymbolCompleted; |
|
| 5665 | 5677 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddPublicSymbol(symbol_public); |
| 5666 | 5678 |
} |
| 5667 |
catch (Exception) |
|
| 5679 |
catch (Exception ex)
|
|
| 5668 | 5680 |
{
|
| 5669 |
throw; |
|
| 5681 |
throw new InvalidOperationException(ex.Message);
|
|
| 5670 | 5682 |
} |
| 5671 | 5683 |
} |
| 5672 | 5684 |
|
| ... | ... | |
| 5725 | 5737 |
Custom = new Symbol_Custom(); |
| 5726 | 5738 |
} |
| 5727 | 5739 |
symbolPanel_Instance.lstSymbolPublic.ItemsSource = Custom_List; |
| 5728 |
BaseClient.Close(); |
|
| 5729 | 5740 |
} |
| 5730 |
catch (Exception e) |
|
| 5741 |
catch (Exception ex)
|
|
| 5731 | 5742 |
{
|
| 5732 |
//DialogMessage_Alert("DataBind", "Alert");
|
|
| 5743 |
DialogMessage_Alert(ex.Message, "Error");
|
|
| 5733 | 5744 |
} |
| 5734 | 5745 |
} |
| 5735 | 5746 |
|
내보내기 Unified diff
