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
70364578
Commit
70364578
authored
Sep 22, 2021
by
fallenstardust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
arrange code
parent
e406a7f9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
30 deletions
+30
-30
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardFavorites.java
...main/java/cn/garymb/ygomobile/ui/cards/CardFavorites.java
+1
-1
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivity.java
...ava/cn/garymb/ygomobile/ui/cards/DeckManagerActivity.java
+29
-29
No files found.
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardFavorites.java
View file @
70364578
...
@@ -46,7 +46,7 @@ public class CardFavorites {
...
@@ -46,7 +46,7 @@ public class CardFavorites {
return
false
;
return
false
;
}
}
public
boolean
hasCard
(
Integer
id
){
public
boolean
hasCard
(
Integer
id
)
{
return
mList
.
contains
(
id
);
return
mList
.
contains
(
id
);
}
}
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerActivity.java
View file @
70364578
...
@@ -157,9 +157,9 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
...
@@ -157,9 +157,9 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
$
(
R
.
id
.
btn_nav_list
).
setOnClickListener
((
v
)
->
doMenu
(
R
.
id
.
action_card_list
));
$
(
R
.
id
.
btn_nav_list
).
setOnClickListener
((
v
)
->
doMenu
(
R
.
id
.
action_card_list
));
//
//
final
File
_file
;
final
File
_file
;
//
打开指定卡组
//
打开指定卡组
if
(!
TextUtils
.
isEmpty
(
preLoadFile
)
&&
(
mPreLoadFile
=
new
File
(
preLoadFile
)).
exists
())
{
if
(!
TextUtils
.
isEmpty
(
preLoadFile
)
&&
(
mPreLoadFile
=
new
File
(
preLoadFile
)).
exists
())
{
//
外面卡组
//
外面卡组
_file
=
mPreLoadFile
;
_file
=
mPreLoadFile
;
}
else
{
}
else
{
mPreLoadFile
=
null
;
mPreLoadFile
=
null
;
...
@@ -167,7 +167,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
...
@@ -167,7 +167,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
if
(
TextUtils
.
isEmpty
(
path
)){
if
(
TextUtils
.
isEmpty
(
path
)){
_file
=
null
;
_file
=
null
;
}
else
{
}
else
{
//
最后卡组
//
最后卡组
_file
=
new
File
(
path
);
_file
=
new
File
(
path
);
}
}
}
}
...
@@ -260,13 +260,13 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
...
@@ -260,13 +260,13 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
DialogPlus
dlg
=
DialogPlus
.
show
(
this
,
null
,
getString
(
R
.
string
.
loading
));
DialogPlus
dlg
=
DialogPlus
.
show
(
this
,
null
,
getString
(
R
.
string
.
loading
));
VUiKit
.
defer
().
when
(()
->
{
VUiKit
.
defer
().
when
(()
->
{
DataManager
.
get
().
load
(
true
);
DataManager
.
get
().
load
(
true
);
//
默认第一个卡表
//
默认第一个卡表
if
(
mLimitManager
.
getCount
()
>
0
)
{
if
(
mLimitManager
.
getCount
()
>
0
)
{
mCardLoader
.
setLimitList
(
mLimitManager
.
getTopLimit
());
mCardLoader
.
setLimitList
(
mLimitManager
.
getTopLimit
());
}
}
File
file
=
ydk
;
File
file
=
ydk
;
if
(
file
==
null
||
!
file
.
exists
())
{
if
(
file
==
null
||
!
file
.
exists
())
{
//
当默认卡组不存在的时候
//
当默认卡组不存在的时候
List
<
File
>
files
=
getYdkFiles
();
List
<
File
>
files
=
getYdkFiles
();
if
(
files
!=
null
&&
files
.
size
()
>
0
)
{
if
(
files
!=
null
&&
files
.
size
()
>
0
)
{
file
=
files
.
get
(
0
);
file
=
files
.
get
(
0
);
...
@@ -288,15 +288,15 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
...
@@ -288,15 +288,15 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
mCardSelector
.
initItems
();
mCardSelector
.
initItems
();
initLimitListSpinners
(
mLimitSpinner
,
mCardLoader
.
getLimitList
());
initLimitListSpinners
(
mLimitSpinner
,
mCardLoader
.
getLimitList
());
initDecksListSpinners
(
mDeckSpinner
,
rs
.
source
);
initDecksListSpinners
(
mDeckSpinner
,
rs
.
source
);
//
设置当前卡组
//
设置当前卡组
setCurDeck
(
rs
);
setCurDeck
(
rs
);
//
设置收藏夹
//
设置收藏夹
mCardSelector
.
showFavorites
(
false
);
mCardSelector
.
showFavorites
(
false
);
});
});
}
}
/**
/**
*
设置当前卡组
*
设置当前卡组
*/
*/
private
void
setCurDeck
(
DeckInfo
deckInfo
)
{
private
void
setCurDeck
(
DeckInfo
deckInfo
)
{
if
(
deckInfo
==
null
)
{
if
(
deckInfo
==
null
)
{
...
@@ -307,7 +307,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
...
@@ -307,7 +307,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
String
name
=
IOUtils
.
tirmName
(
file
.
getName
(),
Constants
.
YDK_FILE_EX
);
String
name
=
IOUtils
.
tirmName
(
file
.
getName
(),
Constants
.
YDK_FILE_EX
);
setActionBarSubTitle
(
name
);
setActionBarSubTitle
(
name
);
// if (inDeckDir(file)) {
// if (inDeckDir(file)) {
//
记住最后打开的卡组
//
记住最后打开的卡组
mSettings
.
setLastDeckPath
(
file
.
getAbsolutePath
());
mSettings
.
setLastDeckPath
(
file
.
getAbsolutePath
());
tv_deck
.
setText
(
name
);
tv_deck
.
setText
(
name
);
...
@@ -383,7 +383,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
...
@@ -383,7 +383,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
@Override
@Override
public
void
onItemDoubleClick
(
View
view
,
int
pos
)
{
public
void
onItemDoubleClick
(
View
view
,
int
pos
)
{
//
拖拽中,就不显示
//
拖拽中,就不显示
if
(
isShowDrawer
())
{
if
(
isShowDrawer
())
{
return
;
return
;
}
}
...
@@ -627,7 +627,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
...
@@ -627,7 +627,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
// mDeckAdapater.notifyDataSetChanged();
// mDeckAdapater.notifyDataSetChanged();
// break;
// break;
case
R
.
id
.
action_search
:
case
R
.
id
.
action_search
:
//
弹条件对话框
//
弹条件对话框
showSearch
(
true
);
showSearch
(
true
);
break
;
break
;
case
R
.
id
.
action_card_list
:
case
R
.
id
.
action_card_list
:
...
@@ -642,7 +642,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
...
@@ -642,7 +642,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
break
;
break
;
case
R
.
id
.
action_save
:
case
R
.
id
.
action_save
:
if
(
mPreLoadFile
!=
null
&&
mPreLoadFile
==
mDeckAdapater
.
getYdkFile
())
{
if
(
mPreLoadFile
!=
null
&&
mPreLoadFile
==
mDeckAdapater
.
getYdkFile
())
{
//
需要保存到deck文件夹
//
需要保存到deck文件夹
inputDeckName
(
mPreLoadFile
,
null
,
true
);
inputDeckName
(
mPreLoadFile
,
null
,
true
);
}
else
{
}
else
{
if
(
mDeckAdapater
.
getYdkFile
()
==
null
)
{
if
(
mDeckAdapater
.
getYdkFile
()
==
null
)
{
...
@@ -709,7 +709,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
...
@@ -709,7 +709,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
}
}
break
;
break
;
case
R
.
id
.
action_unsort
:
case
R
.
id
.
action_unsort
:
//
打乱
//
打乱
mDeckAdapater
.
unSort
();
mDeckAdapater
.
unSort
();
break
;
break
;
case
R
.
id
.
action_sort
:
case
R
.
id
.
action_sort
:
...
@@ -729,7 +729,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
...
@@ -729,7 +729,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
builder
.
setMessageGravity
(
Gravity
.
CENTER_HORIZONTAL
);
builder
.
setMessageGravity
(
Gravity
.
CENTER_HORIZONTAL
);
builder
.
setLeftButtonListener
((
dlg
,
rs
)
->
{
builder
.
setLeftButtonListener
((
dlg
,
rs
)
->
{
dlg
.
dismiss
();
dlg
.
dismiss
();
//
复制当前卡组
//
复制当前卡组
inputDeckName
(
old
,
savePath
,
true
);
inputDeckName
(
old
,
savePath
,
true
);
});
});
builder
.
setRightButtonListener
((
dlg
,
rs
)
->
{
builder
.
setRightButtonListener
((
dlg
,
rs
)
->
{
...
@@ -757,11 +757,11 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
...
@@ -757,11 +757,11 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
builderShareLoading
.
setMessage
(
R
.
string
.
Pre_share
);
builderShareLoading
.
setMessage
(
R
.
string
.
Pre_share
);
builderShareLoading
.
show
();
builderShareLoading
.
show
();
//
先排序
//
先排序
// mDeckAdapater.sort();
// mDeckAdapater.sort();
//
保存
//
保存
// if (mPreLoadFile != null && mPreLoadFile == mDeckAdapater.getYdkFile()) {
// if (mPreLoadFile != null && mPreLoadFile == mDeckAdapater.getYdkFile()) {
// //
需要保存到deck文件夹
// //
需要保存到deck文件夹
// inputDeckName(mPreLoadFile, null, true);
// inputDeckName(mPreLoadFile, null, true);
// } else {
// } else {
// if (mDeckAdapater.getYdkFile() == null) {
// if (mDeckAdapater.getYdkFile() == null) {
...
@@ -770,27 +770,27 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
...
@@ -770,27 +770,27 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
// save(mDeckAdapater.getYdkFile());
// save(mDeckAdapater.getYdkFile());
// }
// }
// }
// }
// //
保存成功后重新加载卡组
// //
保存成功后重新加载卡组
// File file = getSelectDeck(mDeckSpinner);
// File file = getSelectDeck(mDeckSpinner);
// if (file != null) {
// if (file != null) {
// loadDeckFromFile(file);
// loadDeckFromFile(file);
// }
// }
//
延时半秒,使整体看起来更流畅
//
延时半秒,使整体看起来更流畅
new
Handler
().
postDelayed
(
this
::
shareDeck1
,
500
);
new
Handler
().
postDelayed
(
this
::
shareDeck1
,
500
);
}
}
private
void
shareDeck1
()
{
private
void
shareDeck1
()
{
//
开启绘图缓存
//
开启绘图缓存
mRecyclerView
.
setDrawingCacheEnabled
(
true
);
mRecyclerView
.
setDrawingCacheEnabled
(
true
);
//
这个方法可调可不调,因为在getDrawingCache()里会自动判断有没有缓存有没有准备好,
//
这个方法可调可不调,因为在getDrawingCache()里会自动判断有没有缓存有没有准备好,
//
如果没有,会自动调用
buildDrawingCache()
//
如果没有,会自动调用build
DrawingCache()
mRecyclerView
.
buildDrawingCache
();
mRecyclerView
.
buildDrawingCache
();
//
获取绘图缓存 这里直接创建了一个新的b
itmap
//
获取绘图缓存 这里直接创建了一个新的bitmap
//
因为我们在最后需要释放缓存资源,会释放掉缓存中创建的bitmap对象
//
因为我们在最后需要释放缓存资源,会释放掉缓存中创建的bitmap对象
Bitmap
bitmap
=
BitmapUtil
.
drawBg4Bitmap
(
Color
.
parseColor
(
"#e6f3fd"
),
Bitmap
.
createBitmap
(
mRecyclerView
.
getDrawingCache
(),
0
,
0
,
mRecyclerView
.
getMeasuredWidth
(),
Bitmap
bitmap
=
BitmapUtil
.
drawBg4Bitmap
(
Color
.
parseColor
(
"#e6f3fd"
),
Bitmap
.
createBitmap
(
mRecyclerView
.
getDrawingCache
(),
0
,
0
,
mRecyclerView
.
getMeasuredWidth
(),
mRecyclerView
.
getMeasuredHeight
()));
mRecyclerView
.
getMeasuredHeight
()));
//
清理绘图缓存,释放资源
//
清理绘图缓存,释放资源
mRecyclerView
.
destroyDrawingCache
();
mRecyclerView
.
destroyDrawingCache
();
// shotRecyclerView(mRecyclerView)
// shotRecyclerView(mRecyclerView)
...
@@ -817,7 +817,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
...
@@ -817,7 +817,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
stopService
(
new
Intent
(
this
,
DuelAssistantService
.
class
));
stopService
(
new
Intent
(
this
,
DuelAssistantService
.
class
));
YGOUtil
.
copyMessage
(
this
,
et_code
.
getText
().
toString
().
trim
());
YGOUtil
.
copyMessage
(
this
,
et_code
.
getText
().
toString
().
trim
());
showToast
(
getString
(
R
.
string
.
deck_text_copyed
));
showToast
(
getString
(
R
.
string
.
deck_text_copyed
));
//
复制完毕开启决斗助手
//
复制完毕开启决斗助手
YGOUtil
.
startDuelService
(
this
);
YGOUtil
.
startDuelService
(
this
);
});
});
...
@@ -844,7 +844,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
...
@@ -844,7 +844,7 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
});
});
//
复制前关闭决斗助手
//
复制前关闭决斗助手
// String label = TextUtils.isEmpty(deck.getName()) ? getString(R.string.share_deck) : deck.getName();
// String label = TextUtils.isEmpty(deck.getName()) ? getString(R.string.share_deck) : deck.getName();
...
@@ -1075,9 +1075,9 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
...
@@ -1075,9 +1075,9 @@ public class DeckManagerActivity extends BaseCardsActivity implements RecyclerVi
addMenuButton
(
mMenuIds
,
menu
,
R
.
id
.
action_sort
,
R
.
string
.
sort
,
R
.
drawable
.
sort
);
addMenuButton
(
mMenuIds
,
menu
,
R
.
id
.
action_sort
,
R
.
string
.
sort
,
R
.
drawable
.
sort
);
addMenuButton
(
mMenuIds
,
menu
,
R
.
id
.
action_deck_backup_n_restore
,
R
.
string
.
deck_backup_n_restore
,
R
.
drawable
.
downloadimages
);
addMenuButton
(
mMenuIds
,
menu
,
R
.
id
.
action_deck_backup_n_restore
,
R
.
string
.
deck_backup_n_restore
,
R
.
drawable
.
downloadimages
);
//
设置展开或隐藏的延时。 默认值为 800ms。
//
设置展开或隐藏的延时。 默认值为 800ms。
menu
.
setDuration
(
150
);
menu
.
setDuration
(
150
);
//
设置每两个子按钮之间动画的延时(ms为单位)。 比如,如果延时设为0,那么所有子按钮都会同时展开或隐藏,默认值为100ms。
//
设置每两个子按钮之间动画的延时(ms为单位)。 比如,如果延时设为0,那么所有子按钮都会同时展开或隐藏,默认值为100ms。
menu
.
setDelay
(
10
);
menu
.
setDelay
(
10
);
menu
.
setOnBoomListener
(
new
DefaultOnBoomListener
()
{
menu
.
setOnBoomListener
(
new
DefaultOnBoomListener
()
{
...
...
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