Commit 873fdab8 authored by feihuaduo's avatar feihuaduo

分享排序后保存

parent 6013a9c3
...@@ -588,10 +588,10 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView ...@@ -588,10 +588,10 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
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, true); inputDeckName(mPreLoadFile, true,true);
} else { } else {
if (mDeckAdapater.getYdkFile() == null) { if (mDeckAdapater.getYdkFile() == null) {
inputDeckName(null, true); inputDeckName(null, true,true);
} else { } else {
save(mDeckAdapater.getYdkFile()); save(mDeckAdapater.getYdkFile());
} }
...@@ -605,7 +605,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView ...@@ -605,7 +605,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
// } // }
// break; // break;
case R.id.action_rename: case R.id.action_rename:
inputDeckName(mDeckAdapater.getYdkFile(), false); inputDeckName(mDeckAdapater.getYdkFile(), false,true);
break; break;
case R.id.action_deck_new: { case R.id.action_deck_new: {
final File old = mDeckAdapater.getYdkFile(); final File old = mDeckAdapater.getYdkFile();
...@@ -616,17 +616,17 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView ...@@ -616,17 +616,17 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
builder.setLeftButtonListener((dlg, rs) -> { builder.setLeftButtonListener((dlg, rs) -> {
dlg.dismiss(); dlg.dismiss();
//复制当前卡组 //复制当前卡组
inputDeckName(old, true); inputDeckName(old, true,true);
}); });
builder.setRightButtonListener((dlg, rs) -> { builder.setRightButtonListener((dlg, rs) -> {
dlg.dismiss(); dlg.dismiss();
setCurDeck(null); setCurDeck(null);
inputDeckName(null, true); inputDeckName(null, true,true);
}); });
builder.setOnCloseLinster((dlg) -> { builder.setOnCloseLinster((dlg) -> {
dlg.dismiss(); dlg.dismiss();
setCurDeck(null); setCurDeck(null);
inputDeckName(null, true); inputDeckName(null, true,true);
}); });
builder.show(); builder.show();
} }
...@@ -693,6 +693,17 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView ...@@ -693,6 +693,17 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
//先排序 //先排序
mDeckAdapater.sort(); mDeckAdapater.sort();
//保存
if (mPreLoadFile != null && mPreLoadFile == mDeckAdapater.getYdkFile()) {
//需要保存到deck文件夹
inputDeckName(mPreLoadFile, true,false);
} else {
if (mDeckAdapater.getYdkFile() == null) {
inputDeckName(null, true,false);
} else {
save(mDeckAdapater.getYdkFile());
}
}
//延时一秒,等排好序再分享 //延时一秒,等排好序再分享
new Handler().postDelayed(new Runnable() { new Handler().postDelayed(new Runnable() {
@Override @Override
...@@ -899,7 +910,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView ...@@ -899,7 +910,7 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
}); });
} }
private void inputDeckName(File oldYdk, boolean keepOld) { private void inputDeckName(File oldYdk, boolean keepOld,boolean isToastSave) {
DialogPlus builder = new DialogPlus(this); DialogPlus builder = new DialogPlus(this);
// AlertDialog.Builder builder = new AlertDialog.Builder(this); // AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.intpu_name); builder.setTitle(R.string.intpu_name);
...@@ -942,7 +953,8 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView ...@@ -942,7 +953,8 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
} catch (IOException e) { } catch (IOException e) {
} }
initDecksListSpinners(mDeckSpinner, ydk); initDecksListSpinners(mDeckSpinner, ydk);
save(ydk); if(isToastSave)
save(ydk);
loadDeckFromFile(ydk); loadDeckFromFile(ydk);
} }
} else { } else {
......
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