1

DuiLib/DuiLib.vcxproj

@@ -9,14 +9,6 @@
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="UnicodeDebug|Win32">
-      <Configuration>UnicodeDebug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="UnicodeRelease|Win32">
-      <Configuration>UnicodeRelease</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{E106ACD7-4E53-4AEE-942B-D0DD426DB34E}</ProjectGuid>
@@ -24,18 +16,6 @@
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v142</PlatformToolset>
@@ -51,14 +31,6 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
-  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
@@ -84,20 +56,7 @@
     <LinkIncremental>false</LinkIncremental>
     <GenerateManifest>false</GenerateManifest>
     <EmbedManifest>false</EmbedManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">
-    <OutDir>.\Build\Debug_u\</OutDir>
-    <IntDir>.\Build\Debug_u\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-    <GenerateManifest>false</GenerateManifest>
-    <EmbedManifest>false</EmbedManifest>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">
-    <OutDir>.\Build\Release_u\</OutDir>
-    <IntDir>.\Build\Release_u\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-    <GenerateManifest>false</GenerateManifest>
-    <EmbedManifest>false</EmbedManifest>
+    <TargetName>$(ProjectName)_d</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
@@ -190,112 +149,46 @@ copy $(SolutionDir)temp\link\$(Platform)\$(Configuration)\$(ProjectName)\DuiLib.
     </Bscmake>
     <PostBuildEvent>
       <Command>copy $(TargetPath) $(SolutionDir)dll\debug\
-copy $(SolutionDir)temp\link\$(Platform)\$(Configuration)\$(ProjectName)\DuiLib.lib $(SolutionDir)lib\debug\</Command>
+copy $(SolutionDir)temp\link\$(Platform)\$(Configuration)\$(ProjectName)\DuiLib_d.lib $(SolutionDir)lib\debug\</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/DuiLib.tlb</TypeLibraryName>
-      <HeaderFileName />
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;UILIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>.\Build\Debug_u/DuiLib.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0409</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>../bin/DuiLib_ud.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <BaseAddress>0x11000000</BaseAddress>
-      <ImportLibrary>../Lib/DuiLib_ud.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug/DuiLib.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/DuiLib.tlb</TypeLibraryName>
-      <HeaderFileName />
-    </Midl>
-    <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;UILIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderOutputFile>.\Build\Release_u/DuiLib.pch</PrecompiledHeaderOutputFile>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0406</Culture>
-    </ResourceCompile>
-    <Link>
-      <OutputFile>../bin/DuiLib_u.dll</OutputFile>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <BaseAddress>0x11000000</BaseAddress>
-      <ImportLibrary>../Lib/DuiLib_u.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release/DuiLib.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="Control\UIAnimation.cpp" />
+    <ClCompile Include="Control\UIColorPalette.cpp" />
+    <ClCompile Include="Control\UIComboBox.cpp" />
+    <ClCompile Include="Control\UIFadeButton.cpp" />
+    <ClCompile Include="Control\UIFlash.cpp" />
+    <ClCompile Include="Control\UIGifAnimEx.cpp" />
+    <ClCompile Include="Control\UIGroupBox.cpp" />
+    <ClCompile Include="Control\UIHotKey.cpp" />
+    <ClCompile Include="Control\UIIPAddress.cpp" />
+    <ClCompile Include="Control\UIIPAddressEx.cpp" />
+    <ClCompile Include="Control\UIListEx.cpp" />
+    <ClCompile Include="Control\UILoading.cpp" />
+    <ClCompile Include="Control\UIMenu.cpp" />
+    <ClCompile Include="Control\UIPageControl.cpp" />
+    <ClCompile Include="Control\UIRing.cpp" />
+    <ClCompile Include="Control\UIRollText.cpp" />
     <ClCompile Include="Control\UITreeView.cpp" />
-    <ClCompile Include="Utils\WinImplBase.cpp" />
-    <ClCompile Include="Utils\stb_image.c">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">
-      </PrecompiledHeader>
+    <ClCompile Include="Core\ControlFactory.cpp" />
+    <ClCompile Include="Core\UIResourceManager.cpp" />
+    <ClCompile Include="Layout\UIAnimationTabLayout.cpp" />
+    <ClCompile Include="StdAfx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
     </ClCompile>
+    <ClCompile Include="UIlib.cpp" />
+    <ClCompile Include="Utils\DPI.cpp" />
+    <ClCompile Include="Utils\DragDropImpl.cpp" />
+    <ClCompile Include="Utils\TrayIcon.cpp" />
+    <ClCompile Include="Utils\UIShadow.cpp" />
+    <ClCompile Include="Utils\unzip.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="Utils\WinImplBase.cpp" />
     <ClCompile Include="Utils\UIDelegate.cpp" />
     <ClCompile Include="Utils\Utils.cpp" />
-    <ClCompile Include="Utils\WndShadow.cpp" />
-    <ClCompile Include="Utils\XUnzip.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">
-      </PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">
-      </PrecompiledHeader>
-    </ClCompile>
     <ClCompile Include="Core\UIBase.cpp" />
     <ClCompile Include="Core\UIContainer.cpp" />
     <ClCompile Include="Core\UIControl.cpp" />
