duheng
2025-02-07 e3ca589482a056449963e7bbbd77824ded3928bc
过渡件匹配修改
已修改17个文件
已添加7个文件
1178 ■■■■■ 文件已修改
Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Desktop/HStation.Desktop.Xhs.Core/Login/LoginFrm.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Desktop/HStation.Desktop.Xhs.Core/MainForm.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UpdatePwdDlg.Designer.cs 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.Designer.cs 499 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.cs 149 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.resx 120 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/UserInfoPage.Designer.cs 136 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/UserInfoPage.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/Window1.xaml 144 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/Window1.xaml.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj.user 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Core/Resources/Image1.png 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Core/Resources/Imported.png 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.Designer.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.resx 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeViewModel.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Hstation.WinFrmUI.Core/Lib/ImageLib.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Hstation.WinFrmUI.Core/Lib/Resource1.Designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Hstation.WinFrmUI.Core/Lib/Resource1.resx 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj
@@ -16,7 +16,7 @@
  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Yw.BLL.Auth.Core" Version="3.6.3" />
    <PackageReference Include="Yw.BLL.Auth.Core" Version="3.6.4" />
    <PackageReference Include="Yw.Update.Core" Version="1.0.2" />
  </ItemGroup>
Desktop/HStation.Desktop.Xhs.Core/Login/LoginFrm.cs
@@ -14,6 +14,7 @@
            InitializeComponent();
            this.layoutControl1.SetupLayoutControl();
            this.Load += LoginFrm_Load;
            this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
            this.systemLoginCtrl1.LoginCancelEvent += Cancel;
            this.systemLoginCtrl1.LoginStartEvent += Start;
            this.systemLoginCtrl1.LoginEndEvet += End;
Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs
@@ -454,7 +454,7 @@
            Controls.Add(barDockControlTop);
            Margin = new Padding(3, 2, 3, 2);
            Name = "MainForm";
            Text = "Form1";
            Text = "循环水分析系统";
            WindowState = FormWindowState.Maximized;
            FormClosing += MainForm_FormClosing;
            FormClosed += MainForm_FormClosed;
Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
@@ -20,6 +20,7 @@
        public MainForm()
        {
            InitializeComponent();
            this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
        }
        //验证权限
@@ -1120,8 +1121,8 @@
                        };
                        if (!IsExistPage(guid, true))
                        {
                            var page = new UserInfoPage();
                            CreatePage(page, guid);
                            var dlg = new PersonalCenterDlg();
                            dlg.Show();
                        }
                    }
                    break;
WinFrmUI/HStation.WinFrmUI.Auth.Core/03-user/UpdatePwdDlg.Designer.cs
@@ -66,7 +66,7 @@
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(668, 0, 650, 400);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(369, 91);
            layoutControl1.Size = new Size(384, 93);
            layoutControl1.TabIndex = 1;
            layoutControl1.Text = "layoutControl1";
            // 
@@ -76,7 +76,7 @@
            txtConfirm.Margin = new Padding(3, 2, 3, 2);
            txtConfirm.Name = "txtConfirm";
            txtConfirm.Properties.PasswordChar = '*';
            txtConfirm.Size = new Size(274, 20);
            txtConfirm.Size = new Size(289, 20);
            txtConfirm.StyleController = layoutControl1;
            txtConfirm.TabIndex = 7;
            // 
@@ -86,7 +86,7 @@
            txtPwd.Margin = new Padding(3, 2, 3, 2);
            txtPwd.Name = "txtPwd";
            txtPwd.Properties.PasswordChar = '*';
            txtPwd.Size = new Size(274, 20);
            txtPwd.Size = new Size(289, 20);
            txtPwd.StyleController = layoutControl1;
            txtPwd.TabIndex = 6;
            // 
@@ -95,7 +95,7 @@
            btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            btnCancel.Appearance.Options.UseBackColor = true;
            btnCancel.DialogResult = DialogResult.Cancel;
            btnCancel.Location = new Point(274, 60);
            btnCancel.Location = new Point(289, 60);
            btnCancel.Margin = new Padding(3, 2, 3, 2);
            btnCancel.Name = "btnCancel";
            btnCancel.Size = new Size(83, 17);
@@ -107,7 +107,7 @@
            // 
            btnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
            btnOk.Appearance.Options.UseBackColor = true;
            btnOk.Location = new Point(187, 60);
            btnOk.Location = new Point(202, 60);
            btnOk.Margin = new Padding(3, 2, 3, 2);
            btnOk.Name = "btnOk";
            btnOk.Size = new Size(83, 17);
@@ -124,17 +124,17 @@
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, emptySpaceItem1, layoutControlItem3, layoutControlItem4 });
            Root.Name = "Root";
            Root.Size = new Size(369, 91);
            Root.Size = new Size(384, 93);
            Root.TextVisible = false;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = btnOk;
            layoutControlItem1.Location = new Point(175, 48);
            layoutControlItem1.Location = new Point(190, 48);
            layoutControlItem1.MaxSize = new Size(87, 21);
            layoutControlItem1.MinSize = new Size(87, 21);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(87, 23);
            layoutControlItem1.Size = new Size(87, 25);
            layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
@@ -142,11 +142,11 @@
            // layoutControlItem2
            // 
            layoutControlItem2.Control = btnCancel;
            layoutControlItem2.Location = new Point(262, 48);
            layoutControlItem2.Location = new Point(277, 48);
            layoutControlItem2.MaxSize = new Size(87, 21);
            layoutControlItem2.MinSize = new Size(87, 21);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(87, 23);
            layoutControlItem2.Size = new Size(87, 25);
            layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            layoutControlItem2.TextSize = new Size(0, 0);
            layoutControlItem2.TextVisible = false;
@@ -156,7 +156,7 @@
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 48);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(175, 23);
            emptySpaceItem1.Size = new Size(190, 25);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // layoutControlItem3
@@ -165,7 +165,7 @@
            layoutControlItem3.Control = txtPwd;
            layoutControlItem3.Location = new Point(0, 0);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(349, 24);
            layoutControlItem3.Size = new Size(364, 24);
            layoutControlItem3.Text = "<color=red>*</color>新密码:";
            layoutControlItem3.TextSize = new Size(59, 14);
            // 
@@ -175,7 +175,7 @@
            layoutControlItem4.Control = txtConfirm;
            layoutControlItem4.Location = new Point(0, 24);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(349, 24);
            layoutControlItem4.Size = new Size(364, 24);
            layoutControlItem4.Text = "<color=red>*</color>确定密码:";
            layoutControlItem4.TextSize = new Size(59, 14);
            // 
@@ -187,7 +187,7 @@
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(369, 91);
            ClientSize = new Size(384, 93);
            Controls.Add(layoutControl1);
            FormBorderStyle = FormBorderStyle.FixedToolWindow;
            Margin = new Padding(3, 2, 3, 2);
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,499 @@
namespace HStation.WinFrmUI
{
    partial class PersonalCenterDlg
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Windows Form Designer generated code
        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            navigationPane1 = new DevExpress.XtraBars.Navigation.NavigationPane();
            navigationPage1 = new DevExpress.XtraBars.Navigation.NavigationPage();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            BtnSave = new DevExpress.XtraEditors.SimpleButton();
            BtnEditPwd = new DevExpress.XtraEditors.SimpleButton();
            txtEditUserName = new DevExpress.XtraEditors.TextEdit();
            txtAccountName = new DevExpress.XtraEditors.TextEdit();
            textAccountType = new DevExpress.XtraEditors.TextEdit();
            txtEditAdminType = new DevExpress.XtraEditors.TextEdit();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            navigationPage2 = new DevExpress.XtraBars.Navigation.NavigationPage();
            layoutControl2 = new DevExpress.XtraLayout.LayoutControl();
            btnPhoneBinding = new DevExpress.XtraEditors.SimpleButton();
            txtMobileNumber = new DevExpress.XtraEditors.TextEdit();
            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
            navigationPage3 = new DevExpress.XtraBars.Navigation.NavigationPage();
            layoutControl3 = new DevExpress.XtraLayout.LayoutControl();
            btnRefresh = new DevExpress.XtraEditors.SimpleButton();
            wechatBindingCtrl1 = new WechatBindingCtrl();
            layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
            layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)navigationPane1).BeginInit();
            navigationPane1.SuspendLayout();
            navigationPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)txtEditUserName.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtAccountName.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textAccountType.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtEditAdminType.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
            navigationPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)layoutControl2).BeginInit();
            layoutControl2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)txtMobileNumber.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem2).BeginInit();
            navigationPage3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)layoutControl3).BeginInit();
            layoutControl3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
            SuspendLayout();
            //
            // navigationPane1
            //
            navigationPane1.AllowHtmlDraw = false;
            navigationPane1.Controls.Add(navigationPage1);
            navigationPane1.Controls.Add(navigationPage2);
            navigationPane1.Controls.Add(navigationPage3);
            navigationPane1.Dock = DockStyle.Fill;
            navigationPane1.Location = new Point(0, 0);
            navigationPane1.Name = "navigationPane1";
            navigationPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navigationPage1, navigationPage2, navigationPage3 });
            navigationPane1.RegularSize = new Size(661, 375);
            navigationPane1.SelectedPage = navigationPage1;
            navigationPane1.Size = new Size(661, 375);
            navigationPane1.TabIndex = 0;
            navigationPane1.Text = "个人信息";
            //
            // navigationPage1
            //
            navigationPage1.Caption = "个人信息";
            navigationPage1.Controls.Add(layoutControl1);
            navigationPage1.Name = "navigationPage1";
            navigationPage1.Size = new Size(558, 302);
            //
            // layoutControl1
            //
            layoutControl1.Controls.Add(BtnSave);
            layoutControl1.Controls.Add(BtnEditPwd);
            layoutControl1.Controls.Add(txtEditUserName);
            layoutControl1.Controls.Add(txtAccountName);
            layoutControl1.Controls.Add(textAccountType);
            layoutControl1.Controls.Add(txtEditAdminType);
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1034, 149, 650, 400);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(558, 302);
            layoutControl1.TabIndex = 0;
            layoutControl1.Text = "layoutControl1";
            //
            // BtnSave
            //
            BtnSave.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            BtnSave.Appearance.Options.UseBackColor = true;
            BtnSave.Location = new Point(490, 108);
            BtnSave.Name = "BtnSave";
            BtnSave.Size = new Size(56, 22);
            BtnSave.StyleController = layoutControl1;
            BtnSave.TabIndex = 6;
            BtnSave.Text = "保存";
            //
            // BtnEditPwd
            //
            BtnEditPwd.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
            BtnEditPwd.Appearance.Options.UseBackColor = true;
            BtnEditPwd.Location = new Point(431, 108);
            BtnEditPwd.Name = "BtnEditPwd";
            BtnEditPwd.Size = new Size(55, 22);
            BtnEditPwd.StyleController = layoutControl1;
            BtnEditPwd.TabIndex = 5;
            BtnEditPwd.Text = "修改密码";
            BtnEditPwd.Click += BtnEditPwd_Click;
            //
            // txtEditUserName
            //
            txtEditUserName.Location = new Point(76, 12);
            txtEditUserName.Name = "txtEditUserName";
            txtEditUserName.Properties.ReadOnly = true;
            txtEditUserName.Properties.UseReadOnlyAppearance = false;
            txtEditUserName.Size = new Size(470, 20);
            txtEditUserName.StyleController = layoutControl1;
            txtEditUserName.TabIndex = 0;
            //
            // txtAccountName
            //
            txtAccountName.Location = new Point(76, 60);
            txtAccountName.Name = "txtAccountName";
            txtAccountName.Properties.ReadOnly = true;
            txtAccountName.Properties.UseReadOnlyAppearance = false;
            txtAccountName.Size = new Size(470, 20);
            txtAccountName.StyleController = layoutControl1;
            txtAccountName.TabIndex = 3;
            //
            // textAccountType
            //
            textAccountType.Location = new Point(76, 84);
            textAccountType.Name = "textAccountType";
            textAccountType.Properties.ReadOnly = true;
            textAccountType.Properties.UseReadOnlyAppearance = false;
            textAccountType.Size = new Size(470, 20);
            textAccountType.StyleController = layoutControl1;
            textAccountType.TabIndex = 4;
            //
            // txtEditAdminType
            //
            txtEditAdminType.Location = new Point(76, 36);
            txtEditAdminType.Name = "txtEditAdminType";
            txtEditAdminType.Properties.ReadOnly = true;
            txtEditAdminType.Properties.UseReadOnlyAppearance = false;
            txtEditAdminType.Size = new Size(470, 20);
            txtEditAdminType.StyleController = layoutControl1;
            txtEditAdminType.TabIndex = 2;
            //
            // Root
            //
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, emptySpaceItem1, layoutControlItem4, layoutControlItem6, layoutControlItem5 });
            Root.Name = "Root";
            Root.Size = new Size(558, 302);
            Root.TextVisible = false;
            //
            // layoutControlItem1
            //
            layoutControlItem1.Control = txtEditUserName;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(538, 24);
            layoutControlItem1.Text = "用户名:";
            layoutControlItem1.TextSize = new Size(52, 14);
            //
            // layoutControlItem2
            //
            layoutControlItem2.Control = txtEditAdminType;
            layoutControlItem2.Location = new Point(0, 24);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(538, 24);
            layoutControlItem2.Text = "管理类型:";
            layoutControlItem2.TextSize = new Size(52, 14);
            //
            // layoutControlItem3
            //
            layoutControlItem3.Control = textAccountType;
            layoutControlItem3.Location = new Point(0, 72);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(538, 24);
            layoutControlItem3.Text = "账户类型:";
            layoutControlItem3.TextSize = new Size(52, 14);
            //
            // emptySpaceItem1
            //
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 96);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(419, 186);
            emptySpaceItem1.TextSize = new Size(0, 0);
            //
            // layoutControlItem4
            //
            layoutControlItem4.Control = txtAccountName;
            layoutControlItem4.Location = new Point(0, 48);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(538, 24);
            layoutControlItem4.Text = "账户名:";
            layoutControlItem4.TextSize = new Size(52, 14);
            //
            // layoutControlItem6
            //
            layoutControlItem6.Control = BtnSave;
            layoutControlItem6.Location = new Point(478, 96);
            layoutControlItem6.Name = "layoutControlItem6";
            layoutControlItem6.Size = new Size(60, 186);
            layoutControlItem6.TextSize = new Size(0, 0);
            layoutControlItem6.TextVisible = false;
            //
            // layoutControlItem5
            //
            layoutControlItem5.Control = BtnEditPwd;
            layoutControlItem5.Location = new Point(419, 96);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(59, 186);
            layoutControlItem5.TextSize = new Size(0, 0);
            layoutControlItem5.TextVisible = false;
            //
            // navigationPage2
            //
            navigationPage2.Caption = "手机绑定";
            navigationPage2.Controls.Add(layoutControl2);
            navigationPage2.Name = "navigationPage2";
            navigationPage2.Size = new Size(558, 302);
            //
            // layoutControl2
            //
            layoutControl2.Controls.Add(btnPhoneBinding);
            layoutControl2.Controls.Add(txtMobileNumber);
            layoutControl2.Dock = DockStyle.Fill;
            layoutControl2.Location = new Point(0, 0);
            layoutControl2.Name = "layoutControl2";
            layoutControl2.Root = layoutControlGroup1;
            layoutControl2.Size = new Size(558, 302);
            layoutControl2.TabIndex = 0;
            layoutControl2.Text = "layoutControl2";
            //
            // btnPhoneBinding
            //
            btnPhoneBinding.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            btnPhoneBinding.Appearance.Options.UseBackColor = true;
            btnPhoneBinding.Location = new Point(488, 36);
            btnPhoneBinding.Name = "btnPhoneBinding";
            btnPhoneBinding.Size = new Size(58, 22);
            btnPhoneBinding.StyleController = layoutControl2;
            btnPhoneBinding.TabIndex = 7;
            btnPhoneBinding.Text = "绑定";
            btnPhoneBinding.Click += btnPhoneBinding_Click;
            //
            // txtMobileNumber
            //
            txtMobileNumber.Location = new Point(64, 12);
            txtMobileNumber.Name = "txtMobileNumber";
            txtMobileNumber.Size = new Size(482, 20);
            txtMobileNumber.StyleController = layoutControl2;
            txtMobileNumber.TabIndex = 14;
            //
            // layoutControlGroup1
            //
            layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            layoutControlGroup1.GroupBordersVisible = false;
            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem7, layoutControlItem8, emptySpaceItem2 });
            layoutControlGroup1.Name = "layoutControlGroup1";
            layoutControlGroup1.Size = new Size(558, 302);
            layoutControlGroup1.TextVisible = false;
            //
            // layoutControlItem7
            //
            layoutControlItem7.Control = txtMobileNumber;
            layoutControlItem7.Location = new Point(0, 0);
            layoutControlItem7.Name = "layoutControlItem7";
            layoutControlItem7.Size = new Size(538, 24);
            layoutControlItem7.Text = "手机号:";
            layoutControlItem7.TextSize = new Size(40, 14);
            //
            // layoutControlItem8
            //
            layoutControlItem8.Control = btnPhoneBinding;
            layoutControlItem8.Location = new Point(476, 24);
            layoutControlItem8.Name = "layoutControlItem8";
            layoutControlItem8.Size = new Size(62, 258);
            layoutControlItem8.TextSize = new Size(0, 0);
            layoutControlItem8.TextVisible = false;
            //
            // emptySpaceItem2
            //
            emptySpaceItem2.AllowHotTrack = false;
            emptySpaceItem2.Location = new Point(0, 24);
            emptySpaceItem2.Name = "emptySpaceItem2";
            emptySpaceItem2.Size = new Size(476, 258);
            emptySpaceItem2.TextSize = new Size(0, 0);
            //
            // navigationPage3
            //
            navigationPage3.Caption = "微信绑定";
            navigationPage3.Controls.Add(layoutControl3);
            navigationPage3.Name = "navigationPage3";
            navigationPage3.Size = new Size(558, 302);
            //
            // layoutControl3
            //
            layoutControl3.Controls.Add(btnRefresh);
            layoutControl3.Controls.Add(wechatBindingCtrl1);
            layoutControl3.Dock = DockStyle.Fill;
            layoutControl3.Location = new Point(0, 0);
            layoutControl3.Name = "layoutControl3";
            layoutControl3.Root = layoutControlGroup2;
            layoutControl3.Size = new Size(558, 302);
            layoutControl3.TabIndex = 0;
            layoutControl3.Text = "layoutControl3";
            //
            // btnRefresh
            //
            btnRefresh.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            btnRefresh.Appearance.Options.UseBackColor = true;
            btnRefresh.Location = new Point(482, 268);
            btnRefresh.Name = "btnRefresh";
            btnRefresh.Size = new Size(64, 22);
            btnRefresh.StyleController = layoutControl3;
            btnRefresh.TabIndex = 8;
            btnRefresh.Text = "刷新";
            btnRefresh.Click += btnRefresh_Click;
            //
            // wechatBindingCtrl1
            //
            wechatBindingCtrl1.Location = new Point(12, 12);
            wechatBindingCtrl1.Name = "wechatBindingCtrl1";
            wechatBindingCtrl1.Size = new Size(534, 252);
            wechatBindingCtrl1.TabIndex = 0;
            //
            // layoutControlGroup2
            //
            layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            layoutControlGroup2.GroupBordersVisible = false;
            layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem9, emptySpaceItem3, layoutControlItem10 });
            layoutControlGroup2.Name = "layoutControlGroup2";
            layoutControlGroup2.Size = new Size(558, 302);
            layoutControlGroup2.TextVisible = false;
            //
            // layoutControlItem9
            //
            layoutControlItem9.Control = wechatBindingCtrl1;
            layoutControlItem9.Location = new Point(0, 0);
            layoutControlItem9.Name = "layoutControlItem9";
            layoutControlItem9.Size = new Size(538, 256);
            layoutControlItem9.TextSize = new Size(0, 0);
            layoutControlItem9.TextVisible = false;
            //
            // emptySpaceItem3
            //
            emptySpaceItem3.AllowHotTrack = false;
            emptySpaceItem3.Location = new Point(0, 256);
            emptySpaceItem3.Name = "emptySpaceItem3";
            emptySpaceItem3.Size = new Size(470, 26);
            emptySpaceItem3.TextSize = new Size(0, 0);
            //
            // layoutControlItem10
            //
            layoutControlItem10.Control = btnRefresh;
            layoutControlItem10.Location = new Point(470, 256);
            layoutControlItem10.Name = "layoutControlItem10";
            layoutControlItem10.Size = new Size(68, 26);
            layoutControlItem10.TextSize = new Size(0, 0);
            layoutControlItem10.TextVisible = false;
            //
            // PersonalCenterDlg
            //
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            ClientSize = new Size(661, 375);
            Controls.Add(navigationPane1);
            Name = "PersonalCenterDlg";
            StartPosition = FormStartPosition.CenterScreen;
            Text = "个人中心";
            ((System.ComponentModel.ISupportInitialize)navigationPane1).EndInit();
            navigationPane1.ResumeLayout(false);
            navigationPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)txtEditUserName.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtAccountName.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textAccountType.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtEditAdminType.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
            navigationPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)layoutControl2).EndInit();
            layoutControl2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)txtMobileNumber.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem2).EndInit();
            navigationPage3.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)layoutControl3).EndInit();
            layoutControl3.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup2).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem3).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
            ResumeLayout(false);
        }
        #endregion
        private DevExpress.XtraBars.Navigation.NavigationPane navigationPane1;
        private DevExpress.XtraBars.Navigation.NavigationPage navigationPage1;
        private DevExpress.XtraBars.Navigation.NavigationPage navigationPage2;
        private DevExpress.XtraBars.Navigation.NavigationPage navigationPage3;
        private DevExpress.XtraLayout.LayoutControl layoutControl1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraEditors.TextEdit txtEditUserName;
        private DevExpress.XtraEditors.TextEdit txtAccountName;
        private DevExpress.XtraEditors.TextEdit textAccountType;
        private DevExpress.XtraEditors.TextEdit txtEditAdminType;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
        private DevExpress.XtraEditors.SimpleButton BtnEditPwd;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraEditors.SimpleButton BtnSave;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControl layoutControl2;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
        private DevExpress.XtraEditors.TextEdit txtMobileNumber;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
        private DevExpress.XtraEditors.SimpleButton btnPhoneBinding;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControl layoutControl3;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
        private WechatBindingCtrl wechatBindingCtrl1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraEditors.SimpleButton btnRefresh;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
    }
}
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,149 @@
using Yw;
using Yw.Auth;
using Yw.Dto;
using Yw.WinFrmUI;
namespace HStation.WinFrmUI
{
    public partial class PersonalCenterDlg : DevExpress.XtraEditors.XtraForm
    {
        public PersonalCenterDlg()
        {
            InitializeComponent();
            this.Load += PersonalCenterDlg_Load;
            this.wechatBindingCtrl1.LoginStartEvent += WechatBindingCtrl1_LoginStartEvent;
        }
        private const string _smsTemplate = "hzkw_sms_template";//手机号登录模板
        private const string _vxTemplate = "hzkw_wx_template";//微信登录模板
        private const string _software = "HStation_XHS_DESKTOP";//软件编码
        //登录回调
        private void WechatBindingCtrl1_LoginStartEvent(string code)
        {
            WechatBinding(code);
        }
        //初始化
        private void PersonalCenterDlg_Load(object? sender, EventArgs e)
        {
            this.txtEditUserName.Text = GlobalParas._GlobalParas.LoginName;
            this.txtEditAdminType.Text = GlobalParas._GlobalParas.AdminType;
            this.txtAccountName.Text = GlobalParas._GlobalParas.AccountName;
            this.textAccountType.Text = GlobalParas._GlobalParas.LoginType;
            this.wechatBindingCtrl1.Initial();
        }
        //修改密码
        private void BtnEditPwd_Click(object sender, EventArgs e)
        {
            var dlg = new UpdatePwdDlg();
            dlg.SetBindingData(GlobalParas._GlobalParas.LoginID);
            dlg.ShowDialog();
        }
        //手机号验证
        private bool IsValidMobileNumber(string mobile)
        {
            var regex = new System.Text.RegularExpressions.Regex(@"^1\d{10}$");
            return regex.IsMatch(mobile);
        }
        //微信绑定
        private async void WechatBinding(string code)
        {
            var loginType = await BLLFactory<Yw.BLL.UserLoginType>.Instance.GetByIdentifier(LoginType.Wechat);
            if (loginType != null)
            {
                var tokenInfo = await BLLFactory<Yw.BLL.ToolWechat>.Instance.GetTokenInfo(code, _vxTemplate);
                if (tokenInfo == null)
                    return;
                var isExist = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.IsExist(new IsExistUserLoginAccountInput
                {
                    CorpID = GlobalParas._GlobalParas.CorpID,
                    LoginTypeID = loginType.ID,
                    Identifier = _vxTemplate,
                    Credential = tokenInfo.openid
                });
                if (isExist)
                {
                    TipFormHelper.ShowError("账户已存在!");
                    return;
                }
                var vmo = new Yw.Vmo.AddUserLoginAccountVmo
                {
                    CorpID = GlobalParas._GlobalParas.CorpID,
                    UserID = GlobalParas._GlobalParas.UserID,
                    LoginTypeID = loginType.ID,
                    Identifier = _vxTemplate,
                    Credential = tokenInfo.openid,
                    IfVerified = true
                };
                var bol = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.Insert(vmo);
                if (bol > 0)
                {
                    TipFormHelper.ShowSucceed("绑定成功!");
                }
                else
                {
                    TipFormHelper.ShowError("绑定失败!");
                }
            };
        }
        //手机绑定
        private async void PhoneBinding()
        {
            if (!IsValidMobileNumber(this.txtMobileNumber.Text.Trim()))
            {
                TipFormHelper.ShowError("手机号有误!");
                return;
            }
            var loginType = await BLLFactory<Yw.BLL.UserLoginType>.Instance.GetByIdentifier(LoginType.SMS);
            if (loginType != null)
            {
                var isExist = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.IsExist(new IsExistUserLoginAccountInput
                {
                    CorpID = GlobalParas._GlobalParas.CorpID,
                    LoginTypeID = loginType.ID,
                    Identifier = _smsTemplate,
                    Credential = this.txtMobileNumber.Text.Trim()
                });
                if (isExist)
                {
                    TipFormHelper.ShowError("账户已存在!");
                    return;
                }
                var vmo = new Yw.Vmo.AddUserLoginAccountVmo
                {
                    CorpID = GlobalParas._GlobalParas.CorpID,
                    UserID = GlobalParas._GlobalParas.UserID,
                    LoginTypeID = loginType.ID,
                    Identifier = _smsTemplate,
                    Credential = this.txtMobileNumber.Text.Trim(),
                    IfVerified = true
                };
                var bol = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.Insert(vmo);
                if (bol > 0)
                {
                    TipFormHelper.ShowSucceed("绑定成功!");
                }
                else
                {
                    TipFormHelper.ShowError("绑定失败!");
                }
            }
        }
        private void btnPhoneBinding_Click(object sender, EventArgs e)
        {
            PhoneBinding();
        }
        //微信二维码刷新
        private void btnRefresh_Click(object sender, EventArgs e)
        {
            this.wechatBindingCtrl1.Initial();
        }
    }
}
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.resx
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Version 2.0
    The primary goals of this format is to allow a simple XML format
    that is mostly human readable. The generation and parsing of the
    various data types are done through the TypeConverter classes
    associated with the data types.
    Example:
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
    There are any number of "resheader" rows that contain simple
    name/value pairs.
    Each data row contains a name, and value. The row also contains a
    type or mimetype. Type corresponds to a .NET class that support
    text/value conversion through the TypeConverter architecture.
    Classes that don't support this are serialized and stored with the
    mimetype set.
    The mimetype is used for serialized objects, and tells the
    ResXResourceReader how to depersist the object. This is currently not
    extensible. For a given mimetype the value must be set accordingly:
    Note - application/x-microsoft.net.object.binary.base64 is the format
    that the ResXResourceWriter will generate, however the reader can
    read any of the formats listed below.
    mimetype: application/x-microsoft.net.object.binary.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.bytearray.base64
    value   : The object must be serialized into a byte array
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
    <xsd:element name="root" msdata:IsDataSet="true">
      <xsd:complexType>
        <xsd:choice maxOccurs="unbounded">
          <xsd:element name="metadata">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" />
              </xsd:sequence>
              <xsd:attribute name="name" use="required" type="xsd:string" />
              <xsd:attribute name="type" type="xsd:string" />
              <xsd:attribute name="mimetype" type="xsd:string" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="assembly">
            <xsd:complexType>
              <xsd:attribute name="alias" type="xsd:string" />
              <xsd:attribute name="name" type="xsd:string" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="data">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
              <xsd:attribute ref="xml:space" />
            </xsd:complexType>
          </xsd:element>
          <xsd:element name="resheader">
            <xsd:complexType>
              <xsd:sequence>
                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
              </xsd:sequence>
              <xsd:attribute name="name" type="xsd:string" use="required" />
            </xsd:complexType>
          </xsd:element>
        </xsd:choice>
      </xsd:complexType>
    </xsd:element>
  </xsd:schema>
  <resheader name="resmimetype">
    <value>text/microsoft-resx</value>
  </resheader>
  <resheader name="version">
    <value>2.0</value>
  </resheader>
  <resheader name="reader">
    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
