个人中心修改

duheng

2025-02-07 80ef0be2e44f42d6f7dc0f9c928de0dbe7362138

个人中心修改

 WinFrmUI/HStation.WinFrmUI.Auth.Core/00-core/WechatBindingCtrl.cs

@@ -30,22 +30,14 @@
        /// </summary>
        public event Action LoginCancelEvent;

        /// <summary>

        private bool _isInitialized = false;//初始化
        private const string _template = "hzkw_wx_template";//微信登录模板
        private const string _software = "HStation_XHS_DESKTOP";//软件编码

        /// <summary>
        /// 初始化
        /// </summary>
        public async void Initial()
        {
            if (_isInitialized)
            {
                return;
            }
            _isInitialized = true;
            var loginUrl = await BLLFactory<Yw.BLL.ToolWechat>.Instance.GetLoginUrl(_template);
            await this.webView21.EnsureCoreWebView2Async();
            this.webView21.Source = new Uri(loginUrl);

 WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.Designer.cs

@@ -28,6 +28,7 @@
        /// </summary>
        private void InitializeComponent()
        {
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PersonalCenterDlg));
            navigationPane1 = new DevExpress.XtraBars.Navigation.NavigationPane();
            navigationPage1 = new DevExpress.XtraBars.Navigation.NavigationPage();
            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
@@ -104,6 +105,7 @@
            navigationPane1.Dock = DockStyle.Fill;
            navigationPane1.Location = new Point(0, 0);
            navigationPane1.Name = "navigationPane1";
            navigationPane1.PageProperties.ShowMode = DevExpress.XtraBars.Navigation.ItemShowMode.ImageAndText;
            navigationPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navigationPage1, navigationPage2, navigationPage3 });
            navigationPane1.RegularSize = new Size(661, 375);
            navigationPane1.SelectedPage = navigationPage1;
@@ -115,8 +117,10 @@
            // 
            navigationPage1.Caption = "个人信息";
            navigationPage1.Controls.Add(layoutControl1);
            navigationPage1.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navigationPage1.ImageOptions.SvgImage");
            navigationPage1.ImageOptions.SvgImageSize = new Size(20, 20);
            navigationPage1.Name = "navigationPage1";
            navigationPage1.Size = new Size(558, 302);
            navigationPage1.Size = new Size(536, 302);
            // 
            // layoutControl1
            // 
@@ -131,7 +135,7 @@
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1034, 149, 650, 400);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(558, 302);
            layoutControl1.Size = new Size(536, 302);
            layoutControl1.TabIndex = 0;
            layoutControl1.Text = "layoutControl1";
            // 
@@ -139,9 +143,9 @@
            // 
            BtnSave.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            BtnSave.Appearance.Options.UseBackColor = true;
            BtnSave.Location = new Point(490, 108);
            BtnSave.Location = new Point(473, 108);
            BtnSave.Name = "BtnSave";
            BtnSave.Size = new Size(56, 22);
            BtnSave.Size = new Size(51, 22);
            BtnSave.StyleController = layoutControl1;
            BtnSave.TabIndex = 6;
            BtnSave.Text = "保存";
@@ -150,7 +154,7 @@
            // 
            BtnEditPwd.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
            BtnEditPwd.Appearance.Options.UseBackColor = true;
            BtnEditPwd.Location = new Point(431, 108);
            BtnEditPwd.Location = new Point(414, 108);
            BtnEditPwd.Name = "BtnEditPwd";
            BtnEditPwd.Size = new Size(55, 22);
            BtnEditPwd.StyleController = layoutControl1;
@@ -162,9 +166,7 @@
            // 
            txtEditUserName.Location = new Point(76, 12);
            txtEditUserName.Name = "txtEditUserName";
            txtEditUserName.Properties.ReadOnly = true;
            txtEditUserName.Properties.UseReadOnlyAppearance = false;
            txtEditUserName.Size = new Size(470, 20);
            txtEditUserName.Size = new Size(448, 20);
            txtEditUserName.StyleController = layoutControl1;
            txtEditUserName.TabIndex = 0;
            // 
@@ -174,7 +176,7 @@
            txtAccountName.Name = "txtAccountName";
            txtAccountName.Properties.ReadOnly = true;
            txtAccountName.Properties.UseReadOnlyAppearance = false;
            txtAccountName.Size = new Size(470, 20);
            txtAccountName.Size = new Size(448, 20);
            txtAccountName.StyleController = layoutControl1;
            txtAccountName.TabIndex = 3;
            // 