@@ -310,7 +203,6 @@ copy $(SolutionDir)temp\link\$(Platform)\$(Configuration)\$(ProjectName)\DuiLib.
     <ClCompile Include="Layout\UIVerticalLayout.cpp" />
     <ClCompile Include="Control\UIActiveX.cpp" />
     <ClCompile Include="Control\UIButton.cpp" />
-    <ClCompile Include="Control\UICheckBox.cpp" />
     <ClCompile Include="Control\UICombo.cpp" />
     <ClCompile Include="Control\UIDateTime.cpp" />
     <ClCompile Include="Control\UIEdit.cpp" />
@@ -326,12 +218,40 @@ copy $(SolutionDir)temp\link\$(Platform)\$(Configuration)\$(ProjectName)\DuiLib.
     <ClCompile Include="Control\UIWebBrowser.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="Control\UIAnimation.h" />
+    <ClInclude Include="Control\UIColorPalette.h" />
+    <ClInclude Include="Control\UIComboBox.h" />
+    <ClInclude Include="Control\UIFadeButton.h" />
+    <ClInclude Include="Control\UIFlash.h" />
+    <ClInclude Include="Control\UIGifAnimEx.h" />
+    <ClInclude Include="Control\UIGroupBox.h" />
+    <ClInclude Include="Control\UIHotKey.h" />
+    <ClInclude Include="Control\UIIPAddress.h" />
+    <ClInclude Include="Control\UIIPAddressEx.h" />
+    <ClInclude Include="Control\UIListEx.h" />
+    <ClInclude Include="Control\UILoading.h" />
+    <ClInclude Include="Control\UIMenu.h" />
+    <ClInclude Include="Control\UIPageControl.h" />
+    <ClInclude Include="Control\UIRing.h" />
+    <ClInclude Include="Control\UIRollText.h" />
     <ClInclude Include="Control\UITreeView.h" />
+    <ClInclude Include="Core\ControlFactory.h" />
+    <ClInclude Include="Core\UIResourceManager.h" />
+    <ClInclude Include="Layout\UIAnimationTabLayout.h" />
+    <ClInclude Include="StdAfx.h" />
+    <ClInclude Include="UIlib.h" />
     <ClInclude Include="Utils\downloadmgr.h" />
+    <ClInclude Include="Utils\DPI.h" />
+    <ClInclude Include="Utils\DragDropImpl.h" />
     <ClInclude Include="Utils\FlashEventHandler.h" />
+    <ClInclude Include="Utils\observer_impl_base.h" />
     <ClInclude Include="Utils\stb_image.h" />
+    <ClInclude Include="Utils\TrayIcon.h" />
     <ClInclude Include="Utils\UIDelegate.h" />
+    <ClInclude Include="Utils\UIShadow.h" />
+    <ClInclude Include="Utils\unzip.h" />
     <ClInclude Include="Utils\Utils.h" />
+    <ClInclude Include="Utils\VersionHelpers.h" />
     <ClInclude Include="Utils\WebBrowserEventHandler.h" />
     <ClInclude Include="Utils\WinImplBase.h" />
     <ClInclude Include="Core\UIBase.h" />
@@ -349,7 +269,6 @@ copy $(SolutionDir)temp\link\$(Platform)\$(Configuration)\$(ProjectName)\DuiLib.
     <ClInclude Include="Layout\UIVerticalLayout.h" />
     <ClInclude Include="Control\UIActiveX.h" />
     <ClInclude Include="Control\UIButton.h" />
-    <ClInclude Include="Control\UICheckBox.h" />
     <ClInclude Include="Control\UICombo.h" />
     <ClInclude Include="Control\UIDateTime.h" />
     <ClInclude Include="Control\UIEdit.h" />
@@ -363,7 +282,6 @@ copy $(SolutionDir)temp\link\$(Platform)\$(Configuration)\$(ProjectName)\DuiLib.
     <ClInclude Include="Control\UISlider.h" />
     <ClInclude Include="Control\UIText.h" />
     <ClInclude Include="Control\UIWebBrowser.h" />
-    <ClInclude Include="Utils\WndShadow.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

DuiLib/DuiLib.vcxproj.filters

@@ -33,24 +33,14 @@
     <Filter Include="Header Files\Control">
       <UniqueIdentifier>{9d25d6fa-9ff9-4ebd-a5a9-20302dd1c58a}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{c6069066-0c47-4447-90dc-5ca0e3e72cc6}</UniqueIdentifier>
-      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="Utils\stb_image.c">
-      <Filter>Source Files\Utils</Filter>
-    </ClCompile>
     <ClCompile Include="Utils\UIDelegate.cpp">
       <Filter>Source Files\Utils</Filter>
     </ClCompile>
     <ClCompile Include="Utils\Utils.cpp">
       <Filter>Source Files\Utils</Filter>
     </ClCompile>
-    <ClCompile Include="Utils\XUnzip.cpp">
-      <Filter>Source Files\Utils</Filter>
-    </ClCompile>
     <ClCompile Include="Core\UIBase.cpp">
       <Filter>Source Files\Core</Filter>
     </ClCompile>
@@ -93,9 +83,6 @@
     <ClCompile Include="Control\UIButton.cpp">
       <Filter>Source Files\Control</Filter>
     </ClCompile>
-    <ClCompile Include="Control\UICheckBox.cpp">
-      <Filter>Source Files\Control</Filter>
-    </ClCompile>
     <ClCompile Include="Control\UICombo.cpp">
       <Filter>Source Files\Control</Filter>
     </ClCompile>
