修复BUG，更新UI

2024-02-17 18:09:29 +08:00 · 2024-02-17 18:09:29 +08:00 · 92586c4a60
commit 92586c4a60
parent 7b79ef3e5e
15 changed files with 124 additions and 78 deletions
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="C:\Users\19669\.android\avd\Pixel_2_API_30.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2024-02-17T09:31:32.068883900Z" />
+  </component>
+</project>
--- a/README.md
+++ b/README.md
@ -23,10 +23,11 @@
  * 悬浮歌词功能
  * 基本播放器功能（控制暂停 上下曲 播放歌单操作）

-![Screenshot_20240204_165814.png](image%2FScreenshot_20240204_165814.png)
-![Screenshot_20240204_170426.png](image%2FScreenshot_20240204_170426.png)
-![Screenshot_20240204_165932.png](image%2FScreenshot_20240204_165932.png)
-* 
+![Screenshot_20240217_180254.png](image%2FScreenshot_20240217_180254.png)
+![Screenshot_20240217_180447.png](image%2FScreenshot_20240217_180447.png)
+![Screenshot_20240217_180310.png](image%2FScreenshot_20240217_180310.png)
+
+
 * 在使用中有任何问题，欢迎反馈给我，可以用以下联系方式跟我交流
  * [邮件](<a target="_blank" href="http://mail.qq.com/cgi-bin/qm_share?t=qm_mailme&email=MAEJBgYJBAQDAABwQUEeU19d" style="text-decoration:none;"><img src="http://rescdn.qqmail.com/zh_CN/htmledition/images/function/qm_open/ico_mailme_12.png"/></a>)
  * QQ:1966944300