@@ -184,7 +186,7 @@
            textAccountType.Name = "textAccountType";
            textAccountType.Properties.ReadOnly = true;
            textAccountType.Properties.UseReadOnlyAppearance = false;
            textAccountType.Size = new Size(470, 20);
            textAccountType.Size = new Size(448, 20);
            textAccountType.StyleController = layoutControl1;
            textAccountType.TabIndex = 4;
            // 
@@ -194,7 +196,7 @@
            txtEditAdminType.Name = "txtEditAdminType";
            txtEditAdminType.Properties.ReadOnly = true;
            txtEditAdminType.Properties.UseReadOnlyAppearance = false;
            txtEditAdminType.Size = new Size(470, 20);
            txtEditAdminType.Size = new Size(448, 20);
            txtEditAdminType.StyleController = layoutControl1;
            txtEditAdminType.TabIndex = 2;
            // 
@@ -204,7 +206,7 @@
            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.Size = new Size(536, 302);
            Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -212,7 +214,7 @@
            layoutControlItem1.Control = txtEditUserName;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(538, 24);
            layoutControlItem1.Size = new Size(516, 24);
            layoutControlItem1.Text = "用户名:";
            layoutControlItem1.TextSize = new Size(52, 14);
            // 
@@ -221,7 +223,7 @@
            layoutControlItem2.Control = txtEditAdminType;
            layoutControlItem2.Location = new Point(0, 24);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(538, 24);
            layoutControlItem2.Size = new Size(516, 24);
            layoutControlItem2.Text = "管理类型:";
            layoutControlItem2.TextSize = new Size(52, 14);
            // 
@@ -230,7 +232,7 @@
            layoutControlItem3.Control = textAccountType;
            layoutControlItem3.Location = new Point(0, 72);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(538, 24);
            layoutControlItem3.Size = new Size(516, 24);
            layoutControlItem3.Text = "账户类型:";
            layoutControlItem3.TextSize = new Size(52, 14);
            // 
@@ -239,7 +241,7 @@
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 96);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(419, 186);
            emptySpaceItem1.Size = new Size(402, 186);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // layoutControlItem4
@@ -247,23 +249,23 @@
            layoutControlItem4.Control = txtAccountName;
            layoutControlItem4.Location = new Point(0, 48);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(538, 24);
            layoutControlItem4.Size = new Size(516, 24);
            layoutControlItem4.Text = "账户名:";
            layoutControlItem4.TextSize = new Size(52, 14);
            // 
            // layoutControlItem6
            // 
            layoutControlItem6.Control = BtnSave;
            layoutControlItem6.Location = new Point(478, 96);
            layoutControlItem6.Location = new Point(461, 96);
            layoutControlItem6.Name = "layoutControlItem6";
            layoutControlItem6.Size = new Size(60, 186);
            layoutControlItem6.Size = new Size(55, 186);
            layoutControlItem6.TextSize = new Size(0, 0);
            layoutControlItem6.TextVisible = false;
            // 
            // layoutControlItem5
            // 
            layoutControlItem5.Control = BtnEditPwd;
            layoutControlItem5.Location = new Point(419, 96);
            layoutControlItem5.Location = new Point(402, 96);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(59, 186);
            layoutControlItem5.TextSize = new Size(0, 0);
@@ -273,8 +275,10 @@
            // 
            navigationPage2.Caption = "手机绑定";
            navigationPage2.Controls.Add(layoutControl2);
            navigationPage2.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navigationPage2.ImageOptions.SvgImage");
            navigationPage2.ImageOptions.SvgImageSize = new Size(20, 20);
            navigationPage2.Name = "navigationPage2";
            navigationPage2.Size = new Size(558, 302);
            navigationPage2.Size = new Size(536, 302);
            // 
            // layoutControl2
            // 
@@ -284,7 +288,7 @@
            layoutControl2.Location = new Point(0, 0);
            layoutControl2.Name = "layoutControl2";
            layoutControl2.Root = layoutControlGroup1;
            layoutControl2.Size = new Size(558, 302);
            layoutControl2.Size = new Size(536, 302);
            layoutControl2.TabIndex = 0;
            layoutControl2.Text = "layoutControl2";
            // 