@@ -135,15 +122,90 @@
     <ClCompile Include="Control\UIGifAnim.cpp">
       <Filter>Source Files\Control</Filter>
     </ClCompile>
-    <ClCompile Include="Utils\WndShadow.cpp">
-      <Filter>Source Files\Utils</Filter>
-    </ClCompile>
     <ClCompile Include="Utils\WinImplBase.cpp">
       <Filter>Source Files\Utils</Filter>
     </ClCompile>
     <ClCompile Include="Control\UITreeView.cpp">
       <Filter>Source Files\Control</Filter>
     </ClCompile>
+    <ClCompile Include="Control\UIAnimation.cpp">
+      <Filter>Source Files\Control</Filter>
+    </ClCompile>
+    <ClCompile Include="Control\UIColorPalette.cpp">
+      <Filter>Source Files\Control</Filter>
+    </ClCompile>
+    <ClCompile Include="Control\UIComboBox.cpp">
+      <Filter>Source Files\Control</Filter>
+    </ClCompile>
+    <ClCompile Include="Control\UIFadeButton.cpp">
+      <Filter>Source Files\Control</Filter>
+    </ClCompile>
+    <ClCompile Include="Control\UIFlash.cpp">
+      <Filter>Source Files\Control</Filter>
+    </ClCompile>
+    <ClCompile Include="Control\UIGifAnimEx.cpp">
+      <Filter>Source Files\Control</Filter>
+    </ClCompile>
+    <ClCompile Include="Control\UIGroupBox.cpp">
+      <Filter>Source Files\Control</Filter>
+    </ClCompile>
+    <ClCompile Include="Control\UIHotKey.cpp">
+      <Filter>Source Files\Control</Filter>
+    </ClCompile>
+    <ClCompile Include="Control\UIIPAddress.cpp">
+      <Filter>Source Files\Control</Filter>
+    </ClCompile>
+    <ClCompile Include="Control\UIIPAddressEx.cpp">
+      <Filter>Source Files\Control</Filter>
+    </ClCompile>
+    <ClCompile Include="Control\UIListEx.cpp">
+      <Filter>Source Files\Control</Filter>
+    </ClCompile>
+    <ClCompile Include="Control\UILoading.cpp">
+      <Filter>Source Files\Control</Filter>
+    </ClCompile>
+    <ClCompile Include="Control\UIMenu.cpp">
+      <Filter>Source Files\Control</Filter>
+    </ClCompile>
+    <ClCompile Include="Control\UIPageControl.cpp">
+      <Filter>Source Files\Control</Filter>
+    </ClCompile>
+    <ClCompile Include="Control\UIRing.cpp">
+      <Filter>Source Files\Control</Filter>
+    </ClCompile>
+    <ClCompile Include="Control\UIRollText.cpp">
+      <Filter>Source Files\Control</Filter>
+    </ClCompile>
+    <ClCompile Include="Core\ControlFactory.cpp">
+      <Filter>Source Files\Core</Filter>
+    </ClCompile>
+    <ClCompile Include="Core\UIResourceManager.cpp">
+      <Filter>Source Files\Core</Filter>
+    </ClCompile>
+    <ClCompile Include="Layout\UIAnimationTabLayout.cpp">
+      <Filter>Source Files\Layout</Filter>
+    </ClCompile>
+    <ClCompile Include="Utils\DPI.cpp">
+      <Filter>Source Files\Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="Utils\DragDropImpl.cpp">
+      <Filter>Source Files\Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="Utils\TrayIcon.cpp">
+      <Filter>Source Files\Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="Utils\UIShadow.cpp">
+      <Filter>Source Files\Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="Utils\unzip.cpp">
+      <Filter>Source Files\Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="StdAfx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="UIlib.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Utils\downloadmgr.h">
@@ -152,9 +214,6 @@
     <ClInclude Include="Utils\FlashEventHandler.h">
       <Filter>Header Files\Utils</Filter>
     </ClInclude>
-    <ClInclude Include="Utils\stb_image.h">
-      <Filter>Header Files\Utils</Filter>
-    </ClInclude>
     <ClInclude Include="Utils\UIDelegate.h">
       <Filter>Header Files\Utils</Filter>
     </ClInclude>
@@ -212,9 +271,6 @@
     <ClInclude Include="Control\UIButton.h">
       <Filter>Header Files\Control</Filter>
     </ClInclude>
-    <ClInclude Include="Control\UICheckBox.h">
-      <Filter>Header Files\Control</Filter>
-    </ClInclude>
     <ClInclude Include="Control\UICombo.h">
       <Filter>Header Files\Control</Filter>
     </ClInclude>
@@ -254,11 +310,95 @@
     <ClInclude Include="Control\UIGifAnim.h">
       <Filter>Header Files\Control</Filter>
     </ClInclude>
-    <ClInclude Include="Utils\WndShadow.h">
-      <Filter>Header Files\Utils</Filter>
-    </ClInclude>
     <ClInclude Include="Control\UITreeView.h">
       <Filter>Header Files\Control</Filter>
     </ClInclude>
