Merge branch 'master' of http://10.2.1.24:10244/xxe/HKCard

HKCardOUT/HKCardOUT.csproj

@@ -14,9 +14,9 @@
 		<AssemblyVersion>1.0.0.0</AssemblyVersion>
 		<Platforms>AnyCPU;x86</Platforms>
 	</PropertyGroup>
-	<PropertyGroup>
+	<!--<PropertyGroup>
 		<ApplicationManifest>App.manifest</ApplicationManifest>
-	</PropertyGroup>
+	</PropertyGroup>-->
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
 		<DefineConstants>TRACE;Core</DefineConstants>
 	</PropertyGroup>

HKCardOUT/Views/RootView.xaml.cs

@@ -26,15 +26,15 @@ namespace HKCardOUT.Views
             {
                 HKLog.HKLogImport.WriteInfo(s);
             });
-            //TurnOn();
+            /*//TurnOn();
             if (!StartEXE.IsExistKey("HKCardOUT"))
             {
                 var Paths = "D:\\HKSK\\HKCardOUT.exe";
                 StartEXE.SelfRunning(true, "HKCardOUT", Paths);
             }
-            /*if (StartEXE.IsExistKey("HKCardOUT"))
+            if (StartEXE.IsExistKey("HKCardOUT"))
             {
-                var Paths = "D:\\HK刷卡端正式环境\\HKCardOUT.exe";
+                var Paths = "D:\\HKSK\\HKCardOUT.exe";
                 StartEXE.SelfRunning(false, "HKCardOUT", Paths);
             }*/
             this.Loaded += RootView_Loaded;