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
01a9e8d8
Commit
01a9e8d8
authored
Dec 11, 2019
by
fallenstardust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
如果有alias则替换显示code
异画卡ourocg改搜索key为alias
parent
c99b4029
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
27 additions
and
12 deletions
+27
-12
mobile/build.gradle
mobile/build.gradle
+1
-1
mobile/src/main/java/cn/garymb/ygomobile/ui/adapters/CardListAdapter.java
...java/cn/garymb/ygomobile/ui/adapters/CardListAdapter.java
+6
-1
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearchActivityImpl.java
.../cn/garymb/ygomobile/ui/cards/CardSearchActivityImpl.java
+14
-9
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivityImpl.java
...cn/garymb/ygomobile/ui/cards/DeckManagerActivityImpl.java
+6
-1
No files found.
mobile/build.gradle
View file @
01a9e8d8
...
...
@@ -8,7 +8,7 @@ android {
applicationId
"cn.garymb.ygomobile"
minSdkVersion
21
targetSdkVersion
28
versionCode
3540012
08
versionCode
3540012
11
versionName
"3.5.4"
flavorDimensions
"versionCode"
vectorDrawables
.
useSupportLibrary
=
true
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/adapters/CardListAdapter.java
View file @
01a9e8d8
...
...
@@ -19,6 +19,7 @@ import cn.garymb.ygomobile.utils.CardUtils;
import
ocgcore.DataManager
;
import
ocgcore.StringManager
;
import
ocgcore.data.Card
;
import
ocgcore.data.CardData
;
import
ocgcore.data.LimitList
;
import
ocgcore.enums.CardType
;
import
ocgcore.enums.LimitType
;
...
...
@@ -162,7 +163,11 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i
//卡片类型
holder
.
cardType
.
setText
(
CardUtils
.
getAllTypeString
(
item
,
mStringManager
));
if
(
holder
.
codeView
!=
null
)
{
holder
.
codeView
.
setText
(
String
.
format
(
"%08d"
,
item
.
Code
));
if
(
item
.
Alias
!=
0
)
{
holder
.
codeView
.
setText
(
String
.
format
(
"%08d"
,
item
.
Alias
));
}
else
{
holder
.
codeView
.
setText
(
String
.
format
(
"%08d"
,
item
.
Code
));
}
}
bindMenu
(
holder
,
position
);
}
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearchActivityImpl.java
View file @
01a9e8d8
...
...
@@ -51,16 +51,16 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
private
ImageLoader
mImageLoader
;
private
String
intentSearchMessage
;
private
boolean
isFirstCardSearch
=
true
;
private
String
currentCardSearchMessage
=
""
;
private
boolean
isFirstCardSearch
=
true
;
private
String
currentCardSearchMessage
=
""
;
@Override
protected
void
onCreate
(
@Nullable
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
setContentView
(
R
.
layout
.
activity_search
);
if
(
TextUtils
.
isEmpty
(
getIntent
().
getStringExtra
(
CardSearchAcitivity
.
SEARCH_MESSAGE
)))
{
ServiceDuelAssistant
.
cardSearchMessage
=
""
;
if
(
TextUtils
.
isEmpty
(
getIntent
().
getStringExtra
(
CardSearchAcitivity
.
SEARCH_MESSAGE
)))
{
ServiceDuelAssistant
.
cardSearchMessage
=
""
;
}
Toolbar
toolbar
=
$
(
R
.
id
.
toolbar
);
setSupportActionBar
(
toolbar
);
...
...
@@ -98,20 +98,20 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
mCardLoader
.
loadData
();
mCardSelector
.
initItems
();
intentSearch
();
isFirstCardSearch
=
false
;
isFirstCardSearch
=
false
;
});
}
@Override
protected
void
onRestart
()
{
super
.
onRestart
();
if
(!
isFirstCardSearch
&&!
currentCardSearchMessage
.
equals
(
ServiceDuelAssistant
.
cardSearchMessage
))
{
currentCardSearchMessage
=
ServiceDuelAssistant
.
cardSearchMessage
;
if
(!
isFirstCardSearch
&&
!
currentCardSearchMessage
.
equals
(
ServiceDuelAssistant
.
cardSearchMessage
))
{
currentCardSearchMessage
=
ServiceDuelAssistant
.
cardSearchMessage
;
intentSearch
();
}
}
private
void
intentSearch
(){
private
void
intentSearch
()
{
// intentSearchMessage=getIntent().getStringExtra(CardSearchAcitivity.SEARCH_MESSAGE);
mCardSelector
.
search
(
ServiceDuelAssistant
.
cardSearchMessage
);
}
...
...
@@ -269,7 +269,12 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
mCardDetail
.
setOnCardClickListener
(
new
CardDetail
.
DefaultOnCardClickListener
()
{
@Override
public
void
onOpenUrl
(
Card
cardInfo
)
{
String
uri
=
Constants
.
WIKI_SEARCH_URL
+
String
.
format
(
"%08d"
,
cardInfo
.
Code
);
String
uri
;
if
(
cardInfo
.
Alias
!=
0
)
{
uri
=
Constants
.
WIKI_SEARCH_URL
+
String
.
format
(
"%08d"
,
cardInfo
.
Alias
);
}
else
{
uri
=
Constants
.
WIKI_SEARCH_URL
+
String
.
format
(
"%08d"
,
cardInfo
.
Code
);
}
WebActivity
.
open
(
getContext
(),
cardInfo
.
Name
,
uri
);
}
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivityImpl.java
View file @
01a9e8d8
...
...
@@ -403,7 +403,12 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
mCardDetail
.
setOnCardClickListener
(
new
CardDetail
.
OnCardClickListener
()
{
@Override
public
void
onOpenUrl
(
Card
cardInfo
)
{
String
uri
=
Constants
.
WIKI_SEARCH_URL
+
String
.
format
(
"%08d"
,
cardInfo
.
Code
);
String
uri
;
if
(
cardInfo
.
Alias
!=
0
)
{
uri
=
Constants
.
WIKI_SEARCH_URL
+
String
.
format
(
"%08d"
,
cardInfo
.
Alias
);
}
else
{
uri
=
Constants
.
WIKI_SEARCH_URL
+
String
.
format
(
"%08d"
,
cardInfo
.
Code
);
}
WebActivity
.
open
(
getContext
(),
cardInfo
.
Name
,
uri
);
}
...
...
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