diff --git a/app/src/main/java/com/lizongying/mytv/MainActivity.kt b/app/src/main/java/com/lizongying/mytv/MainActivity.kt index b87182f..aa85d68 100644 --- a/app/src/main/java/com/lizongying/mytv/MainActivity.kt +++ b/app/src/main/java/com/lizongying/mytv/MainActivity.kt @@ -4,11 +4,10 @@ import android.app.AlertDialog import android.os.Bundle import android.os.Handler import android.os.Looper -import android.view.Gravity import android.view.KeyEvent -import android.view.ViewGroup import android.widget.ImageView import android.widget.LinearLayout +import android.widget.TextView import android.widget.Toast import androidx.core.content.ContextCompat import androidx.fragment.app.FragmentActivity @@ -104,31 +103,32 @@ class MainActivity : FragmentActivity() { } KeyEvent.KEYCODE_MENU -> { + val packageInfo = packageManager.getPackageInfo(packageName, 0) + + val versionName = packageInfo.versionName + + val textView = TextView(this) + textView.text = + "当前版本: $versionName\n获取最新: https://github.com/lizongying/my-tv/releases/" + val imageView = ImageView(this) val drawable = ContextCompat.getDrawable(this, R.drawable.appreciate) imageView.setImageDrawable(drawable) - val parent = imageView.parent as? ViewGroup - parent?.removeView(imageView) - val linearLayout = LinearLayout(this) + linearLayout.orientation = LinearLayout.VERTICAL + linearLayout.addView(textView) linearLayout.addView(imageView) val layoutParams = LinearLayout.LayoutParams( LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT ) - layoutParams.gravity = Gravity.BOTTOM imageView.layoutParams = layoutParams - - - val packageInfo = packageManager.getPackageInfo(packageName, 0) - - val versionName = packageInfo.versionName + textView.layoutParams = layoutParams val builder: AlertDialog.Builder = AlertDialog.Builder(this) builder - .setTitle("当前版本: $versionName, 获取最新: https://github.com/lizongying/my-tv/releases/") .setView(linearLayout) val dialog: AlertDialog = builder.create() diff --git a/app/src/main/java/com/lizongying/mytv/PlaybackFragment.kt b/app/src/main/java/com/lizongying/mytv/PlaybackFragment.kt index 7edb3fa..4895acf 100644 --- a/app/src/main/java/com/lizongying/mytv/PlaybackFragment.kt +++ b/app/src/main/java/com/lizongying/mytv/PlaybackFragment.kt @@ -32,6 +32,11 @@ class PlaybackFragment : VideoSupportFragment() { fun play(tv: TV) { val videoUrl = tv.videoUrl[tv.videoIndex] + if (videoUrl == "") { + Log.e(TAG, "videoUrl is empty") + return + } + if (videoUrl == lastVideoUrl) { Log.e(TAG, "videoUrl is duplication") return diff --git a/app/src/main/java/com/lizongying/mytv/TVList.kt b/app/src/main/java/com/lizongying/mytv/TVList.kt index 0f6ad32..4e1746a 100644 --- a/app/src/main/java/com/lizongying/mytv/TVList.kt +++ b/app/src/main/java/com/lizongying/mytv/TVList.kt @@ -9,9 +9,7 @@ object TVList { val tvs = """ 央视频道,CCTV1 综合,http://tvpull.dxhmt.cn/tv/11481-4.m3u8 央视频道,CCTV1 综合,http://hlsbkmgsplive.miguvideo.com/migu/kailu/cctv1hd265/57/20191230/index.m3u8?&encrypt= -央视频道,CCTV2 财经,https://iptv.luas.edu.cn/liverespath/6b13fe5368d391761312a985ace065c0ecad2f5e/877097d2fa-0-0-b7736e6941fd5cb71f45ef9397b68092/index.m3u8 央视频道,CCTV2 财经,http://hlsbkmgsplive.miguvideo.com/migu/kailu/cctv2hd265/55/20200407/index.m3u8?&encrypt= -央视频道,CCTV3 综艺,https://iptv.luas.edu.cn/liverespath/f76f9947c68be18d7a456e25aa59a08c5747e6a5/0df24da9ec-0-0-dca40ddadd2a051ce1a83536d9310820/index.m3u8 央视频道,CCTV3 综艺,http://hlsbkmgsplive.miguvideo.com/wd_r2/ocn/cctv3hd/3000/index.m3u8?&encrypt= 央视频道,CCTV4 中文国际,http://39.134.24.161/dbiptv.sn.chinamobile.com/PLTV/88888890/224/3221226191/index.m3u8 央视频道,CCTV4 中文国际,http://hlsbkmgsplive.miguvideo.com/wd_r2/cctv/cctv4hd/1500/index.m3u8?&encrypt=