瀏覽代碼

Fix bug 0019577: 【工作站】logo需屏蔽的地方:1、点击科研分析,加载科研分析界面时;2、科研界面左上角‘’3、【数据】和【图像】无内容时,页面下的logo

jimmy.jiang@vinno.com 8 月之前
父節點
當前提交
8539fa434f
共有 6 個文件被更改,包括 12 次插入1 次删除
  1. 1 1
      fis/Managers/AppManager.cs
  2. 二進制
      fis/Resources/images/Station.ico
  3. 1 0
      fis/WindowsTitleBar.axaml.cs
  4. 3 0
      fis/fis.Mac.csproj
  5. 4 0
      fis/fis.Win.Dev.csproj
  6. 3 0
      fis/fis.Win.csproj

+ 1 - 1
fis/Managers/AppManager.cs

@@ -145,7 +145,7 @@ namespace fis.Managers
         /// </summary>
         public static bool IsSlaveWindow { get; set; } = false;
 
-        public static bool IsVStation { get; set; }=false;
+        public static bool IsVStation => true;
 
         /// <summary>
         /// Current vCloud is cart system or not

二進制
fis/Resources/images/Station.ico


+ 1 - 0
fis/WindowsTitleBar.axaml.cs

@@ -102,6 +102,7 @@ namespace fis
 
                 var resources = assembly.GetManifestResourceNames();
                 var nameFilter = VersionInfo.Instance.isLab ? "flyinsonoLab.ico" : "flyinsono.ico";
+                nameFilter = AppManager.IsVStation ? "Station.ico" : nameFilter;
                 var filePath = resources.FirstOrDefault(x => x.EndsWith(nameFilter));
                 using (var stream = assembly.GetManifestResourceStream(filePath!))
                 {

+ 3 - 0
fis/fis.Mac.csproj

@@ -25,6 +25,9 @@
  <EmbeddedResource Include="Resources\images\flyinsono.ico">
    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  </EmbeddedResource>
+<EmbeddedResource Include="Resources\images\Station.ico">
+		<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+</EmbeddedResource>
  <EmbeddedResource Include="Resources\images\flyinsonoLab.ico">
    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
  </EmbeddedResource>

+ 4 - 0
fis/fis.Win.Dev.csproj

@@ -11,6 +11,7 @@
     <None Remove="Resources\cdll\cdll8_x86.dll" />
     <None Remove="Resources\images\flyinsono.ico" />
     <None Remove="Resources\images\flyinsonoLab.ico" />
+    <None Remove="Resources\images\Station.ico" />
     <None Remove="Resources\labReport\report.html" />
   </ItemGroup>
   <ItemGroup>
@@ -44,6 +45,9 @@
     <EmbeddedResource Include="FisTools\FisPrintDrive.exe">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources\images\Station.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
     <EmbeddedResource Include="Resources\labReport\report.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>

+ 3 - 0
fis/fis.Win.csproj

@@ -65,6 +65,9 @@
 	</EmbeddedResource>
 	<EmbeddedResource Include="Resources\images\flyinsonoLab.ico">
 		<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	</EmbeddedResource>
+                <EmbeddedResource Include="Resources\images\Station.ico">
+		<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	</EmbeddedResource>
     <EmbeddedResource Include="Resources\lang\English.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>