프로젝트

일반

사용자정보

개정판 ed705a3d

IDed705a3deb806f39aa2f269cbe8b197c8c5f5c55
상위 6c45db59
하위 4d701de6

김태성이(가) 약 4년 전에 추가함

m talk 추가 오류 수정

Change-Id: I45e15e87686fbc67f7b8d87563ca1b6c526a75d0

차이점 보기:

FinalService/KCOM_FinalService/MarkupToPDF/MarkupToPDF.cs
1225 1225 
                                            StatusChange($"markupItem : {markupItem.ID}" + ex.ToString(), 0);
1226 1226 
                                        }
1227 1227 
                                    }
1228 
                                }
1229 1228 

  		




  
  1229
  
    
                                


  		




  
  1230
  
    
                                }


  		




  1230
  1231
  
    
                            }


  		




  
  1232
  
    
                            //PdfFileSpecification pfs = PdfFileSpecification.FileEmbedded(pdfStamper.Writer, @"C:\Users\kts\Documents\업무\CARS\엑셀양식\F-000-5378-702_R2_계장 Cable Schedule Sample.xlsx", "F-000-5378-702_R2_계장 Cable Schedule Sample.xlsx", null);


  		




  
  1233
  
    
                            //pdfStamper.AddFileAttachment("F-000-5378-702_R2_계장 Cable Schedule Sample.xlsx", pfs);


  		




  
  1234
  
    

  		




  1231
  1235
  
    
                            pdfStamper.Outlines = root;


  		




  1232
  1236
  
    
                            pdfStamper.Close();


  		




  1233
  1237
  
    
                            pdfReader.Close();


  		












  

    
      FinalService/KCOM_FinalService/UploadTest/UploadTest.csproj
    
  





  110
  110
  
    
      <Name>UploadFinal_Daelim</Name>


  		




  111
  111
  
    
    </ProjectReference>


  		




  112
  112
  
    
  </ItemGroup>


  		




  
  113
  
    
  <ItemGroup>


  		




  
  114
  
    
    <PackageReference Include="log4net">


  		




  
  115
  
    
      <Version>2.0.12</Version>


  		




  
  116
  
    
    </PackageReference>


  		




  
  117
  
    
  </ItemGroup>


  		




  113
  118
  
    
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />


  		




  114
  119
  
    
</Project>


  		












  

    
      KCOM/Messenger/ConversationView.xaml.cs
    
  





  6
  6
  
    
using System.Diagnostics;


  		




  7
  7
  
    
using System.Linq;


  		




  8
  8
  
    
using System.Text;


  		




  
  9
  
    
using System.Threading.Tasks;


  		




  9
  10
  
    
using System.Windows;


  		




  10
  11
  
    
using System.Windows.Controls;


  		




  11
  12
  
    
