提交修复

This commit is contained in:
dathlin
2017-05-30 17:38:35 +08:00
parent 03bd245df0
commit 038f1c38cf
2 changed files with 18 additions and 18 deletions

View File

@@ -206,7 +206,7 @@ namespace 软件系统客户端模版
OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.); OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.);
if (result.IsSuccess) return result.Content; if (result.IsSuccess) return result.Content;
else return result.ToMessageShowString(); else return result.ToMessageShowString();
},m => UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode. + m).IsSuccess); }, m => UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode. + m).IsSuccess);
fam.ShowDialog(); fam.ShowDialog();
fam.Dispose(); fam.Dispose();
} }
@@ -255,7 +255,7 @@ namespace 软件系统客户端模版
net_socket_client.ClientAlias = $"{UserClient.UserAccount.UserName} ({UserClient.UserAccount.Factory})";//标记客户端在线的名称 net_socket_client.ClientAlias = $"{UserClient.UserAccount.UserName} ({UserClient.UserAccount.Factory})";//标记客户端在线的名称
net_socket_client.ClientStart(); net_socket_client.ClientStart();
} }
catch(Exception ex) catch (Exception ex)
{ {
SoftBasic.ShowExceptionMessage(ex); SoftBasic.ShowExceptionMessage(ex);
} }
@@ -304,10 +304,10 @@ namespace 软件系统客户端模版
JObject json = JObject.Parse(object2.Substring(4)); JObject json = JObject.Parse(object2.Substring(4));
UserClient.DateTimeServer = json["Time"].ToObject<DateTime>(); UserClient.DateTimeServer = json["Time"].ToObject<DateTime>();
if (IsHandleCreated) Invoke(new Action(() => if (IsHandleCreated) Invoke(new Action(() =>
{ {
toolStripStatusLabel_time.Text = UserClient.DateTimeServer.ToString("yyyy-MM-dd HH:mm"); toolStripStatusLabel_time.Text = UserClient.DateTimeServer.ToString("yyyy-MM-dd HH:mm");
label_file_count.Text = json["FileCount"].ToObject<int>().ToString(); label_file_count.Text = json["FileCount"].ToObject<int>().ToString();
})); }));
} }
else if (head_code == CommonHeadCode.MultiNetHeadCode.) else if (head_code == CommonHeadCode.MultiNetHeadCode.)
{ {
@@ -438,7 +438,7 @@ namespace 软件系统客户端模版
private void SetShowRenderControl(UserControl control) private void SetShowRenderControl(UserControl control)
{ {
if(!ReferenceEquals(CurrentRender,control)) if (!ReferenceEquals(CurrentRender, control))
{ {
CurrentRender = control; CurrentRender = control;
all_main_render.ForEach(c => c.Visible = false); all_main_render.ForEach(c => c.Visible = false);
@@ -448,9 +448,9 @@ namespace 软件系统客户端模版
private void SetShowRenderControl(Type typeControl) private void SetShowRenderControl(Type typeControl)
{ {
UserControl control = null; UserControl control = null;
foreach(var c in all_main_render) foreach (var c in all_main_render)
{ {
if(c.GetType()==typeControl) if (c.GetType() == typeControl)
{ {
control = c; control = c;
break; break;
@@ -471,6 +471,6 @@ namespace 软件系统客户端模版
#endregion #endregion
} }
} }

View File

@@ -160,7 +160,7 @@ namespace 软件系统服务端模版
using (FormInputAndAction fiaa = new FormInputAndAction( using (FormInputAndAction fiaa = new FormInputAndAction(
m => m =>
{ {
net_socket_server.SendAllClients(CommonHeadCode.MultiNetHeadCode. + m); return true; net_socket_server.SendAllClients(CommonHeadCode.MultiNetHeadCode. + m); return true;
})) }))
{ {
fiaa.ShowDialog(); fiaa.ShowDialog();
@@ -312,11 +312,11 @@ namespace 软件系统服务端模版
private void Net_simplify_server_ReceiveStringEvent(AsyncStateBase object1, string object2) private void Net_simplify_server_ReceiveStringEvent(AsyncStateBase object1, string object2)
{ {
//必须返回结果调用SendMessage(object1,[实际数据]); //必须返回结果调用SendMessage(object1,[实际数据]);
if(object2.StartsWith("A")) if (object2.StartsWith("A"))
{ {
DataProcessingWithStartA(object1, object2); DataProcessingWithStartA(object1, object2);
} }
else if(object2.StartsWith("B")) else if (object2.StartsWith("B"))
{ {
DataProcessingWithStartB(object1, object2); DataProcessingWithStartB(object1, object2);
} }
@@ -612,7 +612,7 @@ namespace 软件系统服务端模版
#endregion #endregion
#region 线 #region 线
/********************************************************************************************* /*********************************************************************************************
* *
* 说明 一个后台线程,用来执行一些周期执行的东西 * 说明 一个后台线程,用来执行一些周期执行的东西
@@ -643,9 +643,9 @@ namespace 软件系统服务端模版
int hour = -1; int hour = -1;
int day = -1; int day = -1;
Action DTimeShow = delegate Action DTimeShow = delegate
{ {
toolStripStatusLabel_time.Text = DateTime.Now.ToString(); toolStripStatusLabel_time.Text = DateTime.Now.ToString();
}; };
while (IsWindowShow) while (IsWindowShow)
{ {
@@ -705,7 +705,7 @@ namespace 软件系统服务端模版
net_simple_file_server.FileChange += Net_simple_file_server_FileChange; net_simple_file_server.FileChange += Net_simple_file_server_FileChange;
net_simple_file_server.ServerStart(CommonLibrary.CommonLibrary.Port_Share_File); net_simple_file_server.ServerStart(CommonLibrary.CommonLibrary.Port_Share_File);
} }
catch(Exception ex) catch (Exception ex)
{ {
SoftBasic.ShowExceptionMessage(ex); SoftBasic.ShowExceptionMessage(ex);
} }