Commit a7c8a321 authored by fallenstardust's avatar fallenstardust

决斗助手1.0.8

parent 3661c67e
...@@ -133,7 +133,7 @@ dependencies { ...@@ -133,7 +133,7 @@ dependencies {
//圆形头像 //圆形头像
implementation 'de.hdodenhof:circleimageview:2.2.0' implementation 'de.hdodenhof:circleimageview:2.2.0'
//决斗助手 //决斗助手
implementation 'com.github.feihuaduo:YGODuelAssistantLib:1.0.7' implementation 'com.github.feihuaduo:YGODuelAssistantLib:1.0.8'
// jsoup HTML parser library @ https://jsoup.org/ // jsoup HTML parser library @ https://jsoup.org/
implementation 'org.jsoup:jsoup:1.15.3' implementation 'org.jsoup:jsoup:1.15.3'
} }
...@@ -280,7 +280,7 @@ public class GameUriManager { ...@@ -280,7 +280,7 @@ public class GameUriManager {
Deck deckInfo = new Deck(uri, mainList, exList, sideList); Deck deckInfo = new Deck(uri, mainList, exList, sideList);
File file = deckInfo.saveTemp(AppsSettings.get().getDeckDir()); File file = deckInfo.saveTemp(AppsSettings.get().getDeckDir());
if (!deckInfo.isCompleteDeck()) { if (!deckInfo.isCompleteDeck()) {
YGOUtil.showTextToast("当前卡组缺少完整信息,将只显示已有卡片"); YGOUtil.showTextToast(activity.getString(R.string.tip_deckInfo_isNot_completeDeck));
} }
startSetting.putExtra(Intent.EXTRA_TEXT, file.getAbsolutePath()); startSetting.putExtra(Intent.EXTRA_TEXT, file.getAbsolutePath());
activity.startActivity(startSetting); activity.startActivity(startSetting);
......
...@@ -516,7 +516,6 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene ...@@ -516,7 +516,6 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
DialogPlus dlg = new DialogPlus(getActivity()); DialogPlus dlg = new DialogPlus(getActivity());
dlg.setMessage(R.string.tip_ygopro_is_running); dlg.setMessage(R.string.tip_ygopro_is_running);
dlg.setLeftButtonListener((d, s) -> { dlg.setLeftButtonListener((d, s) -> {
dlg.dismiss();
if (!TextUtils.isEmpty(password)) { if (!TextUtils.isEmpty(password)) {
SimpleListAdapter simpleListAdapter = new SimpleListAdapter(getContext()); SimpleListAdapter simpleListAdapter = new SimpleListAdapter(getContext());
simpleListAdapter.set(AppsSettings.get().getLastRoomList()); simpleListAdapter.set(AppsSettings.get().getLastRoomList());
...@@ -531,9 +530,9 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene ...@@ -531,9 +530,9 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
AppsSettings.get().setLastRoomList(items); AppsSettings.get().setLastRoomList(items);
simpleListAdapter.notifyDataSetChanged(); simpleListAdapter.notifyDataSetChanged();
} }
dlg.dismiss();
}); });
dlg.show(); dlg.show();
return;
} }
if (id == ID_HOMEFRAGMENT) { if (id == ID_HOMEFRAGMENT) {
quickjoinRoom(host, port, password); quickjoinRoom(host, port, password);
...@@ -582,9 +581,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene ...@@ -582,9 +581,7 @@ public class HomeFragment extends BaseFragemnt implements OnDuelAssistantListene
deckInfo.setCompleteDeck(isCompleteDeck); deckInfo.setCompleteDeck(isCompleteDeck);
File file = deckInfo.saveTemp(AppsSettings.get().getDeckDir()); File file = deckInfo.saveTemp(AppsSettings.get().getDeckDir());
if (!deckInfo.isCompleteDeck()) { if (!deckInfo.isCompleteDeck()) {
YGOUtil.showTextToast(activity.getString(R.string.tip_deckInfo_isNot_completeDeck)); YGOUtil.showTextToast(activity.getString(R.string.tip_deckInfo_isNot_completeDeck));
} }
if (!file.getAbsolutePath().isEmpty()) { if (!file.getAbsolutePath().isEmpty()) {
mBundle.putString("setDeck", file.getAbsolutePath()); mBundle.putString("setDeck", file.getAbsolutePath());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment