Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
YGOMobile
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fallenstardust
YGOMobile
Commits
9220dd46
Commit
9220dd46
authored
Sep 29, 2022
by
fallenstardust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix makeMd5 边界溢出
是卡包的场合下extra和side边界设为0
parent
64780612
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
8 deletions
+14
-8
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckAdapater.java
.../java/cn/garymb/ygomobile/ui/cards/deck/DeckAdapater.java
+1
-1
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckItem.java
...main/java/cn/garymb/ygomobile/ui/cards/deck/DeckItem.java
+12
-6
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckItemUtils.java
...java/cn/garymb/ygomobile/ui/cards/deck/DeckItemUtils.java
+1
-1
No files found.
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckAdapater.java
View file @
9220dd46
...
@@ -403,7 +403,7 @@ public class DeckAdapater extends RecyclerView.Adapter<DeckViewHolder> implement
...
@@ -403,7 +403,7 @@ public class DeckAdapater extends RecyclerView.Adapter<DeckViewHolder> implement
if
(
deckinfo
!=
null
)
{
if
(
deckinfo
!=
null
)
{
loadData
(
deckinfo
,
isPack
);
loadData
(
deckinfo
,
isPack
);
}
}
if
(!
isPack
)
mDeckMd5
=
DeckItemUtils
.
makeMd5
(
mItems
);
mDeckMd5
=
DeckItemUtils
.
makeMd5
(
mItems
);
}
}
public
DeckInfo
read
(
CardLoader
cardLoader
,
File
file
,
LimitList
limitList
)
{
public
DeckInfo
read
(
CardLoader
cardLoader
,
File
file
,
LimitList
limitList
)
{
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckItem.java
View file @
9220dd46
...
@@ -19,19 +19,25 @@ public class DeckItem {
...
@@ -19,19 +19,25 @@ public class DeckItem {
public
static
void
resetLabel
(
DeckInfo
deckInfo
,
boolean
isPack
)
{
public
static
void
resetLabel
(
DeckInfo
deckInfo
,
boolean
isPack
)
{
if
(!
isPack
)
{
if
(!
isPack
)
{
MainEnd
=
MainStart
+
Constants
.
DECK_MAIN_MAX
-
1
;
MainEnd
=
MainStart
+
Constants
.
DECK_MAIN_MAX
-
1
;
ExtraLabel
=
MainEnd
+
1
;
ExtraStart
=
ExtraLabel
+
1
;
ExtraEnd
=
ExtraStart
+
Constants
.
DECK_EXTRA_COUNT
-
1
;
SideLabel
=
ExtraEnd
+
1
;
SideStart
=
SideLabel
+
1
;
SideEnd
=
SideStart
+
Constants
.
DECK_SIDE_COUNT
-
1
;
}
else
{
}
else
{
if
(
deckInfo
.
getMainCount
()
<=
Constants
.
DECK_MAIN_MAX
)
{
if
(
deckInfo
.
getMainCount
()
<=
Constants
.
DECK_MAIN_MAX
)
{
MainEnd
=
MainStart
+
Constants
.
DECK_MAIN_MAX
-
1
;
MainEnd
=
MainStart
+
Constants
.
DECK_MAIN_MAX
-
1
;
}
else
{
}
else
{
MainEnd
=
MainStart
+
deckInfo
.
getMainCount
()
-
1
;
MainEnd
=
MainStart
+
deckInfo
.
getMainCount
()
-
1
;
}
}
ExtraLabel
=
0
;
ExtraStart
=
0
;
ExtraEnd
=
0
;
SideLabel
=
0
;
SideStart
=
0
;
SideEnd
=
0
;
}
}
ExtraLabel
=
MainEnd
+
1
;
ExtraStart
=
ExtraLabel
+
1
;
ExtraEnd
=
ExtraStart
+
Constants
.
DECK_EXTRA_COUNT
-
1
;
SideLabel
=
ExtraEnd
+
1
;
SideStart
=
SideLabel
+
1
;
SideEnd
=
SideStart
+
Constants
.
DECK_SIDE_COUNT
-
1
;
}
}
private
DeckItemType
mType
;
private
DeckItemType
mType
;
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckItemUtils.java
View file @
9220dd46
...
@@ -18,7 +18,7 @@ class DeckItemUtils {
...
@@ -18,7 +18,7 @@ class DeckItemUtils {
public
static
String
makeMd5
(
List
<
DeckItem
>
items
)
{
public
static
String
makeMd5
(
List
<
DeckItem
>
items
)
{
StringBuilder
stringBuilder
=
new
StringBuilder
();
StringBuilder
stringBuilder
=
new
StringBuilder
();
stringBuilder
.
append
(
"#main"
);
stringBuilder
.
append
(
"#main"
);
for
(
int
i
=
DeckItem
.
MainStart
;
i
<
DeckItem
.
MainStart
+
Constants
.
DECK_MAIN_MAX
;
i
++)
{
for
(
int
i
=
DeckItem
.
MainStart
;
i
<
DeckItem
.
MainStart
+
items
.
size
()
;
i
++)
{
DeckItem
deckItem
=
items
.
get
(
i
);
DeckItem
deckItem
=
items
.
get
(
i
);
if
(
deckItem
.
getType
()
==
DeckItemType
.
Space
)
{
if
(
deckItem
.
getType
()
==
DeckItemType
.
Space
)
{
break
;
break
;
...
...
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