@@ -292,9 +296,9 @@
            // 
            btnPhoneBinding.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            btnPhoneBinding.Appearance.Options.UseBackColor = true;
            btnPhoneBinding.Location = new Point(488, 36);
            btnPhoneBinding.Location = new Point(469, 36);
            btnPhoneBinding.Name = "btnPhoneBinding";
            btnPhoneBinding.Size = new Size(58, 22);
            btnPhoneBinding.Size = new Size(55, 22);
            btnPhoneBinding.StyleController = layoutControl2;
            btnPhoneBinding.TabIndex = 7;
            btnPhoneBinding.Text = "绑定";
@@ -304,7 +308,7 @@
            // 
            txtMobileNumber.Location = new Point(64, 12);
            txtMobileNumber.Name = "txtMobileNumber";
            txtMobileNumber.Size = new Size(482, 20);
            txtMobileNumber.Size = new Size(460, 20);
            txtMobileNumber.StyleController = layoutControl2;
            txtMobileNumber.TabIndex = 14;
            // 
@@ -314,7 +318,7 @@
            layoutControlGroup1.GroupBordersVisible = false;
            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem7, layoutControlItem8, emptySpaceItem2 });
            layoutControlGroup1.Name = "layoutControlGroup1";
            layoutControlGroup1.Size = new Size(558, 302);
            layoutControlGroup1.Size = new Size(536, 302);
            layoutControlGroup1.TextVisible = false;
            // 
            // layoutControlItem7
@@ -322,16 +326,16 @@
            layoutControlItem7.Control = txtMobileNumber;
            layoutControlItem7.Location = new Point(0, 0);
            layoutControlItem7.Name = "layoutControlItem7";
            layoutControlItem7.Size = new Size(538, 24);
            layoutControlItem7.Size = new Size(516, 24);
            layoutControlItem7.Text = "手机号:";
            layoutControlItem7.TextSize = new Size(40, 14);
            // 
            // layoutControlItem8
            // 
            layoutControlItem8.Control = btnPhoneBinding;
            layoutControlItem8.Location = new Point(476, 24);
            layoutControlItem8.Location = new Point(457, 24);
            layoutControlItem8.Name = "layoutControlItem8";
            layoutControlItem8.Size = new Size(62, 258);
            layoutControlItem8.Size = new Size(59, 258);
            layoutControlItem8.TextSize = new Size(0, 0);
            layoutControlItem8.TextVisible = false;
            // 
@@ -340,15 +344,16 @@
            emptySpaceItem2.AllowHotTrack = false;
            emptySpaceItem2.Location = new Point(0, 24);
            emptySpaceItem2.Name = "emptySpaceItem2";
            emptySpaceItem2.Size = new Size(476, 258);
            emptySpaceItem2.Size = new Size(457, 258);
            emptySpaceItem2.TextSize = new Size(0, 0);
            // 
            // navigationPage3
            // 
            navigationPage3.Caption = "微信绑定";
            navigationPage3.Controls.Add(layoutControl3);
            navigationPage3.ImageOptions.Image = (Image)resources.GetObject("navigationPage3.ImageOptions.Image");
            navigationPage3.Name = "navigationPage3";
            navigationPage3.Size = new Size(558, 302);
            navigationPage3.Size = new Size(536, 302);
            // 
            // layoutControl3
            // 
@@ -358,7 +363,7 @@
            layoutControl3.Location = new Point(0, 0);
            layoutControl3.Name = "layoutControl3";
            layoutControl3.Root = layoutControlGroup2;
            layoutControl3.Size = new Size(558, 302);
            layoutControl3.Size = new Size(536, 302);
            layoutControl3.TabIndex = 0;
            layoutControl3.Text = "layoutControl3";
            // 
@@ -366,9 +371,9 @@
            // 
            btnRefresh.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            btnRefresh.Appearance.Options.UseBackColor = true;
            btnRefresh.Location = new Point(482, 268);
            btnRefresh.Location = new Point(463, 268);
            btnRefresh.Name = "btnRefresh";
            btnRefresh.Size = new Size(64, 22);
            btnRefresh.Size = new Size(61, 22);
            btnRefresh.StyleController = layoutControl3;
            btnRefresh.TabIndex = 8;
            btnRefresh.Text = "刷新";
