From 90af25233a811c8a1a5725728a601e744349fb8c Mon Sep 17 00:00:00 2001 From: jsbxyyx Date: Sat, 20 Apr 2024 13:52:19 +0800 Subject: [PATCH] optimize: video --- app/src/main/AndroidManifest.xml | 29 ++++++++++++------- .../github/jsbxyyx/xbook/ListFragment.java | 6 ++-- .../jsbxyyx/xbook/ListVideoAdapter.java | 8 +++-- .../jsbxyyx/xbook/VideoListFragment.java | 10 +++---- .../main/res/drawable/baseline_live_tv_24.xml | 5 ++++ .../drawable/baseline_video_library_24.xml | 5 ---- .../main/res/layout/activity_video_view.xml | 3 +- app/src/main/res/layout/fragment_list.xml | 1 + app/src/main/res/layout/video_item.xml | 7 ++--- app/src/main/res/menu/menu_navigation.xml | 2 +- 10 files changed, 43 insertions(+), 33 deletions(-) create mode 100644 app/src/main/res/drawable/baseline_live_tv_24.xml delete mode 100644 app/src/main/res/drawable/baseline_video_library_24.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index bb4048b..04f9534 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -28,40 +28,37 @@ tools:targetApi="31"> - - - - - @@ -70,6 +67,16 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/github/jsbxyyx/xbook/ListFragment.java b/app/src/main/java/com/github/jsbxyyx/xbook/ListFragment.java index ae15634..e6dcf31 100644 --- a/app/src/main/java/com/github/jsbxyyx/xbook/ListFragment.java +++ b/app/src/main/java/com/github/jsbxyyx/xbook/ListFragment.java @@ -18,8 +18,8 @@ import com.github.jsbxyyx.xbook.common.Common; import com.github.jsbxyyx.xbook.common.LogUtil; import com.github.jsbxyyx.xbook.common.SPUtils; -import com.github.jsbxyyx.xbook.data.bean.Book; import com.github.jsbxyyx.xbook.data.BookNetHelper; +import com.github.jsbxyyx.xbook.data.bean.Book; import java.util.List; @@ -85,8 +85,8 @@ private void showListView(boolean clear) { EditText et_keyword = mView.findViewById(R.id.et_keyword); String keyword = et_keyword.getText().toString(); if (Common.isEmpty(keyword)) { - Toast.makeText(mActivity, "搜索关键词为空", Toast.LENGTH_LONG).show(); - return; + keyword = et_keyword.getHint().toString(); + et_keyword.setText(keyword); } List languages = Common.split(SPUtils.getData(mActivity, Common.search_language_key), Common.comma); List extensions = Common.split(SPUtils.getData(mActivity, Common.search_ext_key), Common.comma); diff --git a/app/src/main/java/com/github/jsbxyyx/xbook/ListVideoAdapter.java b/app/src/main/java/com/github/jsbxyyx/xbook/ListVideoAdapter.java index b7568ab..472054f 100644 --- a/app/src/main/java/com/github/jsbxyyx/xbook/ListVideoAdapter.java +++ b/app/src/main/java/com/github/jsbxyyx/xbook/ListVideoAdapter.java @@ -6,12 +6,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; -import android.widget.Button; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.ListView; import android.widget.TextView; +import com.github.jsbxyyx.xbook.common.Common; import com.github.jsbxyyx.xbook.data.bean.QqVideo; import com.squareup.picasso.Picasso; @@ -65,12 +64,15 @@ public View getView(final int position, View convertView, ViewGroup parent) { holder.video_playlist.removeAllViews(); for (QqVideo.QqPlaylist pl : playlist) { TextView textView = new TextView(mContext); - textView.setText(pl.getTitle()); AutoLinearLayout.LayoutParams params = new AutoLinearLayout.LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); params.setMargins(20, 20, 10, 0); textView.setLayoutParams(params); textView.setTextSize(23); + textView.setText(pl.getTitle()); + if (!Common.isEmpty(pl.getMarkLabel()) && pl.getMarkLabel().contains("VIP")) { + textView.setTextColor(Color.parseColor("#ebd078")); + } final int finalSubPosition = subPosition; textView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/github/jsbxyyx/xbook/VideoListFragment.java b/app/src/main/java/com/github/jsbxyyx/xbook/VideoListFragment.java index 7a3bf5b..c8646ae 100644 --- a/app/src/main/java/com/github/jsbxyyx/xbook/VideoListFragment.java +++ b/app/src/main/java/com/github/jsbxyyx/xbook/VideoListFragment.java @@ -3,11 +3,6 @@ import android.app.Activity; import android.content.Intent; import android.os.Bundle; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; - import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -16,6 +11,10 @@ import android.widget.ListView; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import com.github.jsbxyyx.xbook.common.Common; import com.github.jsbxyyx.xbook.common.DataCallback; import com.github.jsbxyyx.xbook.common.LogUtil; @@ -84,6 +83,7 @@ private void showListView(boolean clear) { String q = et_video_keyword.getText().toString(); if (Common.isEmpty(q)) { q = et_video_keyword.getHint().toString(); + et_video_keyword.setText(q); } videoNetHelper.search(q, new DataCallback>() { @Override diff --git a/app/src/main/res/drawable/baseline_live_tv_24.xml b/app/src/main/res/drawable/baseline_live_tv_24.xml new file mode 100644 index 0000000..81d625b --- /dev/null +++ b/app/src/main/res/drawable/baseline_live_tv_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/baseline_video_library_24.xml b/app/src/main/res/drawable/baseline_video_library_24.xml deleted file mode 100644 index 9e1f717..0000000 --- a/app/src/main/res/drawable/baseline_video_library_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_video_view.xml b/app/src/main/res/layout/activity_video_view.xml index bd01282..f05fec2 100644 --- a/app/src/main/res/layout/activity_video_view.xml +++ b/app/src/main/res/layout/activity_video_view.xml @@ -12,8 +12,9 @@ android:layout_height="wrap_content" android:text="请不要相信视频中的任何广告" android:textStyle="bold" - android:textSize="20sp" + android:textSize="16sp" android:gravity="center" + android:ellipsize="marquee" android:textColor="#ff0000" />