+    <ClInclude Include="Control\UIAnimation.h">
+      <Filter>Header Files\Control</Filter>
+    </ClInclude>
+    <ClInclude Include="Control\UIColorPalette.h">
+      <Filter>Header Files\Control</Filter>
+    </ClInclude>
+    <ClInclude Include="Control\UIComboBox.h">
+      <Filter>Header Files\Control</Filter>
+    </ClInclude>
+    <ClInclude Include="Control\UIFadeButton.h">
+      <Filter>Header Files\Control</Filter>
+    </ClInclude>
+    <ClInclude Include="Control\UIFlash.h">
+      <Filter>Header Files\Control</Filter>
+    </ClInclude>
+    <ClInclude Include="Control\UIGifAnimEx.h">
+      <Filter>Header Files\Control</Filter>
+    </ClInclude>
+    <ClInclude Include="Control\UIGroupBox.h">
+      <Filter>Header Files\Control</Filter>
+    </ClInclude>
+    <ClInclude Include="Control\UIHotKey.h">
+      <Filter>Header Files\Control</Filter>
+    </ClInclude>
+    <ClInclude Include="Control\UIIPAddress.h">
+      <Filter>Header Files\Control</Filter>
+    </ClInclude>
+    <ClInclude Include="Control\UIIPAddressEx.h">
+      <Filter>Header Files\Control</Filter>
+    </ClInclude>
+    <ClInclude Include="Control\UIListEx.h">
+      <Filter>Header Files\Control</Filter>
+    </ClInclude>
+    <ClInclude Include="Control\UILoading.h">
+      <Filter>Header Files\Control</Filter>
+    </ClInclude>
+    <ClInclude Include="Control\UIMenu.h">
+      <Filter>Header Files\Control</Filter>
+    </ClInclude>
+    <ClInclude Include="Control\UIPageControl.h">
+      <Filter>Header Files\Control</Filter>
+    </ClInclude>
+    <ClInclude Include="Control\UIRing.h">
+      <Filter>Header Files\Control</Filter>
+    </ClInclude>
+    <ClInclude Include="Control\UIRollText.h">
+      <Filter>Header Files\Control</Filter>
+    </ClInclude>
+    <ClInclude Include="Core\ControlFactory.h">
+      <Filter>Header Files\Core</Filter>
+    </ClInclude>
+    <ClInclude Include="Core\UIResourceManager.h">
+      <Filter>Header Files\Core</Filter>
+    </ClInclude>
+    <ClInclude Include="Layout\UIAnimationTabLayout.h">
+      <Filter>Header Files\Layout</Filter>
+    </ClInclude>
+    <ClInclude Include="Utils\DPI.h">
+      <Filter>Header Files\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="Utils\DragDropImpl.h">
+      <Filter>Header Files\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="Utils\observer_impl_base.h">
+      <Filter>Header Files\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="Utils\TrayIcon.h">
+      <Filter>Header Files\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="Utils\UIShadow.h">
+      <Filter>Header Files\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="Utils\unzip.h">
+      <Filter>Header Files\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="Utils\VersionHelpers.h">
+      <Filter>Header Files\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="StdAfx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="UIlib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Utils\stb_image.h">
+      <Filter>Header Files\Utils</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

bin/Win32/Debug/zhipuzi_pos_windows/skin/main.xml

@@ -13,10 +13,10 @@
 	<Font id="34" name="微软雅黑" size="34" />
 	<Font id="36" name="微软雅黑" size="36" />
 	
-	<Default shared="true" name="VScrollBar" value="width=&quot;8&quot; showbutton1=&quot;false&quot; showbutton2=&quot;false&quot; thumbnormalimage=&quot;file='scrollbar_shu_line_zhengchang.png' corner='2,2,2,2'&quot; thumbhotimage=&quot;file='scrollbar_shu_line_xuanfu.png' corner='2,2,2,2'&quot; thumbpushedimage=&quot;file='scrollbar_shu_line_dianji.png' corner='2,2,2,2'&quot;" />
-    <Default shared="true" name="HScrollBar" value="height=&quot;8&quot; showbutton1=&quot;false&quot; showbutton2=&quot;false&quot; thumbnormalimage=&quot;file='scrollbar_heng_line_zhengchang.png' corner='2,2,2,2'&quot; thumbhotimage=&quot;file='scrollbar_heng_line_xuanfu.png' corner='2,2,2,2'&quot; thumbpushedimage=&quot;file='scrollbar_heng_line_dianji.png' corner='2,2,2,2'&quot;" />
+	<Default shared="true" name="VScrollBar" value="" width="8" showbutton1="false" showbutton2="false" thumbnormalimage="file='scrollbar_shu_line_zhengchang.png' corner='2,2,2,2'" thumbhotimage="file='scrollbar_shu_line_xuanfu.png' corner='2,2,2,2'" thumbpushedimage="file='scrollbar_shu_line_dianji.png' corner='2,2,2,2'" />
+    <Default shared="true" name="HScrollBar" value="" height="8" showbutton1="false" showbutton2="false" thumbnormalimage="file='scrollbar_heng_line_zhengchang.png' corner='2,2,2,2'" thumbhotimage="file='scrollbar_heng_line_xuanfu.png' corner='2,2,2,2'" thumbpushedimage="file='scrollbar_heng_line_dianji.png' corner='2,2,2,2'" />
 	
-	<Default name="Button" value="normalimage=&quot;file='btn_green_zhengchang.png' corner='5,5,5,5'&quot; hotimage=&quot;file='btn_green_xuanfu.png' corner='5,5,5,5'&quot; pushedimage=&quot;file='btn_green_dianji.png' corner='5,5,5,5'&quot; " />	
+	<Default name="Button" normalimage="file='btn_green_zhengchang.png' corner='5,5,5,5'" hotimage="file='btn_green_xuanfu.png' corner='5,5,5,5'" pushedimage="file='btn_green_dianji.png' corner='5,5,5,5'"  />	
 
 	<VerticalLayout bkcolor="#FFF5F5F5">
 		<HorizontalLayout height="79" bkcolor="#FF3CB371">

zhipuzi_pos_windows/ai/YoloFeatureManager.cpp

@@ -339,10 +339,10 @@ std::string YoloFeatureManager::Class(cv::Mat & image)
 		}
 
 		// 在画面上绘制分类结果
-		std::wstring resultText = CLewaimaiString::ANSIToUnicode(className) + L" ： " + std::to_wstring(round(topConfidence * 10000) / 100) + L"%";
-		this->drawChineseText(image, resultText.c_str(), cv::Point(20, 50), cv::Scalar(0, 255, 0), 24);
-		cv::imshow("yolo26n-cls 实时图像分类", image);
-		if (cv::waitKey(30) >= 0); // 按任意键退出
+		//std::wstring resultText = CLewaimaiString::ANSIToUnicode(className) + L" ： " + std::to_wstring(round(topConfidence * 10000) / 100) + L"%";
+		//this->drawChineseText(image, resultText.c_str(), cv::Point(20, 50), cv::Scalar(0, 255, 0), 24);
+		//cv::imshow("yolo26n-cls 实时图像分类", image);
+		//if (cv::waitKey(30) >= 0); // 按任意键退出
 
 		return className;
 	}
@@ -363,7 +363,7 @@ std::string YoloFeatureManager::ClassFromVideoCapture()
 		CVideoCaptureWorker::GetInstance()->GetFrame(image);
 		if (image.empty())
 		{
-			DEBUG_LOG("从摄像头获取帧失败");
+			//DEBUG_LOG("从摄像头获取帧失败");
 			return "Unknown";
 		}
 

zhipuzi_pos_windows/page/CJiaobanPageUI.cpp

@@ -180,7 +180,7 @@ void CJiaobanPageUI::HandleJiaobanShijian()
 	}
 
 	com->SetInternVisible(true);
-	com->SelectItem(num - 1, false, false);
+	com->SelectItem(num - 1, false);
 	com->SetText(CLewaimaiString::UTF8ToUnicode(m_init_time).c_str());
 
 	//到这里了，开始处理数据刷新

zhipuzi_pos_windows/page/CSettingPageUI.cpp

@@ -152,12 +152,12 @@ void CSettingPageUI::InitShow()
 	if (CSetting::GetInstance()->GetParam("setting_printer_guige") == "58")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(0, false, false);
+		com->SelectItem(0, false);
 	}
 	else
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(1, false, false);
+		com->SelectItem(1, false);
 	}
 
 	com = static_cast<CComboUI*>(this->FindSubControl(_T("setting_printer_lianshu")));
@@ -166,25 +166,25 @@ void CSettingPageUI::InitShow()
 	if (setting_printer_lianshu == "1")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(0, false, false);
+		com->SelectItem(0, false);
 		com->SetText(L"1联");
 	}
 	else if (setting_printer_lianshu == "2")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(1, false, false);
+		com->SelectItem(1, false);
 		com->SetText(L"2联");
 	}
 	else if (setting_printer_lianshu == "3")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(2, false, false);
+		com->SelectItem(2, false);
 		com->SetText(L"3联");
 	}
 	else if (setting_printer_lianshu == "4")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(3, false, false);
+		com->SelectItem(3, false);
 		com->SetText(L"4联");
 	}
 
@@ -198,7 +198,7 @@ void CSettingPageUI::InitShow()
 	if (setting_printer_leixing == "auto")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(0, false, false);
+		com->SelectItem(0, false);
 		com->SetText(L"智能识别模式");
 
 		//智能识别模式隐藏这3个
@@ -209,7 +209,7 @@ void CSettingPageUI::InitShow()
 	else if (setting_printer_leixing == "usb")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(1, false, false);
+		com->SelectItem(1, false);
 		com->SetText(L"usb");
 
 		//显示usb布局
@@ -245,13 +245,13 @@ void CSettingPageUI::InitShow()
 		}
 
 		com_usb->SetInternVisible(true);
-		com_usb->SelectItem(nSelect, false, false);
+		com_usb->SelectItem(nSelect, false);
 		com_usb->SetText(CLewaimaiString::UTF8ToUnicode(setting_printer_usb).c_str());
 	}
 	else if (setting_printer_leixing == "bingkou")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(2, false, false);
+		com->SelectItem(2, false);
 		com->SetText(L"并口");
 
 		usb_layout->SetVisible(false);
@@ -261,7 +261,7 @@ void CSettingPageUI::InitShow()
 	else if (setting_printer_leixing == "chuankou")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(3, false, false);
+		com->SelectItem(3, false);
 		com->SetText(L"串口");
 
 		usb_layout->SetVisible(false);
@@ -297,13 +297,13 @@ void CSettingPageUI::InitShow()
 		}
 
 		com_chuankou->SetInternVisible(true);