@@ -378,7 +383,7 @@
            // 
            wechatBindingCtrl1.Location = new Point(12, 12);
            wechatBindingCtrl1.Name = "wechatBindingCtrl1";
            wechatBindingCtrl1.Size = new Size(534, 252);
            wechatBindingCtrl1.Size = new Size(512, 252);
            wechatBindingCtrl1.TabIndex = 0;
            // 
            // layoutControlGroup2
@@ -387,7 +392,7 @@
            layoutControlGroup2.GroupBordersVisible = false;
            layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem9, emptySpaceItem3, layoutControlItem10 });
            layoutControlGroup2.Name = "layoutControlGroup2";
            layoutControlGroup2.Size = new Size(558, 302);
            layoutControlGroup2.Size = new Size(536, 302);
            layoutControlGroup2.TextVisible = false;
            // 
            // layoutControlItem9
@@ -395,7 +400,7 @@
            layoutControlItem9.Control = wechatBindingCtrl1;
            layoutControlItem9.Location = new Point(0, 0);
            layoutControlItem9.Name = "layoutControlItem9";
            layoutControlItem9.Size = new Size(538, 256);
            layoutControlItem9.Size = new Size(516, 256);
            layoutControlItem9.TextSize = new Size(0, 0);
            layoutControlItem9.TextVisible = false;
            // 
@@ -404,15 +409,15 @@
            emptySpaceItem3.AllowHotTrack = false;
            emptySpaceItem3.Location = new Point(0, 256);
            emptySpaceItem3.Name = "emptySpaceItem3";
            emptySpaceItem3.Size = new Size(470, 26);
            emptySpaceItem3.Size = new Size(451, 26);
            emptySpaceItem3.TextSize = new Size(0, 0);
            // 
            // layoutControlItem10
            // 
            layoutControlItem10.Control = btnRefresh;
            layoutControlItem10.Location = new Point(470, 256);
            layoutControlItem10.Location = new Point(451, 256);
            layoutControlItem10.Name = "layoutControlItem10";
            layoutControlItem10.Size = new Size(68, 26);
            layoutControlItem10.Size = new Size(65, 26);
            layoutControlItem10.TextSize = new Size(0, 0);
            layoutControlItem10.TextVisible = false;
            // 

 WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.cs