</root>
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/UserInfoPage.Designer.cs
@@ -29,12 +29,6 @@
        private void InitializeComponent()
        {
            components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UserInfoPage));
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -46,7 +40,14 @@
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            buttonEditBinding = new DevExpress.XtraEditors.ButtonEdit();
            txtEditUserName = new DevExpress.XtraEditors.TextEdit();
            txtAccountName = new DevExpress.XtraEditors.TextEdit();
            textAccountType = new DevExpress.XtraEditors.TextEdit();
@@ -56,6 +57,9 @@
            txtEditAdminType = new DevExpress.XtraEditors.TextEdit();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
            layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -64,16 +68,13 @@
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem();
            layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            buttonEditBinding = new DevExpress.XtraEditors.ButtonEdit();
            layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)buttonEditBinding.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtEditUserName.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)txtAccountName.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textAccountType.Properties).BeginInit();
@@ -81,6 +82,9 @@
            ((System.ComponentModel.ISupportInitialize)txtEditAdminType.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)tabbedControlGroup1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem12).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
@@ -89,14 +93,10 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
            ((System.ComponentModel.ISupportInitialize)buttonEditBinding.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem12).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
@@ -116,6 +116,30 @@
            layoutControl1.Size = new Size(946, 549);
            layoutControl1.TabIndex = 0;
            layoutControl1.Text = "layoutControl1";
            //
            // buttonEditBinding
            //
            buttonEditBinding.Location = new Point(517, 154);
            buttonEditBinding.Margin = new Padding(2);
            buttonEditBinding.Name = "buttonEditBinding";
            buttonEditBinding.Properties.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.False;
            buttonEditBinding.Properties.AllowHtmlDraw = DevExpress.Utils.DefaultBoolean.False;
            buttonEditBinding.Properties.BeepOnError = true;
            editorButtonImageOptions1.EnableTransparency = false;
            editorButtonImageOptions1.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
            editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
            editorButtonImageOptions1.SvgImageSize = new Size(14, 14);
            editorButtonImageOptions2.EnableTransparency = false;
            editorButtonImageOptions2.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
            editorButtonImageOptions2.SvgImageSize = new Size(14, 14);
            buttonEditBinding.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "手机绑定", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "手机号绑定", "Phone", null, DevExpress.Utils.ToolTipAnchor.Default), new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "微信绑定", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "微信绑定", "Wechat", null, DevExpress.Utils.ToolTipAnchor.Default) });
            buttonEditBinding.Properties.ContextImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.False;
            buttonEditBinding.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            buttonEditBinding.Properties.UseMaskAsDisplayFormat = true;
            buttonEditBinding.Size = new Size(152, 23);
            buttonEditBinding.StyleController = layoutControl1;
            buttonEditBinding.TabIndex = 7;
            buttonEditBinding.ButtonClick += buttonEditBinding_ButtonClick;
            // 
            // txtEditUserName
            // 
