Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
YGOMobile-Cn-Ko-En
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-Cn-Ko-En
Commits
ba675edd
Commit
ba675edd
authored
Apr 15, 2020
by
fallenstardust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
显示搜索结果中,添加移除收藏夹操作不会覆盖掉结果显示
parent
6d5bc4d2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardDetail.java
...rc/main/java/cn/garymb/ygomobile/ui/cards/CardDetail.java
+8
-6
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearcher.java
.../main/java/cn/garymb/ygomobile/ui/cards/CardSearcher.java
+3
-0
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivityImpl.java
...cn/garymb/ygomobile/ui/cards/DeckManagerActivityImpl.java
+2
-0
No files found.
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardDetail.java
View file @
ba675edd
...
...
@@ -219,13 +219,15 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
favConf
.
save
(
"#Favorite"
);
favConf
.
read
();
Favorite
.
clear
();
SparseArray
<
Card
>
id
=
mCardLoader
.
readCards
(
ConfigManager
.
mLines
,
false
);
if
(
id
!=
null
)
{
for
(
int
i
=
0
;
i
<
id
.
size
();
i
++)
Favorite
.
add
(
id
.
valueAt
(
i
));
if
(!
DeckManagerActivityImpl
.
isSearchResult
)
{
SparseArray
<
Card
>
id
=
mCardLoader
.
readCards
(
ConfigManager
.
mLines
,
false
);
if
(
id
!=
null
)
{
for
(
int
i
=
0
;
i
<
id
.
size
();
i
++)
Favorite
.
add
(
id
.
valueAt
(
i
));
}
if
(
mCallBack
!=
null
)
mCallBack
.
onSearchResult
(
Favorite
,
true
);
}
if
(
mCallBack
!=
null
)
mCallBack
.
onSearchResult
(
Favorite
,
true
);
}
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearcher.java
View file @
ba675edd
...
...
@@ -149,6 +149,8 @@ public class CardSearcher implements View.OnClickListener {
}
if
(
mCallBack
!=
null
)
mCallBack
.
onSearchResult
(
Favorite
,
false
);
DeckManagerActivityImpl
.
isSearchResult
=
false
;
}
});
...
...
@@ -543,6 +545,7 @@ public class CardSearcher implements View.OnClickListener {
,
getSelect
(
typeMonsterSpinner2
));
lineKey
=
0
;
}
DeckManagerActivityImpl
.
isSearchResult
=
true
;
}
private
void
resetAll
()
{
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivityImpl.java
View file @
ba675edd
...
...
@@ -103,6 +103,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
private
DialogPlus
mDialog
;
private
DialogPlus
builderShareLoading
;
private
boolean
isExit
=
false
;
public
static
boolean
isSearchResult
;
public
static
List
<
Card
>
Favorite
=
new
ArrayList
<
Card
>();
@Override
...
...
@@ -287,6 +288,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
Favorite
.
add
(
id
.
valueAt
(
i
));
}
onSearchResult
(
Favorite
,
true
);
isSearchResult
=
false
;
});
}
...
...
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