using System.Windows.Data;


  		




  ......




  74
  75
  
    
        }


  		




  75
  76
  
    

  		




  76
  77
  
    
        //강인구 추가


  		




  77
  
  
    
        private void BtnSend_Click(object sender, MouseButtonEventArgs e)


  		




  
  78
  
    
        private async void BtnSend_Click(object sender, MouseButtonEventArgs e)


  		




  78
  79
  
    
        {


  		




  79
  
  
    
            AddText();


  		




  
  80
  
    
            await AddTextAsync();


  		




  80
  81
  
    
        }


  		




  81
  82
  
    

  		




  82
  83
  
    
        private void MarkupNameUpdatePromptClose(WindowClosedEventArgs args)


  		




  ......




  228
  229
  
    
            }


  		




  229
  230
  
    
        }


  		




  230
  231
  
    

  		




  231
  
  
    
        private void OnKeyDownHandler(object sender, KeyEventArgs e)


  		




  
  232
  
    
        private async void OnKeyDownHandler(object sender, KeyEventArgs e)


  		




  232
  233
  
    
        {


  		




  233
  234
  
    
            if (e.Key == Key.Return)


  		




  234
  235
  
    
            {


  		




  235
  236
  
    
                if (Keyboard.Modifiers != ModifierKeys.Shift)


  		




  236
  237
  
    
                {


  		




  237
  
  
    
                    AddText();


  		




  
  238
  
    
                    await AddTextAsync();


  		




  238
  239
  
    
                    e.Handled = true;


  		




  239
  240
  
    
                }


  		




  240
  241
  
    
                else


  		




  ......




  246
  247
  
    
            }


  		




  247
  248
  
    
        }


  		




  248
  249
  
    

  		




  249
  
  
    
        private void AddText()


  		




  
  250
  
    
        private async Task AddTextAsync()


  		




  250
  251
  
    
        {


  		




  251
  252
  
    
            Common.ViewerDataModel.Instance.k_talkMessageSet.Clear();


  		




  252
  253
  
    

  		




  ......




  263
  264
  
    

  		




  264
  265
  
    
            //Logger.sendReqLog("AddMessage", App.ViewInfo.ProjectNO + "," + message, 1);


  		




  265
  266
  
    
            //Logger.sendResLog("AddMessage", Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddMessage(App.ViewInfo.ProjectNO, message).ToString(), 1);


  		




  266
  
  
    
            //Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.AddMessage(App.ViewInfo.ProjectNO, message);


  		




  267
  
  
    

  		




  268
  
  
    
            //Logger.sendReqLog("GetMessage: ", App.ViewInfo.ProjectNO + "," + App.ViewInfo.DocumentItemID, 1);


  		




  269
  
  
    
            List<KCOMDataModel.DataModel.TALK> messagelist = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseClient.GetMessage(App.ViewInfo.ProjectNO, App.ViewInfo.DocumentItemID);


  		




  270
  
  
    
            if (messagelist.Count() > 0)


  		




  271
  
  
    
            {


  		




  272
  
  
    
                //Logger.sendResLog("GetMessage", "TRUE", 1);


  		




  273
  
  
    
            }


  		




  274
  
  
    
            else


  		




  
  267
  
    
            if(await Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.AddMessageAsync(App.ViewInfo.ProjectNO, message))


  		




  275
  268
  
    
            {


  		




  276
  
  
    
                //Logger.sendResLog("GetMessage", "FALSE", 1);


  		




  
  269
  
    
                var messagelist = await Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.BaseTaskClient.GetMessageAsync(App.ViewInfo.ProjectNO, App.ViewInfo.DocumentItemID);


  		




  
  270
  
    

  		




  
  271
  
    
                if (messagelist.Count() > 0)


  		




  
  272
  
    
                {


  		




  
  273
  
    
                    //Logger.sendResLog("GetMessage", "TRUE", 1);


  		




  
  274
  
    
                }


  		




  
  275
  
    
                else


  		




  
  276
  
    
                {


  		




  
  277
  
    
                    //Logger.sendResLog("GetMessage", "FALSE", 1);


  		




  
  278
  
    
                }


  		




  
  279
  
    

  		




  
  280
  
    
                messagelist.ForEach(a =>


  		




  
  281
  
    
                {


  		




  
  282
  
    
                    Common.ViewerDataModel.Instance.k_talkMessageSet.Add(a);


  		




  
  283
  
    
                });


  		




  
  284
  
    
                tbContent.Text = "";


  		




  
  285
  
    
                tbContent.Focus();


  		




  
  286
  
    
                (lstMessage.Parent as ScrollViewer).ScrollToEnd();


  		




  277
  287
  
    
            }


  		




  278
  288
  
    

  		




  279
  
  
    
            messagelist.ForEach(a =>


  		




  280
  
  
    
            {


  		




  281
  
  
    
                Common.ViewerDataModel.Instance.k_talkMessageSet.Add(a);


  		




  282
  
  
    
            });


  		




  283
  
  
    
            tbContent.Text = "";


  		




  284
  
  
    
            tbContent.Focus();


  		




  285
  
  
    
            (lstMessage.Parent as ScrollViewer).ScrollToEnd();


  		




  
  289
  
    
            //Logger.sendReqLog("GetMessage: ", App.ViewInfo.ProjectNO + "," + App.ViewInfo.DocumentItemID, 1);


  		




  
  290
  
    
           


  		




  286
  291
  
    

  		




  287
  292
  
    
        }


  		




  288
  293
  
    
    }


  		












  

    
      MarkusAutoUpdate/src/NetSparkle.Samples.NetFramework.WPF/MARKUS.ini
    
  





  1
  1
  
    
[Internal]


  		




  2
  
  
    
IP=172.20.120.141


  		




  
  2
  
    
IP=10.11.252.3:8975


  		




  3
  3
  
    
[External]


  		




  4
  
  
    
IP=172.20.120.141


  		




  
  4
  
    
IP=10.11.252.3:8975


  		




  5
  5
  
    
