Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
Thick-Common
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
Thick-Common
Commits
7176fbd7
Commit
7176fbd7
authored
Jun 04, 2019
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 修改Misc.Version 的bug
2.修改 MainEdit 模块查找的bug
parent
ee92836d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
4 deletions
+19
-4
Ver.cs
Project.FLY.Misc/MISC/Ver.cs
+18
-3
GraphTabItem.cs
...FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/GraphTabItem.cs
+1
-1
No files found.
Project.FLY.Misc/MISC/Ver.cs
View file @
7176fbd7
...
@@ -48,15 +48,30 @@ namespace Misc
...
@@ -48,15 +48,30 @@ namespace Misc
Version
version
=
asm
.
GetName
().
Version
;
Version
version
=
asm
.
GetName
().
Version
;
string
version_str
=
string
.
Format
(
"v{0}.{1}.{2}"
,
version
.
Major
,
version
.
Minor
,
version
.
Build
);
string
version_str
=
string
.
Format
(
"v{0}.{1}.{2}"
,
version
.
Major
,
version
.
Minor
,
version
.
Build
);
string
buliddt
=
System
.
IO
.
File
.
GetLastWriteTime
(
this
.
GetType
().
Assembly
.
Location
).
ToString
(
"yyyyMMdd"
);
string
location
=
asm
.
Location
;
string
buliddt
;
if
(!
string
.
IsNullOrEmpty
(
location
))
{
buliddt
=
System
.
IO
.
File
.
GetLastWriteTime
(
location
).
ToString
(
"yyyyMMdd"
);
}
else
{
buliddt
=
""
;
}
Product
=
asmproduct
.
Product
;
Product
=
asmproduct
.
Product
;
V
=
version_str
;
V
=
version_str
;
BuildTime
=
buliddt
;
BuildTime
=
buliddt
;
}
}
public
override
string
ToString
()
public
override
string
ToString
()
{
{
return
Product
+
" "
+
V
+
" at "
+
BuildTime
;
if
(!
string
.
IsNullOrEmpty
(
BuildTime
))
{
return
Product
+
" "
+
V
+
" at "
+
BuildTime
;
}
else
{
return
Product
+
" "
+
V
;
}
}
}
}
}
}
}
Project.FLY.Thick.Base/FLY.Thick.Base.UI/MainEdit/GraphTabItem.cs
View file @
7176fbd7
...
@@ -554,7 +554,7 @@ namespace ThickTcpUiInWindow.MainEdit
...
@@ -554,7 +554,7 @@ namespace ThickTcpUiInWindow.MainEdit
UIModule
.
DynAreaComponent
dynAreaItem
;
UIModule
.
DynAreaComponent
dynAreaItem
;
if
(
component
.
ID
!=
0
)
if
(
component
.
ID
!=
0
)
{
{
int
idx
=
dest_dynAreaItems
.
FindIndex
((
daitem
)
=>
{
return
daitem
.
GetHashCode
()
==
component
.
ID
;
});
int
idx
=
dest_dynAreaItems
.
FindIndex
((
daitem
)
=>
{
return
daitem
.
ID
==
component
.
ID
;
});
if
(
idx
==
-
1
)
if
(
idx
==
-
1
)
{
{
//异常
//异常
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment