dathlin/ClientServerProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

账户新增电话号码和电子邮件，安卓端载入界面增加一个安卓LOGO显示。v1.7.5

Browse Source
This commit is contained in:
dathlin
2017-11-05 13:54:25 +08:00
parent c84bd71cb7
commit 9d49827f83
5 changed files with 71 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
AndroidTemplate/app/src/main/res/layout/activity_splash.xml
View File

@@ -9,14 +9,15 @@
tools:context="com.example.UserSoftwareAndroidTemplate.LoginSupport.SplashActivity">
<TextView android:id="@+id/copy_right"
<TextView
android:id="@+id/copy_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="12dip"
android:layout_centerHorizontal="true"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:padding="12dip"
android:text="by Richard.Hu 出品"
android:textSize="11sp"/>
android:textSize="11sp" />
<RelativeLayout android:layout_width="fill_parent"
android:layout_height="fill_parent">
<LinearLayout
@@ -30,6 +31,7 @@
<ImageView android:id="@+id/jay_studio_icon"
android:layout_width="110dip"
android:layout_height="130dip"
android:src="@mipmap/ic_launcher"
/>
<ImageView
android:layout_width="wrap_content"

56
ClientsLibrary/AccountSupport/FormRegisterAccount.Designer.cs generated
View File

@@ -45,6 +45,10 @@ namespace ClientsLibrary
this.comboBox_factory = new System.Windows.Forms.ComboBox();
this.textBox3 = new System.Windows.Forms.TextBox();
this.label7 = new System.Windows.Forms.Label();
this.textBox5 = new System.Windows.Forms.TextBox();
this.label8 = new System.Windows.Forms.Label();
this.textBox6 = new System.Windows.Forms.TextBox();
this.label9 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// label1
@@ -100,7 +104,7 @@ namespace ClientsLibrary
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(21, 193);
this.label5.Location = new System.Drawing.Point(21, 255);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(68, 17);
this.label5.TabIndex = 8;
@@ -108,7 +112,7 @@ namespace ClientsLibrary
//
// textBox4
//
this.textBox4.Location = new System.Drawing.Point(129, 224);
this.textBox4.Location = new System.Drawing.Point(129, 286);
this.textBox4.Name = "textBox4";
this.textBox4.Size = new System.Drawing.Size(201, 23);
this.textBox4.TabIndex = 11;
@@ -116,7 +120,7 @@ namespace ClientsLibrary
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(21, 227);
this.label6.Location = new System.Drawing.Point(21, 289);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(68, 17);
this.label6.TabIndex = 10;
@@ -128,7 +132,7 @@ namespace ClientsLibrary
this.userButton_login.CustomerInformation = "";
this.userButton_login.EnableColor = System.Drawing.Color.FromArgb(((int)(((byte)(190)))), ((int)(((byte)(190)))), ((int)(((byte)(190)))));
this.userButton_login.Font = new System.Drawing.Font("微软雅黑", 9F);
this.userButton_login.Location = new System.Drawing.Point(129, 284);
this.userButton_login.Location = new System.Drawing.Point(140, 332);
this.userButton_login.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.userButton_login.Name = "userButton_login";
this.userButton_login.Size = new System.Drawing.Size(97, 31);
@@ -149,7 +153,7 @@ namespace ClientsLibrary
//
this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox2.FormattingEnabled = true;
this.comboBox2.Location = new System.Drawing.Point(129, 189);
this.comboBox2.Location = new System.Drawing.Point(129, 251);
this.comboBox2.Name = "comboBox2";
this.comboBox2.Size = new System.Drawing.Size(201, 25);
this.comboBox2.TabIndex = 14;
@@ -179,11 +183,47 @@ namespace ClientsLibrary
this.label7.TabIndex = 16;
this.label7.Text = "别名：";
//
// textBox5
//
this.textBox5.Location = new System.Drawing.Point(129, 189);
this.textBox5.Name = "textBox5";
this.textBox5.Size = new System.Drawing.Size(201, 23);
this.textBox5.TabIndex = 19;
//
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(21, 192);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(56, 17);
this.label8.TabIndex = 18;
this.label8.Text = "手机号：";
//
// textBox6
//
this.textBox6.Location = new System.Drawing.Point(129, 220);
this.textBox6.Name = "textBox6";
this.textBox6.Size = new System.Drawing.Size(201, 23);
this.textBox6.TabIndex = 21;
//
// label9
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(21, 223);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(68, 17);
this.label9.TabIndex = 20;
this.label9.Text = "电子邮箱：";
//
// FormRegisterAccount
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(382, 342);
this.ClientSize = new System.Drawing.Size(382, 394);
this.Controls.Add(this.textBox6);
this.Controls.Add(this.label9);
this.Controls.Add(this.textBox5);
this.Controls.Add(this.label8);
this.Controls.Add(this.textBox3);
this.Controls.Add(this.label7);
this.Controls.Add(this.comboBox_factory);
@@ -229,5 +269,9 @@ namespace ClientsLibrary
private System.Windows.Forms.ComboBox comboBox_factory;
private System.Windows.Forms.TextBox textBox3;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.TextBox textBox5;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.TextBox textBox6;
private System.Windows.Forms.Label label9;
}
}

5
ClientsLibrary/AccountSupport/FormRegisterAccount.cs
View File

@@ -88,6 +88,7 @@ namespace ClientsLibrary
account.NameAlias = textBox3.Text;
account.Password = textBox2.Text;
account.Factory = comboBox_factory.SelectedItem.ToString();
switch (comboBox1.SelectedIndex)
{
case 0: account.Grade = AccountGrade.SuperAdministrator; break;
@@ -95,8 +96,12 @@ namespace ClientsLibrary
case 2: account.Grade = AccountGrade.Technology; break;
default: account.Grade = AccountGrade.General; break;
}
account.LoginEnable = comboBox2.SelectedItem.ToString() == "允许";
account.ForbidMessage = textBox4.Text;
account.Phone = textBox5.Text;
account.EMail = textBox6.Text;
OperateResultString result = net_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.注册账号, account.ToJsonString());
if (result.IsSuccess && result.Content == "1")

10
CommonLibrary/AccountSupport/UserAccount.cs
View File

@@ -35,6 +35,14 @@ namespace CommonLibrary
/// </summary>
public int Grade { get; set; } = 0;
/// <summary>
/// 用户的手机号
/// </summary>
public string Phone { get; set; }
/// <summary>
/// 用户的电子邮件
/// </summary>
public string EMail { get; set; }
/// <summary>
/// 该用户的注册日期，一旦注册，应该固定
/// </summary>
public DateTime RegisterTime { get; set; } = DateTime.Now;
@@ -63,7 +71,7 @@ namespace CommonLibrary
/// </summary>
public int LoginFailedCount { get; set; } = 0;
/// <summary>
/// 上次登录系统的方式，有winform版，wpf版，web版
/// 上次登录系统的方式，有winform版，wpf版，web版，Android版
/// </summary>
public string LastLoginWay { get; set; } = string.Empty;
/// <summary>

2
CommonLibrary/UserSystem.cs
View File

@@ -44,7 +44,7 @@ namespace CommonLibrary
**************************************************************************/
SoftBasic.FrameworkVersion = new SystemVersion("1.7.4");
SoftBasic.FrameworkVersion = new SystemVersion("1.7.5");
}