optimize: video

jsbxyyx · Apr 20, 2024 · 90af252 · 90af252
1 parent 819eccd
commit 90af252
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 33 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -28,40 +28,37 @@
         tools:targetApi="31">
         <activity
             android:name=".VideoViewActivity2"
+            android:screenOrientation="landscape"
             android:configChanges="orientation|screenSize"
             android:exported="false" />
 
         <activity
             android:name=".VideoViewActivity"
+            android:screenOrientation="landscape"
             android:configChanges="orientation|screenSize"
             android:exported="false" />
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
-
         <activity
+            android:screenOrientation="portrait"
             android:name=".SettingsActivity"
             android:exported="false" />
         <activity
+            android:screenOrientation="portrait"
             android:name=".RegistrationActivity"
             android:exported="false" />
         <activity
+            android:screenOrientation="portrait"
             android:name=".LoginActivity"
             android:exported="false" />
         <activity
             android:name=".ViewActivity"
+            android:configChanges="orientation|screenSize"
             android:exported="false" />
         <activity
+            android:screenOrientation="portrait"
             android:name=".DetailActivity"
             android:exported="false" />
         <activity
+            android:screenOrientation="portrait"
             android:name=".MainActivity"
             android:exported="true">
             <intent-filter>
@@ -70,6 +67,16 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileProvider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/file_paths" />
+        </provider>
     </application>
 
 </manifest>
diff --git 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<String> languages = Common.split(SPUtils.getData(mActivity, Common.search_language_key), Common.comma);
         List<String> 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
@@ -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
@@ -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<List<QqVideo>>() {
             @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
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#654F9F"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M21,6h-7.59l3.29,-3.29L16,2l-4,4 -4,-4 -0.71,0.71L10.59,6L3,6c-1.1,0 -2,0.89 -2,2v12c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,8c0,-1.11 -0.9,-2 -2,-2zM21,20L3,20L3,8h18v12zM9,10v8l7,-4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/baseline_video_library_24.xml b/app/src/main/res/drawable/baseline_video_library_24.xml
diff --git 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" />
 
     <org.mozilla.geckoview.GeckoView

diff --git a/app/src/main/res/layout/fragment_list.xml b/app/src/main/res/layout/fragment_list.xml
@@ -19,6 +19,7 @@
             android:layout_weight="0.7"
             android:maxLines="1"
             android:singleLine="true"
+            android:hint="C程序设计语言"
             />
 
         <Button

diff --git a/app/src/main/res/layout/video_item.xml b/app/src/main/res/layout/video_item.xml
@@ -35,7 +35,8 @@
                 android:layout_height="match_parent"
                 android:maxLines="5"
                 android:ellipsize="end"
-                android:text="desc" />
+                android:text="desc"
+                android:textSize="10sp"/>
 
         </LinearLayout>
 
@@ -44,8 +45,6 @@
     <com.github.jsbxyyx.xbook.AutoLinearLayout
         android:id="@+id/ll_playlist"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-    </com.github.jsbxyyx.xbook.AutoLinearLayout>
-
+        android:layout_height="wrap_content" />
 
 </LinearLayout>
diff --git a/app/src/main/res/menu/menu_navigation.xml b/app/src/main/res/menu/menu_navigation.xml
@@ -12,7 +12,7 @@
     <item
         android:id="@+id/nav_video_list"
         android:title="视频"
-        android:icon="@drawable/baseline_video_library_24"/>
+        android:icon="@drawable/baseline_live_tv_24"/>
 
     <item
         android:id="@+id/nav_profile"