[BaseClientAddress]


  		




  6
  
  
    
URL=http://172.20.120.141:5978


  		




  
  6
  
    
URL=http://10.11.252.3:8975


  		




  7
  7
  
    
[HubAddress]


  		




  8
  
  
    
URL=http://172.20.120.141:5100/


  		




  
  8
  
    
URL=http://10.11.252.3:8975/


  		




  9
  9
  
    
[UpdateVer64]


  		




  10
  
  
    
URL=http://172.20.120.141:5977/TileSource/Version/version_x64.xml


  		




  
  10
  
    
URL=http://10.11.252.3:8975/TileSource/Version/version_x64.xml


  		




  11
  11
  
    
[UpdateVer86]


  		




  12
  
  
    
URL=http://172.20.120.141:5977/TileSource/Version/version_x86.xml


  		




  
  12
  
    
URL=http://10.11.252.3:8975/TileSource/Version/version_x86.xml


  		




  13
  13
  
    
[excelFilePath]


  		




  14
  
  
    
URL=http://172.20.120.141:5977/TileSource/Check_Test/CheckList_T.xlsx


  		




  
  14
  
    
URL=http://10.11.252.3:8975/TileSource/Check_Test/CheckList_T.xlsx


  		




  15
  15
  
    
[KCOM_Get_FinalImage_Get_PdfImage]


  		




  16
  
  
    
URL=http://172.20.120.141:5977/Get_FInalImage/Get_PdfImage.asmx


  		




  
  16
  
    
URL=http://10.11.252.3:8975/Get_FInalImage/Get_PdfImage.asmx


  		




  17
  17
  
    
[KCOM_kr_co_devdoftech_cloud_FileUpload]


  		




  18
  
  
    
URL=http://172.20.120.141:5977/ImageUpload/FileUpload.asmx


  		




  
  18
  
    
URL=http://10.11.252.3:8975/ImageUpload/FileUpload.asmx


  		




  19
  19
  
    
[mainServerImageWebPath]


  		




  20
  
  
    
URL=http://172.20.120.141:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png


  		




  
  20
  
    
URL=http://10.11.252.3:8975/TileSource/{0}_Tile/{1}/{2}/{3}.png


  		




  21
  21
  
    
[subServerImageWebPath]


  		




  22
  
  
    
URL=https://ensembleitf.daelim.co.kr/TileSource/{0}_Tile/{1}/{2}/{3}.png


  		




  
  22
  
    
URL=http://10.11.252.3:8975/TileSource/{0}_Tile/{1}/{2}/{3}.png


  		




  23
  23
  
    
[Debug_BaseClientAddress]


  		




  24
  
  
    
URL=http://172.20.120.141:5978


  		




  
  24
  
    
URL=http://10.11.252.3:8975


  		




  25
  25
  
    
[HOST_DOMAIN]


  		




  26
  
  
    
DOMAIN=DAELIM.COM


  		




  
  26
  
    
DOMAIN=


  		




  27
  27
  
    
[GetConversionStateFailed]


  		




  28
  
  
    
MSG=VG9vIE1hbnkgVi9QIEZpbGVzIGFyZSB1cGxvYWRpbmcgaW5zdGFudGFuZW91c2x5LCBUaGlzIFYvUCBmaWxlIGNhbiBub3QgYmUgb3BlbiBub3cuIFBsZWFzZSBmZWVsIGZyZWUgdG8gcmUtb3BlbiB3YWl0IGEgbW9tZW50IGFnYWluIVxuXG7tmITsnqwg7J287Iuc7KCB7Jy866GcIOunjuydgCDslpHsnZggVi9Q6rCAIOuTseuhneuQmOqzoCDsnojslrQg7J20IOusuOyEnOulvCDsl7TrnoztlaAg7IiYIOyXhuyKteuLiOuLpC5cbuyeoOyLnOunjCDquLDri6TroKQg7KO87IugIO2bhCDri6Tsi5wg7Je0656M7ZWY7JesIOyjvOyLnOq4sCDrsJTrno3ri4jri6RcblxuQ29udGFjdCBQb2ludCA6IFlPVSwgU3VuZy1IbyAoMDItMzY5LTU2NDMpXHJcbuyXsOudveyymDog7Jyg7ISx7Zi4IOu2gOyepSgwMiAtIDM2OSAtIDU2MzQp


  		




  
  28
  
    
