2.03

dunvit · Dec 16, 2017 · 03939ca · 03939ca
1 parent 09b8902
commit 03939ca
Show file tree

Hide file tree

Showing 43 changed files with 2,444 additions and 767 deletions.
diff --git a/Client/EvaJima/EveJima.csproj b/Client/EvaJima/EveJima.csproj
@@ -68,7 +68,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\2.02.5\</OutputPath>
+    <OutputPath>bin\x86\2.03.1\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -177,7 +177,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EvaJimaCore\EveJimaCore.csproj">

diff --git a/Client/EvaJima/Version.txt b/Client/EvaJima/Version.txt
@@ -1 +1 @@
-2.02
+2.03
diff --git a/Client/EvaJimaCore/BLL/EveJimaMessages.cs b/Client/EvaJimaCore/BLL/EveJimaMessages.cs
@@ -0,0 +1,12 @@
+using EvaJimaCore;
+
+namespace EveJimaCore.BLL
+{
+    public class EveJimaMessages
+    {
+        public string Get(string key)
+        {
+            return Tools.GetValue(key, Global.ApplicationSettings.LanguageId);
+        }
+    }
+}
diff --git a/Client/EvaJimaCore/EveJimaCore.csproj b/Client/EvaJimaCore/EveJimaCore.csproj
@@ -92,6 +92,7 @@
     <Compile Include="BLL\Map\MapTools.cs" />
     <Compile Include="BLL\Map\MapUpdateHistory.cs" />
     <Compile Include="BLL\Map\PilotLocation.cs" />
+    <Compile Include="BLL\EveJimaMessages.cs" />
     <Compile Include="BLL\MetricsWriter.cs" />
     <Compile Include="BLL\Navigator\Path.cs" />
     <Compile Include="BLL\PathFinder.cs" />
@@ -106,6 +107,16 @@
     <Compile Include="EveJimaPresenter.cs" />
     <Compile Include="Infrastructure\CrestApiFunctions.cs" />
     <Compile Include="Infrastructure\LazyLogger.cs" />
+    <Compile Include="Localization\English.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>English.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Localization\Russian.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Russian.resx</DependentUpon>
+    </Compile>
     <Compile Include="Logic\MapInformation\AMapInformationModel.cs" />
     <Compile Include="Logic\MapInformation\AMapInformationPresenter.cs" />
     <Compile Include="Logic\MapInformation\IAMapInformationModel.cs" />
@@ -251,12 +262,6 @@
     <Compile Include="WhlControls\whlRouter.Designer.cs">
       <DependentUpon>whlRouter.cs</DependentUpon>
     </Compile>
-    <Compile Include="WhlControls\windowMapSettings.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="WhlControls\windowMapSettings.Designer.cs">
-      <DependentUpon>windowMapSettings.cs</DependentUpon>
-    </Compile>
     <Compile Include="WhlControls\windowMessage.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -351,6 +356,14 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Localization\English.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>English.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Localization\Russian.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Russian.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <EmbeddedResource Include="Logic\MapInformation\MapControl.resx">
       <DependentUpon>MapControl.cs</DependentUpon>
     </EmbeddedResource>
@@ -449,9 +462,6 @@
     <EmbeddedResource Include="WhlControls\whlVersion.resx">
       <DependentUpon>whlVersion.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="WhlControls\windowMapSettings.resx">
-      <DependentUpon>windowMapSettings.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="WhlControls\windowMessage.resx">
       <DependentUpon>windowMessage.cs</DependentUpon>
     </EmbeddedResource>
@@ -519,9 +529,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="RoadMap\TasksStack.txt" />
     <Content Include="Versions\202\2.02.txt" />
     <Content Include="Versions\202\Release.html" />
+    <Content Include="Versions\203\2.03.txt" />
+    <Content Include="Versions\203\Release.html" />
     <Content Include="Versions\Release.html" />
     <Content Include="Versions\Tasks.txt" />
     <Content Include="Versions\1.35.txt" />

