개정판 81908c01
PageStorage Null 체크 후 Clear
Change-Id: Ic2ecdf79c316531cbf15ec3b51451862427549d3
KCOM/App.xaml.cs | ||
---|---|---|
120 | 120 |
|
121 | 121 |
protected override void OnExit(ExitEventArgs e) |
122 | 122 |
{ |
123 |
App.PageStorage.Clear(); |
|
123 |
try |
|
124 |
{ |
|
125 |
if (App.PageStorage != null) |
|
126 |
{ |
|
127 |
App.PageStorage.Clear(); |
|
128 |
} |
|
129 |
} |
|
130 |
catch (Exception) |
|
131 |
{ |
|
132 |
} |
|
124 | 133 |
|
125 | 134 |
base.OnExit(e); |
126 | 135 |
} |
KCOM/KCOM.csproj | ||
---|---|---|
1589 | 1589 |
copy /Y "$(SolutionDir)\INI\MARKUS_Doftech.ini" "C:\ProgramData\MARKUS\MARKUS.ini" |
1590 | 1590 |
) |
1591 | 1591 |
|
1592 |
rem if $(ConfigurationName) == Debug_HyoSung (
|
|
1593 |
rem copy /Y "$(SolutionDir)\INI\MARKUS_HyoSung_Debug.ini" "C:\ProgramData\MARKUS\MARKUS.ini"
|
|
1594 |
rem )
|
|
1592 |
if $(ConfigurationName) == Debug_HyoSung ( |
|
1593 |
copy /Y "$(SolutionDir)\INI\MARKUS_HyoSung_Debug.ini" "C:\ProgramData\MARKUS\MARKUS.ini" |
|
1594 |
) |
|
1595 | 1595 |
|
1596 |
rem if $(ConfigurationName) == Release_HyoSung (
|
|
1597 |
rem copy /Y "$(SolutionDir)\INI\MARKUS_HyoSung.ini" "C:\ProgramData\MARKUS\MARKUS.ini"
|
|
1598 |
rem )
|
|
1596 |
if $(ConfigurationName) == Release_HyoSung ( |
|
1597 |
copy /Y "$(SolutionDir)\INI\MARKUS_HyoSung.ini" "C:\ProgramData\MARKUS\MARKUS.ini" |
|
1598 |
) |
|
1599 | 1599 |
|
1600 | 1600 |
if $(ConfigurationName) == Debug_SNI ( |
1601 | 1601 |
copy /Y "$(SolutionDir)\INI\MARKUS_SNI.ini" "C:\ProgramData\MARKUS\MARKUS.ini" |
KCOM_API/Web.config | ||
---|---|---|
10 | 10 |
</sectionGroup> |
11 | 11 |
</configSections> |
12 | 12 |
<connectionStrings> |
13 |
<!--효성 Connection String--> |
|
14 | 13 |
<add name="ConnectionString" |
15 |
connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework""
|
|
14 |
connectionString="metadata=res://*/DataModel.KCOM_Model.csdl|res://*/DataModel.KCOM_Model.ssdl|res://*/DataModel.KCOM_Model.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework""
|
|
16 | 15 |
providerName="System.Data.EntityClient"/> |
17 | 16 |
<add name="CIConnectionString" |
18 |
connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=10.11.252.2,9875;initial catalog=markus;persist security info=True;user id=ProjectPortalDBConn;password=ProjectPortalDBConn;multipleactiveresultsets=True;App=EntityFramework""
|
|
17 |
connectionString="metadata=res://*/DataModel.CIModel.csdl|res://*/DataModel.CIModel.ssdl|res://*/DataModel.CIModel.msl;provider=System.Data.SqlClient;provider=System.Data.SqlClient;provider connection string="data source=cloud.devdoftech.co.kr,7777;initial catalog=markus;persist security info=True;user id=doftech;password=dof1073#;multipleactiveresultsets=True;App=EntityFramework""
|
|
19 | 18 |
providerName="System.Data.EntityClient"/> |
20 | 19 |
</connectionStrings> |
21 | 20 |
<!-- |
... | ... | |
82 | 81 |
<applicationSettings> |
83 | 82 |
<KCOM_API.Properties.Settings> |
84 | 83 |
<setting name="TileSoucePath" serializeAs="String"> |
85 |
<value>http://10.11.252.3/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
84 |
<value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
86 | 85 |
</setting> |
87 | 86 |
<setting name="TileSoucePath_SUB" serializeAs="String"> |
88 |
<value>http://10.11.252.3/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
87 |
<value>http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png</value>
|
|
89 | 88 |
</setting> |
90 | 89 |
<setting name="IsProjectNoPass" serializeAs="String"> |
91 | 90 |
<value>True</value> |
내보내기 Unified diff