Commit 55e4f102 authored by 姜春辉's avatar 姜春辉

版本发布

Signed-off-by: 姜春辉's avatar姜春辉 <gaigai3355@hotmail.com>
parent b5439343
<?xml version="1.0" encoding="utf-8" ?>
<Settings xmlns="urn:Chinags-Configuration" AddonName="GS.Terminal.Console">
<Dictionaries>
<Dict Name="baseConfig" Caption="基本配置">
<Key Name="WatchPort" Value="10031" Caption="监听端口" Choice="" />
<Key Name="HttpPort" Value="10032" Caption="控制页面端口" Choice="" />
</Dict>
</Dictionaries>
</Settings>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<Extensibility xmlns="urn:Chinags-Extensibility-1.0" Name="终端控制台插件" SymbolicName="GS.Terminal.Console" Version="1.0.0.0" StartLevel="10">
<License>hPnEXlXcHZOUdEa4a8sn56bTmI9lqbfLm/krwT3T7KFeREu3k58r9HCL/9p4ZrbYlrf6a14Bquo70dQN4zVxCEN+OoF9zCU7BCjqD7Z9PpnWv0yEeV/hD4/VvDzchq3sV64XgtxIIuKrI+WjZ/gZcMVQRq2RwCE/hgHbDtcoT6k=</License>
<Activator Type="GS.Terminal.Console.Activator" />
<Runtime>
<Assembly Path="GS.Terminal.Console.dll" Share="true" />
</Runtime>
<Services>
<Service Caption="远程指令服务" TypeAndName="GS.Terminal.Console.Services.RemoteService">
<!--
/// <summary>
/// 开始向远程机发送心跳
/// </summary>
/// <param name="remoteIp">地址</param>
/// <param name="remotePort">端口</param>
/// <param name="interval">间隔</param>
void StartHeart(string remoteIp,int remotePort, int interval)
发送心跳指令$Heart
指令内容通过 TERMINAL_STATUS 公共交互字段填充
/// <summary>
/// 停止发送心跳
/// </summary>
/// <param name="remoteIp">心跳远程地址</param>
void StopHeart(string remoteIp)
/// <summary>
/// 发送ping指令
/// </summary>
/// <param name="serverIP">服务器ip</param>
/// <param name="StatusChangedCallback">ping指令状态变更回调</param>
void StartPing(string serverIP,Action<IPStatus> StatusChangedCallback)
/// <summary>
/// 停止Ping
/// </summary>
/// <param name="serverIP">服务器地址</param>
/// <param name="StatusChangedCallback">移除事件</param>
void StopPing(string serverIP, Action<IPStatus> StatusChangedCallback)
-->
</Service>
</Services>
</Extensibility>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Settings xmlns="urn:Chinags-Configuration" AddonName="GS.Terminal.Visitor.Logic">
<Dictionaries>
<Dict Caption="业务逻辑基本配置" Name="LogicConfig">
<Key Caption="界面切换的时间间隔(秒)" Choice="" Name="SwitchViewSecond" Value="30"/>
<Key Caption="是否显示菜单" Choice="" Name="ShowMenu" Value="true"/>
</Dict>
</Dictionaries>
<Structures>
<Structure Caption="仪表板配置" Name="DashBoardConfig">
<Declare>
<Property Caption="名称" Name="Name"/>
<Property Caption="ID" Name="DashBoardID"/>
<Property Caption="数据源地址" Name="Source"/>
<Property Caption="是否启用" Name="Enable"/>
<Property Caption="排序序号" Name="OrderIndex"/>
</Declare>
<Datas>
<!--班级考勤-->
<Data Name="班级考勤" DashBoardID="2434f42b-b9bf-4369-997d-88349e61572a" Source="http://xykt.hz2hs.net.cn/Services/ClassAttendance/CourseAttendanceStatistics/Json" Enable="true" OrderIndex="1" />
<!--以下是可视化内容-->
<Data Name="学生在校状态" DashBoardID="28ef0db7-558f-4cb7-a1d3-afb0b5dc0623" Source="http://xykt.hz2hs.net.cn/Services/HZEZDataSummary/SchoolAllStudentState/json" Enable="true" OrderIndex="1" />
<Data Name="房间预约" DashBoardID="dc9537ab-0480-45f0-a309-eec97b9fb734" Source="http://xykt.hz2hs.net.cn/Services/HZEZDataSummary/SpecialClassroomOrderInfo/json" Enable="true" OrderIndex="2" />
<Data Name="宿舍状态" DashBoardID="f0eccb42-801c-462d-a98a-3de216314d51" Source="http://xykt.hz2hs.net.cn/Services/HZEZDataSummary/GetSuSheData/json" Enable="true" OrderIndex="3" />
<Data Name="教师请假" DashBoardID="ddd2027a-d1d4-42ac-9313-8ce50d4b197f" Source="http://xykt.hz2hs.net.cn/Services/HZEZDataSummary/TeacherLeaveList/json" Enable="true" OrderIndex="4" />
<Data Name="环境信息" DashBoardID="8a27048a-00ec-4906-8eb8-0fcd1d110436" Source="http://xykt.hz2hs.net.cn/Visualization/ClassNowEn.ashx" Enable="false" OrderIndex="5" />
</Datas>
</Structure>
</Structures>
</Settings>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Extensibility xmlns="urn:Chinags-Extensibility-1.0" Name="数据仪表板业务逻辑插件" SymbolicName="GS.Terminal.Visitor.Logic" Version="1.0.0.0" StartLevel="999">
<License>dWQFG13hw6Mb8GfKDzviapq6qiVcsWqKwbjZxONSxhqjn/Z/3S6tn/QCEhZv50Faa4lwGY1/O5O35ZrNfRtcgD4+JU31wIQGfl3oDUZzoJ4R7l4Ivlim/rdPZqJ33WX8o9/qfUbbSCmJx3eFe87UMkXaLE+5Xpp7x+QNx3TRle0=</License>
<Activator Type="GS.Terminal.DashBoard.Logic.Program"/>
<Runtime>
<Assembly Path="GS.Terminal.DashBoard.Logic.dll" Share="true"/>
</Runtime>
<ObjectSpaces>
<!--<Channel ConnectionName="sqlite" ModelAssembly="GS.Terminal.Visitor.db" Name="localdb"/>-->
</ObjectSpaces>
</Extensibility>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Settings xmlns="urn:Chinags-Configuration" AddonName="GS.Terminal.LogicShell">
</Settings>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Extensibility xmlns="urn:Chinags-Extensibility-1.0" Name="终端业务界面插件" SymbolicName="GS.Terminal.LogicShell" Version="2.0.1.0" StartLevel="30">
<License>PQypSf3bqcoeawY+ml/JvhDU784Tc+sIPCMDNb/42vS8AoqOxowMaqfLyPjHuJ1XdGb2rZ0YvlwOyKBVlllR1r+8iGq/4HJ7b9QAyoYbmqDF8gixxRk2PrvV9+lY5eepuUtZ3xi09boITUZ31yz6qtVLaei13YFKAnk5Db2YssY=</License>
<Activator Type="GS.Terminal.LogicShell.Activator" />
<Runtime>
<Assembly Path="GS.Terminal.LogicShell.dll" Share="true" />
</Runtime>
<Services>
<Service Caption="试图控制服务" TypeAndName="GS.Terminal.LogicShell.Interface.IViewHelperService"></Service>
</Services>
</Extensibility>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Settings xmlns="urn:Chinags-Configuration" AddonName="GS.Terminal.MainShell">
<Dictionaries>
<Dict Name="WindowAttribute" Caption="窗体属性">
<Key Caption="窗口头部标题" Name="LogoTitle" Value="" Choice=""/>
<Key Caption="高级设置窗口打开延迟(毫秒)" Name="PasswordWindowDelay" Value="3000" Choice="" />
</Dict>
</Dictionaries>
</Settings>
<?xml version="1.0" encoding="utf-8" ?>
<Extensibility xmlns="urn:Chinags-Extensibility-1.0" Name="主界面" SymbolicName="GS.Terminal.MainShell" Version="2.0.0.0" StartLevel="20">
<License>iLVGuqCCTy+V0cauDJoMTHmmpAGXpbej0ziJivEZX1sq8Qo/WBXJ5WEiWWtxpkkf45wkKUmkNJi8auJi5y5X1VYSP+D15/TROtR85kiQpdZx7IHQXpodt3tjhVnpWNwr9s4TiJrIiQQsV4QKVL+7ysElGccdwgLNOa56vTwyouk=</License>
<Activator Type="GS.Terminal.MainShell.Program" />
<Runtime>
<Assembly Path="GS.Terminal.MainShell.dll" Share="true" />
</Runtime>
<Services>
<Service Caption="跳转服务" TypeAndName="GS.Terminal.MainShell.Services.NavigateService"></Service>
<Service Caption="界面控制服务" TypeAndName="GS.Terminal.MainShell.Services.UIService"></Service>
</Services>
</Extensibility>
\ No newline at end of file
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- 头部-->
<Style x:Key="MainShell_HeaderBackground" TargetType="Grid">
<Setter Property="Height" Value="80"></Setter>
<Setter Property="Background" Value="#0278d2"></Setter>
</Style>
<!-- 底部-->
<Style x:Key="MainShell_FootBackground" TargetType="Grid">
<Setter Property="Height" Value="0"></Setter>
<Setter Property="Background" Value="#006766"></Setter>
</Style>
</ResourceDictionary>
\ No newline at end of file
ThemeName=Common
ThemeDescribe=公共资源
MainShellStyle.xaml
ScrollViewStyle.xaml
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Settings xmlns="urn:Chinags-Configuration" AddonName="GS.Terminal.Theme">
<Dictionaries>
<Dict Name="Theme" Caption="默认主题">
<Key Caption="主题名称" Choice="" Name="ThemeName" Value="Default"/>
</Dict>
</Dictionaries>
</Settings>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<Extensibility xmlns="urn:Chinags-Extensibility-1.0" Name="终端皮肤管理插件" SymbolicName="GS.Terminal.Theme" Version="1.0.0.0" StartLevel="10">
<License>
ULuQdHnvhrvUlZmzA5BCjYAK7Qd9kGYtaWzaNyalfGLllQno+WuOpN02bNnqtZBVy0CMsc5vHdGEC2CKn1Oo5d0/h0pezKKRK8pWwWVOkN42Slqjd15Zh/fIcKo6JYLaAWhUs1/NAGXPzLIp5GddHGaEEB9RuicntOi9fUa06YE=
</License>
<Activator Type="GS.Terminal.Theme.AddonActivator"/>
<Runtime>
<Assembly Path="GS.Terminal.Theme.dll" Share="true"/>
</Runtime>
<Services>
<Service Caption="主题管理服务" TypeAndName="GS.Terminal.Theme.Service"></Service>
</Services>
</Extensibility>
\ No newline at end of file
ThemeName=Default
ThemeDescribe=默认
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<DataSpaces Encrypt="false" xmlns="urn:Chinags-DataSpaceConfig">
<Connection Database="localData.db" Password="123" Name="sqlite" DBType="SQLITE" Server="" User=""/>
</DataSpaces>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
</startup>
<appSettings>
<clear/>
<add key="UpdateUrl" value="http://192.168.1.5:8089/Soft/update"/>
<add key="ServerIP" value="192.168.1.5"/>
<add key="tCode" value="DM"/>
<add key="WebPath" value="http://192.168.1.5:8088/"/>
</appSettings>
</configuration>
\ No newline at end of file
<RSAKeyValue><Modulus>oR1xS/pMhMW+FLn20nm7pCR9CJ5K9MBFa3xJ/Ehd2C0xADZ/MUzXzot0J+ML9hOSj2tKZz33kN2CC2TV93xzStz21P+GIHwEdHLZMeRiOl8Yr1DXx0f7Nn/GYi9VAO4eiHgvoiTqukCc2pnxxY/nUxoNYTJAM6B3eQBkv3+FV0E=</Modulus><Exponent>AQAB</Exponent><P>1zuUcJ5Cpbj6+m/n15TBBoCZYq6MdOECVAnx3hHHIEr567cTntPuY+ZN5JRmf6Vtlyyl3RKrp/0Xrdr3oJdtKw==</P><Q>v6G/lgpj1UXJmizLmjGtvQu60ICDbAhSqY2/a0M2iDeXdu6bm02czS6j2vlP1rg4+wF5NGXHdX2RvpmBMNrPQw==</Q><DP>l4iWCPgTmlPzN/EjvK85e1d9JnIX544nsn1R8XR4yq6e6Kr7wF4bv+/8tUsaIxKYZtADcvNbManKSxgYMdOLAw==</DP><DQ>DUfqfT2PGbLSfArquW8D+XwcoGKnuQ8Cm5mlUIvB9cLUjnuO8T55xYab+Isay2jNGihJ/CWpoyzmsuz0lSw0/Q==</DQ><InverseQ>pSRidCNVfapskDhvS4DA1RC35S4RnqB6gs5nMNT4C1euu5w06pbJ5s98zgs2avWBzxCA7uFiQyol/NC0KKQA/A==</InverseQ><D>JKPFeDnb3PX7XEtOTl9QxOtnY+ZbtX1kTCVfzffHH7pnQl0iX9vR2C7uo4OG3NdmpScJLKFzA4bcZCryXe33adp/Qk1WUMCawnwP1dHKjGs7aB0+mTbfYiFw7Nnhdt0FsxM64/tw9Tra9aF0z+GN5aagpzE9PBKN28cRBYHg5mE=</D></RSAKeyValue>
\ No newline at end of file
<log4net>
<!-- 调试日志类-->
<logger name="logdebug">
<level value="ALL" />
<appender-ref ref="DebugAppender" />
</logger>
<!-- 错误日志类-->
<logger name="logerror">
<level value="ALL" />
<appender-ref ref="ErrorAppender" />
</logger>
<!-- 信息日志类 -->
<logger name="loginfo">
<level value="ALL" />
<appender-ref ref="InfoAppender" />
</logger>
<!-- 调试日志附加介质-->
<appender name="DebugAppender" type="log4net.Appender.RollingFileAppender">
<param name="File" value="Log\\LogDebug\\" />
<param name="AppendToFile" value="false" />
<param name="MaxFileSize" value="1024" />
<param name="MaxSizeRollBackups" value="3" />
<param name="StaticLogFileName" value="false" />
<param name="DatePattern" value="yyyyMMdd&quot;.htm&quot;" />
<param name="RollingStyle" value="Date" />
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<Encoding value="UTF-8" />
<!-- 信息日志布局-->
<layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="&lt;HR COLOR=blue&gt;%n日志时间:%d [%t] &lt;BR&gt;%n日志级别:%-5p &lt;BR&gt;%n日 志 类:%c &lt;BR&gt;%n%m &lt;BR&gt;%n &lt;HR Size=1&gt;" />
</layout>
</appender>
<!-- 错误日志附加介质-->
<appender name="ErrorAppender" type="log4net.Appender.RollingFileAppender">
<param name="File" value="Log\\LogError\\" />
<param name="AppendToFile" value="false" />
<param name="MaxSizeRollBackups" value="5" />
<param name="MaxFileSize" value="1024" />
<param name="StaticLogFileName" value="false" />
<param name="DatePattern" value="yyyyMMdd&quot;.htm&quot;" />
<param name="RollingStyle" value="Date" />
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<Encoding value="UTF-8" />
<!--布局-->
<layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="&lt;HR COLOR=red&gt;%n【异常时间】:%d [%t] &lt;BR&gt;%n【异常级别】:%-5p &lt;BR&gt;%n【异 常 类】:%c &lt;BR&gt;%n%m &lt;BR&gt;%n &lt;HR Size=1&gt;" />
</layout>
</appender>
<!-- 信息日志附加介质-->
<appender name="InfoAppender" type="log4net.Appender.RollingFileAppender">
<param name="File" value="Log\\LogInfo\\" />
<param name="AppendToFile" value="false" />
<param name="MaxFileSize" value="1024" />
<param name="MaxSizeRollBackups" value="3" />
<param name="StaticLogFileName" value="false" />
<param name="DatePattern" value="yyyyMMdd&quot;.htm&quot;" />
<param name="RollingStyle" value="Date" />
<lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
<Encoding value="UTF-8" />
<!-- 信息日志布局-->
<layout type="log4net.Layout.PatternLayout">
<param name="ConversionPattern" value="&lt;HR COLOR=blue&gt;%n日志时间:%d [%t] &lt;BR&gt;%n日志级别:%-5p &lt;BR&gt;%n日 志 类:%c &lt;BR&gt;%n%m &lt;BR&gt;%n &lt;HR Size=1&gt;" />
</layout>
</appender>
</log4net>
......@@ -17,13 +17,13 @@
</Declare>
<Datas>
<!--班级考勤-->
<Data Name="班级考勤" DashBoardID="2434f42b-b9bf-4369-997d-88349e61572a" Source="http://192.168.1.5/Services/ClassAttendance/CourseAttendanceStatistics/Json" Enable="true" OrderIndex="1" />
<Data Name="班级考勤" DashBoardID="2434f42b-b9bf-4369-997d-88349e61572a" Source="http://xykt.hz2hs.net.cn/Services/ClassAttendance/CourseAttendanceStatistics/Json" Enable="true" OrderIndex="1" />
<!--以下是可视化内容-->
<Data Name="学生在校状态" DashBoardID="28ef0db7-558f-4cb7-a1d3-afb0b5dc0623" Source="http://192.168.1.5/Services/HZEZDataSummary/SchoolAllStudentState/json" Enable="true" OrderIndex="1" />
<Data Name="房间预约" DashBoardID="dc9537ab-0480-45f0-a309-eec97b9fb734" Source="http://192.168.1.5/Services/HZEZDataSummary/SpecialClassroomOrderInfo/json" Enable="true" OrderIndex="2" />
<Data Name="宿舍状态" DashBoardID="f0eccb42-801c-462d-a98a-3de216314d51" Source="http://192.168.1.5/Services/HZEZDataSummary/GetSuSheData/json" Enable="true" OrderIndex="3" />
<Data Name="教师请假" DashBoardID="ddd2027a-d1d4-42ac-9313-8ce50d4b197f" Source="http://192.168.1.5/Services/HZEZDataSummary/TeacherLeaveList/json" Enable="true" OrderIndex="4" />
<Data Name="环境信息" DashBoardID="8a27048a-00ec-4906-8eb8-0fcd1d110436" Source="http://ykt.hz2hs.net.cn/Visualization/ClassNowEn.ashx" Enable="true" OrderIndex="5" />
<Data Name="学生在校状态" DashBoardID="28ef0db7-558f-4cb7-a1d3-afb0b5dc0623" Source="http://xykt.hz2hs.net.cn/Services/HZEZDataSummary/SchoolAllStudentState/json" Enable="true" OrderIndex="1" />
<Data Name="房间预约" DashBoardID="dc9537ab-0480-45f0-a309-eec97b9fb734" Source="http://xykt.hz2hs.net.cn/Services/HZEZDataSummary/SpecialClassroomOrderInfo/json" Enable="true" OrderIndex="2" />
<Data Name="宿舍状态" DashBoardID="f0eccb42-801c-462d-a98a-3de216314d51" Source="http://xykt.hz2hs.net.cn/Services/HZEZDataSummary/GetSuSheData/json" Enable="true" OrderIndex="3" />
<Data Name="教师请假" DashBoardID="ddd2027a-d1d4-42ac-9313-8ce50d4b197f" Source="http://xykt.hz2hs.net.cn/Services/HZEZDataSummary/TeacherLeaveList/json" Enable="true" OrderIndex="4" />
<Data Name="环境信息" DashBoardID="8a27048a-00ec-4906-8eb8-0fcd1d110436" Source="http://xykt.hz2hs.net.cn/Visualization/ClassNowEn.ashx" Enable="false" OrderIndex="5" />
</Datas>
</Structure>
</Structures>
......
......@@ -67,11 +67,7 @@ namespace GS.Terminal.DashBoard.Logic
locator.Main.EnableCancelFullScreen = false;
locator.Main.ShowItem();
}
//MainShellService.RegistBackgroundCommand("dashboard", () =>
//{
LogicShellService.Show(locator.Main, arg => { dbc?.StartRefresh(); });
//ThemeService.SetTheme("dashboard");
//});
}
public void Stop(IAddonContext Context)
......
......@@ -28,39 +28,56 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Publish|Any CPU = Publish|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D9AE7B96-4C82-43B4-B7C6-3E87A6E7FBBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D9AE7B96-4C82-43B4-B7C6-3E87A6E7FBBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D9AE7B96-4C82-43B4-B7C6-3E87A6E7FBBB}.Publish|Any CPU.ActiveCfg = Publish|Any CPU
{D9AE7B96-4C82-43B4-B7C6-3E87A6E7FBBB}.Publish|Any CPU.Build.0 = Publish|Any CPU
{D9AE7B96-4C82-43B4-B7C6-3E87A6E7FBBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D9AE7B96-4C82-43B4-B7C6-3E87A6E7FBBB}.Release|Any CPU.Build.0 = Release|Any CPU
{A574B188-3BD5-41D7-A0A6-ABDDB19D090C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A574B188-3BD5-41D7-A0A6-ABDDB19D090C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A574B188-3BD5-41D7-A0A6-ABDDB19D090C}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
{A574B188-3BD5-41D7-A0A6-ABDDB19D090C}.Publish|Any CPU.Build.0 = Debug|Any CPU
{A574B188-3BD5-41D7-A0A6-ABDDB19D090C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A574B188-3BD5-41D7-A0A6-ABDDB19D090C}.Release|Any CPU.Build.0 = Release|Any CPU
{F82DE260-171B-4C82-A9D1-166317E26498}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F82DE260-171B-4C82-A9D1-166317E26498}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F82DE260-171B-4C82-A9D1-166317E26498}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
{F82DE260-171B-4C82-A9D1-166317E26498}.Publish|Any CPU.Build.0 = Debug|Any CPU
{F82DE260-171B-4C82-A9D1-166317E26498}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F82DE260-171B-4C82-A9D1-166317E26498}.Release|Any CPU.Build.0 = Release|Any CPU
{7F5D04DD-9328-40B5-A69E-7A6F99895073}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7F5D04DD-9328-40B5-A69E-7A6F99895073}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7F5D04DD-9328-40B5-A69E-7A6F99895073}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
{7F5D04DD-9328-40B5-A69E-7A6F99895073}.Publish|Any CPU.Build.0 = Debug|Any CPU
{7F5D04DD-9328-40B5-A69E-7A6F99895073}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7F5D04DD-9328-40B5-A69E-7A6F99895073}.Release|Any CPU.Build.0 = Release|Any CPU
{DEF5B6CC-F295-47CD-A6E0-8D981942AC27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DEF5B6CC-F295-47CD-A6E0-8D981942AC27}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DEF5B6CC-F295-47CD-A6E0-8D981942AC27}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
{DEF5B6CC-F295-47CD-A6E0-8D981942AC27}.Publish|Any CPU.Build.0 = Debug|Any CPU
{DEF5B6CC-F295-47CD-A6E0-8D981942AC27}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DEF5B6CC-F295-47CD-A6E0-8D981942AC27}.Release|Any CPU.Build.0 = Release|Any CPU
{CFBE64F7-4EB9-4057-8182-0EBC2C96FD60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CFBE64F7-4EB9-4057-8182-0EBC2C96FD60}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CFBE64F7-4EB9-4057-8182-0EBC2C96FD60}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
{CFBE64F7-4EB9-4057-8182-0EBC2C96FD60}.Publish|Any CPU.Build.0 = Debug|Any CPU
{CFBE64F7-4EB9-4057-8182-0EBC2C96FD60}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CFBE64F7-4EB9-4057-8182-0EBC2C96FD60}.Release|Any CPU.Build.0 = Release|Any CPU
{A1F9EC7B-EA1E-4141-B380-51D03324433A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A1F9EC7B-EA1E-4141-B380-51D03324433A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1F9EC7B-EA1E-4141-B380-51D03324433A}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
{A1F9EC7B-EA1E-4141-B380-51D03324433A}.Publish|Any CPU.Build.0 = Debug|Any CPU
{A1F9EC7B-EA1E-4141-B380-51D03324433A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A1F9EC7B-EA1E-4141-B380-51D03324433A}.Release|Any CPU.Build.0 = Release|Any CPU
{95149426-C9E2-4339-B345-67F73F134C2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{95149426-C9E2-4339-B345-67F73F134C2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{95149426-C9E2-4339-B345-67F73F134C2F}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
{95149426-C9E2-4339-B345-67F73F134C2F}.Publish|Any CPU.Build.0 = Debug|Any CPU
{95149426-C9E2-4339-B345-67F73F134C2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{95149426-C9E2-4339-B345-67F73F134C2F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
......
......@@ -40,6 +40,17 @@
<PropertyGroup>
<StartupObject>GS.Terminal.DashBoard.App</StartupObject>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Publish|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\Publish\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="CommonServiceLocator, Version=2.0.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll</HintPath>
......
......@@ -188,7 +188,7 @@
</Grid>
</Grid>
<Border Background="#4C000000" Visibility="{Binding DetailShowing, Converter={StaticResource BooleanToVisibilityConverter}}">
<Border d:IsHidden="True" Background="#4C000000" Visibility="{Binding DetailShowing, Converter={StaticResource BooleanToVisibilityConverter}}">
<Border Background="White" Padding="30,10,30,10" Width="1244" Height="708" BorderBrush="#0080a9" BorderThickness="4" CornerRadius="10">
<Grid >
<Grid.RowDefinitions>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment