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
c02040ac
Commit
c02040ac
authored
Apr 10, 2020
by
fallenstardust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
同步父类
parent
9596be3a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
14 deletions
+12
-14
mobile/src/main/java/cn/garymb/ygomobile/loader/CardLoader.java
.../src/main/java/cn/garymb/ygomobile/loader/CardLoader.java
+3
-3
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/BaseCardsAcitivity.java
...java/cn/garymb/ygomobile/ui/cards/BaseCardsAcitivity.java
+1
-2
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearchActivityImpl.java
.../cn/garymb/ygomobile/ui/cards/CardSearchActivityImpl.java
+4
-4
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivity3.java
...va/cn/garymb/ygomobile/ui/cards/DeckManagerActivity3.java
+1
-1
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivityImpl.java
...cn/garymb/ygomobile/ui/cards/DeckManagerActivityImpl.java
+2
-3
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivityImpl2.java
...n/garymb/ygomobile/ui/cards/DeckManagerActivityImpl2.java
+1
-1
No files found.
mobile/src/main/java/cn/garymb/ygomobile/loader/CardLoader.java
View file @
c02040ac
...
...
@@ -38,7 +38,7 @@ public class CardLoader implements ICardLoader {
void
onLimitListChanged
(
LimitList
limitList
);
void
onSearchResult
(
List
<
Card
>
Cards
);
void
onSearchResult
(
List
<
Card
>
Cards
,
boolean
isHide
);
void
onResetSearch
();
}
...
...
@@ -143,13 +143,13 @@ public class CardLoader implements ICardLoader {
return
tmp
;
}).
fail
((
e
)
->
{
if
(
mCallBack
!=
null
)
{
mCallBack
.
onSearchResult
(
null
);
mCallBack
.
onSearchResult
(
null
,
false
);
}
Log
.
e
(
"kk"
,
"search"
,
e
);
wait
.
dismiss
();
}).
done
((
tmp
)
->
{
if
(
mCallBack
!=
null
)
{
mCallBack
.
onSearchResult
(
tmp
);
mCallBack
.
onSearchResult
(
tmp
,
false
);
}
wait
.
dismiss
();
});
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/BaseCardsAcitivity.java
View file @
c02040ac
...
...
@@ -117,8 +117,7 @@ public abstract class BaseCardsAcitivity extends BaseActivity implements CardLoa
finish
();
}
@Override
public
void
onSearchResult
(
List
<
Card
>
cardInfos
)
{
public
void
onSearchResult
(
List
<
Card
>
cardInfos
,
boolean
isHide
)
{
// Log.d("kk", "find " + (cardInfos == null ? -1 : cardInfos.size()));
mCardListAdapater
.
set
(
cardInfos
);
mCardListAdapater
.
notifyDataSetChanged
();
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearchActivityImpl.java
View file @
c02040ac
...
...
@@ -115,10 +115,10 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
private
void
intentSearch
(
String
searchMessage
)
{
//如果要求搜索的关键字为空,就搜索决斗助手保存的卡查关键字
if
(
TextUtils
.
isEmpty
(
searchMessage
)){
if
(
TextUtils
.
isEmpty
(
searchMessage
))
{
currentCardSearchMessage
=
duelAssistantManagement
.
getCardSearchMessage
();
}
else
{
currentCardSearchMessage
=
searchMessage
;
}
else
{
currentCardSearchMessage
=
searchMessage
;
}
//卡查关键字为空不卡查
if
(
TextUtils
.
isEmpty
(
currentCardSearchMessage
))
...
...
@@ -191,7 +191,7 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
}
@Override
public
void
onSearchResult
(
List
<
Card
>
cardInfos
)
{
public
void
onSearchResult
(
List
<
Card
>
cardInfos
,
boolean
isHide
)
{
// Log.d("kk", "find " + (cardInfos == null ? -1 : cardInfos.size()));
mCardListAdapater
.
set
(
cardInfos
);
mCardListAdapater
.
notifyDataSetChanged
();
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivity3.java
View file @
c02040ac
...
...
@@ -147,7 +147,7 @@ public class DeckManagerActivity3 extends BaseActivity implements OnItemDragList
}
@Override
public
void
onSearchResult
(
List
<
Card
>
Cards
)
{
public
void
onSearchResult
(
List
<
Card
>
Cards
,
boolean
isHide
)
{
}
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivityImpl.java
View file @
c02040ac
...
...
@@ -58,7 +58,6 @@ import cn.garymb.ygomobile.bean.DeckType;
import
cn.garymb.ygomobile.bean.events.CardInfoEvent
;
import
cn.garymb.ygomobile.bean.events.DeckFile
;
import
cn.garymb.ygomobile.lite.R
;
import
cn.garymb.ygomobile.ui.activities.BaseActivity
;
import
cn.garymb.ygomobile.ui.activities.WebActivity
;
import
cn.garymb.ygomobile.ui.adapters.SimpleSpinnerAdapter
;
import
cn.garymb.ygomobile.ui.adapters.SimpleSpinnerItem
;
...
...
@@ -357,9 +356,9 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
}
}
}
@Override
public
void
onSearchResult
(
List
<
Card
>
cardInfos
,
boolean
isHide
)
{
super
.
onSearchResult
(
cardInfos
);
super
.
onSearchResult
(
cardInfos
,
isHide
);
if
(!
isHide
)
showResult
(
false
);
}
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivityImpl2.java
View file @
c02040ac
...
...
@@ -388,7 +388,7 @@ class DeckManagerActivityImpl2 extends BaseActivity implements CardLoader.CallBa
}
@Override
public
void
onSearchResult
(
List
<
Card
>
cardInfos
)
{
public
void
onSearchResult
(
List
<
Card
>
cardInfos
,
boolean
isHide
)
{
mCardListAdapater
.
set
(
cardInfos
);
mCardListAdapater
.
notifyDataSetChanged
();
if
(
cardInfos
!=
null
&&
cardInfos
.
size
()
>
0
)
{
...
...
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