diff --git a/README.md b/README.md
index b8477f47..fa2a841c 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,17 @@
## 更新日志
+### v1.6.6（通用）
+
+* 更新重庆卫视图标
+* 凤凰卫视增强画质
+* 凤凰卫视增加EPG
+
+### v1.6.5（安卓5及以上专用）
+
+* 增加CETV1图标
+* 稳定性提升
+
### v1.6.4（通用）
* 增加CETV1
@@ -222,6 +233,7 @@ adb install my-tv.apk
* 节目增加预告
* 频道列表优化
* 自动更新
+* 時間
## 赞赏
diff --git a/app/build.gradle b/app/build.gradle
index 12e10ad2..1bf5012d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -54,7 +54,7 @@ android {
}
kotlinOptions {
- jvmTarget=17
+ jvmTarget = 17
}
// Encapsulates your external native build configurations.
@@ -71,9 +71,14 @@ android {
static def VersionCode() {
try {
- def process = 'git rev-list --count HEAD'.execute()
+ def p = "git describe --tags --always"
+ def process = p.execute()
process.waitFor()
- return process.text.toInteger()
+ def replace = [v: "", ".": " ", "-": " "]
+ def arr = (process.text.trim().replace(replace) + " 0").split(" ")
+ def versionCode = arr[0].toInteger() * 16777216 + arr[1].toInteger() * 65536 + arr[2].toInteger() * 256 + arr[3].toInteger()
+ println("VersionCode $versionCode")
+ return versionCode
} catch (ignored) {
return 0
}
@@ -81,7 +86,7 @@ static def VersionCode() {
static def VersionName() {
try {
- def process = 'git describe --tags --always'.execute()
+ def process = "git describe --tags --always".execute()
process.waitFor()
return process.text.trim() - "v"
} catch (ignored) {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3bb6bc5c..3dbaa932 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
android:name="android.software.leanback"
android:required="true" />
+
? = null
private var callAuth: Call? = null
private var callInfo: Call? = null
- private var fAuth: Call? = null
+ private var callFAuth: Call? = null
private var callPage: Call? = null
private fun cancelCall() {
call?.cancel()
callAuth?.cancel()
callInfo?.cancel()
- fAuth?.cancel()
+ callFAuth?.cancel()
callPage?.cancel()
}
@@ -91,7 +91,6 @@ object Request {
val data = YSP.getAuthData(tvModel)
val request = AuthRequest(data)
callAuth = request.let { yspApiService.getAuth("guid=${YSP.getGuid()}; $cookie", it) }
-
callAuth?.enqueue(object : Callback {
override fun onResponse(call: Call, response: Response) {
if (response.isSuccessful) {
@@ -106,12 +105,12 @@ object Request {
if (tvModel.retryTimes < tvModel.retryMaxTimes) {
tvModel.retryTimes++
if (tvModel.getTV().needToken) {
- if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+ if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
if (!tvModel.getTV().mustToken) {
fetchAuth(tvModel, cookie)
}
} else {
- token = ""
+ tvModel.needGetToken = true
fetchAuth(tvModel)
}
} else {
@@ -124,12 +123,12 @@ object Request {
if (tvModel.retryTimes < tvModel.retryMaxTimes) {
tvModel.retryTimes++
if (tvModel.getTV().needToken) {
- if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+ if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
if (!tvModel.getTV().mustToken) {
fetchAuth(tvModel, cookie)
}
} else {
- token = ""
+ tvModel.needGetToken = true
fetchAuth(tvModel)
}
} else {
@@ -144,12 +143,12 @@ object Request {
if (tvModel.retryTimes < tvModel.retryMaxTimes) {
tvModel.retryTimes++
if (tvModel.getTV().needToken) {
- if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+ if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
if (!tvModel.getTV().mustToken) {
fetchAuth(tvModel, cookie)
}
} else {
- token = ""
+ tvModel.needGetToken = true
fetchAuth(tvModel)
}
} else {
@@ -212,13 +211,13 @@ object Request {
if (tvModel.retryTimes < tvModel.retryMaxTimes) {
tvModel.retryTimes++
if (tvModel.getTV().needToken) {
- if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+ if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
if (!tvModel.getTV().mustToken) {
fetchVideo(tvModel, cookie)
// fetchAuth(tvModel, cookie)
}
} else {
- token = ""
+ tvModel.needGetToken = true
fetchVideo(tvModel)
// fetchAuth(tvModel)
}
@@ -237,13 +236,13 @@ object Request {
if (tvModel.retryTimes < tvModel.retryMaxTimes) {
tvModel.retryTimes++
if (tvModel.getTV().needToken) {
- if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+ if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
if (!tvModel.getTV().mustToken) {
fetchVideo(tvModel, cookie)
// fetchAuth(tvModel, cookie)
}
} else {
- token = ""
+ tvModel.needGetToken = true
fetchVideo(tvModel)
// fetchAuth(tvModel)
}
@@ -259,13 +258,13 @@ object Request {
if (tvModel.retryTimes < tvModel.retryMaxTimes) {
tvModel.retryTimes++
if (tvModel.getTV().needToken) {
- if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+ if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
if (!tvModel.getTV().mustToken) {
fetchVideo(tvModel, cookie)
// fetchAuth(tvModel, cookie)
}
} else {
- token = ""
+ tvModel.needGetToken = true
fetchVideo(tvModel)
// fetchAuth(tvModel)
}
@@ -282,12 +281,12 @@ object Request {
if (tvModel.retryTimes < tvModel.retryMaxTimes) {
tvModel.retryTimes++
if (tvModel.getTV().needToken) {
- if (tvModel.tokenRetryTimes == tvModel.tokenRetryMaxTimes) {
+ if (tvModel.tokenYSPRetryTimes == tvModel.tokenYSPRetryMaxTimes) {
if (!tvModel.getTV().mustToken) {
fetchVideo(tvModel, cookie)
}
} else {
- token = ""
+ tvModel.needGetToken = true
fetchVideo(tvModel)
}
} else {
@@ -300,20 +299,28 @@ object Request {
private fun fetchAuth(tvModel: TVViewModel) {
cancelCall()
- if (token == "") {
+ if (tvModel.needGetToken) {
callInfo = yspTokenService.getInfo("")
callInfo?.enqueue(object : Callback {
override fun onResponse(call: Call, response: Response) {
- if (response.isSuccessful) {
+ if (response.isSuccessful && response.body()?.data?.token != null) {
token = response.body()?.data?.token!!
Log.i(TAG, "info success $token")
+ tvModel.needGetToken = false
+ tvModel.tokenYSPRetryTimes = 0
val cookie =
"versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109;yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
fetchAuth(tvModel, cookie)
+ } else if (response.code() == 304) {
+ tvModel.needGetToken = false
+ tvModel.tokenYSPRetryTimes = 0
+ val cookie =
+ "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+ fetchVideo(tvModel, cookie)
} else {
Log.e(TAG, "info status error")
- if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
- tvModel.tokenRetryTimes++
+ if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+ tvModel.tokenYSPRetryTimes++
fetchAuth(tvModel)
} else {
if (!tvModel.getTV().mustToken) {
@@ -327,8 +334,8 @@ object Request {
override fun onFailure(call: Call, t: Throwable) {
Log.e(TAG, "info request error $t")
- if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
- tvModel.tokenRetryTimes++
+ if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+ tvModel.tokenYSPRetryTimes++
fetchVideo(tvModel)
} else {
if (!tvModel.getTV().mustToken) {
@@ -349,20 +356,28 @@ object Request {
private fun fetchVideo(tvModel: TVViewModel) {
cancelCall()
Log.d(TAG, "fetchVideo")
- if (token == "") {
+ if (tvModel.needGetToken) {
callInfo = yspTokenService.getInfo("")
callInfo?.enqueue(object : Callback {
override fun onResponse(call: Call, response: Response) {
if (response.isSuccessful && response.body()?.data?.token != null) {
token = response.body()?.data?.token!!
Log.i(TAG, "info success $token")
+ tvModel.needGetToken = false
+ tvModel.tokenYSPRetryTimes = 0
+ val cookie =
+ "versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
+ fetchVideo(tvModel, cookie)
+ } else if (response.code() == 304) {
+ tvModel.needGetToken = false
+ tvModel.tokenYSPRetryTimes = 0
val cookie =
"versionName=99.99.99; versionCode=999999; vplatform=109; platformVersion=Chrome; deviceModel=120; appid=1400421205; yspappid=519748109; yspopenid=vu0-8lgGV2LW9QjDeuBFsX8yMnzs37Q3_HZF6XyVDpGR_I; vusession=$token"
fetchVideo(tvModel, cookie)
} else {
Log.e(TAG, "info status error")
- if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
- tvModel.tokenRetryTimes++
+ if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+ tvModel.tokenYSPRetryTimes++
fetchVideo(tvModel)
} else {
if (!tvModel.getTV().mustToken) {
@@ -376,8 +391,8 @@ object Request {
override fun onFailure(call: Call, t: Throwable) {
Log.e(TAG, "info request error $t")
- if (tvModel.tokenRetryTimes < tvModel.tokenRetryMaxTimes) {
- tvModel.tokenRetryTimes++
+ if (tvModel.tokenYSPRetryTimes < tvModel.tokenYSPRetryMaxTimes) {
+ tvModel.tokenYSPRetryTimes++
fetchVideo(tvModel)
} else {
if (!tvModel.getTV().mustToken) {
@@ -405,8 +420,8 @@ object Request {
qa = "FHD"
}
- fAuth = fAuthService.getAuth(tokenFH, tvModel.getTV().pid, qa)
- fAuth?.enqueue(object : Callback {
+ callFAuth = fAuthService.getAuth(tokenFH, tvModel.getTV().pid, qa)
+ callFAuth?.enqueue(object : Callback {
override fun onResponse(call: Call, response: Response) {
if (response.isSuccessful && response.body()?.data?.live_url != null) {
val url = response.body()?.data?.live_url!!
diff --git a/app/src/main/java/com/lizongying/mytv/SP.kt b/app/src/main/java/com/lizongying/mytv/SP.kt
index 583bd5fc..7f8595ab 100644
--- a/app/src/main/java/com/lizongying/mytv/SP.kt
+++ b/app/src/main/java/com/lizongying/mytv/SP.kt
@@ -6,14 +6,19 @@ import android.content.SharedPreferences
object SP {
// Name of the sp file TODO Should use a meaningful name and do migrations
private const val SP_FILE_NAME = "MainActivity"
+
// If Change channel with up and down in reversed order or not
private const val KEY_CHANNEL_REVERSAL = "channel_reversal"
+
// If use channel num to select channel or not
private const val KEY_CHANNEL_NUM = "channel_num"
+
// If start app on device boot or not
private const val KEY_BOOT_STARTUP = "boot_startup"
+
// Position in list of the selected channel item
private const val KEY_POSITION = "position"
+
// guid
private const val KEY_GUID = "guid"
@@ -43,6 +48,6 @@ object SP {
set(value) = sp.edit().putInt(KEY_POSITION, value).apply()
var guid: String
- get() = sp.getString(KEY_GUID, "") ?: ""
+ get() = sp.getString(KEY_GUID, "") ?: ""
set(value) = sp.edit().putString(KEY_GUID, value).apply()
}
\ No newline at end of file
diff --git a/app/src/main/java/com/lizongying/mytv/SettingFragment.kt b/app/src/main/java/com/lizongying/mytv/SettingFragment.kt
index dbf63b52..10fc5a6e 100644
--- a/app/src/main/java/com/lizongying/mytv/SettingFragment.kt
+++ b/app/src/main/java/com/lizongying/mytv/SettingFragment.kt
@@ -27,8 +27,8 @@ class SettingFragment : DialogFragment() {
): View {
val context = requireContext() // It‘s safe to get context here.
_binding = DialogBinding.inflate(inflater, container, false)
- binding.version.text =
- "当前版本: ${context.appVersionName}\n获取最新: https://github.com/lizongying/my-tv/releases/"
+ binding.versionName.text = "当前版本: v${context.appVersionName}"
+ binding.version.text = "https://github.com/lizongying/my-tv"
binding.switchChannelReversal.run {
isChecked = SP.channelReversal
diff --git a/app/src/main/java/com/lizongying/mytv/TV.kt b/app/src/main/java/com/lizongying/mytv/TV.kt
index ee8b1fff..019d3707 100644
--- a/app/src/main/java/com/lizongying/mytv/TV.kt
+++ b/app/src/main/java/com/lizongying/mytv/TV.kt
@@ -7,7 +7,6 @@ data class TV(
var title: String,
var alias: String = "",
var videoUrl: List,
- var videoIndex: Int = 0,
var channel: String = "",
var logo: Any = "",
var pid: String = "",
@@ -23,7 +22,6 @@ data class TV(
"id=" + id +
", title='" + title + '\'' +
", videoUrl='" + videoUrl + '\'' +
- ", videoIndex='" + videoIndex + '\'' +
", logo='" + logo + '\'' +
", pid='" + pid + '\'' +
", sid='" + sid + '\'' +
diff --git a/app/src/main/java/com/lizongying/mytv/TVList.kt b/app/src/main/java/com/lizongying/mytv/TVList.kt
index a445fd91..9a6e9397 100644
--- a/app/src/main/java/com/lizongying/mytv/TVList.kt
+++ b/app/src/main/java/com/lizongying/mytv/TVList.kt
@@ -20,7 +20,6 @@ object TVList {
"CCTV1 综合",
"CCTV1",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226231/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/d57905b93540bd15f0c48230dbbbff7ee0d645ff539e38866e2d15c8b9f7dfcd.png?imageMogr2/format/webp",
"600001859",
@@ -34,7 +33,6 @@ object TVList {
"CCTV2 财经",
"CCTV2",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226195/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/20115388de0207131af17eac86c33049b95d69eaff064e55653a1b941810a006.png?imageMogr2/format/webp",
"600001800",
@@ -48,7 +46,6 @@ object TVList {
"CCTV3 综艺",
"CCTV3",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226397/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/7b7a65c712450da3deb6ca66fbacf4f9aee00d3f20bd80eafb5ada01ec63eb3a.png?imageMogr2/format/webp",
"600001801",
@@ -65,7 +62,6 @@ object TVList {
"http://39.134.24.161/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226191/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226191/index.m3u8"
),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/f357e58fdbcc076a3d65e1f958c942b2e14f14342c60736ceed98b092d35356a.png?imageMogr2/format/webp",
"600001814",
@@ -79,7 +75,6 @@ object TVList {
"CCTV5 体育",
"CCTV5",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226395/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/0a6a7138952675983a3d854df7688557b286d59aa06166edae51506f9204d655.png?imageMogr2/format/webp",
"600001818",
@@ -93,7 +88,6 @@ object TVList {
"CCTV6 电影",
"CCTV6",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226393/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/741515efda91f03f455df8a7da4ee11fa9329139c276435cf0a9e2af398d5bf2.png?imageMogr2/format/webp",
"600108442",
@@ -107,7 +101,6 @@ object TVList {
"CCTV7 国防军事",
"CCTV7",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226192/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/b29af94e295ebdf646cefb68122c429b9cd921f498ca20d2d8070252536f9ff9.png?imageMogr2/format/webp",
"600004092",
@@ -121,7 +114,6 @@ object TVList {
"CCTV8 电视剧",
"CCTV8",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226391/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/ad51de94426a0ba039e6dd6a8534ea98ecc813a6176bde87b4f18cc34d6d7590.png?imageMogr2/format/webp",
"600001803",
@@ -135,7 +127,6 @@ object TVList {
"CCTV9 纪录",
"CCTV9",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226197/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/2ed1b4deeca179d5db806bb941790f82eb92a1b7299c1c38fe027f95a5caee5e.png?imageMogr2/format/webp",
"600004078",
@@ -149,7 +140,6 @@ object TVList {
"CCTV10 科教",
"CCTV10",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226189/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/aa6157ec65188cd41826e5a2f088c3d6d153205f5f6428258d12c59999e221aa.png?imageMogr2/format/webp",
"600001805",
@@ -163,7 +153,6 @@ object TVList {
"CCTV11 戏曲",
"CCTV11",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226240/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/ed12ed7c7a1034dae4350011fe039284c5d5a836506b28c9e32e3c75299625c0.png?imageMogr2/format/webp",
"600001806",
@@ -177,7 +166,6 @@ object TVList {
"CCTV12 社会与法",
"CCTV12",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226190/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/484083cffaa40df7e659565e8cb4d1cc740158a185512114167aa21fa0c59240.png?imageMogr2/format/webp",
"600001807",
@@ -191,10 +179,8 @@ object TVList {
"CCTV13 新闻",
"CCTV13",
listOf(
- "https://live-play.cctvnews.cctv.com/cctv/merge_cctv13.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226233/index.m3u8"
),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/266da7b43c03e2312186b4a999e0f060e8f15b10d2cc2c9aa32171819254cf1a.png?imageMogr2/format/webp",
"600001811",
@@ -208,7 +194,6 @@ object TVList {
"CCTV14 少儿",
"CCTV14",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226193/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/af6b603896938dc346fbb16abfc63c12cba54b0ec9d18770a15d347d115f12d5.png?imageMogr2/format/webp",
"600001809",
@@ -222,7 +207,6 @@ object TVList {
"CCTV15 音乐",
"CCTV15",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225785/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/2ceee92188ef684efe0d8b90839c4f3ad450d179dc64d59beff417059453af47.png?imageMogr2/format/webp",
"600001815",
@@ -239,7 +223,6 @@ object TVList {
"http://39.134.24.162/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226921/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226921/index.m3u8"
),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/53793fa7bacd3a93ff6dc5d2758418985e1f952a316c335d663b572d8bdcd74d.png?imageMogr2/format/webp",
"600098637",
@@ -253,7 +236,6 @@ object TVList {
"CCTV17 农业农村",
"CCTV17",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226198/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/ddef563072f8bad2bea5b9e52674cb7b4ed50efb20c26e61994dfbdf05c1e3c0.png?imageMogr2/format/webp",
"600001810",
@@ -267,7 +249,6 @@ object TVList {
"CCTV5+ 体育赛事",
"CCTV5+",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226221/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/649ad76a90bfef55b05db9fe52e006487280f619089099d5dc971e387fc6eff0.png?imageMogr2/format/webp",
"600001817",
@@ -281,7 +262,6 @@ object TVList {
"CCTV4K 超高清",
"CCTV4K",
listOf(),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/3e9d06fd7244d950df5838750f1c6ac3456e172b51caca2c16d2282125b111e8.png?imageMogr2/format/webp",
"600002264",
@@ -295,7 +275,6 @@ object TVList {
"CCTV8K 超高清",
"CCTV8K",
listOf(),
- 0,
"央视",
R.drawable.cctv8k,
"600156816",
@@ -309,7 +288,6 @@ object TVList {
"风云剧场",
"CCTV风云剧场频道",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226950/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/4d549e53e6d0f632d5a633d1945280797b153e588f919221a07faa869812cc89.png?imageMogr2/format/webp",
"600099658",
@@ -323,7 +301,6 @@ object TVList {
"第一剧场",
"CCTV第一剧场频道",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226959/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/a556bd7d93ce65e18f243a8892b5604f4faa994a4897315914216a710a706208.png?imageMogr2/format/webp",
"600099655",
@@ -337,7 +314,6 @@ object TVList {
"怀旧剧场",
"CCTV怀旧剧场频道",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226972/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/5661bd04fecdb6e899f801147a22ab5d3a475bf2b62e30aec2c0023190ebc9b1.png?imageMogr2/format/webp",
"600099620",
@@ -351,7 +327,6 @@ object TVList {
"世界地理",
"CCTV世界地理频道",
listOf(),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/bb3c6c9e145d698137f5bb64a582021a01b51344b929003630eb769ea65832a9.png?imageMogr2/format/webp",
"600099637",
@@ -365,7 +340,6 @@ object TVList {
"风云音乐",
"CCTV风云音乐频道",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226953/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/bbf1d024c5228b8dd128b0e3cb1717d173fab4ee84c3a4c8a57b1a215362ca3b.png?imageMogr2/format/webp",
"600099660",
@@ -379,7 +353,6 @@ object TVList {
"兵器科技",
"CCTV兵器科技频道",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226975/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/4c6b6a6d3839889f34d33db3c2f80233b26b74d3489b393487635f8704e70796.png?imageMogr2/format/webp",
"600099649",
@@ -393,7 +366,6 @@ object TVList {
"风云足球",
"CCTV风云足球频道",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226984/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/cd1e2bb52b06a991de168733e5ff0f1d85adc8042d40c8f393f723543e5dd08a.png?imageMogr2/format/webp",
"600099636",
@@ -407,7 +379,6 @@ object TVList {
"高尔夫网球",
"CCTV高尔夫·网球频道",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226978/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/cdd1b31ede7a5ad049ed53d9a072422f829e72dd062ed2c19e077fdd01699071.png?imageMogr2/format/webp",
"600099659",
@@ -421,7 +392,6 @@ object TVList {
"女性时尚",
"CCTV女性时尚频道",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226969/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/fa28955ce8b2539d728bf4c6a13a46ff57ad76eae46627f7bcfb1ed8a613d3fc.png?imageMogr2/format/webp",
"600099650",
@@ -435,7 +405,6 @@ object TVList {
"央视文化精品",
"CCTV央视文化精品频道",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226981/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/14ac5ce40482cacd3d4b37435222bfe86af2b452a2f04ecbfc1d13d76edd7c57.png?imageMogr2/format/webp",
"600099653",
@@ -449,7 +418,6 @@ object TVList {
"央视台球",
"CCTV央视台球频道",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226956/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/10e14a92478011aa6c3c8562e62127f3b1908e29fcd78e4b2b24b9e6d3ec2fbc.png?imageMogr2/format/webp",
"600099652",
@@ -463,7 +431,6 @@ object TVList {
"电视指南",
"CCTV电视指南频道",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888893/224/3221226987/index.m3u8"),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/244d72c0eb1615ed7d51c2f5db5a67f306aa3f58c05bc2d34de3aa7e956dc8c9.png?imageMogr2/format/webp",
"600099656",
@@ -477,7 +444,6 @@ object TVList {
"卫生健康",
"CCTV卫生健康频道",
listOf(),
- 0,
"央视",
"https://resources.yangshipin.cn/assets/oms/image/202306/54a6863656fdfd8f803be193ddf22441c5000a108833889816fd2d8911715ce8.png?imageMogr2/format/webp",
"600099651",
@@ -493,7 +459,6 @@ object TVList {
"东方卫视",
"东方卫视",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226217/index.m3u8"),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/9bd372ca292a82ce3aa08772b07efc4af1f85c21d1f268ea33440c49e9a0a488.png?imageMogr2/format/webp",
"600002483",
@@ -510,7 +475,6 @@ object TVList {
"http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226307/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226211/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/4120e89d3079d08aa17d382f69a2308ec70839b278367763c34a34666c75cb88.png?imageMogr2/format/webp",
"600002475",
@@ -527,7 +491,6 @@ object TVList {
"http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226477/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226194/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/7a6be5a2bb1dc53a945c016ff1f525dc4a84c51db371c15c89aa55404b0ba784.png?imageMogr2/format/webp",
"600002508",
@@ -544,7 +507,6 @@ object TVList {
"http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226546/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226201/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/ac4ed6058a87c101ae7147ebc38905d0cae047fb73fd277ee5049b84f52bda36.png?imageMogr2/format/webp",
"600002505",
@@ -561,7 +523,6 @@ object TVList {
"http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226200/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226200/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/380ad685c0c1d5b2c902246b8d2df6d3f9b45e2837abcfe493075bbded597a31.png?imageMogr2/format/webp",
"600002521",
@@ -578,7 +539,6 @@ object TVList {
"http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226344/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225764/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/3c760d0d00463855890e8a1864ea4a6b6dd66b90c29b4ac714a4b17c16519871.png?imageMogr2/format/webp",
"600002503",
@@ -592,7 +552,6 @@ object TVList {
"山东卫视",
"山东卫视",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226209/index.m3u8"),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/22d403f07a7cf5410b3ad3ddb65a11aa229a32475fac213f5344c9f0ec330ca1.png?imageMogr2/format/webp",
"600002513",
@@ -606,7 +565,6 @@ object TVList {
"广东卫视",
"广东卫视",
listOf("http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226216/index.m3u8"),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/28886880a4dc0f06fb7e0a528a1def0591d61a65870e29176ede0cc92033bbfd.png?imageMogr2/format/webp",
"600002485",
@@ -623,7 +581,6 @@ object TVList {
"http://live.gxrb.com.cn/tv/gxtvlive03/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225770/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/54b7e97cb816bb223fe05f3fc44da2c7820eb66e8550c19d23100f2c414ecc38.png?imageMogr2/format/webp",
"600002509",
@@ -640,7 +597,6 @@ object TVList {
"http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226409/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226202/index.m3u8"
),
- 0,
"地方",
R.drawable.chongqing,
"600002531",
@@ -657,7 +613,6 @@ object TVList {
"http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226480/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225767/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/74925962148a6d31c85808b6cd4e444c2a54bab393d2c5fc85e960b50e22fa86.png?imageMogr2/format/webp",
"600002525",
@@ -674,7 +629,6 @@ object TVList {
"http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226406/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225750/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/d545becdc81c60197b08c7f47380705e4665ed3fe55efc8b855e486f6e655378.png?imageMogr2/format/webp",
"600002493",
@@ -691,7 +645,6 @@ object TVList {
"http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226474/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225793/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/4eb45f4781d33d872af027dc01c941559aab55667dd99cc5c22bef7037807b13.png?imageMogr2/format/webp",
"600002490",
@@ -708,7 +661,6 @@ object TVList {
"http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221225728/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226222/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/f4f23633c578beea49a3841d88d3490100f029ee349059fa532869db889872c5.png?imageMogr2/format/webp",
"600002309",
@@ -725,7 +677,6 @@ object TVList {
"http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226327/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226215/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/d8273ae9be698ce2db21f5b886ecac95a73429593f93713c60ed8c12c38bf0d3.png?imageMogr2/format/webp",
"600002498",
@@ -742,7 +693,6 @@ object TVList {
"http://hw-m-l.cztv.com/channels/lantian/channel01/1080p.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226199/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/a66c836bd98ba3e41a2e9a570d4b9c50dedc6839e9de333e2e78212ad505f37e.png?imageMogr2/format/webp",
"600002520",
@@ -759,7 +709,6 @@ object TVList {
"http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226391/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226203/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/f35fa04b51b1ee4984b03578b65403570868ebca03c6c01e11b097f999a58d9b.png?imageMogr2/format/webp",
"600002532",
@@ -776,7 +725,6 @@ object TVList {
"http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226205/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226205/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/d59fec04c902e3581c617136d02d4b9b8c4cbe64272781ddd3525e80c823edb7.png?imageMogr2/format/webp",
"600002481",
@@ -793,7 +741,6 @@ object TVList {
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225768/index.m3u8",
"http://39.134.24.166/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225768/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/3276a414ae0eaa0f116f2045cd913367967d0c7c1e978e8621ac3879436c6ed7.png?imageMogr2/format/webp",
"600002516",
@@ -810,7 +757,6 @@ object TVList {
"http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226341/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225766/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/3208fe6564a293c21b711333fb3edb05bb5b406cff840573c9a8d839680a1579.png?imageMogr2/format/webp",
"600002484",
@@ -827,7 +773,6 @@ object TVList {
"http://ottrrs.hl.chinamobile.com/PLTV/88888888/224/3221226465/index.m3u8",
"http://dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221225769/index.m3u8"
),
- 0,
"地方",
"https://resources.yangshipin.cn/assets/oms/image/202306/6e060391fde0469801fc3d84dbf204b4f8d650d251f17d7595a6964c0bb99e81.png?imageMogr2/format/webp",
"600002506",
@@ -841,7 +786,6 @@ object TVList {
"天津卫视",
"天津卫视",
listOf(),
- 0,
"地方",
R.drawable.tianjin,
"600152137",
@@ -855,7 +799,6 @@ object TVList {
"新疆卫视",
"新疆卫视",
listOf(),
- 0,
"地方",
R.drawable.xinjiang,
"600152138",
@@ -869,7 +812,6 @@ object TVList {
"兵团卫视",
"兵团卫视",
listOf(),
- 0,
"地方",
R.drawable.bingtuan,
"600170344",
@@ -883,7 +825,6 @@ object TVList {
"CETV1",
"CETV1",
listOf(),
- 0,
"地方",
R.drawable.cetv1,
"600171827",
@@ -899,7 +840,6 @@ object TVList {
"凤凰卫视资讯台",
"",
listOf(),
- 0,
"港澳台",
"http://c1.fengshows-cdn.com/a/2021_22/79dcc3a9da358a3.png",
"7c96b084-60e1-40a9-89c5-682b994fb680",
@@ -913,7 +853,6 @@ object TVList {
"凤凰卫视中文台",
"",
listOf(),
- 0,
"港澳台",
"http://c1.fengshows-cdn.com/a/2021_22/ede3d9e09be28e5.png",
"f7f48462-9b13-485b-8101-7b54716411ec",
@@ -927,7 +866,6 @@ object TVList {
"凤凰卫视香港台",
"",
listOf(),
- 0,
"港澳台",
"http://c1.fengshows-cdn.com/a/2021_23/325d941090bee17.png",
"15e02d92-1698-416c-af2f-3e9a872b4d78",
@@ -943,7 +881,6 @@ object TVList {
"CGTN",
"CGTN",
listOf("http://live.cgtn.com/1000/prog_index.m3u8"),
- 0,
"国际",
"https://resources.yangshipin.cn/assets/oms/image/202306/a72dff758ca1c17cd0ecc8cedc11b893d208f409d5e6302faa0e9d298848abc3.png?imageMogr2/format/webp",
"600014550",
@@ -957,7 +894,6 @@ object TVList {
"CGTN 法语频道",
"CGTN法语频道",
listOf("https://livefr.cgtn.com/1000f/prog_index.m3u8"),
- 0,
"国际",
"https://resources.yangshipin.cn/assets/oms/image/202306/a8d0046a47433d952bf6ed17062deb8bd2184ba9aec0f7781df6bf9487a3ffcf.png?imageMogr2/format/webp",
"600084704",
@@ -971,7 +907,6 @@ object TVList {
"CGTN 俄语频道",
"CGTN俄语频道",
listOf("http://liveru.cgtn.com/1000r/prog_index.m3u8"),
- 0,
"国际",
"https://resources.yangshipin.cn/assets/oms/image/202306/bf0a820893cbaf20dd0333e27042e1ef9c8806e5b602b6a8c95af399db0bc77a.png?imageMogr2/format/webp",
"600084758",
@@ -985,7 +920,6 @@ object TVList {
"CGTN 阿拉伯语频道",
"CGTN阿拉伯语频道",
listOf("http://livear.cgtn.com/1000a/prog_index.m3u8"),
- 0,
"国际",
"https://resources.yangshipin.cn/assets/oms/image/202306/2e44e2aa3e7a1cedf07fd0ae59fe69e86a60a2632660a006e3e9e7397b2d107e.png?imageMogr2/format/webp",
"600084782",
@@ -1002,7 +936,6 @@ object TVList {
"http://livees.cgtn.com/500e/prog_index.m3u8",
"http://livees.cgtn.com/1000e/prog_index.m3u8"
),
- 0,
"国际",
"https://resources.yangshipin.cn/assets/oms/image/202309/7c337e3dbe64402ec7e4678a619a4a6d95144e42f35161181ff78e143b7cf67a.png?imageMogr2/format/webp",
"600084744",
@@ -1016,7 +949,6 @@ object TVList {
"CGTN 纪录频道",
"CGTN外语纪录频道",
listOf("https://livedoc.cgtn.com/500d/prog_index.m3u8"),
- 0,
"国际",
"https://resources.yangshipin.cn/assets/oms/image/202309/74d3ac436a7e374879578de1d87a941fbf566d39d5632b027c5097891ed32bd5.png?imageMogr2/format/webp",
"600084781",
diff --git a/app/src/main/java/com/lizongying/mytv/UpdateManager.kt b/app/src/main/java/com/lizongying/mytv/UpdateManager.kt
index 5616bdd4..4f84dace 100644
--- a/app/src/main/java/com/lizongying/mytv/UpdateManager.kt
+++ b/app/src/main/java/com/lizongying/mytv/UpdateManager.kt
@@ -1,5 +1,6 @@
package com.lizongying.mytv
+import android.app.Activity
import android.app.DownloadManager
import android.app.DownloadManager.Request
import android.content.BroadcastReceiver
@@ -13,8 +14,10 @@ import android.os.Environment
import android.os.Handler
import android.os.Looper
import android.util.Log
-import android.widget.Toast
-import com.lizongying.mytv.api.Release
+import androidx.core.app.ActivityCompat
+import androidx.core.content.PermissionChecker
+import androidx.core.content.PermissionChecker.checkSelfPermission
+import com.lizongying.mytv.api.ReleaseV2
import com.lizongying.mytv.requests.MyRequest
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
@@ -30,49 +33,79 @@ class UpdateManager(
ConfirmationDialogFragment.ConfirmationDialogListener {
private var myRequest = MyRequest()
- private var release: Release? = null
+ private var release: ReleaseV2? = null
private var downloadReceiver: DownloadReceiver? = null
fun checkAndUpdate() {
+ if (!haveStoragePermission()) {
+ return
+ }
CoroutineScope(Dispatchers.Main).launch {
+ var text = "版本获取失败"
try {
release = myRequest.getRelease()
- updateUI(release)
- Log.i(TAG, "versionCode $versionCode ${release?.data?.versionCode}")
- if (release != null) {
- if (release?.data?.versionCode!! >= versionCode) {
+ Log.i(TAG, "versionCode $versionCode ${release?.c}")
+ if (release?.c != null) {
+ if (release?.c!! >= versionCode) {
+ text = "最新版本：${release?.n}"
val dialog = ConfirmationDialogFragment(this@UpdateManager)
dialog.show(settingFragment.fragmentManager, "ConfirmationDialogFragment")
} else {
- Toast.makeText(context, "不需要更新", Toast.LENGTH_LONG)
- .show()
+ text = "已是最新版本，不需要更新"
}
}
} catch (e: Exception) {
Log.e(TAG, "Error occurred: ${e.message}", e)
}
+ updateUI(text)
}
}
- private fun updateUI(release: Release?) {
- if (release?.data?.versionName.isNullOrEmpty()) {
- settingFragment.setVersionName("版本获取失败")
- } else {
- settingFragment.setVersionName("最新版本：${release?.data?.versionName!!}")
+ private fun updateUI(text: String) {
+ settingFragment.setVersionName(text)
+ }
+
+ fun haveStoragePermission(): Boolean {
+ if (Build.VERSION.SDK_INT >= 23) {
+ if (checkSelfPermission(context, android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
+ === PermissionChecker.PERMISSION_GRANTED
+ ) {
+ Log.e("Permission error", "You have permission")
+ return true
+ } else {
+ Log.e("Permission error", "You have asked for permission")
+ ActivityCompat.requestPermissions(
+ context as Activity, arrayOf(
+ android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+ ), 1
+ )
+ return false
+ }
+ } else { //you don't need to worry about these stuff below api level 23
+ Log.e("Permission error", "You already have the permission")
+ return true
}
}
- private fun startDownload(release: Release) {
- val apkFileName = "my-tv-${release.data.versionName}.apk"
+
+ private fun startDownload(release: ReleaseV2) {
+ val apkFileName = "my-tv-${release.n}.apk"
Log.i(TAG, "apkFileName $apkFileName")
val downloadManager =
context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
- val request = Request(Uri.parse(release.data.downloadUrl))
- Log.i(TAG, "url ${Uri.parse(release.data.downloadUrl)}")
- request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, apkFileName)
+ val request = Request(Uri.parse(release.u))
+ Log.i(TAG, "url ${Uri.parse(release.u)}")
+ context.getExternalFilesDir(Environment.DIRECTORY_DOWNLOADS)?.mkdirs()
+ request.setDestinationInExternalFilesDir(
+ context,
+ Environment.DIRECTORY_DOWNLOADS,
+ apkFileName
+ )
request.setTitle("New Version Download")
request.setNotificationVisibility(Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
+ request.setAllowedOverRoaming(false)
+ request.setMimeType("application/vnd.android.package-archive")
// 获取下载任务的引用
val downloadReference = downloadManager.enqueue(request)
@@ -97,7 +130,11 @@ class UpdateManager(
}
}
- private fun getDownloadProgress(context: Context, downloadId: Long, progressListener: (Int) -> Unit) {
+ private fun getDownloadProgress(
+ context: Context,
+ downloadId: Long,
+ progressListener: (Int) -> Unit
+ ) {
val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
val handler = Handler(Looper.getMainLooper())
val intervalMillis: Long = 1000
@@ -179,7 +216,6 @@ class UpdateManager(
override fun onCancel() {
}
-
fun destroy() {
if (downloadReceiver != null) {
context.unregisterReceiver(downloadReceiver)
diff --git a/app/src/main/java/com/lizongying/mytv/api/ApiClient.kt b/app/src/main/java/com/lizongying/mytv/api/ApiClient.kt
index fb22208c..a8fbb605 100644
--- a/app/src/main/java/com/lizongying/mytv/api/ApiClient.kt
+++ b/app/src/main/java/com/lizongying/mytv/api/ApiClient.kt
@@ -1,7 +1,11 @@
package com.lizongying.mytv.api
+import android.os.Build
+import android.util.Log
+import okhttp3.ConnectionSpec
import okhttp3.OkHttpClient
+import okhttp3.TlsVersion
import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory
import retrofit2.converter.protobuf.ProtoConverterFactory
@@ -13,7 +17,6 @@ import javax.net.ssl.X509TrustManager
class ApiClient {
private val yspUrl = "https://player-api.yangshipin.cn/"
private val myUrl = "https://lyrics.run/"
- private val devUrl = "http://10.0.2.2:8081/"
private val protoUrl = "https://capi.yangshipin.cn/"
private val traceUrl = "https://btrace.yangshipin.cn/"
private val fUrl = "https://m.fengshows.com/"
@@ -68,6 +71,36 @@ class ApiClient {
.build().create(FAuthService::class.java)
}
+ private fun enableTls12OnPreLollipop(client: OkHttpClient.Builder): OkHttpClient.Builder {
+ if (Build.VERSION.SDK_INT >= 16 && Build.VERSION.SDK_INT < 22) {
+ try {
+ val sc = SSLContext.getInstance("TLSv1.2")
+
+ sc.init(null, null, null)
+
+ // a more robust version is to pass a custom X509TrustManager
+ // as the second parameter and make checkServerTrusted to accept your server.
+ // Credits: https://github.com/square/okhttp/issues/2372#issuecomment-1774955225
+ client.sslSocketFactory(Tls12SocketFactory(sc.socketFactory))
+
+ val cs = ConnectionSpec.Builder(ConnectionSpec.MODERN_TLS)
+ .tlsVersions(TlsVersion.TLS_1_2)
+ .build()
+
+ val specs: MutableList = ArrayList()
+ specs.add(cs)
+ specs.add(ConnectionSpec.COMPATIBLE_TLS)
+ specs.add(ConnectionSpec.CLEARTEXT)
+
+ client.connectionSpecs(specs)
+ } catch (exc: java.lang.Exception) {
+ Log.e("OkHttpTLSCompat", "Error while setting TLS 1.2", exc)
+ }
+ }
+
+ return client
+ }
+
private fun getUnsafeOkHttpClient(): OkHttpClient {
try {
val trustAllCerts: Array = arrayOf(
@@ -93,11 +126,12 @@ class ApiClient {
val sslContext = SSLContext.getInstance("SSL")
sslContext.init(null, trustAllCerts, java.security.SecureRandom())
- return OkHttpClient.Builder()
+ val builder = OkHttpClient.Builder()
.sslSocketFactory(sslContext.socketFactory, trustAllCerts[0] as X509TrustManager)
.hostnameVerifier { _, _ -> true }
.dns(DnsCache())
- .build()
+
+ return enableTls12OnPreLollipop(builder).build()
} catch (e: Exception) {
throw RuntimeException(e)
diff --git a/app/src/main/java/com/lizongying/mytv/api/Info.kt b/app/src/main/java/com/lizongying/mytv/api/Info.kt
index 0bec143e..4a2e381e 100644
--- a/app/src/main/java/com/lizongying/mytv/api/Info.kt
+++ b/app/src/main/java/com/lizongying/mytv/api/Info.kt
@@ -22,18 +22,11 @@ data class InfoV2(
val c: Int?,
)
-data class Release(
- val code: Int?,
- val msg: String?,
- val data: Data,
-) {
- data class Data(
- val versionName: String,
- val versionCode: Int,
- val downloadUrl: String,
- val updateTime: Int,
- )
-}
+data class ReleaseV2(
+ val n: String?,
+ val u: String?,
+ val c: Int?,
+)
data class TimeResponse(
val data: Time
diff --git a/app/src/main/java/com/lizongying/mytv/api/ReleaseService.kt b/app/src/main/java/com/lizongying/mytv/api/ReleaseService.kt
index d06eea16..f26db56d 100644
--- a/app/src/main/java/com/lizongying/mytv/api/ReleaseService.kt
+++ b/app/src/main/java/com/lizongying/mytv/api/ReleaseService.kt
@@ -2,10 +2,11 @@ package com.lizongying.mytv.api
import retrofit2.Call
import retrofit2.http.GET
-
+import retrofit2.http.Path
interface ReleaseService {
- @GET("my-tv/v1/release")
+ @GET("my-tv/v2/release/{name}")
fun getRelease(
- ): Call
+ @Path("name") date: String = "1",
+ ): Call
}
\ No newline at end of file
diff --git a/app/src/main/java/com/lizongying/mytv/api/Tls12SocketFactory.kt b/app/src/main/java/com/lizongying/mytv/api/Tls12SocketFactory.kt
new file mode 100644
index 00000000..f701f833
--- /dev/null
+++ b/app/src/main/java/com/lizongying/mytv/api/Tls12SocketFactory.kt
@@ -0,0 +1,74 @@
+package com.lizongying.mytv.api
+
+import java.io.IOException
+import java.net.InetAddress
+import java.net.Socket
+import java.net.UnknownHostException
+import javax.net.ssl.SSLSocket
+import javax.net.ssl.SSLSocketFactory
+
+
+/**
+ * Enables TLS v1.2 when creating SSLSockets.
+ *
+ *
+ * For some reason, android supports TLS v1.2 from API 16, but enables it by
+ * default only from API 20.
+ * @link https://developer.android.com/reference/javax/net/ssl/SSLSocket.html
+ * @see SSLSocketFactory
+ */
+class Tls12SocketFactory(val delegate: SSLSocketFactory) : SSLSocketFactory() {
+ override fun getDefaultCipherSuites(): Array {
+ return delegate.defaultCipherSuites
+ }
+
+ override fun getSupportedCipherSuites(): Array {
+ return delegate.supportedCipherSuites
+ }
+
+ @Throws(IOException::class)
+ override fun createSocket(s: Socket, host: String, port: Int, autoClose: Boolean): Socket {
+ return patch(delegate.createSocket(s, host, port, autoClose))
+ }
+
+ @Throws(IOException::class, UnknownHostException::class)
+ override fun createSocket(host: String, port: Int): Socket {
+ return patch(delegate.createSocket(host, port))
+ }
+
+ @Throws(IOException::class, UnknownHostException::class)
+ override fun createSocket(
+ host: String,
+ port: Int,
+ localHost: InetAddress,
+ localPort: Int
+ ): Socket {
+ return patch(delegate.createSocket(host, port, localHost, localPort))
+ }
+
+ @Throws(IOException::class)
+ override fun createSocket(host: InetAddress, port: Int): Socket {
+ return patch(delegate.createSocket(host, port))
+ }
+
+ @Throws(IOException::class)
+ override fun createSocket(
+ address: InetAddress,
+ port: Int,
+ localAddress: InetAddress,
+ localPort: Int
+ ): Socket {
+ return patch(delegate.createSocket(address, port, localAddress, localPort))
+ }
+
+ private fun patch(s: Socket): Socket {
+ if (s is SSLSocket) {
+ s.enabledProtocols = TLS_V12_ONLY
+ }
+ return s
+ }
+
+ companion object {
+ private val TLS_V12_ONLY = arrayOf("TLSv1.2")
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt b/app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt
index cb8eb204..1288cfb3 100644
--- a/app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt
+++ b/app/src/main/java/com/lizongying/mytv/models/TVViewModel.kt
@@ -23,10 +23,12 @@ class TVViewModel(private var tv: TV) : ViewModel() {
var retryTimes = 0
var retryMaxTimes = 8
- var tokenRetryTimes = 0
- var tokenRetryMaxTimes = 0
+ var tokenYSPRetryTimes = 0
+ var tokenYSPRetryMaxTimes = 0
var tokenFHRetryTimes = 0
- var tokenFHRetryMaxTimes = 2
+ var tokenFHRetryMaxTimes = 4
+
+ var needGetToken = false
private val _errInfo = MutableLiveData()
val errInfo: LiveData
@@ -88,9 +90,8 @@ class TVViewModel(private var tv: TV) : ViewModel() {
} else {
tv.videoUrl = tv.videoUrl + listOf(url)
}
- tv.videoIndex = tv.videoUrl.lastIndex
_videoUrl.value = tv.videoUrl
- _videoIndex.value = tv.videoIndex
+ _videoIndex.value = tv.videoUrl.lastIndex
}
fun firstSource() {
@@ -118,7 +119,7 @@ class TVViewModel(private var tv: TV) : ViewModel() {
_id.value = tv.id
_title.value = tv.title
_videoUrl.value = tv.videoUrl
- _videoIndex.value = tv.videoIndex
+ _videoIndex.value = tv.videoUrl.lastIndex
_logo.value = tv.logo
_programId.value = tv.programId
_pid.value = tv.pid
@@ -171,19 +172,13 @@ class TVViewModel(private var tv: TV) : ViewModel() {
_epg.value = p.map { EPG(it.title, formatFTime(it.event_time)) }.toMutableList()
}
- private var mHeaders: Map? = mapOf()
-
- fun setHeaders(headers: Map) {
- mHeaders = headers
- }
-
/**
* (playerView?.player as ExoPlayer).setMediaSource(tvViewModel.buildSource())
*/
@OptIn(UnstableApi::class)
fun buildSource(): HlsMediaSource {
val httpDataSource = DefaultHttpDataSource.Factory()
- mHeaders?.let { httpDataSource.setDefaultRequestProperties(it) }
+// mHeaders?.let { httpDataSource.setDefaultRequestProperties(it) }
return HlsMediaSource.Factory(httpDataSource).createMediaSource(
MediaItem.fromUri(
diff --git a/app/src/main/java/com/lizongying/mytv/requests/MyRequest.kt b/app/src/main/java/com/lizongying/mytv/requests/MyRequest.kt
index 412c504e..17022eb3 100644
--- a/app/src/main/java/com/lizongying/mytv/requests/MyRequest.kt
+++ b/app/src/main/java/com/lizongying/mytv/requests/MyRequest.kt
@@ -1,7 +1,7 @@
package com.lizongying.mytv.requests
import com.lizongying.mytv.api.ApiClient
-import com.lizongying.mytv.api.Release
+import com.lizongying.mytv.api.ReleaseV2
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import retrofit2.Call
@@ -13,17 +13,17 @@ import kotlin.coroutines.suspendCoroutine
class MyRequest {
private var releaseService = ApiClient().releaseService
- suspend fun getRelease(): Release? {
+ suspend fun getRelease(): ReleaseV2? {
return withContext(Dispatchers.IO) {
fetchRelease()
}
}
- private suspend fun fetchRelease(): Release? {
+ private suspend fun fetchRelease(): ReleaseV2? {
return suspendCoroutine { continuation ->
releaseService.getRelease()
- .enqueue(object : Callback {
- override fun onResponse(call: Call, response: Response) {
+ .enqueue(object : Callback {
+ override fun onResponse(call: Call, response: Response) {
if (response.isSuccessful) {
continuation.resume(response.body())
} else {
@@ -31,7 +31,7 @@ class MyRequest {
}
}
- override fun onFailure(call: Call, t: Throwable) {
+ override fun onFailure(call: Call, t: Throwable) {
continuation.resume(null)
}
})
diff --git a/app/src/main/res/raw/channels.json b/app/src/main/res/raw/channels.json
index 7b9f469a..2d6443af 100644
--- a/app/src/main/res/raw/channels.json
+++ b/app/src/main/res/raw/channels.json
@@ -1,7 +1,6 @@
[
{
"id": 0,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d57905b93540bd15f0c48230dbbbff7ee0d645ff539e38866e2d15c8b9f7dfcd.png?imageMogr2/format/webp",
"pid": "600001859",
@@ -16,7 +15,6 @@
},
{
"id": 1,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/20115388de0207131af17eac86c33049b95d69eaff064e55653a1b941810a006.png?imageMogr2/format/webp",
"pid": "600001800",
@@ -31,7 +29,6 @@
},
{
"id": 2,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/7b7a65c712450da3deb6ca66fbacf4f9aee00d3f20bd80eafb5ada01ec63eb3a.png?imageMogr2/format/webp",
"pid": "600001801",
@@ -46,7 +43,6 @@
},
{
"id": 3,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f357e58fdbcc076a3d65e1f958c942b2e14f14342c60736ceed98b092d35356a.png?imageMogr2/format/webp",
"pid": "600001814",
@@ -62,7 +58,6 @@
},
{
"id": 4,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/0a6a7138952675983a3d854df7688557b286d59aa06166edae51506f9204d655.png?imageMogr2/format/webp",
"pid": "600001818",
@@ -77,7 +72,6 @@
},
{
"id": 5,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/741515efda91f03f455df8a7da4ee11fa9329139c276435cf0a9e2af398d5bf2.png?imageMogr2/format/webp",
"pid": "600001802",
@@ -92,7 +86,6 @@
},
{
"id": 6,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/b29af94e295ebdf646cefb68122c429b9cd921f498ca20d2d8070252536f9ff9.png?imageMogr2/format/webp",
"pid": "600004092",
@@ -107,7 +100,6 @@
},
{
"id": 7,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ad51de94426a0ba039e6dd6a8534ea98ecc813a6176bde87b4f18cc34d6d7590.png?imageMogr2/format/webp",
"pid": "600001803",
@@ -122,7 +114,6 @@
},
{
"id": 8,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2ed1b4deeca179d5db806bb941790f82eb92a1b7299c1c38fe027f95a5caee5e.png?imageMogr2/format/webp",
"pid": "600004078",
@@ -137,7 +128,6 @@
},
{
"id": 9,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/aa6157ec65188cd41826e5a2f088c3d6d153205f5f6428258d12c59999e221aa.png?imageMogr2/format/webp",
"pid": "600001805",
@@ -152,7 +142,6 @@
},
{
"id": 10,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ed12ed7c7a1034dae4350011fe039284c5d5a836506b28c9e32e3c75299625c0.png?imageMogr2/format/webp",
"pid": "600001806",
@@ -167,7 +156,6 @@
},
{
"id": 11,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/484083cffaa40df7e659565e8cb4d1cc740158a185512114167aa21fa0c59240.png?imageMogr2/format/webp",
"pid": "600001807",
@@ -182,7 +170,6 @@
},
{
"id": 12,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/266da7b43c03e2312186b4a999e0f060e8f15b10d2cc2c9aa32171819254cf1a.png?imageMogr2/format/webp",
"pid": "600001811",
@@ -198,7 +185,6 @@
},
{
"id": 13,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/af6b603896938dc346fbb16abfc63c12cba54b0ec9d18770a15d347d115f12d5.png?imageMogr2/format/webp",
"pid": "600001809",
@@ -213,7 +199,6 @@
},
{
"id": 14,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2ceee92188ef684efe0d8b90839c4f3ad450d179dc64d59beff417059453af47.png?imageMogr2/format/webp",
"pid": "600001815",
@@ -228,7 +213,6 @@
},
{
"id": 15,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/53793fa7bacd3a93ff6dc5d2758418985e1f952a316c335d663b572d8bdcd74d.png?imageMogr2/format/webp",
"pid": "600098637",
@@ -244,7 +228,6 @@
},
{
"id": 16,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ddef563072f8bad2bea5b9e52674cb7b4ed50efb20c26e61994dfbdf05c1e3c0.png?imageMogr2/format/webp",
"pid": "600001810",
@@ -259,7 +242,6 @@
},
{
"id": 17,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/649ad76a90bfef55b05db9fe52e006487280f619089099d5dc971e387fc6eff0.png?imageMogr2/format/webp",
"pid": "600001817",
@@ -274,7 +256,6 @@
},
{
"id": 18,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3e9d06fd7244d950df5838750f1c6ac3456e172b51caca2c16d2282125b111e8.png?imageMogr2/format/webp",
"pid": "600002264",
@@ -289,7 +270,6 @@
},
{
"id": 19,
- "videoIndex": 0,
"channel": "央视",
"logo": "",
"pid": "600156816",
@@ -304,7 +284,6 @@
},
{
"id": 20,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4d549e53e6d0f632d5a633d1945280797b153e588f919221a07faa869812cc89.png?imageMogr2/format/webp",
"pid": "600099658",
@@ -319,7 +298,6 @@
},
{
"id": 21,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a556bd7d93ce65e18f243a8892b5604f4faa994a4897315914216a710a706208.png?imageMogr2/format/webp",
"pid": "600099655",
@@ -334,7 +312,6 @@
},
{
"id": 22,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/5661bd04fecdb6e899f801147a22ab5d3a475bf2b62e30aec2c0023190ebc9b1.png?imageMogr2/format/webp",
"pid": "600099620",
@@ -349,7 +326,6 @@
},
{
"id": 23,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bb3c6c9e145d698137f5bb64a582021a01b51344b929003630eb769ea65832a9.png?imageMogr2/format/webp",
"pid": "600099637",
@@ -364,7 +340,6 @@
},
{
"id": 24,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bbf1d024c5228b8dd128b0e3cb1717d173fab4ee84c3a4c8a57b1a215362ca3b.png?imageMogr2/format/webp",
"pid": "600099660",
@@ -379,7 +354,6 @@
},
{
"id": 25,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4c6b6a6d3839889f34d33db3c2f80233b26b74d3489b393487635f8704e70796.png?imageMogr2/format/webp",
"pid": "600099649",
@@ -394,7 +368,6 @@
},
{
"id": 26,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/cd1e2bb52b06a991de168733e5ff0f1d85adc8042d40c8f393f723543e5dd08a.png?imageMogr2/format/webp",
"pid": "600099636",
@@ -409,7 +382,6 @@
},
{
"id": 27,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/cdd1b31ede7a5ad049ed53d9a072422f829e72dd062ed2c19e077fdd01699071.png?imageMogr2/format/webp",
"pid": "600099659",
@@ -424,7 +396,6 @@
},
{
"id": 28,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/fa28955ce8b2539d728bf4c6a13a46ff57ad76eae46627f7bcfb1ed8a613d3fc.png?imageMogr2/format/webp",
"pid": "600099650",
@@ -439,7 +410,6 @@
},
{
"id": 29,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/14ac5ce40482cacd3d4b37435222bfe86af2b452a2f04ecbfc1d13d76edd7c57.png?imageMogr2/format/webp",
"pid": "600099653",
@@ -454,7 +424,6 @@
},
{
"id": 30,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/10e14a92478011aa6c3c8562e62127f3b1908e29fcd78e4b2b24b9e6d3ec2fbc.png?imageMogr2/format/webp",
"pid": "600099652",
@@ -469,7 +438,6 @@
},
{
"id": 31,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/244d72c0eb1615ed7d51c2f5db5a67f306aa3f58c05bc2d34de3aa7e956dc8c9.png?imageMogr2/format/webp",
"pid": "600099656",
@@ -484,7 +452,6 @@
},
{
"id": 32,
- "videoIndex": 0,
"channel": "央视",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/54a6863656fdfd8f803be193ddf22441c5000a108833889816fd2d8911715ce8.png?imageMogr2/format/webp",
"pid": "600099651",
@@ -499,7 +466,6 @@
},
{
"id": 33,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/9bd372ca292a82ce3aa08772b07efc4af1f85c21d1f268ea33440c49e9a0a488.png?imageMogr2/format/webp",
"pid": "600002483",
@@ -514,7 +480,6 @@
},
{
"id": 34,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4120e89d3079d08aa17d382f69a2308ec70839b278367763c34a34666c75cb88.png?imageMogr2/format/webp",
"pid": "600002475",
@@ -530,7 +495,6 @@
},
{
"id": 35,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/7a6be5a2bb1dc53a945c016ff1f525dc4a84c51db371c15c89aa55404b0ba784.png?imageMogr2/format/webp",
"pid": "600002508",
@@ -546,7 +510,6 @@
},
{
"id": 36,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/ac4ed6058a87c101ae7147ebc38905d0cae047fb73fd277ee5049b84f52bda36.png?imageMogr2/format/webp",
"pid": "600002505",
@@ -562,7 +525,6 @@
},
{
"id": 37,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/380ad685c0c1d5b2c902246b8d2df6d3f9b45e2837abcfe493075bbded597a31.png?imageMogr2/format/webp",
"pid": "600002521",
@@ -578,7 +540,6 @@
},
{
"id": 38,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3c760d0d00463855890e8a1864ea4a6b6dd66b90c29b4ac714a4b17c16519871.png?imageMogr2/format/webp",
"pid": "600002503",
@@ -594,7 +555,6 @@
},
{
"id": 39,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/22d403f07a7cf5410b3ad3ddb65a11aa229a32475fac213f5344c9f0ec330ca1.png?imageMogr2/format/webp",
"pid": "600002513",
@@ -609,7 +569,6 @@
},
{
"id": 40,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/28886880a4dc0f06fb7e0a528a1def0591d61a65870e29176ede0cc92033bbfd.png?imageMogr2/format/webp",
"pid": "600002485",
@@ -624,7 +583,6 @@
},
{
"id": 41,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/54b7e97cb816bb223fe05f3fc44da2c7820eb66e8550c19d23100f2c414ecc38.png?imageMogr2/format/webp",
"pid": "600002509",
@@ -640,7 +598,6 @@
},
{
"id": 42,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/657651f411de2673d1770d9a78b44c1265704f7468cc41d4be7f51d630768494.png?imageMogr2/format/webp",
"pid": "600002531",
@@ -656,7 +613,6 @@
},
{
"id": 43,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/74925962148a6d31c85808b6cd4e444c2a54bab393d2c5fc85e960b50e22fa86.png?imageMogr2/format/webp",
"pid": "600002525",
@@ -672,7 +628,6 @@
},
{
"id": 44,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d545becdc81c60197b08c7f47380705e4665ed3fe55efc8b855e486f6e655378.png?imageMogr2/format/webp",
"pid": "600002493",
@@ -688,7 +643,6 @@
},
{
"id": 45,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/4eb45f4781d33d872af027dc01c941559aab55667dd99cc5c22bef7037807b13.png?imageMogr2/format/webp",
"pid": "600002490",
@@ -704,7 +658,6 @@
},
{
"id": 46,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f4f23633c578beea49a3841d88d3490100f029ee349059fa532869db889872c5.png?imageMogr2/format/webp",
"pid": "600002309",
@@ -720,7 +673,6 @@
},
{
"id": 47,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d8273ae9be698ce2db21f5b886ecac95a73429593f93713c60ed8c12c38bf0d3.png?imageMogr2/format/webp",
"pid": "600002498",
@@ -736,7 +688,6 @@
},
{
"id": 48,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a66c836bd98ba3e41a2e9a570d4b9c50dedc6839e9de333e2e78212ad505f37e.png?imageMogr2/format/webp",
"pid": "600002520",
@@ -752,7 +703,6 @@
},
{
"id": 49,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/f35fa04b51b1ee4984b03578b65403570868ebca03c6c01e11b097f999a58d9b.png?imageMogr2/format/webp",
"pid": "600002532",
@@ -768,7 +718,6 @@
},
{
"id": 50,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/d59fec04c902e3581c617136d02d4b9b8c4cbe64272781ddd3525e80c823edb7.png?imageMogr2/format/webp",
"pid": "600002481",
@@ -784,7 +733,6 @@
},
{
"id": 51,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3276a414ae0eaa0f116f2045cd913367967d0c7c1e978e8621ac3879436c6ed7.png?imageMogr2/format/webp",
"pid": "600002516",
@@ -800,7 +748,6 @@
},
{
"id": 52,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/3208fe6564a293c21b711333fb3edb05bb5b406cff840573c9a8d839680a1579.png?imageMogr2/format/webp",
"pid": "600002484",
@@ -816,7 +763,6 @@
},
{
"id": 53,
- "videoIndex": 0,
"channel": "地方",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/6e060391fde0469801fc3d84dbf204b4f8d650d251f17d7595a6964c0bb99e81.png?imageMogr2/format/webp",
"pid": "600002506",
@@ -832,7 +778,6 @@
},
{
"id": 54,
- "videoIndex": 0,
"channel": "地方",
"logo": "",
"pid": "600152137",
@@ -847,7 +792,6 @@
},
{
"id": 55,
- "videoIndex": 0,
"channel": "地方",
"logo": "",
"pid": "600152138",
@@ -862,7 +806,6 @@
},
{
"id": 56,
- "videoIndex": 0,
"channel": "国际",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a72dff758ca1c17cd0ecc8cedc11b893d208f409d5e6302faa0e9d298848abc3.png?imageMogr2/format/webp",
"pid": "600014550",
@@ -877,7 +820,6 @@
},
{
"id": 57,
- "videoIndex": 0,
"channel": "国际",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/a8d0046a47433d952bf6ed17062deb8bd2184ba9aec0f7781df6bf9487a3ffcf.png?imageMogr2/format/webp",
"pid": "600084704",
@@ -892,7 +834,6 @@
},
{
"id": 58,
- "videoIndex": 0,
"channel": "国际",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/bf0a820893cbaf20dd0333e27042e1ef9c8806e5b602b6a8c95af399db0bc77a.png?imageMogr2/format/webp",
"pid": "600084758",
@@ -907,7 +848,6 @@
},
{
"id": 59,
- "videoIndex": 0,
"channel": "国际",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202306/2e44e2aa3e7a1cedf07fd0ae59fe69e86a60a2632660a006e3e9e7397b2d107e.png?imageMogr2/format/webp",
"pid": "600084782",
@@ -922,7 +862,6 @@
},
{
"id": 60,
- "videoIndex": 0,
"channel": "国际",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202309/7c337e3dbe64402ec7e4678a619a4a6d95144e42f35161181ff78e143b7cf67a.png?imageMogr2/format/webp",
"pid": "600084744",
@@ -938,7 +877,6 @@
},
{
"id": 61,
- "videoIndex": 0,
"channel": "国际",
"logo": "https://resources.yangshipin.cn/assets/oms/image/202309/74d3ac436a7e374879578de1d87a941fbf566d39d5632b027c5097891ed32bd5.png?imageMogr2/format/webp",
"pid": "600084781",
diff --git a/build.gradle b/build.gradle
index 479de024..40928c7a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
- id 'com.android.application' version '8.2.2' apply false
- id 'com.android.library' version '8.2.2' apply false
+ id 'com.android.application' version '8.3.0' apply false
+ id 'com.android.library' version '8.3.0' apply false
id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 99e680a5..65a247e0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Fri Dec 01 13:53:24 HKT 2023
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-rc-1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME