yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add change download label

Browse Source
This commit is contained in:
seven332 committed 2016-02-28 01:05:15 +08:00
1 parent f47c09deda
commit ab9edf1cf7
12 files changed
+169 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/ehviewer/download/DownloadManager.java
+58 -1
View File
@@ -30,8 +30,11 @@ import com.hippo.ehviewer.spider.SpiderQueen;
import com.hippo.image.Image;
import com.hippo.yorozuya.ConcurrentPool;
import com.hippo.yorozuya.IntList;
import com.hippo.yorozuya.ObjectUtils;
import com.hippo.yorozuya.SimpleHandler;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
@@ -519,7 +522,7 @@ public class DownloadManager implements SpiderQueen.OnSpiderListener {
// Two way
if (gidList.size() < mWaitList.size()) {
for (int i = 0, n = gidList.size(); i < n; i++) {
DownloadInfo info = stopDownloadInternal(gidList.get(i));
stopDownloadInternal(gidList.get(i));
}
} else {
// Check current task
@@ -543,6 +546,51 @@ public class DownloadManager implements SpiderQueen.OnSpiderListener {
}
}
/**
* @param label Not allow new label
*/
public void changeLabel(List<DownloadInfo> list, String label) {
if (null != label && !containLabel(label)) {
Log.e(TAG, "Not exits label: " + label);
return;
}
List<DownloadInfo> dstList = getInfoListForLabel(label);
if (dstList == null) {
Log.e(TAG, "Can't find label with label: " + label);
return;
}
boolean changed = false;
for (DownloadInfo info: list) {
if (ObjectUtils.equal(info.label, label)) {
continue;
}
List<DownloadInfo> srcList = getInfoListForLabel(info.label);
if (srcList == null) {
Log.e(TAG, "Can't find label with label: " + info.label);
continue;
}
srcList.remove(info);
dstList.add(info);
info.label = label;
// TODO Other comparator
Collections.sort(dstList, sDateAscComparator);
// Save to DB
EhDB.updateDownloadInfo(info);
changed = true;
}
if (changed && mDownloadInfoListener != null) {
mDownloadInfoListener.onReload();
}
}
boolean isIdle() {
return mCurrentTask == null && mWaitList.isEmpty();
}
@@ -825,6 +873,13 @@ public class DownloadManager implements SpiderQueen.OnSpiderListener {
}
}
private static Comparator<DownloadInfo> sDateAscComparator = new Comparator<DownloadInfo>() {
@Override
public int compare(DownloadInfo lhs, DownloadInfo rhs) {
return lhs.date - rhs.date > 0 ? 1 : -1;
}
};
public interface DownloadInfoListener {
void onAdd(DownloadInfo info, List<DownloadInfo> list, int position);
@@ -836,6 +891,8 @@ public class DownloadManager implements SpiderQueen.OnSpiderListener {
void onReload();
void onRemove(DownloadInfo info, List<DownloadInfo> list, int position);
void onUpdateLabels();
}
public interface DownloadListener {
app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
+6
View File
@@ -211,6 +211,12 @@ public final class MainActivity extends StageActivity
}
}
public void openDrawer(int drawerGravity) {
if (mDrawerLayout != null) {
mDrawerLayout.openDrawer(drawerGravity);
}
}
public void closeDrawer(int drawerGravity) {
if (mDrawerLayout != null) {
mDrawerLayout.closeDrawer(drawerGravity);
app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.java
+7
View File
@@ -38,6 +38,13 @@ public class BaseScene extends SceneFragment {
}
}
public void openDrawer(int drawerGravity) {
FragmentActivity activity = getActivity();
if (activity instanceof MainActivity) {
((MainActivity) activity).openDrawer(drawerGravity);
}
}
public void closeDrawer(int drawerGravity) {
FragmentActivity activity = getActivity();
if (activity instanceof MainActivity) {
app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadScene.java
+87 -25
View File
@@ -29,6 +29,7 @@ import android.support.annotation.Nullable;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
@@ -103,9 +104,6 @@ public class DownloadScene extends ToolbarScene
@Nullable
private List<DownloadInfo> mList;
private final IntList mTempIntList = new IntList();
private final List<GalleryInfo> mTempGalleryInfoList = new LinkedList<>();
// TODO Only single instance
@Override
public int getLaunchMode() {
@@ -137,6 +135,11 @@ public class DownloadScene extends ToolbarScene
mList = manager.getDefaultDownloadInfoList();
}
}
if (mAdapter != null) {
mAdapter.notifyDataSetChanged();
}
updateTitle();
Settings.putRecentDownloadLabel(mLabel);
}
@@ -251,6 +254,9 @@ public class DownloadScene extends ToolbarScene
getActivity().startService(intent);
return true;
}
case R.id.action_label: {
openDrawer(Gravity.RIGHT);
}
}
return false;
}
@@ -405,16 +411,36 @@ public class DownloadScene extends ToolbarScene
return;
}
IntList gidList = null;
List<GalleryInfo> galleryInfoList = null;
List<DownloadInfo> downloadInfoList = null;
boolean collectGid = position == 1 || position == 2 || position == 3; // Start, Stop, Delete
boolean collectGalleryInfo = position == 3; // Delete
boolean collectDownloadInfo = position == 4; // Move
if (collectGid) {
gidList = new IntList();
}
if (collectGalleryInfo) {
galleryInfoList = new LinkedList<>();
}
if (collectDownloadInfo) {
downloadInfoList = new LinkedList<>();
}
SparseBooleanArray stateArray = recyclerView.getCheckedItemPositions();
for (int i = 0, n = stateArray.size(); i < n; i++) {
if (stateArray.valueAt(i)) {
GalleryInfo gi = list.get(stateArray.keyAt(i)).galleryInfo;
DownloadInfo info = list.get(stateArray.keyAt(i));
if (collectDownloadInfo) {
downloadInfoList.add(info);
}
GalleryInfo gi = info.galleryInfo;
if (collectGalleryInfo) {
mTempGalleryInfoList.add(gi);
galleryInfoList.add(gi);
}
if (collectGid) {
gidList.add(gi.gid);
}
mTempIntList.add(gi.gid);
}
}
@@ -422,10 +448,8 @@ public class DownloadScene extends ToolbarScene
case 1: { // Start
Intent intent = new Intent(getActivity(), DownloadService.class);
intent.setAction(DownloadService.ACTION_START_RANGE);
intent.putExtra(DownloadService.KEY_GID_LIST, mTempIntList);
intent.putExtra(DownloadService.KEY_GID_LIST, gidList);
getActivity().startService(intent);
// Clear
mTempIntList.clear();
// Cancel check mode
recyclerView.outOfCustomChoiceMode();
break;
@@ -433,29 +457,41 @@ public class DownloadScene extends ToolbarScene
case 2: { // Stop
Intent intent = new Intent(getActivity(), DownloadService.class);
intent.setAction(DownloadService.ACTION_STOP_RANGE);
intent.putExtra(DownloadService.KEY_GID_LIST, mTempIntList);
intent.putExtra(DownloadService.KEY_GID_LIST, gidList);
getActivity().startService(intent);
// Clear
mTempIntList.clear();
// Cancel check mode
recyclerView.outOfCustomChoiceMode();
break;
}
case 3: // Delete
case 3: { // Delete
CheckBoxDialogBuilder builder = new CheckBoxDialogBuilder(getContext(),
getString(R.string.download_remove_dialog_message_2, mTempIntList.size()),
getString(R.string.download_remove_dialog_message_2, gidList.size()),
getString(R.string.download_remove_dialog_check_text),
Settings.getRemoveImageFiles());
DeleteRangeDialogHelper helper = new DeleteRangeDialogHelper(
mTempGalleryInfoList, mTempIntList, builder);
galleryInfoList, gidList, builder);
builder.setTitle(R.string.download_remove_dialog_title)
.setPositiveButton(android.R.string.ok, helper)
.setOnDismissListener(helper)
.show();
break;
case 4: // Move
// TODO
}
case 4: {// Move
List<DownloadLabelRaw> labelRawList = EhApplication.getDownloadManager(getContext()).getLabelList();
List<String> labelList = new ArrayList<>(labelRawList.size() + 1);
labelList.add(getString(R.string.default_download_label_name));
for (int i = 0, n = labelRawList.size(); i < n; i++) {
labelList.add(labelRawList.get(i).getLabel());
}
String[] labels = labelList.toArray(new String[labelList.size()]);
MoveDialogHelper helper = new MoveDialogHelper(labels, downloadInfoList);
new AlertDialog.Builder(getContext())
.setTitle(R.string.download_move_dialog_title)
.setItems(labels, helper)
.show();
break;
}
}
}
}
@@ -545,6 +581,11 @@ public class DownloadScene extends ToolbarScene
}
}
@Override
public void onUpdateLabels() {
// TODO
}
private void bindForState(DownloadHolder holder, DownloadInfo info) {
switch (info.state) {
case DownloadInfo.STATE_NONE:
@@ -656,8 +697,7 @@ public class DownloadScene extends ToolbarScene
}
}
private class DeleteRangeDialogHelper implements DialogInterface.OnClickListener,
DialogInterface.OnDismissListener {
private class DeleteRangeDialogHelper implements DialogInterface.OnClickListener {
private final List<GalleryInfo> mGalleryInfoList;
private final IntList mGidList;
@@ -676,6 +716,11 @@ public class DownloadScene extends ToolbarScene
return;
}
// Cancel check mode
if (mRecyclerView != null) {
mRecyclerView.outOfCustomChoiceMode();
}
// Delete
Intent intent = new Intent(getActivity(), DownloadService.class);
intent.setAction(DownloadService.ACTION_DELETE_RANGE);
@@ -698,17 +743,33 @@ public class DownloadScene extends ToolbarScene
// Delete file
deleteFileAsync(files);
}
}
}
private class MoveDialogHelper implements DialogInterface.OnClickListener {
private final String[] mLabels;
private final List<DownloadInfo> mDownloadInfoList;
public MoveDialogHelper(String[] labels, List<DownloadInfo> downloadInfoList) {
mLabels = labels;
mDownloadInfoList = downloadInfoList;
}
@Override
public void onClick(DialogInterface dialog, int which) {
// Cancel check mode
if (mRecyclerView != null) {
mRecyclerView.outOfCustomChoiceMode();
}
}
@Override
public void onDismiss(DialogInterface dialog) {
mGalleryInfoList.clear();
mGidList.clear();
String label;
if (which == 0) {
label = null;
} else {
label = mLabels[which];
}
EhApplication.getDownloadManager(getContext()).changeLabel(mDownloadInfoList, label);
}
}
@@ -743,6 +804,7 @@ public class DownloadScene extends ToolbarScene
percent = (TextView) itemView.findViewById(R.id.percent);
speed = (TextView) itemView.findViewById(R.id.speed);
// TODO cancel on click listener when select items
thumb.setOnClickListener(this);
start.setOnClickListener(this);
stop.setOnClickListener(this);