-		com_chuankou->SelectItem(nSelect, false, false);
+		com_chuankou->SelectItem(nSelect, false);
 		com_chuankou->SetText(CLewaimaiString::UTF8ToUnicode(setting_printer_com).c_str());
 	}
 	else if (setting_printer_leixing == "wangkou")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(4, false, false);
+		com->SelectItem(4, false);
 		com->SetText(L"网口");
 
 		usb_layout->SetVisible(false);
@@ -433,13 +433,13 @@ void CSettingPageUI::InitShow()
 	if (setting_dianzicheng_xinghao == "dahua_acs")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(0, false, false);
+		com->SelectItem(0, false);
 		com->SetText(L"大华ACS系列");
 	}
 	else if (setting_dianzicheng_xinghao == "dingjian_os2x")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(1, false, false);
+		com->SelectItem(1, false);
 		com->SetText(L"顶尖OS2X系列");
 	}
 
@@ -472,7 +472,7 @@ void CSettingPageUI::InitShow()
 	}
 
 	com_dianzicheng->SetInternVisible(true);
-	com_dianzicheng->SelectItem(nSelect, false, false);
+	com_dianzicheng->SelectItem(nSelect, false);
 	com_dianzicheng->SetText(CLewaimaiString::UTF8ToUnicode(setting_dianzicheng_com).c_str());
 
 	com = static_cast<CComboUI*>(this->FindSubControl(_T("setting_dianzicheng_botelv")));
@@ -481,43 +481,43 @@ void CSettingPageUI::InitShow()
 	if (setting_dianzicheng_botelv == "600")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(0, false, false);
+		com->SelectItem(0, false);
 		com->SetText(L"600");
 	}
 	else if (setting_dianzicheng_botelv == "1200")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(1, false, false);
+		com->SelectItem(1, false);
 		com->SetText(L"1200");
 	}
 	else if (setting_dianzicheng_botelv == "2400")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(2, false, false);
+		com->SelectItem(2, false);
 		com->SetText(L"2400");
 	}
 	else if (setting_dianzicheng_botelv == "4800")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(3, false, false);
+		com->SelectItem(3, false);
 		com->SetText(L"4800");
 	}
 	else if (setting_dianzicheng_botelv == "9600")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(4, false, false);
+		com->SelectItem(4, false);
 		com->SetText(L"9600");
 	}
 	else if (setting_dianzicheng_botelv == "19200")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(5, false, false);
+		com->SelectItem(5, false);
 		com->SetText(L"19200");
 	}
 	else if (setting_dianzicheng_botelv == "38400")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(6, false, false);
+		com->SelectItem(6, false);
 		com->SetText(L"38400");
 	}
 
@@ -528,49 +528,49 @@ void CSettingPageUI::InitShow()
 	if (setting_tiaomacheng_geshi == "1")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(0, false, false);
+		com->SelectItem(0, false);
 		com->SetText(L"13位【FWWWWWWEEEEEC】");
 	}
 	else if (setting_tiaomacheng_geshi == "2")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(1, false, false);
+		com->SelectItem(1, false);
 		com->SetText(L"13位【FWWWWWWNNNNNC】");
 	}
 	else if (setting_tiaomacheng_geshi == "3")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(2, false, false);
+		com->SelectItem(2, false);
 		com->SetText(L"13位【FFWWWWWEEEEEC】");
 	}
 	else if (setting_tiaomacheng_geshi == "4")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(3, false, false);
+		com->SelectItem(3, false);
 		com->SetText(L"13位【FFWWWWWNNNNNC】");
 	}
 	else if (setting_tiaomacheng_geshi == "5")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(4, false, false);
+		com->SelectItem(4, false);
 		com->SetText(L"18位【FWWWWWWEEEEENNNNNC】");
 	}
 	else if (setting_tiaomacheng_geshi == "6")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(5, false, false);
+		com->SelectItem(5, false);
 		com->SetText(L"18位【FWWWWWWNNNNNEEEEEC】");
 	}
 	else if (setting_tiaomacheng_geshi == "7")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(6, false, false);
+		com->SelectItem(6, false);
 		com->SetText(L"18位【FFWWWWWEEEEENNNNNC】");
 	}
 	else if (setting_tiaomacheng_geshi == "8")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(6, false, false);
+		com->SelectItem(6, false);
 		com->SetText(L"18位【FFWWWWWNNNNNEEEEEC】");
 	}
 
@@ -580,7 +580,7 @@ void CSettingPageUI::InitShow()
 	if (setting_tiaomacheng_xinghao == "dahua_tm")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(0, false, false);
+		com->SelectItem(0, false);
 		com->SetText(L"大华TM系列");
 	}
 
@@ -632,7 +632,7 @@ void CSettingPageUI::InitShow()
 	if (setting_printer_leixing == "usb")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(0, false, false);
+		com->SelectItem(0, false);
 		com->SetText(L"usb");
 
 		//显示usb布局
@@ -642,7 +642,7 @@ void CSettingPageUI::InitShow()
 	else if (setting_printer_leixing == "wangkou")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(1, false, false);
+		com->SelectItem(1, false);
 		com->SetText(L"网口");
 
 		usb_layout->SetVisible(false);
@@ -677,7 +677,7 @@ void CSettingPageUI::InitShow()
 	}
 
 	com_usb->SetInternVisible(true);