@ -38,16 +39,18 @@

 导入的包
 ```javascript
-dependencies {
+dependencies {   
    implementation 'androidx.appcompat:appcompat:1.6.1'
-
    implementation 'com.google.android.material:material:1.9.0'
+
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

    implementation 'com.google.code.gson:gson:2.9.1'

    implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+    //图片处理
    implementation 'com.github.bumptech.glide:glide:4.16.0'
+    implementation "androidx.palette:palette:1.0.0"
 //    废弃的歌词组件
 //    implementation 'com.github.wangchenyan:lrcview:2.2.1'
    implementation 'com.google.android.flexbox:flexbox:3.0.0'
@ -56,11 +59,17 @@ dependencies {

 //修改音乐标签库
    implementation 'com.mpatric:mp3agic:0.9.1'
+
+//    沉浸式状态栏
+    api project(path: ':StatusBarUtil')
+    api project(path: ':lrcview')
 }
 ```

 修改JAR的包
 ```javascript
+[//]: # (主要修改内容MD3化)
 com.github.QuadFlask:colorpicker:0.0.15
-//主要修改内容MD3化
+[//]: # (歌词做全局变量给悬浮窗歌词)
+'com.github.wangchenyan:lrcview:2.2.1'
 ...
--- a/app/src/main/java/com/muqingbfq/activity_search.java
+++ b/app/src/main/java/com/muqingbfq/activity_search.java
@ -33,6 +33,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.muqingbfq.databinding.ActivitySearchBinding;
+import com.muqingbfq.fragment.search;
 import com.muqingbfq.mq.FragmentActivity;
 import com.muqingbfq.mq.gj;
 import com.muqingbfq.mq.wj;
@ -183,7 +184,6 @@ public class activity_search extends FragmentActivity<ActivitySearchBinding> {
                binding.listRecycler.getAdapter().notifyItemInserted(0);
            }
            wj.xrwb(wj.filesdri + wj.lishi_json, new Gson().toJson(json_list));
-//            binding.listRecycler.getAdapter().notifyDataSetChanged();
        } catch (Exception e) {
            gj.sc(e);
        }
@ -216,9 +216,9 @@ public class activity_search extends FragmentActivity<ActivitySearchBinding> {
    public void start(String name) {
        dismiss();
        if (!TextUtils.isEmpty(name)) {
-/*            search sea = (search) getSupportFragmentManager().findFragmentById(R.id.search_fragment);
+            search sea = (search) getSupportFragmentManager().findFragmentById(R.id.search_fragment);
            binding.searchFragment.setVisibility(View.VISIBLE);
-            sea.sx(name);*/
+            sea.sx(name);
            addSearchRecord(name);
        }
    }
--- a/app/src/main/java/com/muqingbfq/bfq.java
+++ b/app/src/main/java/com/muqingbfq/bfq.java
@ -59,14 +59,13 @@ public class bfq extends AppCompatActivity<ActivityBfqBinding>

    @SuppressLint("ClickableViewAccessibility")
    private void setLrc() {
+        DisplayMetrics dm = getResources().getDisplayMetrics();
+        main.k = dm.widthPixels;
+        main.g = dm.heightPixels;
+        ViewGroup.LayoutParams layoutParams = binding.cardview.getLayoutParams();
        if (!gj.isTablet(this)) {
-            ViewGroup.LayoutParams layoutParams = binding.cardview.getLayoutParams();
-            DisplayMetrics dm = getResources().getDisplayMetrics();
-            main.k = dm.widthPixels;
-            main.g = dm.heightPixels;
            layoutParams.height = (int) (main.k / 1.3f);
            layoutParams.width = (int) (main.k / 1.3f);
-            binding.cardview.setLayoutParams(layoutParams);
            binding.fragmentBfq.setOnTouchListener((v, event) -> bfq.super.onTouchEvent(event));

            binding.lrcView.setOnTapListener((view, x, y) -> {
@ -85,7 +84,11 @@ public class bfq extends AppCompatActivity<ActivityBfqBinding>
                            }
                        });
            });
+        } else {
+            layoutParams.height = (int) (main.g / 2.0f);
+            layoutParams.width = (int) (main.g / 2.0f);
        }
+        binding.cardview.setLayoutParams(layoutParams);
        binding.lrcView.
                setDraggable(true, (a, time) -> {
                    bfqkz.mt.seekTo((int) time);
@ -468,7 +471,7 @@ public class bfq extends AppCompatActivity<ActivityBfqBinding>
    @Override
    public boolean onScroll(@NonNull MotionEvent e1, @NonNull MotionEvent e2,
                            float distanceX, float distanceY) {
-        if (binding.cardview.getVisibility() == View.GONE) {
+        if (binding.lrcView.getVisibility() == View.VISIBLE) {
            return false;
        }
        float y = binding.getRoot().getRootView().getTranslationY() - distanceY;
--- a/app/src/main/java/com/muqingbfq/home.java
+++ b/app/src/main/java/com/muqingbfq/home.java
@ -2,6 +2,7 @@ package com.muqingbfq;

 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v4.media.MediaBrowserCompat;
@ -205,7 +206,7 @@ public class home extends com.muqingbfq.mq.AppCompatActivity<ActivityHomeBinding
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        if (item.getItemId() == R.id.menu_search) {
-            activity_search.start(this, binding.viewPager);
+            startActivity(new Intent(this, activity_search.class));
        }
        return super.onOptionsItemSelected(item);
    }
@ -213,5 +214,4 @@ public class home extends com.muqingbfq.mq.AppCompatActivity<ActivityHomeBinding
    private Context getContext() {
        return this;
    }
-
 }
--- a/app/src/main/res/layout-land/activity_bfq.xml
+++ b/app/src/main/res/layout-land/activity_bfq.xml
@ -4,41 +4,52 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
+    android:background="@drawable/mpbackground"
    android:fitsSystemWindows="true"
-    android:background="?android:colorBackground"
    android:orientation="vertical">

-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/toolbar"
+    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        app:navigationIcon="@drawable/end">
-
+        android:paddingHorizontal="10dp">
+        <ImageView
+            android:id="@+id/image1"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:src="@drawable/end"
+            app:tint="#F1F1F1" />
        <LinearLayout
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:gravity="center_horizontal"
+            android:layout_weight="1"
            android:orientation="vertical">
-
            <com.muqingbfq.view.Text
                android:id="@+id/name"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:singleLine="true"
                android:text="@string/name"
-                android:textColor="@color/text"
+                android:textColor="#CCCCCC"
+                android:textStyle="bold"
                android:textSize="26sp" />
-
            <com.muqingbfq.view.Text
                android:id="@+id/zz"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                android:gravity="center_horizontal"
                android:maxLines="1"
                android:text="@string/zz"
+                android:textColor="#CCCCCC"
                android:textSize="20sp" />
        </LinearLayout>
-    </com.google.android.material.appbar.MaterialToolbar>
+
+        <ImageView
+            android:id="@+id/image2"
+            android:layout_width="26dp"
+            android:layout_height="26dp"
+            android:src="@drawable/abc_ic_menu_share_mtrl_alpha"
+            app:tint="#F1F1F1" />
+    </LinearLayout>

    <androidx.constraintlayout.widget.ConstraintLayout
        android:id="@+id/fragment_bfq"
@ -52,33 +63,33 @@
            android:layout_width="0dp"
            android:layout_height="match_parent"
            app:cardCornerRadius="16dp"
+            app:cardBackgroundColor="#00FFFFFF"
            app:cardUseCompatPadding="true"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/lrcView"
-            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintHorizontal_weight="1"/>
+            app:layout_constraintEnd_toStartOf="@id/lrcView"
+            app:layout_constraintHorizontal_weight="1"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />

        <me.wcy.lrcview.LrcView
            android:id="@+id/lrcView"
            android:layout_width="0dp"
            android:layout_height="match_parent"
-            app:lrcTextSize="20sp"
-            app:lrcNormalTextSize="16sp"
-            app:lrcCurrentTextColor="@color/text"
-            app:lrcNormalTextColor="@color/text_tm"
-            app:lrcTimelineTextColor="@color/text"
-            app:layout_constraintStart_toEndOf="@id/cardview"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintHorizontal_weight="1" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_weight="1"
+            app:layout_constraintStart_toEndOf="@id/cardview"
+            app:layout_constraintTop_toTopOf="parent"
+            app:lrcCurrentTextColor="#EEEEEE"
+            app:lrcNormalTextColor="#CCCCCC"
+            app:lrcTimelineTextColor="#EEEEEE"
+            app:lrcNormalTextSize="16sp"
+            app:lrcTextSize="20sp" />
    </androidx.constraintlayout.widget.ConstraintLayout>

    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:background="@color/bj"
        android:paddingStart="6dp"
        android:paddingTop="6dp"
        android:paddingEnd="6dp"
@ -92,7 +103,7 @@
            android:src="@drawable/like"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintStart_toStartOf="parent"
-            app:tint="@color/text"
+            app:tint="#CCCCCC"
            tools:ignore="ContentDescription" />

        <ImageView
@ -104,7 +115,7 @@
            android:src="@drawable/download"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintStart_toEndOf="@+id/like"
-            app:tint="@color/text"
+            app:tint="#CCCCCC"
            tools:ignore="ContentDescription" />

        <ImageView
@ -114,6 +125,7 @@
            android:layout_marginEnd="16dp"
            android:background="?android:attr/selectableItemBackgroundBorderless"
            android:src="@drawable/mt_sx"
+            app:tint="#CCCCCC"
            app:layout_constraintBottom_toBottomOf="@+id/syq"
            app:layout_constraintEnd_toStartOf="@+id/syq"
            app:layout_constraintTop_toTopOf="@+id/syq"
@ -126,6 +138,7 @@
            android:layout_marginEnd="8dp"
            android:background="?android:attr/selectableItemBackgroundBorderless"
            android:src="@drawable/syq"
+            app:tint="#CCCCCC"
            app:layout_constraintBottom_toBottomOf="@+id/kg"
            app:layout_constraintEnd_toStartOf="@+id/kg"
            app:layout_constraintTop_toTopOf="@+id/kg"
@ -138,6 +151,7 @@
            android:layout_height="46dp"
            android:background="?android:attr/selectableItemBackgroundBorderless"
            android:src="@drawable/zt"
+            app:tint="#CCCCCC"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@ -152,6 +166,7 @@
            android:background="?android:attr/selectableItemBackgroundBorderless"
            android:importantForAccessibility="no"
            android:src="@drawable/xyq"
+            app:tint="#CCCCCC"
            app:layout_constraintBottom_toBottomOf="@+id/kg"
            app:layout_constraintStart_toEndOf="@+id/kg"
            app:layout_constraintTop_toTopOf="@+id/kg"
@ -162,7 +177,8 @@
            android:layout_width="36dp"
            android:layout_height="36dp"
            android:background="?android:attr/selectableItemBackgroundBorderless"
-            android:src="@drawable/mpbackground"
+            android:src="@drawable/mplist"
+            app:tint="#CCCCCC"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            tools:ignore="ContentDescription" />
@ -189,8 +205,8 @@
                android:layout_height="wrap_content"
                android:layout_weight="1"
                app:labelBehavior="gone"
-                app:thumbColor="@color/thumbColor"
-                app:trackColorActive="@color/thumbColor"
+                app:thumbColor="#E6E6E6"
+                app:trackColorActive="#CCCCCC"
                tools:ignore="SpeakableTextPresentCheck" />

            <TextView
--- a/app/src/main/res/layout/activity_bfq.xml
+++ b/app/src/main/res/layout/activity_bfq.xml
@ -11,39 +11,36 @@
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:layout_marginTop="3dp"
        android:paddingHorizontal="10dp">
        <ImageView
            android:id="@+id/image1"
            android:layout_width="36dp"
            android:layout_height="36dp"
-            app:tint="#F1F1F1"
-            android:src="@drawable/end" />
+            android:layout_marginTop="3dp"
+            android:src="@drawable/end"
+            app:tint="#F1F1F1" />
+
        <LinearLayout
            android:layout_width="0dp"
            android:layout_height="wrap_content"
-            android:gravity="center_horizontal"
-            android:layout_weight="1">
+            android:layout_weight="1"
+            android:gravity="center_horizontal">
+
            <com.muqingbfq.view.Text
-                android:id="@+id/text1"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
-                android:visibility="visible"
+                android:text="歌曲"
                android:textColor="#F1F1F1"
-                android:text="歌曲界面"
-                android:textSize="26dp" />
-            <com.muqingbfq.view.Text
-                android:id="@+id/text2"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:visibility="gone"/>
+                android:textSize="26sp"
+                android:visibility="visible" />
        </LinearLayout>
        <ImageView
            android:id="@+id/image2"
            android:layout_width="26dp"
            android:layout_height="26dp"
-            app:tint="#F1F1F1"
-            android:src="@drawable/abc_ic_menu_share_mtrl_alpha"/>
+            android:layout_marginTop="3dp"
+            android:src="@drawable/abc_ic_menu_share_mtrl_alpha"
+            app:tint="#F1F1F1" />
    </LinearLayout>

    <androidx.constraintlayout.widget.ConstraintLayout
@ -59,6 +56,7 @@
            android:layout_height="256dp"
            app:cardCornerRadius="16dp"
            app:cardUseCompatPadding="true"
+            app:cardBackgroundColor="@color/tm"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
@ -75,9 +73,9 @@
            app:layout_constraintTop_toTopOf="parent"
            app:lrcCurrentTextColor="#EEEEEE"
            app:lrcNormalTextColor="#CCCCCC"
+            app:lrcTimelineTextColor="#EEEEEE"
            app:lrcNormalTextSize="16sp"
-            app:lrcTextSize="20sp"
-            app:lrcTimelineTextColor="#7C7C7C" />
+            app:lrcTextSize="20sp" />
    </androidx.constraintlayout.widget.ConstraintLayout>

    <androidx.constraintlayout.widget.ConstraintLayout
@ -93,15 +91,15 @@
            android:layout_marginEnd="6dp"
            android:gravity="center_vertical"
            android:orientation="horizontal"
-            app:tint="#CCCCCC"
            app:layout_constraintBottom_toTopOf="@id/tdt"
-            app:layout_constraintEnd_toEndOf="parent">
+            app:layout_constraintEnd_toEndOf="parent"
+            app:tint="#CCCCCC">

            <LinearLayout
                android:layout_width="0dp"
                android:layout_height="wrap_content"
-                android:layout_weight="1"
                android:layout_marginEnd="6dp"
+                android:layout_weight="1"
                android:orientation="vertical">

                <com.muqingbfq.view.Text
@ -110,8 +108,8 @@
                    android:layout_height="wrap_content"
                    android:singleLine="true"
                    android:text="@string/name"
-                    android:textStyle="bold"
                    android:textColor="#CCCCCC"
+                    android:textStyle="bold"
                    android:textSize="26sp" />

                <com.muqingbfq.view.Text
@ -225,12 +223,12 @@
            android:id="@+id/download"
            android:layout_width="36dp"
            android:layout_height="36dp"
-            app:tint="#CCCCCC"
            android:background="?android:attr/selectableItemBackgroundBorderless"
            android:src="@drawable/download"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
+            app:tint="#CCCCCC"
            tools:ignore="ContentDescription" />

    </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/activity_gd.xml
+++ b/app/src/main/res/layout/activity_gd.xml
@ -14,6 +14,7 @@
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:textSize="26sp"
+            android:transitionName="view"
            android:textColor="@color/text"/>
    </com.google.android.material.appbar.MaterialToolbar>

@ -44,6 +45,7 @@
            android:layout_height="match_parent" />
    </RelativeLayout>

+
    <androidx.fragment.app.FragmentContainerView
        android:id="@+id/bfq_db"
        android:layout_width="match_parent"
--- a/app/src/main/res/layout/list_text.xml
+++ b/app/src/main/res/layout/list_text.xml
@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_marginStart="6dp">
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
    <Button
        android:id="@+id/button"
-        style="?android:attr/buttonBarButtonStyle"
+        style="?attr/buttonBarButtonStyle"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+        app:strokeColor="?attr/colorOnSurface"
+        app:shapeAppearance="?attr/shapeAppearanceSmallComponent"
+        android:textColor="?attr/colorOnSurface"
+        app:rippleColor="?colorBackgroundFloating"
        android:text="@string/app_name"
-        android:textColor="@color/text"
-        app:strokeColor="@color/text"
        app:strokeWidth="1dp" />
 </LinearLayout>
--- a/image/Screenshot_20240204_165814.png
+++ b/image/Screenshot_20240204_165814.png
--- a/image/Screenshot_20240204_165932.png
+++ b/image/Screenshot_20240204_165932.png
--- a/image/Screenshot_20240204_170426.png
+++ b/image/Screenshot_20240204_170426.png
--- a/image/Screenshot_20240217_180254.png
+++ b/image/Screenshot_20240217_180254.png
--- a/image/Screenshot_20240217_180310.png
+++ b/image/Screenshot_20240217_180310.png
--- a/image/Screenshot_20240217_180447.png
+++ b/image/Screenshot_20240217_180447.png