Browse Source

云平台接口取消加密

登录支持Enter事件
配置文件优化 删除多余配置
代码优化
master
张剑 1 year ago
parent
commit
95cad25907

+ 2
- 2
XHWK.WKTool/App.config View File

7
     <!--0正式 1测试-->
7
     <!--0正式 1测试-->
8
     <add key="IsDebug" value="1" />
8
     <add key="IsDebug" value="1" />
9
     <!--版本号-->
9
     <!--版本号-->
10
-    <add key="VersionCode" value="128" />
11
-    <add key="VersionName" value="3.13.1" />
10
+    <add key="VersionCode" value="129" />
11
+    <add key="VersionName" value="3.13.2" />
12
     <!--皮肤样式 0白 1蓝 2黑色 -->
12
     <!--皮肤样式 0白 1蓝 2黑色 -->
13
     <add key="SkinStyle" value="0" />
13
     <add key="SkinStyle" value="0" />
14
     <!--是否输出视频记录日志:0否-->
14
     <!--是否输出视频记录日志:0否-->

+ 1
- 5
XHWK.WKTool/Controls/ToolButton.cs View File

27
                     case Tool.Revoke:
27
                     case Tool.Revoke:
28
                         JieTuWindow.Current.OnRevoke();
28
                         JieTuWindow.Current.OnRevoke();
29
                         break;
29
                         break;
30
-
31
                     case Tool.Save:
30
                     case Tool.Save:
32
                         JieTuWindow.Current.OnSave();
31
                         JieTuWindow.Current.OnSave();
33
                         break;
32
                         break;
34
-
35
                     case Tool.Cancel:
33
                     case Tool.Cancel:
36
                         JieTuWindow.Current.OnCancel();
34
                         JieTuWindow.Current.OnCancel();
37
                         break;
35
                         break;
38
-
39
-                    case Tool.OK:
36
+                    case Tool.Ok:
40
                         JieTuWindow.Current.OnOK();
37
                         JieTuWindow.Current.OnOK();
41
                         break;
38
                         break;
42
-
43
                     default:
39
                     default:
44
                         IsChecked = !IsChecked;
40
                         IsChecked = !IsChecked;
45
                         SizeColorBar.Current.Selected = IsChecked == true ? Tool : Tool.Null;
41
                         SizeColorBar.Current.Selected = IsChecked == true ? Tool : Tool.Null;

+ 2
- 2
XHWK.WKTool/Themes/Generic.xaml View File

278
                         </control:ToolButton>
278
                         </control:ToolButton>
279
                         <control:ToolButton Cursor="Hand"
279
                         <control:ToolButton Cursor="Hand"
280
                             Style="{StaticResource ToolButton}"
280
                             Style="{StaticResource ToolButton}"
281
-                            Tool="OK"
281
+                            Tool="Ok"
282
                             ToolTip="完成截图">
282
                             ToolTip="完成截图">
283
                             <Grid Width="17" Height="14">
283
                             <Grid Width="17" Height="14">
284
                                 <Path
284
                                 <Path
696
             </Setter.Value>
696
             </Setter.Value>
697
         </Setter>
697
         </Setter>
698
     </Style>
698
     </Style>
699
-</ResourceDictionary>
699
+</ResourceDictionary>

+ 1
- 1
XHWK.WKTool/XHWK.WKTool.csproj.user View File

1
 <?xml version="1.0" encoding="utf-8"?>
1
 <?xml version="1.0" encoding="utf-8"?>
2
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3
   <PropertyGroup>
3
   <PropertyGroup>
4
-    <ProjectView>ShowAllFiles</ProjectView>
4
+    <ProjectView>ProjectFiles</ProjectView>
5
   </PropertyGroup>
5
   </PropertyGroup>
6
 </Project>
6
 </Project>

+ 1
- 1
星火微课/星火微课-测试.iss View File

3
 
3
 
4
 #define MyAppName "星火微课测试版"  
4
 #define MyAppName "星火微课测试版"  
5
 #define MyAppDir "xhwk_test"
5
 #define MyAppDir "xhwk_test"
6
-#define MyAppVersion "3.13.1"
6
+#define MyAppVersion "3.13.2"
7
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
7
 #define MyAppPublisher "河南星火燎原软件科技有限公司"
8
 #define MyAppURL "http://www.xhkjedu.com/"
8
 #define MyAppURL "http://www.xhkjedu.com/"
9
 #define MySourcePath "D:\Project\CSharp\xh-wkclient\XHWK.WKTool\bin\x86\Debug\"
9
 #define MySourcePath "D:\Project\CSharp\xh-wkclient\XHWK.WKTool\bin\x86\Debug\"

Loading…
Cancel
Save