-	com_usb->SelectItem(nSelect, false, false);
+	com_usb->SelectItem(nSelect, false);
 	com_usb->SetText(CLewaimaiString::UTF8ToUnicode(setting_biaoqian_printer_usb).c_str());
 
 	//网口显示
@@ -692,37 +692,37 @@ void CSettingPageUI::InitShow()
 	if (setting_biaoqian_printer_guige == "40*30mm")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(0, false, false);
+		com->SelectItem(0, false);
 		com->SetText(L"40*30mm");
 	}
 	else if (setting_biaoqian_printer_guige == "35*25mm")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(1, false, false);
+		com->SelectItem(1, false);
 		com->SetText(L"35*25mm");
 	}
 	else if (setting_biaoqian_printer_guige == "30*25mm")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(2, false, false);
+		com->SelectItem(2, false);
 		com->SetText(L"30*25mm");
 	}
 	else if (setting_biaoqian_printer_guige == "30*20mm")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(3, false, false);
+		com->SelectItem(3, false);
 		com->SetText(L"30*20mm");
 	}
 	else if (setting_biaoqian_printer_guige == "60*80mm")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(4, false, false);
+		com->SelectItem(4, false);
 		com->SetText(L"60*80mm");
 	}
 	else if (setting_biaoqian_printer_guige == "80*60mm")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(5, false, false);
+		com->SelectItem(5, false);
 		com->SetText(L"80*60mm");
 	}
 
@@ -732,13 +732,13 @@ void CSettingPageUI::InitShow()
 	if (setting_biaoqian_printer_fangxiang == "1")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(0, false, false);
+		com->SelectItem(0, false);
 		com->SetText(L"正方向");
 	}
 	else if (setting_biaoqian_printer_fangxiang == "0")
 	{
 		com->SetInternVisible(true);
-		com->SelectItem(1, false, false);
+		com->SelectItem(1, false);
 		com->SetText(L"反方向");
 	}
 
@@ -1841,7 +1841,7 @@ void CSettingPageUI::HandleItemSelectMsg(TNotifyUI& msg)
 			}
 
 			com_usb->SetInternVisible(true);
-			com_usb->SelectItem(nSelect, false, false);
+			com_usb->SelectItem(nSelect, false);
 			com_usb->SetText(CLewaimaiString::UTF8ToUnicode(setting_printer_usb).c_str());
 		}
 		else if (com->GetCurSel() == 2)
@@ -1889,7 +1889,7 @@ void CSettingPageUI::HandleItemSelectMsg(TNotifyUI& msg)
 			}
 
 			com_chuankou->SetInternVisible(true);
-			com_chuankou->SelectItem(nSelect, false, false);
+			com_chuankou->SelectItem(nSelect, false);
 			com_chuankou->SetText(CLewaimaiString::UTF8ToUnicode(setting_printer_com).c_str());
 		}
 		else if (com->GetCurSel() == 4)

zhipuzi_pos_windows/page/CShangpinCreatePageUI.cpp

@@ -59,7 +59,7 @@ void CShangpinCreatePageUI::InitShow()
 
 	if (nTypeNum > 0)
 	{
-		com_fenlei->SelectItem(0, false, false);
+		com_fenlei->SelectItem(0, false);
 	}
 
 	com_fenlei->SetText(CLewaimaiString::UTF8ToUnicode(first_food_name).c_str());

zhipuzi_pos_windows/page/CShangpinUpdatePageUI.cpp

@@ -61,7 +61,7 @@ void CShangpinUpdatePageUI::InitShow()
 
 	if (nSelectType != -1)
 	{
-		com_fenlei->SelectItem(nSelectType, false, false);
+		com_fenlei->SelectItem(nSelectType, false);
 	}
 
 	com_fenlei->SetText(CLewaimaiString::UTF8ToUnicode(select_foodtype_name).c_str());

zhipuzi_pos_windows/wnd/CChufangSettingWnd.cpp

@@ -140,7 +140,7 @@ void CChufangSettingWnd::Init()
 	CComboUI* com = static_cast<CComboUI*>(m_pm.FindControl(_T("chufang_setting_guige")));
 	if (m_mode == 1)
 	{
-		com->SelectItem(0, false, false);
+		com->SelectItem(0, false);
 	}
 	else
 	{
@@ -148,13 +148,13 @@ void CChufangSettingWnd::Init()
 		if (updatePrinter.guige == "58")
 		{
 			com->SetInternVisible(true);
-			com->SelectItem(0, false, false);
+			com->SelectItem(0, false);
 		}
 
 		else
 		{
 			com->SetInternVisible(true);
-			com->SelectItem(1, false, false);
+			com->SelectItem(1, false);
 		}
 	}
 
@@ -308,7 +308,7 @@ void CChufangSettingWnd::Notify(TNotifyUI& msg)
 			std::string fenlei_ids = "";
 
 			CVerticalLayoutUI* pLayout = static_cast<CVerticalLayoutUI*>(m_pm.FindControl(_T("chufang_setting_fenlei_xuanze_area")));