@@ -145,5 +145,23 @@
        {
            this.wechatBindingCtrl1.Initial();
        }

        //个人信息保存
        private async void BtnSave_Click(object sender, EventArgs e)
        {
            var vmo = await BLLFactory<Yw.BLL.User>.Instance.GetByID(GlobalParas._GlobalParas.UserID);
            vmo.Name = this.txtEditUserName.Text;
            var bol = await BLLFactory<Yw.BLL.User>.Instance.Update(vmo);
            if (!bol)
            {
                TipFormHelper.ShowError("更新失败！");
                return;
            }
            else
            {
                GlobalParas._GlobalParas.LoginName = this.txtEditUserName.Text;
                TipFormHelper.ShowSucceed("更新成功！");
            }
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.resx

@@ -117,4 +117,79 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="navigationPage1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALQEAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
        aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
        c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
        O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
        ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
        c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJFbXBsb3llZV8xXyI+
        DQogICAgPHBhdGggZD0iTTEwLjIsOS45Yy0wLjEsMC41LDAuMiwwLjksMC40LDEuNHMtMC4xLDEuNyww
        LjksMS42YzAsMCwwLDAuMSwwLDAuMmMwLjYsMi4zLDIsNC45LDQuNyw0LjkgICBzNC4yLTIuNiw0Ljct
        NC45VjEzYzEsMC4xLDAuNi0xLjEsMC45LTEuNmMwLjItMC41LDAuNC0wLjksMC4zLTEuNGMtMC4xLTAu
        NC0wLjQtMC40LTAuNS0wLjNDMjMuNCw0LjgsMjAuNSw1LDIwLjUsNVMyMC4yLDIsMTUsMiAgIGMtNC44
        LDAtNS40LDQtNC4zLDcuNkMxMC42LDkuNiwxMC4zLDkuNywxMC4yLDkuOXogTTIwLjIsMThjLTAuOCwx
        LjUtMi4xLDQtNCw0cy0zLjItMi41LTQtNGMtMi4zLDMuNS04LDEtOCw4LjVWMzBoMjR2LTMuNSAgIEMy
        OC4yLDE5LjEsMjIuNSwyMS40LDIwLjIsMTh6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3Zn
        Pgs=
</value>
  </data>
  <data name="navigationPage2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAADAEAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
        aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
        c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
        O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
        ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
        c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJQaG9uZSI+DQogICAg
        PHBhdGggZD0iTTI3LjcsMjMuNmwtNS4zLTUuM2MtMC40LTAuNC0xLTAuNC0xLjQsMGwtMi44LDIuOGMt
        My4yLTEuNS01LjgtNC4xLTcuMy03LjNsMi44LTIuOGMwLjQtMC40LDAuNC0xLDAtMS40ICAgTDguNCw0
        LjNjLTAuNC0wLjQtMS0wLjQtMS41LDBMNC4zLDYuOUM0LjEsNy4yLDQsNy40LDQsNy43QzQsMTguOSwx
        My4xLDI4LDI0LjMsMjhjMC4zLDAsMC41LTAuMSwwLjctMC4zbDIuNi0yLjYgICBDMjguMSwyNC42LDI4
        LjEsMjQsMjcuNywyMy42eiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="navigationPage3.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        /9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAYEBQYFBAYGBQYHBwYIChAKCgkJChQODwwQFxQYGBcUFhYa
        HSUfGhsjHBYWICwgIyYnKSopGR8tMC0oMCUoKSj/2wBDAQcHBwoIChMKChMoGhYaKCgoKCgoKCgoKCgo
        KCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/wAARCAAUABQDASIAAhEBAxEB/8QA
        HwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIh
        MUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVW
        V1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXG
        x8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQF
        BgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAV
        YnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOE
        hYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq
        8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDR8OeFtV8YSS6pf6mLW3mufJFxOWZpZW/hUf8A1wKp+MvCN74b
        QXC3qX1iZmtzPESNkq9UYHoeD69K6/4WfELT/D2gzafrRdVSfdAYkLMQ2S2R6Age/wA3TivRdHvNI8S6
        ctxDf2c6zrH5kUsaO4YEl1YNzyOMdgOK5IwjKOj1PkaGBw2KopRl+8er11v6XPCfDnivW9L0821jqE0c
        O8sFzkDIHTNFVdU+wnWdS/sj/kH/AGl/I/3M8Y9vSisuZrS550a9amuRTenZjPGml2+k+KNRsrTf5EMz
        Km85IFYyrgggkEcgg9KKKmW5yVklUkl3PZ/hb4F0bWfCqXt+k7zvKwOJMAAY4HFFFFdUIrlWh9Xg6FKV
        CDcVt2P/2Q==
</value>
  </data>
</root>

 WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/Window1.xaml

@@ -56,12 +56,7 @@
                        FontSize="14"
                        Text="快捷键" />
                </ListBoxItem>
                <ListBoxItem>
                    <TextBlock
                        Padding="10,8"
                        FontSize="14"
                        Text="关于微信" />
                </ListBoxItem>
                <ListBoxItem />
            </ListBox>
        </Border>


 WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj

@@ -50,6 +50,7 @@
  </ItemGroup>

  <ItemGroup>
    <Compile Remove="06-user-info\Window1.xaml.cs" />
    <Compile Remove="RoleMainPanel.cs" />
    <Compile Remove="RoleMainPanel.Designer.cs" />
  </ItemGroup>
@@ -59,6 +60,10 @@
  </ItemGroup>

  <ItemGroup>
    <Page Remove="06-user-info\Window1.xaml" />
  </ItemGroup>

  <ItemGroup>
    <Compile Update="00-core\WechatBindingCtrl.cs">
      <SubType>UserControl</SubType>
    </Compile>

 WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj.user

@@ -57,9 +57,4 @@
      <SubType>Form</SubType>
    </Compile>
  </ItemGroup>
  <ItemGroup>
    <Page Update="06-user-info\Window1.xaml">
      <SubType>Designer</SubType>
    </Page>
  </ItemGroup>
</Project>

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs

@@ -1841,6 +1841,7 @@
        public static bool Matching(HydroPressmeterMatchingViewModel input, List<AssetsPressmeterMainVmo> pressmeterVmos)
        {
            //输入参数验证

            if (input == null)
            {
                return false;