@@ -223,6 +247,32 @@
            tabbedControlGroup1.Size = new Size(421, 264);
            tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1, layoutControlGroup4 });
            // 
            // layoutControlGroup4
            //
            layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem9, layoutControlItem12 });
            layoutControlGroup4.Location = new Point(0, 0);
            layoutControlGroup4.Name = "layoutControlGroup4";
            layoutControlGroup4.Size = new Size(397, 216);
            layoutControlGroup4.Text = "信息绑定";
            //
            // layoutControlItem9
            //
            layoutControlItem9.Control = txtMobileNumber;
            layoutControlItem9.Location = new Point(0, 0);
            layoutControlItem9.Name = "layoutControlItem9";
            layoutControlItem9.Size = new Size(241, 216);
            layoutControlItem9.Text = "手机号:";
            layoutControlItem9.TextSize = new Size(52, 14);
            //
            // layoutControlItem12
            //
            layoutControlItem12.Control = buttonEditBinding;
            layoutControlItem12.Location = new Point(241, 0);
            layoutControlItem12.Name = "layoutControlItem12";
            layoutControlItem12.Size = new Size(156, 216);
            layoutControlItem12.TextSize = new Size(0, 0);
            layoutControlItem12.TextVisible = false;
            //
            // layoutControlGroup1
            // 
            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem5, emptySpaceItem3, layoutControlItem6 });
