1

source/ACSingleStore/AutoInOutStore.csproj

@@ -126,6 +126,7 @@
     </Compile>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Content Include="ResourceCulture - 复制.txt" />
     <Compile Include="ResourceCulture.cs" />
     <Compile Include="ResourceCulture.cs" />
     <Compile Include="userControl\AxisMoveControl.cs">
     <Compile Include="userControl\AxisMoveControl.cs">
       <SubType>UserControl</SubType>
       <SubType>UserControl</SubType>
@@ -164,16 +165,6 @@
     <EmbeddedResource Include="positionTool\FrmPositionTool.resx">
     <EmbeddedResource Include="positionTool\FrmPositionTool.resx">
       <DependentUpon>FrmPositionTool.cs</DependentUpon>
       <DependentUpon>FrmPositionTool.cs</DependentUpon>
     </EmbeddedResource>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resource.en-US.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resource.ge-DE.resx" />
-    <EmbeddedResource Include="Properties\Resource.ja-JP.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resource.zh-CN.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -203,6 +194,15 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     </Compile>
+    <None Include="resources\en-US.lngres">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="resources\ja-JP.lngres">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="resources\zh-CN.lngres">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   </ItemGroup>
   <ItemGroup>
   <ItemGroup>
     <None Include="App.config">
     <None Include="App.config">
@@ -285,6 +285,7 @@
       <Install>false</Install>
       <Install>false</Install>
     </BootstrapperPackage>
     </BootstrapperPackage>
   </ItemGroup>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
   <PropertyGroup>
     <PreBuildEvent>powershell.exe -command "$ci=(git rev-parse HEAD);$bi=git rev-parse --abbrev-ref HEAD ;$ti=Get-Content ..\..\Properties\AssemblyInfo.cs ; Foreach-Object {$ti -replace 'AssemblyProduct.*',\"AssemblyProduct(\"\"$bi $ci\"\")]\"} | Set-Content ..\..\Properties\AssemblyInfo.cs"</PreBuildEvent>
     <PreBuildEvent>powershell.exe -command "$ci=(git rev-parse HEAD);$bi=git rev-parse --abbrev-ref HEAD ;$ti=Get-Content ..\..\Properties\AssemblyInfo.cs ; Foreach-Object {$ti -replace 'AssemblyProduct.*',\"AssemblyProduct(\"\"$bi $ci\"\")]\"} | Set-Content ..\..\Properties\AssemblyInfo.cs"</PreBuildEvent>

source/ACSingleStore/Properties/AssemblyInfo.cs

@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SO815-AutoInOutStore-newui 6a94653ad313f6b8764fff2ac5bc5c8f5ef921a9")]
+[assembly: AssemblyProduct("SO815-AutoInOutStore-newui 8085497464b826c220b36d5ffe07195ff287ff2a")]
 [assembly: AssemblyCopyright("edf7e3d07d3c8cafa890a08f4b855e559a36d414")]
 [assembly: AssemblyCopyright("edf7e3d07d3c8cafa890a08f4b855e559a36d414")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyCulture("")]

source/Common/Common.csproj

@@ -65,6 +65,7 @@
     <Compile Include="util\MyWebClient.cs">
     <Compile Include="util\MyWebClient.cs">
       <SubType>Component</SubType>
       <SubType>Component</SubType>
     </Compile>
     </Compile>
+    <Compile Include="util\SMF.cs" />
     <Compile Include="util\TcpClient.cs" />
     <Compile Include="util\TcpClient.cs" />
     <Compile Include="util\TcpServer.cs" />
     <Compile Include="util\TcpServer.cs" />
     <Compile Include="util\UdpServer.cs" />
     <Compile Include="util\UdpServer.cs" />

source/Common/util/SMF.cs

+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OnlineStore.Common
+{
+    public class SMF
+    {
+        public static string DeviceType = "MIMO";
+        static string _server = ConfigAppSettings.GetValue(Setting_Init.http_server);
+        static string server
+        {
+            get
+            {
+                _server = "http://192.168.1.243/smf-core";
+                if (_server.EndsWith("/"))
+                {
+                    return _server.Remove(_server.Length - 1, 1);
+                }
+                else
+                    return _server;
+            }
+        }
+        public static bool UploadLangJsonData(string json, out SmfResult smfResult)
+        {
+            var insertindex = json.IndexOf("{");
+            json = json.Insert(insertindex + 1, "\"type\": \""+ DeviceType + "\",");
+            return UploadJsonData("/api/translation/resource", json, out smfResult);
+        }
+        public static bool UploadJsonData(string api, string json, out SmfResult smfResult)
+        {
+
+            smfResult = new SmfResult();
+            try
+            {
+                MyWebClient wc = new MyWebClient(10 * 1000);
+                wc.Headers.Add("Content-Type", "application/json;charset=UTF-8");
+                var resp = wc.UploadData(server + api, Encoding.UTF8.GetBytes(json));
+                smfResult = JsonHelper.DeserializeJsonToObject<SmfResult>(Encoding.UTF8.GetString(resp));
+            }
+            catch (Exception e)
+            {
+                LogUtil.info($"UploadJsonData:{api}" + e.ToString());
+            }
+            return smfResult.okResult;
+        }
+        public static List<SmfLangData> DownloadLngData()
+        {
+            string api = "/api/translation/resource?type="+ DeviceType;
+            try
+            {
+                MyWebClient wc = new MyWebClient(10 * 1000);
+                wc.Headers.Add("Content-Type", "application/json;charset=UTF-8");
+                var resp = wc.DownloadData(server + api);
+                var jsondata = Encoding.UTF8.GetString(resp);
+                return JsonConvert.DeserializeObject<List<SmfLangData>>(jsondata);
+            }
+            catch (Exception e)
+            {
+                LogUtil.info($"DownloadLngData:{api}" + e.ToString());
+            }
+
+            return new List<SmfLangData>();
+        }
+    }
+
+    //{"code":0,"data":"ok","msg":"ok","msgKey":"smfcore.ok","okResult":true}
+    public class SmfResult
+    {
+        public int code;
+        public string data;
+        public string msg;
+        public string msgKey;
+        public bool okResult;
+    }
+
+    public class SmfLangData
+    {
+        public string lanCode;
+        public Dictionary<string, string> resourceMap;
+    }
+
+
+}