diff --git a/Client/EvaJimaCore/Global.cs b/Client/EvaJimaCore/Global.cs
@@ -11,6 +11,8 @@ public static class Global
     {
         private static readonly ILog Log = LogManager.GetLogger(typeof(Global));
 
+        public static EveJimaMessages Messages;
+
         public static WorkEnvironment WorkEnvironment;
 
         public static ApplicationSettings ApplicationSettings;
@@ -31,6 +33,8 @@ public static class Global
 
         public static EveJimaPresenter Presenter;
 
+        public static EsiAuthorization EsiTools;
+
         public static void Initialization()
         {
             ApplicationSettings = new ApplicationSettings();
@@ -40,6 +44,8 @@ public static void Initialization()
 
             WorkEnvironment = new WorkEnvironment();
 
+            Messages = new EveJimaMessages();
+
             Metrics = new MetricsWriter();
 
             Pilots = new PilotsEntity();
@@ -56,6 +62,8 @@ public static void Initialization()
 
             Presenter = new EveJimaPresenter();
 
+            EsiTools = new EsiAuthorization(ApplicationSettings.Authorization_ClientId, ApplicationSettings.Authorization_ClientSecret);
+
         }
 
         public static void Dispose()

diff --git a/Client/EvaJimaCore/Infrastructure/EsiAuthorization.cs b/Client/EvaJimaCore/Infrastructure/EsiAuthorization.cs
@@ -234,7 +234,39 @@ public dynamic GetSolarSystemInfo(string systemId)
             }
         }
 
-
+        public dynamic GetCorporationInfo(string corporationId)
+        {
+            Log.DebugFormat("[EsiAuthorization.GetCorporationInfo] started. systemId = {0}", corporationId);
+
+            try
+            {
+                var url = "https://esi.tech.ccp.is/latest/corporations/names/?corporation_ids=" + corporationId + "&datasource=tranquility";
+
+                var httpWebRequest = (HttpWebRequest)WebRequest.Create(url);
+
+                httpWebRequest.Method = "GET";
+                httpWebRequest.Headers.Add("Authorization", "Bearer " + AccessToken);
+                httpWebRequest.ContentType = "application/json";
+
+                var httpResponse = (HttpWebResponse)httpWebRequest.GetResponse();
+                using (var streamReader = new StreamReader(httpResponse.GetResponseStream()))
+                {
+                    var result = streamReader.ReadToEnd();
+
+                    result = result.Substring(1, result.Length - 2);
+
+                    Log.DebugFormat("[EsiAuthorization.GetCorporationInfo] result = {0}", result);
+
+                    return JObject.Parse(result);
+
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.ErrorFormat("Critical error in [EsiAuthorization.GetCorporationInfo] systemId = {1} Exception is {0}", ex, corporationId);
+                return null;
+            }
+        }
 
         public dynamic GetLocation(long pilotId)
         {

diff --git a/Client/EvaJimaCore/Infrastructure/Tools.cs b/Client/EvaJimaCore/Infrastructure/Tools.cs
@@ -1,15 +1,19 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.Eventing.Reader;
 using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Reflection;
+using System.Resources;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Xml;
 using System.Xml.Serialization;
 using EvaJimaCore;
+using EveJimaCore.Localization;
 using log4net;
 using EveJimaUniverse;
 using Newtonsoft.Json;
@@ -231,5 +235,21 @@ public static T CloneObject<T>(this T source)
 
             return JsonConvert.DeserializeObject<T>(JsonConvert.SerializeObject(source), deserializeSettings);
         }
+
+        public static string GetValue(string key, int language)
+        {
+
+            switch(language)
+            {
+                case 1:
+                    return English.ResourceManager.GetString(key);
+
+                case 2:
+                    return Russian.ResourceManager.GetString(key);
+
+                default:
+                    return English.ResourceManager.GetString(key);
+            }
+        }
     }
 }