@@ -294,23 +344,6 @@
            layoutControlItem6.TextSize = new Size(0, 0);
            layoutControlItem6.TextVisible = false;
            // 
            // layoutControlGroup4
            //
            layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem9, layoutControlItem12 });
            layoutControlGroup4.Location = new Point(0, 0);
            layoutControlGroup4.Name = "layoutControlGroup4";
            layoutControlGroup4.Size = new Size(397, 216);
            layoutControlGroup4.Text = "信息绑定";
            //
            // layoutControlItem9
            //
            layoutControlItem9.Control = txtMobileNumber;
            layoutControlItem9.Location = new Point(0, 0);
            layoutControlItem9.Name = "layoutControlItem9";
            layoutControlItem9.Size = new Size(241, 216);
            layoutControlItem9.Text = "手机号:";
            layoutControlItem9.TextSize = new Size(52, 14);
            //
            // emptySpaceItem1
            // 
            emptySpaceItem1.AllowHotTrack = false;
@@ -343,39 +376,6 @@
            layoutControlItem7.TextSize = new Size(0, 0);
            layoutControlItem7.TextVisible = false;
            // 
            // buttonEditBinding
            //
            buttonEditBinding.Location = new Point(517, 154);
            buttonEditBinding.Margin = new Padding(2);
            buttonEditBinding.Name = "buttonEditBinding";
            buttonEditBinding.Properties.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.False;
            buttonEditBinding.Properties.AllowHtmlDraw = DevExpress.Utils.DefaultBoolean.False;
            buttonEditBinding.Properties.BeepOnError = true;
            editorButtonImageOptions1.EnableTransparency = false;
            editorButtonImageOptions1.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
            editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
            editorButtonImageOptions1.SvgImageSize = new Size(14, 14);
            editorButtonImageOptions2.EnableTransparency = false;
            editorButtonImageOptions2.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
            editorButtonImageOptions2.SvgImageSize = new Size(14, 14);
            buttonEditBinding.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "手机绑定", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "手机号绑定", "Phone", null, DevExpress.Utils.ToolTipAnchor.Default), new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "微信绑定", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "微信绑定", "Wechat", null, DevExpress.Utils.ToolTipAnchor.Default) });
            buttonEditBinding.Properties.ContextImageOptions.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.False;
            buttonEditBinding.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            buttonEditBinding.Properties.UseMaskAsDisplayFormat = true;
            buttonEditBinding.Size = new Size(152, 23);
            buttonEditBinding.StyleController = layoutControl1;
            buttonEditBinding.TabIndex = 7;
            buttonEditBinding.ButtonClick += buttonEditBinding_ButtonClick;
             //
            // layoutControlItem12
            //
            layoutControlItem12.Control = buttonEditBinding;
            layoutControlItem12.Location = new Point(241, 0);
            layoutControlItem12.Name = "layoutControlItem12";
            layoutControlItem12.Size = new Size(156, 216);
            layoutControlItem12.TextSize = new Size(0, 0);
            layoutControlItem12.TextVisible = false;
            //
            // UserInfoPage
            // 
            Appearance.BackColor = SystemColors.Control;