-			CDuiPtrArray* pArray = m_pm.FindSubControlsByClass(pLayout, _T("CheckBox"));
+			CStdPtrArray* pArray = m_pm.FindSubControlsByClass(pLayout, _T("CheckBox"));
 			int size = pArray->GetSize();
 			for (int i = 0; i < size; i++)
 			{

zhipuzi_pos_windows/wnd/CMainWnd.cpp

@@ -152,6 +152,8 @@ void CMainWnd::SwitchPage(MainPageName name, bool is_init_show)
 
 	//先删除现在的子对象
 	CContainerUI* pMainContentLayout = static_cast<CContainerUI*>(m_pm.FindControl(_T("main_content_layout")));
+	pMainContentLayout->SetAutoDestroy(false);
+
 	if (m_curPageName != NOPAGE)
 	{
 		//这个是之前已经有一个页面了，切换页面，不能销毁之前的页面，否则容易崩溃
@@ -178,13 +180,19 @@ LRESULT CMainWnd::OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandl
     styleValue &= ~WS_CAPTION;
     ::SetWindowLong(*this, GWL_STYLE, styleValue | WS_CLIPSIBLINGS | WS_CLIPCHILDREN);
     m_pm.Init(m_hWnd);
+
     CDialogBuilder builder;
     CDialogBuilderCallbackEx cb;
     CControlUI* pRoot = builder.Create(_T("main.xml"), (UINT)0, &cb, &m_pm);
     ASSERT(pRoot && "Failed to parse XML");
+
     m_pm.AttachDialog(pRoot);
+
     m_pm.AddNotifier(this);
-    Init();
+
+	//执行完初始化，再绑定事件，避免事件触发时，页面还没有完全
+	Init();
+
     return 0;
 }
 
@@ -1407,7 +1415,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("diandan_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[DIANDAN] = pChildContainer;
 	}
 
@@ -1415,7 +1422,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("waimaiorder_list_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[DINGDAN] = pChildContainer;
 	}	
 
@@ -1423,7 +1429,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("setting_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[SETTING] = pChildContainer;
 	}	
 
@@ -1431,7 +1436,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("huiyuan_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[HUIYUAN] = pChildContainer;
 	}	
 
@@ -1439,7 +1443,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("waimaiorder_info_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[WAIMAIINFO] = pChildContainer;
 	}	
 
@@ -1447,7 +1450,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("dianneiorder_list_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[DIANNEIDINGDAN] = pChildContainer;
 	}	
 
@@ -1455,7 +1457,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("dianneiorder_info_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[DIANNEIINFO] = pChildContainer;
 	}	
 
@@ -1463,7 +1464,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("baobiao_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[BAOBIAO] = pChildContainer;
 	}	
 
@@ -1471,7 +1471,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("jiaoban_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[JIAOBAN] = pChildContainer;
 	}	
 
@@ -1479,7 +1478,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("gengduo_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[GENGDUO] = pChildContainer;
 	}
 
@@ -1487,7 +1485,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("shangpin_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[SHANGPIN] = pChildContainer;
 	}
 
@@ -1495,7 +1492,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("shangpin_create_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[SHANGPIN_CREATE] = pChildContainer;
 	}
 
@@ -1503,7 +1499,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("shangpin_update_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[SHANGPIN_UPDATE] = pChildContainer;
 	}
 
@@ -1511,7 +1506,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("zhengcan_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[ZHENGCAN] = pChildContainer;
 	}
 
@@ -1519,7 +1513,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("saomashouyin_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[SAOMASHOUYIN] = pChildContainer;
 	}
 
@@ -1527,7 +1520,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("caigou_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[CAIGOU] = pChildContainer;
 	}
 
@@ -1535,7 +1527,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("kucun_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[KUCUN] = pChildContainer;
 	}
 
@@ -1543,7 +1534,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("zhengcan_diandan_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[ZHENGCANDIANDAN] = pChildContainer;
 	}
 
@@ -1551,7 +1541,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("zhengcanorder_list_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[ZHENGCANDINGDAN] = pChildContainer;
 	}
 
@@ -1559,7 +1548,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("zhengcanorder_info_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[ZHENGCANINFO] = pChildContainer;
 	}
 
@@ -1567,7 +1555,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("shoukuan_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[SHOUKUAN] = pChildContainer;
 	}
 
@@ -1575,7 +1562,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("shoukuanorder_list_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[SHOUKUANDINGDAN] = pChildContainer;
 	}
 
@@ -1583,7 +1569,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("shoukuanorder_info_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[SHOUKUANINFO] = pChildContainer;
 	}
 
@@ -1591,7 +1576,6 @@ void CMainWnd::CreatePages()
 		CDialogBuilder builder;
 		CDialogBuilderCallbackEx cb;
 		pChildContainer = static_cast<CBasePageUI*>(builder.Create(_T("aixuexi_page.xml"), (UINT)0, &cb, &m_pm));
-		pChildContainer->SetAutoDestroy(false);
 		m_pages[AIXUEXI] = pChildContainer;
 	}
 

zhipuzi_pos_windows/worker/CDiandanAIShibieWorker.cpp

@@ -94,8 +94,8 @@ void CDiandanAIShibieWorker::HandleDiandanAIShibie()
 
 			auto duration_1 = std::chrono::duration_cast<std::chrono::milliseconds>(time_2 - time_1);
 			std::wstring msg = L"all time: " + std::to_wstring(duration_1.count()) + L" 毫秒";
-			DEBUG_LOG(msg.c_str());
-			LOG_INFO(msg);
+			//DEBUG_LOG(msg.c_str());
+			//LOG_INFO(msg);
 
 			//主线程里面去处理界面刷新
 			if (m_hwnd != NULL)