From 9df26b94c7040e84b21180f82ccdda0c22cccd12 Mon Sep 17 00:00:00 2001 From: seven332 Date: Wed, 10 Sep 2014 13:16:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=B7=BB=E5=8A=A0=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E5=81=9C=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- res/drawable-hdpi/ic_clear2.png | Bin 0 -> 829 bytes res/drawable-mdpi/ic_clear2.png | Bin 0 -> 487 bytes res/drawable-xhdpi/ic_clear2.png | Bin 0 -> 974 bytes res/drawable-xxhdpi/ic_clear2.png | Bin 0 -> 1609 bytes res/values-zh-rCN/strings.xml | 1 + res/values/strings.xml | 1 + .../hippo/ehviewer/service/DownloadService.java | 15 +++++++++++++-- 7 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 res/drawable-hdpi/ic_clear2.png create mode 100644 res/drawable-mdpi/ic_clear2.png create mode 100644 res/drawable-xhdpi/ic_clear2.png create mode 100644 res/drawable-xxhdpi/ic_clear2.png diff --git a/res/drawable-hdpi/ic_clear2.png b/res/drawable-hdpi/ic_clear2.png new file mode 100644 index 0000000000000000000000000000000000000000..707c1b7d3d609614082495dcc395f9dcc2853928 GIT binary patch literal 829 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注意 开始 停止 + 全部停止 无效的输入 不再显示 重试 diff --git a/res/values/strings.xml b/res/values/strings.xml index 763e439f1..30a125674 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -355,6 +355,7 @@ Attention Start Stop + Stop all Invalid Input Never show me this dialog Retry diff --git a/src/com/hippo/ehviewer/service/DownloadService.java b/src/com/hippo/ehviewer/service/DownloadService.java index 6847100e4..1108ebb11 100644 --- a/src/com/hippo/ehviewer/service/DownloadService.java +++ b/src/com/hippo/ehviewer/service/DownloadService.java @@ -43,6 +43,7 @@ public class DownloadService extends Service public static final String ACTION_UPDATE = "com.hippo.ehviewer.service.DownloadService.UPDATE"; public static final String ACTION_STOP = "com.hippo.ehviewer.service.DownloadService.STOP"; + public static final String ACTION_STOP_ALL = "com.hippo.ehviewer.service.DownloadService.STOP_ALL"; private Context mContext; private Data mData; @@ -70,8 +71,13 @@ public class DownloadService extends Service @Override public int onStartCommand(Intent intent, int flags, int startId) { - if (ACTION_STOP.equals(intent.getAction())) + if (ACTION_STOP.equals(intent.getAction())) { stopCurrentTask(); + mNotifyManager.cancel(DOWNLOAD_NOTIFY_ID); + } else if (ACTION_STOP_ALL.equals(intent.getAction())) { + stopAll(); + mNotifyManager.cancel(DOWNLOAD_NOTIFY_ID); + } return START_NOT_STICKY; } @@ -235,7 +241,12 @@ public class DownloadService extends Service Intent stopIntent = new Intent(this, DownloadService.class); stopIntent.setAction(ACTION_STOP); PendingIntent piStop = PendingIntent.getService(this, 0, stopIntent, 0); - mBuilder.addAction(R.drawable.ic_clear, getString(R.string.stop), piStop); + mBuilder.addAction(R.drawable.ic_clear2, getString(R.string.stop), piStop); + + Intent stopAllIntent = new Intent(this, DownloadService.class); + stopAllIntent.setAction(ACTION_STOP_ALL); + PendingIntent piStopAll = PendingIntent.getService(this, 0, stopAllIntent, 0); + mBuilder.addAction(R.drawable.ic_clear, getString(R.string.stop_all), piStopAll); } @Override