@@ -387,6 +387,7 @@
            Size = new Size(946, 549);
            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)buttonEditBinding.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtEditUserName.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)txtAccountName.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textAccountType.Properties).EndInit();
@@ -394,6 +395,9 @@
            ((System.ComponentModel.ISupportInitialize)txtEditAdminType.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)tabbedControlGroup1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem12).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
@@ -402,14 +406,10 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem3).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem4).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
            ((System.ComponentModel.ISupportInitialize)buttonEditBinding.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem12).EndInit();
            ResumeLayout(false);
        }
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/UserInfoPage.cs
@@ -73,13 +73,15 @@
                    TipFormHelper.ShowError("账户已存在!");
                    return;
                }
                var vmo = new Yw.Vmo.AddUserLoginAccountVmo();
                vmo.CorpID = GlobalParas._GlobalParas.CorpID;
                vmo.UserID = GlobalParas._GlobalParas.UserID;
                vmo.LoginTypeID = loginType.ID;
                vmo.Identifier = _smsTemplate;
                vmo.Credential = this.txtMobileNumber.Text.Trim();
                vmo.IfVerified = true;
                var vmo = new Yw.Vmo.AddUserLoginAccountVmo
                {
                    CorpID = GlobalParas._GlobalParas.CorpID,
                    UserID = GlobalParas._GlobalParas.UserID,
                    LoginTypeID = loginType.ID,
                    Identifier = _smsTemplate,
                    Credential = this.txtMobileNumber.Text.Trim(),
                    IfVerified = true
                };
                var bol = await BLLFactory<Yw.BLL.UserLoginAccount>.Instance.Insert(vmo);
                if (bol > 0)
                {
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/Window1.xaml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,144 @@
<Window
    x:Class="HStation.WinFrmUI.Auth.Core._06_user_info.Window1"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
    xmlns:local="clr-namespace:HStation.WinFrmUI.Auth.Core._06_user_info"
    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
    Title="Window1"
    Width="800"
    Height="450"
    mc:Ignorable="d">
    <Grid>
        <Grid.ColumnDefinitions>
            <ColumnDefinition Width="100" />
            <ColumnDefinition Width="700" />
        </Grid.ColumnDefinitions>
        <!--  å·¦ä¾§èœå•  -->
        <Border
            Grid.Column="0"
            Grid.ColumnSpan="2"
            BorderBrush="#EEE"
            BorderThickness="0,0,1,0">
            <ListBox
                Width="121"
                HorizontalAlignment="Left"
                BorderThickness="0"
                SelectedIndex="0">
                <ListBoxItem>
                    <TextBlock
                        Padding="10,8"
                        FontSize="14"
                        Text="账号设置" />
                </ListBoxItem>
                <ListBoxItem>
                    <TextBlock
                        Padding="10,8"
                        FontSize="14"
                        Text="消息通知" />
                </ListBoxItem>
                <ListBoxItem>
                    <TextBlock
                        Padding="10,8"
                        FontSize="14"
                        Text="通用设置" />
                </ListBoxItem>
                <ListBoxItem>
                    <TextBlock
                        Padding="10,8"
                        FontSize="14"
                        Text="文件管理" />
                </ListBoxItem>
                <ListBoxItem>
                    <TextBlock
                        Padding="10,8"
                        FontSize="14"
                        Text="快捷键" />
                </ListBoxItem>
                <ListBoxItem>
                    <TextBlock
                        Padding="10,8"
                        FontSize="14"
                        Text="关于微信" />
                </ListBoxItem>
            </ListBox>
        </Border>
        <!--  å³ä¾§å†…容  -->
        <ScrollViewer
            Grid.Column="1"
            Margin="10,0,0,0"
            RenderTransformOrigin="0.31,0.532"
            VerticalScrollBarVisibility="Auto">
            <ScrollViewer.RenderTransform>
                <TransformGroup>
                    <ScaleTransform />
                    <SkewTransform />
                    <RotateTransform Angle="720.108" />
                    <TranslateTransform X="0.064" Y="0.592" />
                </TransformGroup>
            </ScrollViewer.RenderTransform>
            <StackPanel Margin="20">
                <!--  ç”¨æˆ·ä¿¡æ¯  -->
                <StackPanel Margin="0,0,0,20" Orientation="Horizontal">
                    <Border
                        Width="60"
                        Height="60"
                        Background="#EEE"
                        CornerRadius="30" />
                    <StackPanel Margin="200,18,0,0">
                        <TextBlock
                            FontSize="18"
                            FontWeight="DemiBold"
                            Text="测试" />
                    </StackPanel>
                </StackPanel>
                <!--  è‡ªåŠ¨ç™»å½•è®¾ç½®  -->
                <Border
                    Padding="0,0,0,15"
                    BorderBrush="#EEE"
                    BorderThickness="0,0,0,1">
                    <StackPanel>
                        <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
                            <TextBlock
                                VerticalAlignment="Center"
                                FontSize="14"
                                Text="自动登录" />
                            <Button
                                Margin="15,0,0,0"
                                Padding="15,5"
                                Background="#07C160"
                                BorderThickness="0"
                                Content="已开启"
                                Cursor="Hand"
                                Foreground="White" />
                            <TextBlock
                                Margin="10,0,0,0"
                                VerticalAlignment="Center"
                                Cursor="Hand"
                                Foreground="#576B95"
                                Text="关闭" />
                        </StackPanel>
                        <TextBlock
                            Foreground="#999"
                            Text="开启后,在本机登录微信将无需手机确认。可在手机和电脑上关闭。"
                            TextWrapping="Wrap" />
                    </StackPanel>
                </Border>
                <!--  é€€å‡ºç™»å½•  -->
                <Button
                    Margin="0,30,0,0"
                    Padding="30,8"
                    HorizontalAlignment="Left"
                    Background="#07C160"
                    BorderThickness="0"
                    Content="退出登录"
                    FontSize="14"
                    Foreground="#FFF" />
            </StackPanel>
        </ScrollViewer>
    </Grid>
</Window>
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/Window1.xaml.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace HStation.WinFrmUI.Auth.Core._06_user_info
{
    /// <summary>
    /// Window1.xaml çš„交互逻辑
    /// </summary>
    public partial class Window1 : Window
    {
        public Window1()
        {
            InitializeComponent();
        }
    }
}
WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj
@@ -37,7 +37,7 @@
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="Microsoft.QualityTools.Testing.Fakes" Version="17.5.0-beta.23060.1" />
    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
    <PackageReference Include="Yw.BLL.Auth.Core" Version="3.6.3" />
    <PackageReference Include="Yw.BLL.Auth.Core" Version="3.6.4" />
  </ItemGroup>
  <ItemGroup>
WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj.user
@@ -47,6 +47,9 @@
    <Compile Update="05-user-log\UserLoginLogPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
    <Compile Update="06-user-info\PersonalCenterDlg.cs">
      <SubType>Form</SubType>
    </Compile>
    <Compile Update="06-user-info\UserInfoPage.cs">
      <SubType>UserControl</SubType>
    </Compile>
@@ -54,4 +57,9 @@
      <SubType>Form</SubType>
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <Page Update="06-user-info\Window1.xaml">
      <SubType>Designer</SubType>
    </Page>
  </ItemGroup>
</Project>
WinFrmUI/HStation.WinFrmUI.Core/Resources/Image1.png
WinFrmUI/HStation.WinFrmUI.Core/Resources/Imported.png
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.Designer.cs
@@ -248,6 +248,7 @@
            // 
            imageCollection1.ImageStream = (DevExpress.Utils.ImageCollectionStreamer)resources.GetObject("imageCollection1.ImageStream");
            imageCollection1.Images.SetKeyName(0, "NotImported.png");
            imageCollection1.Images.SetKeyName(1, "Imported.png");
            // 
            // searchControl1
            // 
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.cs
@@ -28,7 +28,7 @@
        /// </summary>
        public event Action<ImportXhsProjectViewModel> ImportProjectCompletedEvent;
        private List<HomeXhsProjectTreeViewModel> _allBindingList = new List<HomeXhsProjectTreeViewModel>();//当前绑定列表
        private List<HomeXhsProjectTreeViewModel> _allBindingList = new();
        /// <summary>
        /// ç»‘定数据
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.resx
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
  <!--
    Microsoft ResX Schema
    Microsoft ResX Schema
    Version 2.0
@@ -48,7 +48,7 @@
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
    mimetype: application/x-microsoft.net.object.soap.base64
    value   : The object must be serialized with
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
@@ -283,11 +283,16 @@
        a2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAAChEZXZFeHByZXNzLlV0aWxzLkltYWdlQ29sbGVjdGlvblN0
        cmVhbWVyAgAAAAlJbWFnZVNpemUERGF0YQQHE1N5c3RlbS5EcmF3aW5nLlNpemUDAAAAAgIAAAAF/P//
        /xNTeXN0ZW0uRHJhd2luZy5TaXplAgAAAAV3aWR0aAZoZWlnaHQAAAgIAwAAABAAAAAQAAAACQUAAAAP
        BQAAABMBAAACDwEAAIlQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgGAAAAH/P/YQAAAARnQU1BAACxjwv8
        BQAAADICAAACDwEAAIlQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgGAAAAH/P/YQAAAARnQU1BAACxjwv8
        YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAACxSURBVDhPYyAEvhQUSEKZpIOvmZm+IAzlkg5gBpBlCLJm
        qhhAkiHImm5ahvyHsf/l5vJBleAHyJpB+FN6eiBMDKoEN4ApRDYA2RXfMzMdoUoxwf/4eA5smkH4rmP4
        dpgcVDkmgCkA4UeZtf+RAbIrQBiqBQG+5uZawCTRbUfGuA2ASrwIScjHphGGYepQDEEWxKYJGSOrhWpH
        NYBUDNJsii5ICga74FtmphU5+H58PAcA/rw5+hte4AwAAAAASUVORK5CYIIL
        NYBUDNJsii5ICga74FtmphU5+H58PAcA/rw5+hte4AwAAAAASUVORK5CYIIbAQAAiVBORw0KGgoAAAAN
        SUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAA
        DsMAAA7DAcdvqGQAAACwSURBVDhPtZKxDcIwEEUtZRsWYgVqxmEASioqVkgTMQSODUWqlGc465zYlx8n
        DV96Te6/sxzZ/CU2uKEPPmgsuYtUcF7Un5CokXqZvXJCtDmotIWo63fOacfn4tsvTVygBxqWzf0Qjt25
        nJF3uxawzMAZWpALNZmBC26fxyTWZAYuYNK90Sxh6X2NC/iFocIWUU5BhRqWfCfqHFRcQ5RlUDkHnqzD
        L4wfSSnKDytizBdBx6SB89N3AAAAAABJRU5ErkJgggs=
</value>
  </data>
</root>
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeViewModel.cs
@@ -24,11 +24,11 @@
            this.Project = rhs;
            if (IsHave)
            {
                this.ImageIndex = ImageLib.NotImported;
                this.ImageIndex = 1;
            }
            else
            {
                this.ImageIndex = -1;
                this.ImageIndex = 0;
            }
        }
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
@@ -2053,6 +2053,7 @@
            {
                input.MatchingStartDiameter = translation.StartDiameter;
            }
            input.MatchingTranslationType = (Yw.WinFrmUI.eTranslationType)(int)translation.TranslationType;
            return true;
        }
WinFrmUI/Hstation.WinFrmUI.Core/Lib/ImageLib.cs
@@ -62,6 +62,11 @@
            get => GetImage16Index("NotImported");
        }
        public static int Imported
        {
            get => GetImage16Index("Imported");
        }
        private static int GetImage16Index(string imgName)
        {
            var img = Lib.Images[imgName];
WinFrmUI/Hstation.WinFrmUI.Core/Lib/Resource1.Designer.cs
@@ -83,6 +83,16 @@
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„æœ¬åœ°åŒ–资源。
        /// </summary>
        internal static System.Drawing.Bitmap Imported {
            get {
                object obj = ResourceManager.GetObject("Imported", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   æŸ¥æ‰¾ System.Drawing.Bitmap ç±»åž‹çš„æœ¬åœ°åŒ–资源。
        /// </summary>
        internal static System.Drawing.Bitmap ListView {
            get {
                object obj = ResourceManager.GetObject("ListView", resourceCulture);
WinFrmUI/Hstation.WinFrmUI.Core/Lib/Resource1.resx
@@ -124,6 +124,9 @@
  <data name="Group" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Group.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="Imported" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Imported.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ListView" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\列表视图.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>