Merge branch 'master' of http://git.51dayu.com.cn/diamond-cut/SparkClient

Language/en_US.xaml

@@ -38,14 +38,14 @@
     <sys:String x:Key="Demo1">Button</sys:String>
 
     <!-- 外部接口MSG-->
-    <sys:String x:Key="InProgress">Drawing is in progress</sys:String>   
-    <sys:String x:Key="CacheCleared">Cached images are cleared</sys:String>   
-    <sys:String x:Key="CannotSendCommand">Unable to send instructions tNo the SOC</sys:String>   
-    <sys:String x:Key="MicrocontrollerTimeout">Microcontroller access timeout</sys:String>   
-    <sys:String x:Key="MicrocontrollerError">The microcontroller returns an error code</sys:String>   
-    <sys:String x:Key="CameraNotConnected">Camera not connected</sys:String>   
-    <sys:String x:Key="DeviceNotFound">Cutter not found</sys:String>     
-    <sys:String x:Key="AlgorithmFailed">Algorithm call failed</sys:String>     
-    <sys:String x:Key="ImageFileReadFailure">Failed to read the image file</sys:String>     
-    <sys:String x:Key="JsonParseFailure">JSON parsing failed</sys:String> 
+    <sys:String x:Key="InProgress">S001:Drawing is in progress</sys:String>   
+    <sys:String x:Key="CacheCleared">S002:Cached images are cleared</sys:String>   
+    <sys:String x:Key="CannotSendCommand">S003:Unable to send instructions tNo the SOC</sys:String>   
+    <sys:String x:Key="MicrocontrollerTimeout">S004:Microcontroller access timeout</sys:String>   
+    <sys:String x:Key="MicrocontrollerError">S005:The microcontroller returns an error code</sys:String>   
+    <sys:String x:Key="CameraNotConnected">S006:Camera not connected</sys:String>   
+    <sys:String x:Key="DeviceNotFound">P001:Cutter not found</sys:String>     
+    <sys:String x:Key="AlgorithmFailed">P002:Algorithm call failed</sys:String>     
+    <sys:String x:Key="ImageFileReadFailure">P003:Failed to read the image file</sys:String>     
+    <sys:String x:Key="JsonParseFailure">P004:JSON parsing failed</sys:String> 
 </ResourceDictionary>

Language/zh_CN.xaml

@@ -179,16 +179,16 @@
     <sys:String x:Key="DiamodResultCloseConfirm">是否关闭检测结果画面。</sys:String>
 
         <!-- 外部接口MSG-->
-    <sys:String x:Key="InProgress">采图正在进行中</sys:String>   
-    <sys:String x:Key="CacheCleared">缓存图片被清理</sys:String>   
-    <sys:String x:Key="CannotSendCommand">无法向单片机发送指令</sys:String>   
-    <sys:String x:Key="MicrocontrollerTimeout">单片机访问超时</sys:String>   
-    <sys:String x:Key="MicrocontrollerError">单片机返回错误码</sys:String>   
-    <sys:String x:Key="CameraNotConnected">摄像头未连接</sys:String>   
-    <sys:String x:Key="DeviceNotFound">未找到切工仪</sys:String>     
-    <sys:String x:Key="AlgorithmFailed">算法调用失败</sys:String>     
-    <sys:String x:Key="ImageFileReadFailure">图片文件读取失败</sys:String>     
-    <sys:String x:Key="JsonParseFailure">JSON解析失败</sys:String>        
+    <sys:String x:Key="InProgress">S001：采图正在进行中</sys:String>   
+    <sys:String x:Key="CacheCleared">S002:缓存图片被清理</sys:String>   
+    <sys:String x:Key="CannotSendCommand">S003:无法向单片机发送指令</sys:String>   
+    <sys:String x:Key="MicrocontrollerTimeout">S004:单片机访问超时</sys:String>   
+    <sys:String x:Key="MicrocontrollerError">S005:单片机返回错误码</sys:String>   
+    <sys:String x:Key="CameraNotConnected">S006:摄像头未连接</sys:String>   
+    <sys:String x:Key="DeviceNotFound">P001:未找到切工仪</sys:String>     
+    <sys:String x:Key="AlgorithmFailed">P002:算法调用失败</sys:String>     
+    <sys:String x:Key="ImageFileReadFailure">P003:图片文件读取失败</sys:String>     
+    <sys:String x:Key="JsonParseFailure">P004:JSON解析失败</sys:String>        
     
     
     <sys:String x:Key="ApplicationError">应用程序出现错误：</sys:String>