Skip to content

李娜 / Line-Smart-Workstation

转到一个项目
切换导航栏
切换导航栏固定状态
Commit fb910b0b 由 LN
选项

点顺序可更改

1 个父辈 cf6517fe
内嵌 并排
正在显示 7 个修改的文件 包含 363 行增加 和 312 行删除
DeviceLibrary/bean/ConfigIO.cs
...@@ -45,20 +45,23 @@ namespace TSA_V.DeviceLibrary ...@@ -45,20 +45,23 @@ namespace TSA_V.DeviceLibrary
/// 设备名称 /// 设备名称
/// </summary> /// </summary>
public string DeviceName { get; set; } public string DeviceName { get; set; }
public string DisplayUSStr public string DisplayStr
{ {
get get
{ {
return Explain.Substring(0, 3) + "_" + ProName; if (ResourceControl.GetLanguage().Equals(ResourceControl.China))
} {
} return Explain + "_" + ProName;
public string DisplayCnStr }
{ else
get {
{
return Explain + "_" + ProName ; return Explain.Substring(0, 3) + "_" + ProName;
}
} }
} }
public override string ToString() public override string ToString()
{ {
return "ConfigIO。" + ProType + "," + Explain + "," + ProName + "，属性值：" + IOIndex ; return "ConfigIO。" + ProType + "," + Explain + "," + ProName + "，属性值：" + IOIndex ;
......
DeviceLibrary/manager/ResourceControl.cs
...@@ -13,11 +13,17 @@ namespace TSA_V ...@@ -13,11 +13,17 @@ namespace TSA_V
{ {
public class ResourceControl public class ResourceControl
{ {
public static string China = "zh-CN";
public static string English = "en-US";
public delegate string GetStrDelegate(string id, string defaultStr ); public delegate string GetStrDelegate(string id, string defaultStr );
public static event GetStrDelegate GetStrEvent; public static event GetStrDelegate GetStrEvent;
public delegate string GetStringDelegate(string id, string defaultStr, params object[] param); public delegate string GetStringDelegate(string id, string defaultStr, params object[] param);
public static event GetStringDelegate GetStringEvent; public static event GetStringDelegate GetStringEvent;
public delegate string GetLanDelegate();
public static event GetLanDelegate GetLanEvent;
public static string GetString(string id,string defaultStr) public static string GetString(string id,string defaultStr)
{ {
string result = GetStrEvent?.Invoke(id, defaultStr); string result = GetStrEvent?.Invoke(id, defaultStr);
...@@ -28,7 +34,11 @@ namespace TSA_V ...@@ -28,7 +34,11 @@ namespace TSA_V
string result = GetStringEvent?.Invoke(id, defaultStr,param); string result = GetStringEvent?.Invoke(id, defaultStr,param);
return result; return result;
} }
public static string GetLanguage( )
{
string result = GetLanEvent?.Invoke();
return result;
}
/// <summary> /// <summary>
/// 宽度 /// 宽度
/// </summary> /// </summary>
......
DeviceLibrary/manager/TSAVStatus.cs
...@@ -93,7 +93,8 @@ namespace TSA_V.DeviceLibrary ...@@ -93,7 +93,8 @@ namespace TSA_V.DeviceLibrary
} }
else if (WaitType.Equals(WaitTypeEnum.IOSingle_6)) else if (WaitType.Equals(WaitTypeEnum.IOSingle_6))
{ {
return "IO等待[" + IoType + "]=[" + IoValue + "]"; ConfigIO io = IOManager.getWaitIO(IoType);
return "IO等待[" + io.DisplayStr + "]=[" + IoValue + "]";
} }
else if (WaitType.Equals(WaitTypeEnum.Time_3)) else if (WaitType.Equals(WaitTypeEnum.Time_3))
{ {
......
TSA-V/FrmBoardInfo.Designer.cs
...@@ -64,31 +64,6 @@ ...@@ -64,31 +64,6 @@
this.btnSort = new System.Windows.Forms.Button(); this.btnSort = new System.Windows.Forms.Button();
this.焊点列表 = new System.Windows.Forms.GroupBox(); this.焊点列表 = new System.Windows.Forms.GroupBox();
this.dgvList = new System.Windows.Forms.DataGridView(); this.dgvList = new System.Windows.Forms.DataGridView();
this.Column_pointNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_PartNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_X = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Y = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_NodeX = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_NodeY = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_positionNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_NeedSoldering = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.Column_WeldTemp = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_WeldTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_NeedCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.Column_CheckOK = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.Column_PointType = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_PointSizeX = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_PointSizeY = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_PenWidth = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_ShowText = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_disable = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.Column_getPosition = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_MoveTest = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_btnDetail = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_Del = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_Up = new System.Windows.Forms.DataGridViewImageColumn();
this.Column_Down = new System.Windows.Forms.DataGridViewImageColumn();
this.btnSetOrigin = new System.Windows.Forms.Button(); this.btnSetOrigin = new System.Windows.Forms.Button();
this.panel3 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel();
this.panBoard = new System.Windows.Forms.Panel(); this.panBoard = new System.Windows.Forms.Panel();
...@@ -112,6 +87,31 @@ ...@@ -112,6 +87,31 @@
this.label24 = new System.Windows.Forms.Label(); this.label24 = new System.Windows.Forms.Label();
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.btnSave = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button();
this.Column_pointNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_PartNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_X = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Y = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_NodeX = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_NodeY = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_positionNum = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_NeedSoldering = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.Column_WeldTemp = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_WeldTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_NeedCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.Column_CheckOK = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.Column_PointType = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_PointSizeX = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_PointSizeY = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_PenWidth = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_ShowText = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_disable = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.Column_getPosition = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_MoveTest = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_btnDetail = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_Del = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_Up = new System.Windows.Forms.DataGridViewLinkColumn();
this.Column_Down = new System.Windows.Forms.DataGridViewLinkColumn();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
this.contextMenuStrip2.SuspendLayout(); this.contextMenuStrip2.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
...@@ -298,9 +298,9 @@ ...@@ -298,9 +298,9 @@
this.groupBox2.Controls.Add(this.txtXUpdate); this.groupBox2.Controls.Add(this.txtXUpdate);
this.groupBox2.Controls.Add(this.txtYUpdate); this.groupBox2.Controls.Add(this.txtYUpdate);
this.groupBox2.Controls.Add(this.label10); this.groupBox2.Controls.Add(this.label10);
this.groupBox2.Location = new System.Drawing.Point(851, 80); this.groupBox2.Location = new System.Drawing.Point(888, 80);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(690, 103); this.groupBox2.Size = new System.Drawing.Size(653, 103);
this.groupBox2.TabIndex = 290; this.groupBox2.TabIndex = 290;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "图片信息"; this.groupBox2.Text = "图片信息";
...@@ -433,9 +433,9 @@ ...@@ -433,9 +433,9 @@
this.焊点列表.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.焊点列表.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.焊点列表.Controls.Add(this.dgvList); this.焊点列表.Controls.Add(this.dgvList);
this.焊点列表.Location = new System.Drawing.Point(6, 79); this.焊点列表.Location = new System.Drawing.Point(4, 79);
this.焊点列表.Name = "焊点列表"; this.焊点列表.Name = "焊点列表";
this.焊点列表.Size = new System.Drawing.Size(838, 554); this.焊点列表.Size = new System.Drawing.Size(876, 554);
this.焊点列表.TabIndex = 286; this.焊点列表.TabIndex = 286;
this.焊点列表.TabStop = false; this.焊点列表.TabStop = false;
this.焊点列表.Text = "组装信息(使用键盘上的上下键可更改选中行)"; this.焊点列表.Text = "组装信息(使用键盘上的上下键可更改选中行)";
...@@ -476,240 +476,23 @@ ...@@ -476,240 +476,23 @@
this.Column_Up, this.Column_Up,
this.Column_Down}); this.Column_Down});
this.dgvList.ContextMenuStrip = this.contextMenuStrip2; this.dgvList.ContextMenuStrip = this.contextMenuStrip2;
this.dgvList.Location = new System.Drawing.Point(6, 20); this.dgvList.Location = new System.Drawing.Point(2, 20);
this.dgvList.MultiSelect = false; this.dgvList.MultiSelect = false;
this.dgvList.Name = "dgvList"; this.dgvList.Name = "dgvList";
this.dgvList.RowHeadersWidth = 10; this.dgvList.RowHeadersWidth = 30;
this.dgvList.RowTemplate.Height = 23; this.dgvList.RowTemplate.Height = 23;
this.dgvList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dgvList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dgvList.Size = new System.Drawing.Size(825, 528); this.dgvList.Size = new System.Drawing.Size(868, 528);
this.dgvList.TabIndex = 31; this.dgvList.TabIndex = 31;
this.dgvList.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); this.dgvList.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
this.dgvList.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvList_CellMouseDown); this.dgvList.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvList_CellMouseDown);
this.dgvList.CellMouseMove += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvList_CellMouseMove); this.dgvList.CellMouseMove += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvList_CellMouseMove);
this.dgvList.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.dgvList_RowsAdded); this.dgvList.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.dgvList_RowsAdded);
this.dgvList.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvList_Scroll);
this.dgvList.SelectionChanged += new System.EventHandler(this.dgvList_SelectionChanged); this.dgvList.SelectionChanged += new System.EventHandler(this.dgvList_SelectionChanged);
this.dgvList.DragDrop += new System.Windows.Forms.DragEventHandler(this.dgvList_DragDrop); this.dgvList.DragDrop += new System.Windows.Forms.DragEventHandler(this.dgvList_DragDrop);
this.dgvList.DragEnter += new System.Windows.Forms.DragEventHandler(this.dgvList_DragEnter); this.dgvList.DragEnter += new System.Windows.Forms.DragEventHandler(this.dgvList_DragEnter);
// //
// Column_pointNum
//
this.Column_pointNum.DataPropertyName = "pointNum";
this.Column_pointNum.HeaderText = "Id";
this.Column_pointNum.Name = "Column_pointNum";
this.Column_pointNum.ReadOnly = true;
this.Column_pointNum.Visible = false;
this.Column_pointNum.Width = 55;
//
// Column_PartNum
//
this.Column_PartNum.DataPropertyName = "partNum";
this.Column_PartNum.HeaderText = "编号";
this.Column_PartNum.Name = "Column_PartNum";
this.Column_PartNum.ReadOnly = true;
//
// Column_Name
//
this.Column_Name.DataPropertyName = "pointName";
this.Column_Name.HeaderText = "名称";
this.Column_Name.Name = "Column_Name";
this.Column_Name.ReadOnly = true;
//
// Column_X
//
this.Column_X.DataPropertyName = "PositionX";
this.Column_X.HeaderText = "X";
this.Column_X.Name = "Column_X";
this.Column_X.ReadOnly = true;
this.Column_X.Width = 80;
//
// Column_Y
//
this.Column_Y.DataPropertyName = "PositionY";
this.Column_Y.HeaderText = "Y";
this.Column_Y.Name = "Column_Y";
this.Column_Y.ReadOnly = true;
this.Column_Y.Width = 80;
//
// Column_NodeX
//
this.Column_NodeX.DataPropertyName = "NodePositionX";
this.Column_NodeX.HeaderText = "X";
this.Column_NodeX.Name = "Column_NodeX";
this.Column_NodeX.ReadOnly = true;
this.Column_NodeX.Visible = false;
this.Column_NodeX.Width = 70;
//
// Column_NodeY
//
this.Column_NodeY.DataPropertyName = "NodePositionY";
this.Column_NodeY.HeaderText = "Y";
this.Column_NodeY.Name = "Column_NodeY";
this.Column_NodeY.ReadOnly = true;
this.Column_NodeY.Visible = false;
this.Column_NodeY.Width = 70;
//
// Column_positionNum
//
this.Column_positionNum.DataPropertyName = "Column_positionNum";
this.Column_positionNum.HeaderText = "位置";
this.Column_positionNum.Name = "Column_positionNum";
this.Column_positionNum.ReadOnly = true;
this.Column_positionNum.Width = 70;
//
// Column_NeedSoldering
//
this.Column_NeedSoldering.DataPropertyName = "NeedSoldering";
this.Column_NeedSoldering.HeaderText = "需焊接";
this.Column_NeedSoldering.Name = "Column_NeedSoldering";
this.Column_NeedSoldering.ReadOnly = true;
this.Column_NeedSoldering.Visible = false;
this.Column_NeedSoldering.Width = 70;
//
// Column_WeldTemp
//
this.Column_WeldTemp.DataPropertyName = "WeldTemp";
this.Column_WeldTemp.HeaderText = "焊接温度";
this.Column_WeldTemp.MaxInputLength = 10;
this.Column_WeldTemp.Name = "Column_WeldTemp";
this.Column_WeldTemp.ReadOnly = true;
this.Column_WeldTemp.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_WeldTemp.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Column_WeldTemp.Visible = false;
this.Column_WeldTemp.Width = 80;
//
// Column_WeldTime
//
this.Column_WeldTime.DataPropertyName = "WeldTime";
this.Column_WeldTime.HeaderText = "焊接时间";
this.Column_WeldTime.MaxInputLength = 10;
this.Column_WeldTime.Name = "Column_WeldTime";
this.Column_WeldTime.ReadOnly = true;
this.Column_WeldTime.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_WeldTime.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Column_WeldTime.Visible = false;
this.Column_WeldTime.Width = 80;
//
// Column_NeedCheck
//
this.Column_NeedCheck.DataPropertyName = "NeedCheck";
this.Column_NeedCheck.HeaderText = "需检测";
this.Column_NeedCheck.Name = "Column_NeedCheck";
this.Column_NeedCheck.ReadOnly = true;
this.Column_NeedCheck.Visible = false;
this.Column_NeedCheck.Width = 55;
//
// Column_CheckOK
//
this.Column_CheckOK.HeaderText = "校准点";
this.Column_CheckOK.Name = "Column_CheckOK";
this.Column_CheckOK.ReadOnly = true;
this.Column_CheckOK.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.Column_CheckOK.Width = 80;
//
// Column_PointType
//
this.Column_PointType.HeaderText = "点类型";
this.Column_PointType.Name = "Column_PointType";
this.Column_PointType.ReadOnly = true;
this.Column_PointType.Visible = false;
//
// Column_PointSizeX
//
this.Column_PointSizeX.HeaderText = "横向点大小";
this.Column_PointSizeX.Name = "Column_PointSizeX";
this.Column_PointSizeX.ReadOnly = true;
this.Column_PointSizeX.Visible = false;
//
// Column_PointSizeY
//
this.Column_PointSizeY.HeaderText = "纵向点大小";
this.Column_PointSizeY.Name = "Column_PointSizeY";
this.Column_PointSizeY.ReadOnly = true;
this.Column_PointSizeY.Visible = false;
//
// Column_PenWidth
//
this.Column_PenWidth.HeaderText = "画笔宽度";
this.Column_PenWidth.Name = "Column_PenWidth";
this.Column_PenWidth.ReadOnly = true;
this.Column_PenWidth.Visible = false;
//
// Column_ShowText
//
this.Column_ShowText.HeaderText = "投影文字";
this.Column_ShowText.Name = "Column_ShowText";
this.Column_ShowText.ReadOnly = true;
this.Column_ShowText.Visible = false;
//
// Column_disable
//
this.Column_disable.FillWeight = 80F;
this.Column_disable.HeaderText = "禁用";
this.Column_disable.Name = "Column_disable";
this.Column_disable.ReadOnly = true;
this.Column_disable.Width = 80;
//
// Column_getPosition
//
this.Column_getPosition.HeaderText = "更新坐标";
this.Column_getPosition.Name = "Column_getPosition";
this.Column_getPosition.ReadOnly = true;
this.Column_getPosition.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_getPosition.Text = "更新坐标";
this.Column_getPosition.ToolTipText = "更新坐标";
this.Column_getPosition.UseColumnTextForLinkValue = true;
this.Column_getPosition.Visible = false;
this.Column_getPosition.Width = 70;
//
// Column_MoveTest
//
this.Column_MoveTest.HeaderText = "移动测试";
this.Column_MoveTest.Name = "Column_MoveTest";
this.Column_MoveTest.ReadOnly = true;
this.Column_MoveTest.Text = "移动测试";
this.Column_MoveTest.ToolTipText = "移动测试";
this.Column_MoveTest.UseColumnTextForLinkValue = true;
this.Column_MoveTest.Width = 80;
//
// Column_btnDetail
//
this.Column_btnDetail.HeaderText = "详情";
this.Column_btnDetail.Name = "Column_btnDetail";
this.Column_btnDetail.ReadOnly = true;
this.Column_btnDetail.Text = "详情";
this.Column_btnDetail.UseColumnTextForLinkValue = true;
this.Column_btnDetail.Width = 60;
//
// Column_Del
//
this.Column_Del.HeaderText = "删除";
this.Column_Del.Name = "Column_Del";
this.Column_Del.ReadOnly = true;
this.Column_Del.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_Del.Text = "删除";
this.Column_Del.ToolTipText = "删除";
this.Column_Del.UseColumnTextForLinkValue = true;
this.Column_Del.Width = 60;
//
// Column_Up
//
this.Column_Up.HeaderText = "上升";
this.Column_Up.Image = ((System.Drawing.Image)(resources.GetObject("Column_Up.Image")));
this.Column_Up.Name = "Column_Up";
this.Column_Up.ReadOnly = true;
this.Column_Up.Visible = false;
this.Column_Up.Width = 50;
//
// Column_Down
//
this.Column_Down.HeaderText = "下降";
this.Column_Down.Image = ((System.Drawing.Image)(resources.GetObject("Column_Down.Image")));
this.Column_Down.Name = "Column_Down";
this.Column_Down.ReadOnly = true;
this.Column_Down.Visible = false;
this.Column_Down.Width = 50;
//
// btnSetOrigin // btnSetOrigin
// //
this.btnSetOrigin.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSetOrigin.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
...@@ -729,9 +512,9 @@ ...@@ -729,9 +512,9 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.panel3.Controls.Add(this.panBoard); this.panel3.Controls.Add(this.panBoard);
this.panel3.Location = new System.Drawing.Point(851, 187); this.panel3.Location = new System.Drawing.Point(888, 187);
this.panel3.Name = "panel3"; this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(689, 473); this.panel3.Size = new System.Drawing.Size(652, 473);
this.panel3.TabIndex = 277; this.panel3.TabIndex = 277;
// //
// panBoard // panBoard
...@@ -743,7 +526,7 @@ ...@@ -743,7 +526,7 @@
this.panBoard.Controls.Add(this.picBoard); this.panBoard.Controls.Add(this.picBoard);
this.panBoard.Location = new System.Drawing.Point(3, 3); this.panBoard.Location = new System.Drawing.Point(3, 3);
this.panBoard.Name = "panBoard"; this.panBoard.Name = "panBoard";
this.panBoard.Size = new System.Drawing.Size(676, 467); this.panBoard.Size = new System.Drawing.Size(639, 467);
this.panBoard.TabIndex = 261; this.panBoard.TabIndex = 261;
// //
// picBoard // picBoard
...@@ -965,6 +748,230 @@ ...@@ -965,6 +748,230 @@
this.btnSave.UseVisualStyleBackColor = true; this.btnSave.UseVisualStyleBackColor = true;
this.btnSave.Click += new System.EventHandler(this.btnSave_Click); this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
// //
// Column_pointNum
//
this.Column_pointNum.DataPropertyName = "pointNum";
this.Column_pointNum.HeaderText = "Id";
this.Column_pointNum.Name = "Column_pointNum";
this.Column_pointNum.ReadOnly = true;
this.Column_pointNum.Visible = false;
this.Column_pointNum.Width = 55;
//
// Column_PartNum
//
this.Column_PartNum.DataPropertyName = "partNum";
this.Column_PartNum.HeaderText = "编号";
this.Column_PartNum.Name = "Column_PartNum";
this.Column_PartNum.ReadOnly = true;
//
// Column_Name
//
this.Column_Name.DataPropertyName = "pointName";
this.Column_Name.HeaderText = "名称";
this.Column_Name.Name = "Column_Name";
this.Column_Name.ReadOnly = true;
//
// Column_X
//
this.Column_X.DataPropertyName = "PositionX";
this.Column_X.HeaderText = "X";
this.Column_X.Name = "Column_X";
this.Column_X.ReadOnly = true;
this.Column_X.Width = 80;
//
// Column_Y
//
this.Column_Y.DataPropertyName = "PositionY";
this.Column_Y.HeaderText = "Y";
this.Column_Y.Name = "Column_Y";
this.Column_Y.ReadOnly = true;
this.Column_Y.Width = 80;
//
// Column_NodeX
//
this.Column_NodeX.DataPropertyName = "NodePositionX";
this.Column_NodeX.HeaderText = "X";
this.Column_NodeX.Name = "Column_NodeX";
this.Column_NodeX.ReadOnly = true;
this.Column_NodeX.Visible = false;
this.Column_NodeX.Width = 70;
//
// Column_NodeY
//
this.Column_NodeY.DataPropertyName = "NodePositionY";
this.Column_NodeY.HeaderText = "Y";
this.Column_NodeY.Name = "Column_NodeY";
this.Column_NodeY.ReadOnly = true;
this.Column_NodeY.Visible = false;
this.Column_NodeY.Width = 70;
//
// Column_positionNum
//
this.Column_positionNum.DataPropertyName = "Column_positionNum";
this.Column_positionNum.HeaderText = "位置";
this.Column_positionNum.Name = "Column_positionNum";
this.Column_positionNum.ReadOnly = true;
this.Column_positionNum.Width = 70;
//
// Column_NeedSoldering
//
this.Column_NeedSoldering.DataPropertyName = "NeedSoldering";
this.Column_NeedSoldering.HeaderText = "需焊接";
this.Column_NeedSoldering.Name = "Column_NeedSoldering";
this.Column_NeedSoldering.ReadOnly = true;
this.Column_NeedSoldering.Visible = false;
this.Column_NeedSoldering.Width = 70;
//
// Column_WeldTemp
//
this.Column_WeldTemp.DataPropertyName = "WeldTemp";
this.Column_WeldTemp.HeaderText = "焊接温度";
this.Column_WeldTemp.MaxInputLength = 10;
this.Column_WeldTemp.Name = "Column_WeldTemp";
this.Column_WeldTemp.ReadOnly = true;
this.Column_WeldTemp.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_WeldTemp.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Column_WeldTemp.Visible = false;
this.Column_WeldTemp.Width = 80;
//
// Column_WeldTime
//
this.Column_WeldTime.DataPropertyName = "WeldTime";
this.Column_WeldTime.HeaderText = "焊接时间";
this.Column_WeldTime.MaxInputLength = 10;
this.Column_WeldTime.Name = "Column_WeldTime";
this.Column_WeldTime.ReadOnly = true;
this.Column_WeldTime.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_WeldTime.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
this.Column_WeldTime.Visible = false;
this.Column_WeldTime.Width = 80;
//
// Column_NeedCheck
//
this.Column_NeedCheck.DataPropertyName = "NeedCheck";
this.Column_NeedCheck.HeaderText = "需检测";
this.Column_NeedCheck.Name = "Column_NeedCheck";
this.Column_NeedCheck.ReadOnly = true;
this.Column_NeedCheck.Visible = false;
this.Column_NeedCheck.Width = 55;
//
// Column_CheckOK
//
this.Column_CheckOK.HeaderText = "校准点";
this.Column_CheckOK.Name = "Column_CheckOK";
this.Column_CheckOK.ReadOnly = true;
this.Column_CheckOK.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.Column_CheckOK.Width = 70;
//
// Column_PointType
//
this.Column_PointType.HeaderText = "点类型";
this.Column_PointType.Name = "Column_PointType";
this.Column_PointType.ReadOnly = true;
this.Column_PointType.Visible = false;
//
// Column_PointSizeX
//
this.Column_PointSizeX.HeaderText = "横向点大小";
this.Column_PointSizeX.Name = "Column_PointSizeX";
this.Column_PointSizeX.ReadOnly = true;
this.Column_PointSizeX.Visible = false;
//
// Column_PointSizeY
//
this.Column_PointSizeY.HeaderText = "纵向点大小";
this.Column_PointSizeY.Name = "Column_PointSizeY";
this.Column_PointSizeY.ReadOnly = true;
this.Column_PointSizeY.Visible = false;
//
// Column_PenWidth
//
this.Column_PenWidth.HeaderText = "画笔宽度";
this.Column_PenWidth.Name = "Column_PenWidth";
this.Column_PenWidth.ReadOnly = true;
this.Column_PenWidth.Visible = false;
//
// Column_ShowText
//
this.Column_ShowText.HeaderText = "投影文字";
this.Column_ShowText.Name = "Column_ShowText";
this.Column_ShowText.ReadOnly = true;
this.Column_ShowText.Visible = false;
//
// Column_disable
//
this.Column_disable.FillWeight = 80F;
this.Column_disable.HeaderText = "禁用";
this.Column_disable.Name = "Column_disable";
this.Column_disable.ReadOnly = true;
this.Column_disable.Width = 55;
//
// Column_getPosition
//
this.Column_getPosition.HeaderText = "更新坐标";
this.Column_getPosition.Name = "Column_getPosition";
this.Column_getPosition.ReadOnly = true;
this.Column_getPosition.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_getPosition.Text = "更新坐标";
this.Column_getPosition.ToolTipText = "更新坐标";
this.Column_getPosition.UseColumnTextForLinkValue = true;
this.Column_getPosition.Visible = false;
this.Column_getPosition.Width = 80;
//
// Column_MoveTest
//
this.Column_MoveTest.HeaderText = "移动测试";
this.Column_MoveTest.Name = "Column_MoveTest";
this.Column_MoveTest.ReadOnly = true;
this.Column_MoveTest.Text = "移动测试";
this.Column_MoveTest.ToolTipText = "移动测试";
this.Column_MoveTest.UseColumnTextForLinkValue = true;
this.Column_MoveTest.Width = 80;
//
// Column_btnDetail
//
this.Column_btnDetail.HeaderText = "详情";
this.Column_btnDetail.Name = "Column_btnDetail";
this.Column_btnDetail.ReadOnly = true;
this.Column_btnDetail.Text = "详情";
this.Column_btnDetail.UseColumnTextForLinkValue = true;
this.Column_btnDetail.Width = 55;
//
// Column_Del
//
this.Column_Del.HeaderText = "删除";
this.Column_Del.Name = "Column_Del";
this.Column_Del.ReadOnly = true;
this.Column_Del.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_Del.Text = "删除";
this.Column_Del.ToolTipText = "删除";
this.Column_Del.UseColumnTextForLinkValue = true;
this.Column_Del.Width = 55;
//
// Column_Up
//
this.Column_Up.HeaderText = " ↑";
this.Column_Up.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline;
this.Column_Up.Name = "Column_Up";
this.Column_Up.ReadOnly = true;
this.Column_Up.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_Up.Text = " ↑";
this.Column_Up.ToolTipText = " ↑";
this.Column_Up.UseColumnTextForLinkValue = true;
this.Column_Up.Width = 30;
//
// Column_Down
//
this.Column_Down.HeaderText = " ↓";
this.Column_Down.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline;
this.Column_Down.Name = "Column_Down";
this.Column_Down.ReadOnly = true;
this.Column_Down.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.Column_Down.Text = " ↓";
this.Column_Down.ToolTipText = " ↓";
this.Column_Down.UseColumnTextForLinkValue = true;
this.Column_Down.Width = 30;
//
// FrmBoardInfo // FrmBoardInfo
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
...@@ -1078,7 +1085,7 @@ ...@@ -1078,7 +1085,7 @@
private System.Windows.Forms.DataGridViewLinkColumn Column_MoveTest; private System.Windows.Forms.DataGridViewLinkColumn Column_MoveTest;
private System.Windows.Forms.DataGridViewLinkColumn Column_btnDetail; private System.Windows.Forms.DataGridViewLinkColumn Column_btnDetail;
private System.Windows.Forms.DataGridViewLinkColumn Column_Del; private System.Windows.Forms.DataGridViewLinkColumn Column_Del;
private System.Windows.Forms.DataGridViewImageColumn Column_Up; private System.Windows.Forms.DataGridViewLinkColumn Column_Up;
private System.Windows.Forms.DataGridViewImageColumn Column_Down; private System.Windows.Forms.DataGridViewLinkColumn Column_Down;
} }
} }
\ No newline at end of file \ No newline at end of file
TSA-V/FrmBoardInfo.cs
...@@ -67,7 +67,7 @@ namespace TSA_V ...@@ -67,7 +67,7 @@ namespace TSA_V
if (isNew == false) if (isNew == false)
{ {
AOIManager.LoadAOIFile(cmbAOIFile,updateBoardInfo.AOIProName); AOIManager.LoadAOIFile(cmbAOIFile, updateBoardInfo.AOIProName);
LoadBoardInfo(); LoadBoardInfo();
} }
else else
...@@ -93,7 +93,12 @@ namespace TSA_V ...@@ -93,7 +93,12 @@ namespace TSA_V
TSAVBean.IsCanStepMove = true; TSAVBean.IsCanStepMove = true;
timer1.Start(); timer1.Start();
isFinishLoad = true; isFinishLoad = true;
if (dgvList.Rows.Count > 0)
{
int index = dgvList.Rows.Count - 1;
dgvList.Rows[0].Selected = true;
}
} }
private void LanguagePro() private void LanguagePro()
{ {
...@@ -129,8 +134,12 @@ namespace TSA_V ...@@ -129,8 +134,12 @@ namespace TSA_V
this.Column_Del.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除"); this.Column_Del.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除");
this.Column_Del.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除"); this.Column_Del.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Delete, "删除");
this.Column_Up.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升"); //this.Column_Up.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升");
this.Column_Down.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降"); //this.Column_Up.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升");
//this.Column_Up.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Up, "上升");
//this.Column_Down.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降");
//this.Column_Down.Text = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降");
//this.Column_Down.ToolTipText = ResourceCulture.GetString(ResourceCulture.ItemText_Down, "下降");
this.Column_CheckOK.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Check, "校准点"); this.Column_CheckOK.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Check, "校准点");
this.Column_disable.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Disable, "禁用"); this.Column_disable.HeaderText = ResourceCulture.GetString(ResourceCulture.ItemText_Disable, "禁用");
} }
...@@ -377,15 +386,12 @@ namespace TSA_V ...@@ -377,15 +386,12 @@ namespace TSA_V
{ {
try try
{ {
if (rowIndex >= dgvList.Rows.Count - 1) isFinishLoad = false;
{ if ( rowIndex >= dgvList.Rows.Count - 1)
return;
}
DataGridViewRow row = dgvList.Rows[rowIndex];
if (rowIndex < 0)
{ {
return; return;
} }
DataGridViewRow row = dgvList.Rows[rowIndex];
dgvList.Rows.Remove(dgvList.Rows[rowIndex]); dgvList.Rows.Remove(dgvList.Rows[rowIndex]);
if (rowIndex >= dgvList.Rows.Count - 1) if (rowIndex >= dgvList.Rows.Count - 1)
...@@ -395,30 +401,41 @@ namespace TSA_V ...@@ -395,30 +401,41 @@ namespace TSA_V
else else
{ {
dgvList.Rows.Insert(rowIndex + 1, row); dgvList.Rows.Insert(rowIndex + 1, row);
} };
dgvList.Rows[rowIndex + 1].Selected = true;
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("行下降出错：" + ex.ToString()); LogUtil.error("行下降出错：" + ex.ToString());
} }
finally
{
isFinishLoad = true;
}
} }
private void RowUp(int rowIndex) private void RowUp(int rowIndex)
{ {
try try
{ {
DataGridViewRow row = dgvList.Rows[rowIndex]; isFinishLoad = false;
if (rowIndex <= 0) if (rowIndex <= 0)
{ {
return; return;
} }
DataGridViewRow row = dgvList.Rows[rowIndex];
dgvList.Rows.Remove(dgvList.Rows[rowIndex]); dgvList.Rows.Remove(dgvList.Rows[rowIndex]);
dgvList.Rows.Insert(rowIndex - 1, row); dgvList.Rows.Insert(rowIndex - 1, row);
dgvList.Rows[rowIndex - 1].Selected = true;
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("行上升出错：" + ex.ToString()); LogUtil.error("行上升出错：" + ex.ToString());
} }
finally
{
isFinishLoad = true;
}
} }
...@@ -940,6 +957,7 @@ namespace TSA_V ...@@ -940,6 +957,7 @@ namespace TSA_V
private int GetRowFromPoint(int x, int y) private int GetRowFromPoint(int x, int y)
{ {
y = y + VerticalScrollIndex;
for (int i = 0; i < dgvList.RowCount; i++) for (int i = 0; i < dgvList.RowCount; i++)
{ {
Rectangle rec = dgvList.GetRowDisplayRectangle(i, false); Rectangle rec = dgvList.GetRowDisplayRectangle(i, false);
...@@ -949,14 +967,39 @@ namespace TSA_V ...@@ -949,14 +967,39 @@ namespace TSA_V
} }
return -1; return -1;
} }
int VerticalScrollIndex = 0, HorizontalOffset = 0;
private void dgvList_Scroll(object sender, ScrollEventArgs e)
{
try
{
if (e.ScrollOrientation == ScrollOrientation.VerticalScroll)
{
VerticalScrollIndex = e.NewValue;
}
else if (e.ScrollOrientation == ScrollOrientation.HorizontalScroll)
{
HorizontalOffset = e.NewValue;
}
}
catch { }
}
private void dgvList_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e) private void dgvList_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e)
{ {
if (selectionIdx > -1) try
{ {
dgvList.Rows[selectionIdx].Selected = true; if (selectionIdx > -1 && selectIndex <= (dgvList.Rows.Count - 1))
dgvList.CurrentCell = dgvList.Rows[selectionIdx].Cells[0]; {
selectionIdx = -1; dgvList.Rows[selectionIdx].Selected = true;
dgvList.CurrentCell = dgvList.Rows[selectionIdx].Cells[0];
selectionIdx = -1;
}
}
catch (Exception ex)
{
} }
} }
...@@ -1107,15 +1150,17 @@ namespace TSA_V ...@@ -1107,15 +1150,17 @@ namespace TSA_V
private void dgvList_SelectionChanged(object sender, EventArgs e) private void dgvList_SelectionChanged(object sender, EventArgs e)
{ {
if (dgvList.SelectedRows != null && dgvList.SelectedRows.Count > 0) if (isFinishLoad)
{ {
int rowIndex = dgvList.SelectedRows[0].Index; if (dgvList.SelectedRows != null && dgvList.SelectedRows.Count > 0)
string partNum = dgvList.Rows[rowIndex].Cells[this.Column_PartNum.Name].Value.ToString(); {
string name = dgvList.Rows[rowIndex].Cells[this.Column_Name.Name].Value.ToString(); int rowIndex = dgvList.SelectedRows[0].Index;
记录为组装坐标ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemTextUpdateP, "更新为【{0}-{1}】的位置", partNum, name); string partNum = dgvList.Rows[rowIndex].Cells[this.Column_PartNum.Name].Value.ToString();
string name = dgvList.Rows[rowIndex].Cells[this.Column_Name.Name].Value.ToString();
记录为组装坐标ToolStripMenuItem.Text = ResourceCulture.GetString(ResourceCulture.ItemTextUpdateP, "更新为【{0}-{1}】的位置", partNum, name);
UpdateSelPoint(rowIndex);
UpdateSelPoint(rowIndex);
}
} }
} }
...@@ -1323,5 +1368,6 @@ namespace TSA_V ...@@ -1323,5 +1368,6 @@ namespace TSA_V
dgvList.Rows[i].Cells[this.Column_disable.Name].Value = true ; dgvList.Rows[i].Cells[this.Column_disable.Name].Value = true ;
} }
} }
} }
} }
TSA-V/FrmBoardInfo.resx
...@@ -225,29 +225,9 @@ ...@@ -225,29 +225,9 @@
<metadata name="Column_Up.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column_Up.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<data name="Column_Up.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAANRJREFUSEvtk8ENhSAMQBnAgHplD/c/w8UN1Dkg4adESJWKlsM/8ZIm0FIekCDC
n+iiZtgia20MLizRvu9BCBEDxhw+i7CkRfZJdBxHIUkBtS+8irZty5tqrckxrHmjKsLPNc9zzKU5ME1T
nr8946MIS5RSZ/YqAqCWcjUZKcISODUm5THjOOb8k6wQGWNyE75JItXuSClzDfa4U3TAZ4TF0EjxJAKG
YYg16kOTHeu6Bu/9ObtSEznnYi8F3VGhJqrRRV2UYXcsyxKDC/9ojXRRIyH8ACKfopRlVag2AAAAAElF
TkSuQmCC
</value>
</data>
<metadata name="Column_Down.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="Column_Down.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<data name="Column_Down.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
xAAADsQBlSsOGwAAAONJREFUSEvtk00OhCAMRlkb49/We3j/tS70BuI1TAwzH8FOVQTrYla8pIkttg9I
UOZPJNFrxKKu62xIEYuUUjakJFESEd6OcRzNuq4uOxISbdtmpmly2ZFLR9/3dlCWZa5yJCQqy9KuYcaZ
S8cwDDQsz3NX/XEnqqqK1jDjjHdrWmtqwi45e51T1zXV0evDfwdfuKwoCle9ivhJ7iTgVgS4DLsGew6a
pqE8JAFBEZjnmYa1bev9xj8xoiKwLAsNPQfWnvBIBPg17hG7Ls5jEeAyiQSIRABvxPdOYohFb0milxjz
AeLDoohrNFdzAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>82</value> <value>82</value>
</metadata> </metadata>
......
TSA-V/ResourceCulture.cs
...@@ -25,7 +25,8 @@ namespace TSA_V ...@@ -25,7 +25,8 @@ namespace TSA_V
public static void SetCurrentCulture(string name) public static void SetCurrentCulture(string name)
{ {
ResourceControl.GetStrEvent += GetString; ResourceControl.GetStrEvent += GetString;
ResourceControl.GetStringEvent += GetString; ResourceControl.GetStringEvent += GetString;
ResourceControl.GetLanEvent += GetLanguage;
UserFromControl.UserControlResource.GetStrEvent += GetString; UserFromControl.UserControlResource.GetStrEvent += GetString;
UserFromControl.UserControlResource.GetStringEvent += GetString; UserFromControl.UserControlResource.GetStringEvent += GetString;
...@@ -36,7 +37,10 @@ namespace TSA_V ...@@ -36,7 +37,10 @@ namespace TSA_V
CurrLanguage = name; CurrLanguage = name;
Thread.CurrentThread.CurrentCulture = new CultureInfo(name); Thread.CurrentThread.CurrentCulture = new CultureInfo(name);
} }
public static string GetLanguage()
{
return CurrLanguage;
}
public static string GetString(string id, params object[] param) public static string GetString(string id, params object[] param)
{ {
return GetString(id, id,param); return GetString(id, id,param);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!