MSG=VG9vIE1hbnkgVi9QIEZpbGVzIGFyZSB1cGxvYWRpbmcgaW5zdGFudGFuZW91c2x5LCBUaGlzIFYvUCBmaWxlIGNhbiBub3QgYmUgb3BlbiBub3cuIFBsZWFzZSBmZWVsIGZyZWUgdG8gcmUtb3BlbiB3YWl0IGEgbW9tZW50IGFnYWluIVxuXG7tmITsnqwg7J287Iuc7KCB7Jy866GcIOunjuydgCDslpHsnZggVi9Q6rCAIOuTseuhneuQmOqzoCDsnojslrQg7J20IOusuOyEnOulvCDsl7TrnoztlaAg7IiYIOyXhuyKteuLiOuLpC5cbuyeoOyLnOunjCDquLDri6TroKQg7KO87IugIO2bhCDri6Tsi5wg7Je0656M7ZWY7JesIOyjvOyLnOq4sCDrsJTrno3ri4jri6Q=


  		




  29
  29
  
    
[SetFinalPDFError]


  		




  30
  30
  
    
MSG=7LWc7KKFIO2MjOydvOydhCDrp4zrk5zripTrjbAg66y47KCc6rCAIOuwnOyDne2VmOyYgOyKteuLiOuLpA==


  		




  31
  31
  
    
[SetFinalPDFSuccess]


  		




  32
  
  
    
MSG=RmluYWwgUERGIOyDneyEsSDspJEg7J6F64uI64ukLiDsmYTro4wg65CY66m0ICBPdXRsb29rIOyVjOumvCDrqZTsnbwg67Cc7IahIOuQqeuLiOuLpC4gXHJcbuyeoOyLnOunjCDquLDri6TroKQg7KO87IS47JqULg==


  		




  
  32
  
    
MSG=7LWc7KKFIO2MjOydvCDsg53shLEg7KSR7J6F64uI64ukLiDrrLjshJzqtIDrpqzsi5zsiqTthZzsnYQg7ZmV7J247ZW07KO87IS47JqU


  		




  33
  33
  
    
[SetThumbnail]


  		




  34
  34
  
    
WIDTH=100


  		




  35
  35
  
    
[Site]


  		




  ......




  37
  37
  
    
[PortForwarding]


  		




  38
  38
  
    
HUB=5100:5100


  		




  39
  39
  
    
RESOURCE=5977:5977


  		




  40
  
  
    
BASE=5978:5978


  		




  
  40
  
    
BASE=5979:5979


  		




  41
  41
  
    
[GetImageResourceFailed]


  		




  42
  
  
    
MSG=7ZW064u5IOusuOyEnOydmCB7MH0gUGFnZSBDb252ZXJ06rCAIOygleyDgeyggeydtOyngCDslYrsirXri4jri6QuIOq0gOumrOyekOyXkOqyjCDrrLjsnZjtlbQg7KO87IS47JqULg==


  		




  
  42
  
    
MSG=7ZW064u5IOusuOyEnOydmCB7MH0gUGFnZSBDb252ZXJ06rCAIOygleyDgeyggeydtOyngCDslYrsirXri4jri6QuIOq0gOumrOyekOyXkOqyjCDrrLjsnZjtlbQg7KO87IS47JqULg==


  		












  

    
      MarkusAutoUpdate/src/NetSparkle.Samples.NetFramework.WPF/Markus.AppUpdate.ini
    
  





  1
  
  
    
#daelim APP_CAST address


  		




  
  1
  
    
#SNI APP_CAST address


  		




  2
  2
  
    

  		




  3
  3
  
    
[APP_CAST]


  		




  4
  
  
    
URI = http://172.20.120.141:5977/MarkusUpdate/appcast.xml


  		




  
  4
  
    
URI = http://10.11.252.3:8975/MarkusUpdate/appcast.xml


  		




  
  5
  
    
InstallPath = 


  		












  

    
      MarkusAutoUpdate/src/NetSparkle.Samples.NetFramework.WPF/NetSparkle_Ed25519.pub
    
  





  1
  
  
    
O4Ivb6u1G6uIgZvvkbHjXXk2AM62w+0lsC8+iagSQaE=


  		




  
  1
  
    
P/Wg9ZBtnKrIv3WzI0TvRvs9XexbIWwFGU9lHimxOQQ=


  		












내보내기  Unified diff




         
        

    















   



  

  
  클립보드 이미지 추가
  (최대 크기: 500 MB)