更新解决方案到新版本
增加环境变量。自动本地调试
This commit is contained in:
chfei committed
1 parent
e4692ec48b
commit
7f15eb9c0b
9 files changed
+320
-681
No files matched your search
+20
-20
@@ -1,7 +1,7 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 18
|
||||
VisualStudioVersion = 18.7.12002.237 oobstable
|
||||
VisualStudioVersion = 18.7.12002.237
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "29WxOrderAllBase", "AllBase\29WxOrderAllBase.csproj", "{6461D807-B1C8-45F0-B388-E0CA1A418DE0}"
|
||||
EndProject
|
||||
@@ -9,10 +9,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "29供应链-微信小店拍
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "29WxOrderWork", "Work\29WxOrderWork.csproj", "{1AD45D66-6872-4522-ACF0-04E2C0514048}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "29WxOrderWpf", "29WxOrderWpf\29WxOrderWpf.csproj", "{D7884375-E42F-4B89-AA3A-D8E75508D8C7}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "29供应链-BaseProject", "29供应链-BaseProject", "{4A54DC2A-B47C-4ED1-A482-EE60161DB2C3}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "29WxOrderWpf", "29WxOrderWpf\29WxOrderWpf.csproj", "{5A410EB5-06AD-97BB-2314-9D7A808E12F7}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@@ -57,22 +57,22 @@ Global
|
||||
{1AD45D66-6872-4522-ACF0-04E2C0514048}.Release|x64.Build.0 = Release|x64
|
||||
{1AD45D66-6872-4522-ACF0-04E2C0514048}.Release|x86.ActiveCfg = Release|x86
|
||||
{1AD45D66-6872-4522-ACF0-04E2C0514048}.Release|x86.Build.0 = Release|x86
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|x64.Build.0 = Debug|x64
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|x64.ActiveCfg = Release|x64
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|x64.Build.0 = Release|x64
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7}.Release|x86.Build.0 = Release|Any CPU
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Release|x64.Build.0 = Release|Any CPU
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7}.Release|x86.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@@ -80,7 +80,7 @@ Global
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{6461D807-B1C8-45F0-B388-E0CA1A418DE0} = {4A54DC2A-B47C-4ED1-A482-EE60161DB2C3}
|
||||
{1AD45D66-6872-4522-ACF0-04E2C0514048} = {4A54DC2A-B47C-4ED1-A482-EE60161DB2C3}
|
||||
{D7884375-E42F-4B89-AA3A-D8E75508D8C7} = {1A7830FA-AC8F-40FB-A232-F0626812B8BE}
|
||||
{5A410EB5-06AD-97BB-2314-9D7A808E12F7} = {1A7830FA-AC8F-40FB-A232-F0626812B8BE}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {38687A61-0347-49AC-98C7-E7F7148C0234}
|
||||
|
||||
@@ -1,464 +1,70 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\packages\CefSharp.Common.138.0.340\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.138.0.340\build\CefSharp.Common.props')" />
|
||||
<Import Project="..\packages\chromiumembeddedframework.runtime.win-x86.138.0.34\build\chromiumembeddedframework.runtime.win-x86.props" Condition="Exists('..\packages\chromiumembeddedframework.runtime.win-x86.138.0.34\build\chromiumembeddedframework.runtime.win-x86.props')" />
|
||||
<Import Project="..\packages\chromiumembeddedframework.runtime.win-x64.138.0.34\build\chromiumembeddedframework.runtime.win-x64.props" Condition="Exists('..\packages\chromiumembeddedframework.runtime.win-x64.138.0.34\build\chromiumembeddedframework.runtime.win-x64.props')" />
|
||||
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProjectGuid>{D7884375-E42F-4B89-AA3A-D8E75508D8C7}</ProjectGuid>
|
||||
<OutputType>WinExe</OutputType>
|
||||
<TargetFramework>net462</TargetFramework>
|
||||
<RootNamespace>_29WxOrderWpf</RootNamespace>
|
||||
<AssemblyName>29WxFindOrder</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||
<Deterministic>true</Deterministic>
|
||||
<PublishUrl>publish\</PublishUrl>
|
||||
<Install>true</Install>
|
||||
<InstallFrom>Disk</InstallFrom>
|
||||
<UpdateEnabled>false</UpdateEnabled>
|
||||
<UpdateMode>Foreground</UpdateMode>
|
||||
<UpdateInterval>7</UpdateInterval>
|
||||
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
||||
<UpdatePeriodically>false</UpdatePeriodically>
|
||||
<UpdateRequired>false</UpdateRequired>
|
||||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<ApplicationRevision>0</ApplicationRevision>
|
||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
<NuGetPackageImportStamp>
|
||||
</NuGetPackageImportStamp>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>..\..\KJD Cef138\Bin\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>..\..\KJD Cef138\Bin\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<UseWPF>true</UseWPF>
|
||||
<ApplicationIcon>gear.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<LangVersion>12</LangVersion>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<OutputPath>..\bin\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
|
||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
|
||||
<OutputPath>..\..\KJD\Bin\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<OutputPath>bin\x86\Debug\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
|
||||
<OutputPath>bin\x86\Release\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<PlatformTarget>x86</PlatformTarget>
|
||||
<LangVersion>7.3</LangVersion>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<Prefer32Bit>true</Prefer32Bit>
|
||||
<OutputPath>..\..\KJD Cef138\Bin\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CefSharp.Common" Version="138.0.340" />
|
||||
<PackageReference Include="CefSharp.Wpf" Version="138.0.340" />
|
||||
<PackageReference Include="chromiumembeddedframework.runtime.win-x64" Version="138.0.34" />
|
||||
<PackageReference Include="chromiumembeddedframework.runtime.win-x86" Version="138.0.34" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="CefSharp, Version=138.0.340.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CefSharp.Common.138.0.340\lib\net462\CefSharp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CefSharp.Core, Version=138.0.340.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CefSharp.Common.138.0.340\lib\net462\CefSharp.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="CefSharp.Wpf, Version=138.0.340.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\CefSharp.Wpf.138.0.340\lib\net462\CefSharp.Wpf.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="NaiBa.Util">
|
||||
<HintPath>..\DllReference\NaiBa.Util.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="System.Drawing" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Windows.Forms" />
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Data.DataSetExtensions" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Xaml">
|
||||
<RequiredTargetFramework>4.0</RequiredTargetFramework>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="System.Xaml" />
|
||||
<Reference Include="WindowsBase" />
|
||||
<Reference Include="PresentationCore" />
|
||||
<Reference Include="PresentationFramework" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<ApplicationDefinition Include="App.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</ApplicationDefinition>
|
||||
<Compile Include="BaseWindows\BaseMsgWindow.xaml.cs">
|
||||
<DependentUpon>BaseMsgWindow.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="BaseWindows\BaseWindow.cs" />
|
||||
<Compile Include="CefHelper\WPFCEFBrowser.cs" />
|
||||
<Compile Include="Common\DebugVisibility.cs" />
|
||||
<Compile Include="Common\DelegateCommand.cs" />
|
||||
<Compile Include="Common\DelegateCommandBase.cs" />
|
||||
<Compile Include="Common\DelegateCommand{T}.cs" />
|
||||
<Compile Include="Common\DialogWindowProperty.cs" />
|
||||
<Compile Include="Common\Result.cs" />
|
||||
<Compile Include="Converters\ImageUrlToBitmapImageConverter.cs" />
|
||||
<Compile Include="Converters\HasValueToVisibilityConverter.cs" />
|
||||
<Compile Include="Converters\ListBoxIndexConverter.cs" />
|
||||
<Compile Include="Converters\StatusToColorBrushConverter.cs" />
|
||||
<Compile Include="Converters\TextToVisibilityConverter.cs" />
|
||||
<Compile Include="Converters\VisibleToVisibilityConverter.cs" />
|
||||
<Compile Include="Converters\ValueMinus24Converter.cs" />
|
||||
<Compile Include="Ctrls\BuyerCtrls\PDDBuyerOrderReadCtrl.xaml.cs">
|
||||
<DependentUpon>PDDBuyerOrderReadCtrl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Ctrls\BuyerCtrls\PDDBuyerSelectCtrl.xaml.cs">
|
||||
<DependentUpon>PDDBuyerSelectCtrl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Common\DialogWindow.xaml.cs">
|
||||
<DependentUpon>DialogWindow.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Ctrls\OrderCtrls\OrderListRowCtrl.xaml.cs">
|
||||
<DependentUpon>OrderListRowCtrl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Ctrls\OrderCtrls\OrderListRowHeaderCtrl.xaml.cs">
|
||||
<DependentUpon>OrderListRowHeaderCtrl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Ctrls\OrderCtrls\OrderListRowItemCtrl.xaml.cs">
|
||||
<DependentUpon>OrderListRowItemCtrl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Ctrls\ShopCtrls\ShopDataGridCtrl.xaml.cs">
|
||||
<DependentUpon>ShopDataGridCtrl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Ctrls\ShopCtrls\ShopListCtrl.xaml.cs">
|
||||
<DependentUpon>ShopListCtrl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Ctrls\Statistics\Charts\RevenueLineChart.xaml.cs">
|
||||
<DependentUpon>RevenueLineChart.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Ctrls\Statistics\Charts\RevenuePieChart.xaml.cs">
|
||||
<DependentUpon>RevenuePieChart.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Ctrls\Statistics\Models\ShopRevenueStatisticsModels.cs" />
|
||||
<Compile Include="Ctrls\Statistics\Services\ShopRevenueStatisticsService.cs" />
|
||||
<Compile Include="Ctrls\Statistics\ShopRevenueStatisticsView.xaml.cs">
|
||||
<DependentUpon>ShopRevenueStatisticsView.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Ctrls\Statistics\PeriodRevenueStatisticsView.xaml.cs">
|
||||
<DependentUpon>PeriodRevenueStatisticsView.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Ctrls\Statistics\ViewModels\ShopRevenueStatisticsViewModel.cs" />
|
||||
<Compile Include="Ctrls\Statistics\ViewModels\PeriodRevenueStatisticsViewModel.cs" />
|
||||
<Compile Include="UserControls\UcWaterMarkTextBox.xaml.cs">
|
||||
<DependentUpon>UcWaterMarkTextBox.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Windows\LoginWindows\LoginWindow.xaml.cs">
|
||||
<DependentUpon>LoginWindow.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Ctrls\OrderCtrls\OrderListCtrl.xaml.cs">
|
||||
<DependentUpon>OrderListCtrl.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="StartUp.cs" />
|
||||
<Compile Include="ToolCtrls\Icons.xaml.cs">
|
||||
<DependentUpon>Icons.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="UserControls\UcImageButton.cs" />
|
||||
<Compile Include="UserControls\UcWaterMarkTextBox1.cs" />
|
||||
<Compile Include="UserControls\UcWindowBoxes.xaml.cs">
|
||||
<DependentUpon>UcWindowBoxes.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Utils\UiCtrlUtils.cs" />
|
||||
<Compile Include="Windows\OrderWindows\TransitAfterSaleWindow.xaml.cs">
|
||||
<DependentUpon>TransitAfterSaleWindow.xaml</DependentUpon>
|
||||
</Compile>
|
||||
<Page Include="BaseWindows\BaseMsgWindow.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Ctrls\BuyerCtrls\PDDBuyerOrderReadCtrl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Ctrls\BuyerCtrls\PDDBuyerSelectCtrl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Common\DialogWindow.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Ctrls\OrderCtrls\OrderListRowCtrl.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="Ctrls\OrderCtrls\OrderListRowHeaderCtrl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Ctrls\OrderCtrls\OrderListRowItemCtrl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Ctrls\ShopCtrls\ShopDataGridCtrl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Ctrls\ShopCtrls\ShopListCtrl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Ctrls\Statistics\Charts\Chart.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Ctrls\Statistics\Charts\RevenueLineChart.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Ctrls\Statistics\Charts\RevenuePieChart.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Ctrls\Statistics\General.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Ctrls\Statistics\ShopRevenueStatisticsView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Ctrls\Statistics\PeriodRevenueStatisticsView.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControls\UcWaterMarkTextBox.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Windows\LoginWindows\LoginWindow.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="MainWindow.xaml">
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Compile Include="App.xaml.cs">
|
||||
<DependentUpon>App.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="MainWindow.xaml.cs">
|
||||
<DependentUpon>MainWindow.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Page Include="Ctrls\OrderCtrls\OrderListCtrl.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Styles\BaseButtonStyle.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Styles\BaseComboBoxStyle.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Styles\BaseDataGridStyle.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Styles\BaseTextBoxStyle.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Styles\BaseWindowStyle.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Styles\StaticColorBrushDictionary.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Styles\StaticImageBrushDictionary.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Styles\StaticImageDictionary.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Styles\UcImageButtonStyle.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Styles\UcWaterMarkTextBoxStyle.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="ToolCtrls\Icons.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="UserControls\UcWindowBoxes.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Page Include="Windows\OrderWindows\TransitAfterSaleWindow.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
<Generator>MSBuild:Compile</Generator>
|
||||
</Page>
|
||||
<Reference Include="NaiBa.Util">
|
||||
<HintPath>..\DllReference\NaiBa.Util.dll</HintPath>
|
||||
<Private>true</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Include="Properties\AssemblyInfo.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Properties\Resources.Designer.cs">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DesignTime>True</DesignTime>
|
||||
<DependentUpon>Resources.resx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Properties\Settings.Designer.cs">
|
||||
<AutoGen>True</AutoGen>
|
||||
<DependentUpon>Settings.settings</DependentUpon>
|
||||
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
||||
</Compile>
|
||||
<EmbeddedResource Include="Properties\Resources.resx">
|
||||
<Generator>ResXFileCodeGenerator</Generator>
|
||||
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
|
||||
</EmbeddedResource>
|
||||
<None Include="packages.config" />
|
||||
<None Include="Properties\launchSettings.json" />
|
||||
<None Include="Properties\Settings.settings">
|
||||
<Generator>SettingsSingleFileGenerator</Generator>
|
||||
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="App.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<BootstrapperPackage Include=".NETFramework,Version=v4.6.2">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>Microsoft .NET Framework 4.6.2 %28x86 和 x64%29</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\AllBase\29WxOrderAllBase.csproj">
|
||||
<Project>{6461D807-B1C8-45F0-B388-E0CA1A418DE0}</Project>
|
||||
<Name>29WxOrderAllBase</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Work\29WxOrderWork.csproj">
|
||||
<Project>{1ad45d66-6872-4522-acf0-04e2c0514048}</Project>
|
||||
<Name>29WxOrderWork</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\29wx.ico" />
|
||||
<ProjectReference Include="..\AllBase\29WxOrderAllBase.csproj" />
|
||||
<ProjectReference Include="..\Work\29WxOrderWork.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- 资源文件：SDK 样式工程默认不会把图片/图标作为 Resource，这里按原工程显式声明 -->
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\**\*" />
|
||||
<Resource Include="29wx.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\WindowBoxes\close.hover.png" />
|
||||
<Resource Include="Resources\WindowBoxes\close.png" />
|
||||
<Resource Include="Resources\WindowBoxes\max.hover.png" />
|
||||
<Resource Include="Resources\WindowBoxes\max.png" />
|
||||
<Resource Include="Resources\WindowBoxes\min.hover.png" />
|
||||
<Resource Include="Resources\WindowBoxes\min.png" />
|
||||
<Resource Include="Resources\WindowBoxes\normal.hover.png" />
|
||||
<Resource Include="Resources\WindowBoxes\normal.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\BaseMsgErr.png" />
|
||||
<Resource Include="Resources\BaseMsgInfo.png" />
|
||||
<Resource Include="Resources\BaseMsgQue.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\order_weishop_icon.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\main_29weixin_icon.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\close_gray.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\err_pic.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\loading.gif" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\buyer_order.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="Resources\loading.png" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="29_common_icon.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="gear.ico" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\chromiumembeddedframework.runtime.win-x64.138.0.34\build\chromiumembeddedframework.runtime.win-x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\chromiumembeddedframework.runtime.win-x64.138.0.34\build\chromiumembeddedframework.runtime.win-x64.props'))" />
|
||||
<Error Condition="!Exists('..\packages\chromiumembeddedframework.runtime.win-x86.138.0.34\build\chromiumembeddedframework.runtime.win-x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\chromiumembeddedframework.runtime.win-x86.138.0.34\build\chromiumembeddedframework.runtime.win-x86.props'))" />
|
||||
<Error Condition="!Exists('..\packages\CefSharp.Common.138.0.340\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.138.0.340\build\CefSharp.Common.props'))" />
|
||||
<Error Condition="!Exists('..\packages\CefSharp.Common.138.0.340\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.138.0.340\build\CefSharp.Common.targets'))" />
|
||||
</Target>
|
||||
<Import Project="..\packages\CefSharp.Common.138.0.340\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.138.0.340\build\CefSharp.Common.targets')" />
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
@@ -10,5 +10,12 @@
|
||||
<FallbackCulture>zh-CN</FallbackCulture>
|
||||
<VerifyUploadedFiles>false</VerifyUploadedFiles>
|
||||
<ProjectView>ProjectFiles</ProjectView>
|
||||
<ActiveDebugProfile>Production</ActiveDebugProfile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
|
||||
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
|
||||
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -0,0 +1,65 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace MAX.Core.Helpers;
|
||||
public class EnvironmentHelper
|
||||
{
|
||||
private static string? _currentEnvironment;
|
||||
|
||||
// 获取当前环境
|
||||
public static string CurrentEnvironment
|
||||
{
|
||||
get
|
||||
{
|
||||
if (_currentEnvironment == null)
|
||||
{
|
||||
_currentEnvironment = DetermineEnvironment();
|
||||
}
|
||||
return _currentEnvironment;
|
||||
}
|
||||
}
|
||||
public static bool IsTest => CurrentEnvironment.Equals("Test", StringComparison.OrdinalIgnoreCase);
|
||||
public static bool IsDevelopment => CurrentEnvironment.Equals("Development", StringComparison.OrdinalIgnoreCase);
|
||||
|
||||
public static bool IsProduction => CurrentEnvironment.Equals("Production", StringComparison.OrdinalIgnoreCase);
|
||||
|
||||
private static string DetermineEnvironment()
|
||||
{
|
||||
// 1. 检查环境变量
|
||||
var envVar = Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT") ??
|
||||
Environment.GetEnvironmentVariable("ENVIRONMENT");
|
||||
|
||||
if (!string.IsNullOrEmpty(envVar))
|
||||
{
|
||||
return envVar;
|
||||
}
|
||||
|
||||
|
||||
// 检查当前机器名
|
||||
string machineName = Environment.MachineName.ToLower();
|
||||
if (machineName.Contains("dev") ||
|
||||
machineName.Contains("test"))
|
||||
{
|
||||
return machineName.Contains("TEST") ? "Test" : "Development";
|
||||
}
|
||||
|
||||
// 4. 默认返回 Production
|
||||
return "Production";
|
||||
}
|
||||
|
||||
// 获取环境描述
|
||||
public static string EnvironmentDescription
|
||||
{
|
||||
get
|
||||
{
|
||||
if (IsTest) return "测试环境";
|
||||
if (IsDevelopment) return "开发环境";
|
||||
if (IsProduction) return "生产环境";
|
||||
return $"未知环境 ({CurrentEnvironment})";
|
||||
}
|
||||
}
|
||||
}
|
||||
-26
@@ -1,26 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// 此代码由工具生成。
|
||||
// 运行时版本:4.0.30319.42000
|
||||
//
|
||||
// 对此文件的更改可能会导致不正确的行为，并且如果
|
||||
// 重新生成代码，这些更改将会丢失。
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace _29WxOrderWpf.Properties {
|
||||
|
||||
|
||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
|
||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||
|
||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||
|
||||
public static Settings Default {
|
||||
get {
|
||||
return defaultInstance;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
|
||||
<Profiles>
|
||||
<Profile Name="(Default)" />
|
||||
</Profiles>
|
||||
<Settings />
|
||||
</SettingsFile>
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
{
|
||||
"profiles": {
|
||||
"Production": {
|
||||
"Production": {
|
||||
"commandName": "Project",
|
||||
"environmentVariables": {
|
||||
"ENVIRONMENT": "Production"
|
||||
}
|
||||
}
|
||||
},
|
||||
"Development": {
|
||||
"commandName": "Project",
|
||||
"environmentVariables": {
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using _29WxOrderWpf.UserControls;
|
||||
using AllBase;
|
||||
using AllBase.DouYinModel.Param.LoginManage;
|
||||
using MAX.Core.Helpers;
|
||||
using NaiBa.Util;
|
||||
using NaiBa.Util.Extension;
|
||||
using NaiBa.Util.Helper;
|
||||
@@ -25,201 +26,202 @@ using Work.BaseForms;
|
||||
|
||||
namespace _29WxOrderWpf.Windows.LoginWindows
|
||||
{
|
||||
/// <summary>
|
||||
/// LoginWindow.xaml 的交互逻辑
|
||||
/// </summary>
|
||||
public partial class LoginWindow : BaseWindow
|
||||
{
|
||||
public static ConcurrentList<UserParam> UserParamList { get; set; } = new ConcurrentList<UserParam>();
|
||||
/// <summary>
|
||||
/// LoginWindow.xaml 的交互逻辑
|
||||
/// </summary>
|
||||
public partial class LoginWindow : BaseWindow
|
||||
{
|
||||
public static ConcurrentList<UserParam> UserParamList { get; set; } = new ConcurrentList<UserParam>();
|
||||
|
||||
public bool IsLogin { get; set; } = false;
|
||||
public bool IsLogin { get; set; } = false;
|
||||
|
||||
string[] argsuser;
|
||||
string[] argsuser;
|
||||
|
||||
public LoginWindow(string[] args)
|
||||
{
|
||||
InitializeComponent();
|
||||
public LoginWindow(string[] args)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
if (!string.IsNullOrEmpty(BaseClass.ProgramName))
|
||||
{
|
||||
lblAppName.Content = BaseClass.ProgramName;
|
||||
MainWindow.Instance.lblAppName.Content = lblAppName.Content;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(BaseClass.ProgramName))
|
||||
{
|
||||
lblAppName.Content = BaseClass.ProgramName;
|
||||
MainWindow.Instance.lblAppName.Content = lblAppName.Content;
|
||||
}
|
||||
|
||||
this.Title = "用户登录";
|
||||
argsuser = args;
|
||||
}
|
||||
this.Title = "用户登录";
|
||||
argsuser = args;
|
||||
}
|
||||
|
||||
private void loginWindow_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
#if DEBUG
|
||||
chkDebug.Visibility = Visibility.Visible;
|
||||
#endif
|
||||
|
||||
GetUserList();
|
||||
foreach (var user in UserParamList)
|
||||
{
|
||||
cmbUserNameMobile.Items.Insert(0, user.UserName);
|
||||
}
|
||||
|
||||
this.Title = "登录";
|
||||
if (BaseClass.Remember)
|
||||
{
|
||||
chkRemember.IsChecked = true;
|
||||
cmbUserNameMobile.Text = BaseClass.UserName;
|
||||
if (!string.IsNullOrEmpty(BaseClass.PassWord))
|
||||
txtPassword.Password = "******";
|
||||
}
|
||||
|
||||
if (argsuser.Length > 1)
|
||||
{
|
||||
cmbUserNameMobile.Text = argsuser[0].Replace(" ", "");
|
||||
txtPassword.Password = "******";
|
||||
BaseClass.PassWord = argsuser[1].Replace(" ", "");
|
||||
btnLogin_Click(null, null);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void BaseWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
|
||||
{
|
||||
//if (BaseMsgForm.ShowConfirm("是否关闭软件？\r\n必须登录账户才能使用，无账户请先注册一个", "请先登录或者注册").DialogResult == System.Windows.Forms.DialogResult.OK)
|
||||
// Process.GetCurrentProcess().Kill();
|
||||
//else
|
||||
// e.Cancel = true;
|
||||
|
||||
if (!IsLogin)
|
||||
{
|
||||
if (BaseMsgWindow.ShowConfirm("是否关闭软件？\r\n必须登录账户才能使用，无账户请先注册一个。", "请先登录或者注册", this).DialogResult == true)
|
||||
Process.GetCurrentProcess().Kill();
|
||||
else
|
||||
e.Cancel = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void btnLogin_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
UserLogin ul = new UserLogin();
|
||||
ul.Mobile = cmbUserNameMobile.Text;
|
||||
ul.Password = txtPassword.Password;
|
||||
|
||||
if (cmbUserNameMobile.Text.Length != 11)
|
||||
{
|
||||
BaseMsgWindow.ShowError("手机号不正确", "提示", this);
|
||||
cmbUserNameMobile.Focus();
|
||||
return;
|
||||
}
|
||||
if (txtPassword.Password.Length < 6)
|
||||
{
|
||||
BaseMsgWindow.ShowError("密码长度不正确", "提示", this);
|
||||
txtPassword.Password = "";
|
||||
txtPassword.Focus();
|
||||
return;
|
||||
}
|
||||
string message = "";
|
||||
int weakPassword = 0;
|
||||
int lockUserName = 0;
|
||||
string messageInfo = "";
|
||||
bool ok = ul.Get(ref message, out lockUserName, out weakPassword, out messageInfo);
|
||||
if (!ok)
|
||||
{
|
||||
BaseMsgForm.ShowError(message, "登录失败");
|
||||
return;
|
||||
}
|
||||
MainWindow.Instance.Balance = BaseClass.Balance.ToString("0.00");
|
||||
if (BaseClass.Remember)
|
||||
{
|
||||
Initialization i = new Initialization();
|
||||
i.SaveConfig();
|
||||
|
||||
var eUser = UserParamList.FirstOrDefault(u => u.UserName == BaseClass.UserName);
|
||||
if (eUser != null)
|
||||
UserParamList.Remove(eUser);
|
||||
UserParamList.Add(new UserParam()
|
||||
{
|
||||
UserName = BaseClass.UserName,
|
||||
PasswordMd5 = BaseClass.PassWord
|
||||
});
|
||||
SaveUserList();
|
||||
}
|
||||
private void loginWindow_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
#if DEBUG
|
||||
MainWindow.Instance.lblDebug.Visibility = Visibility.Visible;
|
||||
MainWindow.Instance.lblDebug.Content = "[Debug]";
|
||||
MainWindow.Instance.lblDebug.Foreground = new SolidColorBrush(Color.FromRgb(100, 250, 255));
|
||||
if (BaseClass.LoginApiUrl == BaseClass.DebugUrl)
|
||||
{
|
||||
MainWindow.Instance.lblDebug.Foreground = new SolidColorBrush(Color.FromRgb(0, 255, 100));
|
||||
MainWindow.Instance.lblDebug.Content = "[Dev]";
|
||||
}
|
||||
chkDebug.Visibility = Visibility.Visible;
|
||||
chkDebug.IsChecked = EnvironmentHelper.IsDevelopment;
|
||||
#endif
|
||||
this.IsLogin = true;
|
||||
this.Close();
|
||||
}
|
||||
|
||||
public static void SaveUserList()
|
||||
{
|
||||
ConfigHelper.SaveConfig("user_login_config", UserParamList);
|
||||
}
|
||||
public static void GetUserList()
|
||||
{
|
||||
#region 用户账户记忆功能
|
||||
UserParamList = ConfigHelper.LoadConfig<ConcurrentList<UserParam>>("user_login_config");
|
||||
if (UserParamList == null)
|
||||
UserParamList = new ConcurrentList<UserParam>();
|
||||
#endregion
|
||||
}
|
||||
GetUserList();
|
||||
foreach (var user in UserParamList)
|
||||
{
|
||||
cmbUserNameMobile.Items.Insert(0, user.UserName);
|
||||
}
|
||||
|
||||
private void btnDeleteItem_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var imgButton = sender as UcImageButton;
|
||||
if (imgButton != null)
|
||||
{
|
||||
var userName = imgButton.Tag.ParseToString();
|
||||
if (!string.IsNullOrEmpty(userName))
|
||||
{
|
||||
UserParamList.RemoveAll(u => u.UserName == userName);
|
||||
SaveUserList();
|
||||
foreach (var item in cmbUserNameMobile.Items.Cast<string>().ToList())
|
||||
{
|
||||
if (item.ParseToString() == userName)
|
||||
{
|
||||
cmbUserNameMobile.Items.Remove(item);
|
||||
}
|
||||
this.Title = "登录";
|
||||
if (BaseClass.Remember)
|
||||
{
|
||||
chkRemember.IsChecked = true;
|
||||
cmbUserNameMobile.Text = BaseClass.UserName;
|
||||
if (!string.IsNullOrEmpty(BaseClass.PassWord))
|
||||
txtPassword.Password = "******";
|
||||
}
|
||||
|
||||
}
|
||||
//ShowUserDropDown();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (argsuser.Length > 1)
|
||||
{
|
||||
cmbUserNameMobile.Text = argsuser[0].Replace(" ", "");
|
||||
txtPassword.Password = "******";
|
||||
BaseClass.PassWord = argsuser[1].Replace(" ", "");
|
||||
btnLogin_Click(null, null);
|
||||
}
|
||||
}
|
||||
|
||||
private void cmbUserNameMobile_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
var userName = cmbUserNameMobile.SelectedItem.ParseToString();
|
||||
var user = UserParamList.FirstOrDefault(u => u.UserName == userName);
|
||||
if (user != null)
|
||||
{
|
||||
BaseClass.UserName = user.UserName;
|
||||
BaseClass.PassWord = user.PasswordMd5;
|
||||
this.cmbUserNameMobile.Text = user.UserName;
|
||||
this.txtPassword.Password = "******";
|
||||
}
|
||||
}
|
||||
|
||||
private void chkRemember_Checked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
BaseClass.Remember = chkRemember.IsChecked.ParseToBool();
|
||||
}
|
||||
private void BaseWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
|
||||
{
|
||||
//if (BaseMsgForm.ShowConfirm("是否关闭软件？\r\n必须登录账户才能使用，无账户请先注册一个", "请先登录或者注册").DialogResult == System.Windows.Forms.DialogResult.OK)
|
||||
// Process.GetCurrentProcess().Kill();
|
||||
//else
|
||||
// e.Cancel = true;
|
||||
|
||||
private void chkDebug_Checked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (chkDebug.IsChecked == true)
|
||||
{
|
||||
BaseClass.LoginApiUrl = BaseClass.DebugUrl;
|
||||
}
|
||||
else
|
||||
{
|
||||
BaseClass.LoginApiUrl = BaseClass.ServerUrl;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!IsLogin)
|
||||
{
|
||||
if (BaseMsgWindow.ShowConfirm("是否关闭软件？\r\n必须登录账户才能使用，无账户请先注册一个。", "请先登录或者注册", this).DialogResult == true)
|
||||
Process.GetCurrentProcess().Kill();
|
||||
else
|
||||
e.Cancel = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void btnLogin_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
UserLogin ul = new UserLogin();
|
||||
ul.Mobile = cmbUserNameMobile.Text;
|
||||
ul.Password = txtPassword.Password;
|
||||
|
||||
if (cmbUserNameMobile.Text.Length != 11)
|
||||
{
|
||||
BaseMsgWindow.ShowError("手机号不正确", "提示", this);
|
||||
cmbUserNameMobile.Focus();
|
||||
return;
|
||||
}
|
||||
if (txtPassword.Password.Length < 6)
|
||||
{
|
||||
BaseMsgWindow.ShowError("密码长度不正确", "提示", this);
|
||||
txtPassword.Password = "";
|
||||
txtPassword.Focus();
|
||||
return;
|
||||
}
|
||||
string message = "";
|
||||
int weakPassword = 0;
|
||||
int lockUserName = 0;
|
||||
string messageInfo = "";
|
||||
bool ok = ul.Get(ref message, out lockUserName, out weakPassword, out messageInfo);
|
||||
if (!ok)
|
||||
{
|
||||
BaseMsgForm.ShowError(message, "登录失败");
|
||||
return;
|
||||
}
|
||||
MainWindow.Instance.Balance = BaseClass.Balance.ToString("0.00");
|
||||
if (BaseClass.Remember)
|
||||
{
|
||||
Initialization i = new Initialization();
|
||||
i.SaveConfig();
|
||||
|
||||
var eUser = UserParamList.FirstOrDefault(u => u.UserName == BaseClass.UserName);
|
||||
if (eUser != null)
|
||||
UserParamList.Remove(eUser);
|
||||
UserParamList.Add(new UserParam()
|
||||
{
|
||||
UserName = BaseClass.UserName,
|
||||
PasswordMd5 = BaseClass.PassWord
|
||||
});
|
||||
SaveUserList();
|
||||
}
|
||||
#if DEBUG
|
||||
MainWindow.Instance.lblDebug.Visibility = Visibility.Visible;
|
||||
MainWindow.Instance.lblDebug.Content = "[Debug]";
|
||||
MainWindow.Instance.lblDebug.Foreground = new SolidColorBrush(Color.FromRgb(100, 250, 255));
|
||||
if (BaseClass.LoginApiUrl == BaseClass.DebugUrl)
|
||||
{
|
||||
MainWindow.Instance.lblDebug.Foreground = new SolidColorBrush(Color.FromRgb(0, 255, 100));
|
||||
MainWindow.Instance.lblDebug.Content = "[Dev]";
|
||||
}
|
||||
#endif
|
||||
this.IsLogin = true;
|
||||
this.Close();
|
||||
}
|
||||
|
||||
public static void SaveUserList()
|
||||
{
|
||||
ConfigHelper.SaveConfig("user_login_config", UserParamList);
|
||||
}
|
||||
public static void GetUserList()
|
||||
{
|
||||
#region 用户账户记忆功能
|
||||
UserParamList = ConfigHelper.LoadConfig<ConcurrentList<UserParam>>("user_login_config");
|
||||
if (UserParamList == null)
|
||||
UserParamList = new ConcurrentList<UserParam>();
|
||||
#endregion
|
||||
}
|
||||
|
||||
private void btnDeleteItem_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var imgButton = sender as UcImageButton;
|
||||
if (imgButton != null)
|
||||
{
|
||||
var userName = imgButton.Tag.ParseToString();
|
||||
if (!string.IsNullOrEmpty(userName))
|
||||
{
|
||||
UserParamList.RemoveAll(u => u.UserName == userName);
|
||||
SaveUserList();
|
||||
foreach (var item in cmbUserNameMobile.Items.Cast<string>().ToList())
|
||||
{
|
||||
if (item.ParseToString() == userName)
|
||||
{
|
||||
cmbUserNameMobile.Items.Remove(item);
|
||||
}
|
||||
|
||||
}
|
||||
//ShowUserDropDown();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void cmbUserNameMobile_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
var userName = cmbUserNameMobile.SelectedItem.ParseToString();
|
||||
var user = UserParamList.FirstOrDefault(u => u.UserName == userName);
|
||||
if (user != null)
|
||||
{
|
||||
BaseClass.UserName = user.UserName;
|
||||
BaseClass.PassWord = user.PasswordMd5;
|
||||
this.cmbUserNameMobile.Text = user.UserName;
|
||||
this.txtPassword.Password = "******";
|
||||
}
|
||||
}
|
||||
|
||||
private void chkRemember_Checked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
BaseClass.Remember = chkRemember.IsChecked.ParseToBool();
|
||||
}
|
||||
|
||||
private void chkDebug_Checked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
if (chkDebug.IsChecked == true)
|
||||
{
|
||||
BaseClass.LoginApiUrl = BaseClass.DebugUrl;
|
||||
}
|
||||
else
|
||||
{
|
||||
BaseClass.LoginApiUrl = BaseClass.ServerUrl;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="CefSharp.Common" version="138.0.340" targetFramework="net462" />
|
||||
<package id="CefSharp.Wpf" version="138.0.340" targetFramework="net462" />
|
||||
<package id="chromiumembeddedframework.runtime.win-x64" version="138.0.34" targetFramework="net462" />
|
||||
<package id="chromiumembeddedframework.runtime.win-x86" version="138.0.34" targetFramework="net462" />
|
||||
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net462" />
|
||||
</packages>
|
||||
Reference in new issue
Block a user