Skip to content

Commit 66a4703

Browse files
committed
adapt to api 18
1 parent cbf7c4c commit 66a4703

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ android {
1919
vectorDrawables.useSupportLibrary = true
2020

2121
ndk {
22-
abiFilters 'armeabi-v7a'/*, 'x86' */
22+
abiFilters 'armeabi-v7a'/*, 'x86'*/
2323
}
2424
}
2525
signingConfigs {

app/src/main/kotlin/me/sweetll/tucao/base/BaseActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ abstract class BaseActivity : RxAppCompatActivity() {
3939

4040
fun initStatusBar() {
4141
getStatusBar()?.let {
42-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
42+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
4343
var statusBarHeight = 0
4444
val resourceId = resources.getIdentifier("status_bar_height", "dimen", "android")
4545
if (resourceId > 0) {

app/src/main/kotlin/me/sweetll/tucao/rxdownload/function/DownloadService.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class DownloadService : Service() {
5050

5151
const val ACTION_PAUSE = "pause"
5252
const val ACTION_CANCEL = "cancel"
53-
const val ACTION_VID = "vid"
53+
const val ACTION_URL = "url"
5454
}
5555

5656
val notifyMgr by lazy {
@@ -107,12 +107,12 @@ class DownloadService : Service() {
107107
intent?.let {
108108
when (it.action) {
109109
ACTION_PAUSE -> {
110-
val vid = it.getStringExtra(ACTION_VID)
110+
val vid = it.getStringExtra(ACTION_URL)
111111
pause(vid)
112112
}
113113
ACTION_CANCEL -> {
114-
val vid = it.getStringExtra(ACTION_VID)
115-
DownloadHelpers.cancelDownload(vid)
114+
val vid = it.getStringExtra(ACTION_URL)
115+
DownloadHelpers.cancelDownload()
116116
}
117117
}
118118
}
@@ -396,12 +396,12 @@ class DownloadService : Service() {
396396

397397
val pauseIntent = Intent(this, DownloadService::class.java)
398398
pauseIntent.action = ACTION_PAUSE
399-
pauseIntent.putExtra(ACTION_VID, mission.vid)
399+
pauseIntent.putExtra(ACTION_URL, mission.vid)
400400
val piPause = PendingIntent.getService(this, 0, pauseIntent, PendingIntent.FLAG_UPDATE_CURRENT)
401401

402402
val cancelIntent = Intent(this, DownloadService::class.java)
403403
cancelIntent.action = ACTION_CANCEL
404-
cancelIntent.putExtra(ACTION_VID, mission.vid)
404+
cancelIntent.putExtra(ACTION_URL, mission.vid)
405405
val piCancel = PendingIntent.getService(this, 0, cancelIntent, PendingIntent.FLAG_UPDATE_CURRENT)
406406

407407
val builder = NotificationCompat.Builder(this, PRIMARY_CHANNEL)

changelog.md

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
- 优化:登陆用户名不再限制为邮箱
1010
- 优化:按顺序下载
1111
- 优化:离线视频记录播放位置
12+
- 优化:默认使用硬解码
1213
- 新增:修改个人信息
1314
- 新增:修改密码
1415
- 新增:注册

0 commit comments

Comments
 (0)