增加调音器module

musictuner/build.gradle

@@ -1,13 +1,10 @@
-plugins {
-    id 'com.android.application'
-}
+apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 32
 
     defaultConfig {
-        applicationId "com.cooleshow.musictuner"
-        minSdkVersion 23
+        minSdkVersion 21
         targetSdkVersion 32
         versionCode 1
         versionName "1.0"
@@ -33,14 +30,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
     sourceSets {
         main {
             jniLibs.srcDirs = ['libs']
         }
     }
 
-
     buildFeatures {
         viewBinding = true
     }

musictuner/src/main/AndroidManifest.xml

@@ -2,13 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.cooleshow.musictuner">
 
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.CooleShow">
+    <application>
         <activity
             android:name=".MusicTunerActivity"
             android:exported="false">

musictuner/src/main/java/com/cooleshow/musictuner/MusicTunerActivity.java

@@ -10,20 +10,26 @@ import be.tarsos.dsp.pitch.PitchDetectionHandler;
 import be.tarsos.dsp.pitch.PitchDetectionResult;
 import be.tarsos.dsp.pitch.PitchProcessor;
 
+import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 
 import com.cooleshow.base.ui.activity.BaseActivity;
 import com.cooleshow.musictuner.bean.VoiceToneBean;
-import com.cooleshow.musictuner.databinding.ActivityMainBinding;
+import com.cooleshow.musictuner.databinding.ActivityMusicTunerLayoutBinding;
 import com.cooleshow.musictuner.utils.VoiceDataUtils;
 
-public class MusicTunerActivity extends BaseActivity<ActivityMainBinding> {
+public class MusicTunerActivity extends BaseActivity<ActivityMusicTunerLayoutBinding> {
+
+    public static void start(Context context){
+        Intent intent =new Intent(context,MusicTunerActivity.class);
+        context.startActivity(intent);
+    }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
         test();
     }
 
@@ -33,8 +39,8 @@ public class MusicTunerActivity extends BaseActivity<ActivityMainBinding> {
     }
 
     @Override
-    protected ActivityMainBinding getLayoutView() {
-        return ActivityMainBinding.inflate(getLayoutInflater());
+    protected ActivityMusicTunerLayoutBinding getLayoutView() {
+        return ActivityMusicTunerLayoutBinding.inflate(getLayoutInflater());
     }
 
     private void test(){
@@ -49,7 +55,7 @@ public class MusicTunerActivity extends BaseActivity<ActivityMainBinding> {
                 runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
-//                        mTvResult.setText(pitchInHz + "Hz");
+                        viewBinding.tvResult.setText(pitchInHz + "Hz");
 //                        if (voiceToneBean != null) {
 //                            mTvResultVoiceTones.setText(voiceToneBean.name);
 //                            mBeforeResultVoiceTones.setText(voiceToneBean.beforeName);
@@ -64,6 +70,6 @@ public class MusicTunerActivity extends BaseActivity<ActivityMainBinding> {
         };
         AudioProcessor p = new PitchProcessor(PitchProcessor.PitchEstimationAlgorithm.FFT_YIN, 22050, 1024, pdh);
         dispatcher.addAudioProcessor(p);
-        new Thread(dispatcher, "Audio Dispatcher").start();
+//        new Thread(dispatcher, "Audio Dispatcher").start();
     }
 }

musictuner/src/main/java/com/cooleshow/musictuner/widget/DashBoardView.java

@@ -0,0 +1,209 @@
+package com.cooleshow.musictuner.widget;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.TypedValue;
+import android.view.View;
+
+import com.cooleshow.base.utils.SizeUtils;
+
+import androidx.annotation.Nullable;
+
+/**
+ * Author by pq, Date on 2022/9/26.
+ */
+public class DashBoardView extends View {
+    private int cx = 0;//圆心点坐标x
+    private int cy = 0;//圆心点坐标y
+    private int width;
+    private int height;
+    private int mRadius;
+    private int mCenterX;
+    private int mCenterY;
+
+    private int mSection = 10; // 值域（mMax-mMin）等分份数
+    private int mPortion = 10; // 一个mSection等分份数
+    private int mStartAngle = 0; // 起始角度
+    private float mSweepAngle = mSection * mPortion * 1.8f; // 绘制角度 左边50 右边50 一个刻度1.5度
+
+    private int longScaleLineWidth = dp2px(4);//长刻度线宽度
+    private int longScaleLineHeight = dp2px(12);//长刻度线高度
+    private int shortScaleLineWidth = dp2px(3);//短刻度线宽度
+    private int shortScaleLineHeight = dp2px(8);//短刻度线长度
+    private Paint mLinePaint;
+    private Paint mCenterPointPaint;
+    private String[] mTexts = new String[]{"50", "40", "30", "20", "10", "0", "10", "20", "30", "40", "50"};
+    private Paint mTextValuePaint;
+    private Rect mRectText;
+    private RectF mRectFTextArc;
+    private Path mPath;
+
+    public DashBoardView(Context context) {
+        this(context, null);
+    }
+
+    public DashBoardView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public DashBoardView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    private void init() {
+        mLinePaint = new Paint();
+        mLinePaint.setStrokeCap(Paint.Cap.ROUND);
+        mLinePaint.setStrokeWidth(dp2px(1));
+        mLinePaint.setAlpha(120);
+        mLinePaint.setDither(true);
+        mLinePaint.setAntiAlias(true);
+        mLinePaint.setColor(getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
+
+        mCenterPointPaint = new Paint();
+        mCenterPointPaint.setStrokeWidth(dp2px(6));
+        mCenterPointPaint.setStrokeCap(Paint.Cap.ROUND);
+        mCenterPointPaint.setColor(Color.RED);
+
+        mTextValuePaint = new Paint();
+        mTextValuePaint.setAntiAlias(true);
+        mTextValuePaint.setStrokeCap(Paint.Cap.ROUND);
+        mTextValuePaint.setColor(Color.WHITE);
+        mTextValuePaint.setTextSize(SizeUtils.sp2px(10));
+        mTextValuePaint.setTextAlign(Paint.Align.LEFT);
+        mTextValuePaint.setStyle(Paint.Style.FILL);
+        mTextValuePaint.setAlpha(160);
+        mRectText = new Rect();
+        mPath = new Path();
+        mRectFTextArc = new RectF();
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        width = getWidth(); // Get View Width
+        height = getHeight();// Get View Height
+        width = MeasureSpec.getSize(widthMeasureSpec);
+        height = MeasureSpec.getSize(heightMeasureSpec);
+        cx = width / 2;
+        cy = height;
+        mRadius = (int) ((width / 2) * 0.8);
+        mCenterX = cx;
+        mCenterY = cy;
+
+        mTextValuePaint.getTextBounds("0", 0, "0".length(), mRectText);
+        mRectFTextArc.set(
+                mRectText.height(), mRectText.height(),
+                getMeasuredWidth() - mRectText.height(),
+                getMeasuredWidth() - mRectText.height()
+        );
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        super.onDraw(canvas);
+//        canvas.drawLine(cx, cy, cx, 0, mCenterPointPaint);
+        float x0 = mCenterX;
+        float y0 = height - mRadius;
+        float x1 = mCenterX;
+        float y1 = y0 + longScaleLineHeight;
+        // 逆时针到开始处
+        canvas.save();
+        // 逆时针到开始处
+        canvas.save();
+        canvas.drawLine(x0, y0, x1, y1, mLinePaint);
+        float degree = mSweepAngle / mSection;
+        for (int i = 0; i < mSection / 2; i++) {
+            canvas.rotate(-degree, cx, cy);
+            canvas.drawLine(x0, y0, x1, y1, mLinePaint);
+        }
+        canvas.restore();
+        // 顺时针到结尾处
+        canvas.save();
+        for (int i = 0; i < mSection / 2; i++) {
+            canvas.rotate(degree, cx, cy);
+            canvas.drawLine(x0, y0, x1, y1, mLinePaint);
+        }
+        canvas.restore();
+
+
+        /**
+         * 画短刻度
+         * 同样采用canvas的旋转原理
+         */
+        mLinePaint.setAlpha(90);
+
+        float x2 = mCenterX;
+        float y2 = y0 + shortScaleLineHeight;
+        // 逆时针到开始处
+        canvas.save();
+        canvas.drawLine(x0, y0, x2, y2, mLinePaint);
+        degree = mSweepAngle / (mSection * mPortion);
+        for (int i = 0; i < (mSection * mPortion) / 2; i++) {
+            canvas.rotate(-degree, cx, cy);
+            canvas.drawLine(x0, y0, x2, y2, mLinePaint);
+        }
+        canvas.restore();
+        // 顺时针到结尾处
+        canvas.save();
+        for (int i = 0; i < (mSection * mPortion) / 2; i++) {
+            canvas.rotate(degree, cx, cy);
+            canvas.drawLine(x0, y0, x2, y2, mLinePaint);
+        }
+        canvas.restore();
+
+        /**
+         * 画长刻度读数
+         * 添加一个圆弧path，文字沿着path绘制
+         */
+//        for (int i = 0; i < mTexts.length; i++) {
+//            mTextValuePaint.getTextBounds(mTexts[i], 0, mTexts[i].length(), mRectText);
+//            // 粗略把文字的宽度视为圆心角2*θ对应的弧长，利用弧长公式得到θ，下面用于修正角度
+//            float θ = (float) (180 * mRectText.width() / 2 /
+//                    (Math.PI * (mRadius - mRectText.height())));
+//
+//            mPath.reset();
+//            mPath.addArc(
+//                    mRectFTextArc,
+//                    mStartAngle + i * (mSweepAngle / mSection) , // 正起始角度减去θ使文字居中对准长刻度
+//                    mSweepAngle
+//            );
+//            canvas.drawTextOnPath(mTexts[i], mPath, 0, 0, mTextValuePaint);
+//        }
+
+        Paint.FontMetrics fontMetrics = mTextValuePaint.getFontMetrics();
+        float ascent = fontMetrics.ascent;
+        float descent = fontMetrics.descent;
+        Log.i("pq","cx:"+cx);
+        for (int i = 0; i < mTexts.length; i++) {
+            float textWidth = mTextValuePaint.measureText(mTexts[i]);
+            double a = i * 18 * Math.PI / 180;
+            float baseX;
+            float baseY;
+            if(i <5){
+                baseX = (float) (cx - (Math.cos(a) * (mRadius + SizeUtils.dp2px(20))+ 0));
+            }else if(i == 5){
+                baseX = (float) (cx - (Math.cos(a) * (mRadius + SizeUtils.dp2px(20))+ textWidth/2));
+            }else{
+                baseX= (float) (cx - (Math.cos(a) * (mRadius + SizeUtils.dp2px(20)) + textWidth));
+            }
+            baseY = (float) (cy - Math.sin(a) *
+                    (mRadius + SizeUtils.dp2px(10)));
+            Log.i("pq","baseX:"+baseX);
+            canvas.drawText(mTexts[i], baseX, baseY, mTextValuePaint);
+        }
+    }
+
+    private int dp2px(int dp) {
+        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,
+                Resources.getSystem().getDisplayMetrics());
+    }
+}

musictuner/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>

musictuner/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>

musictuner/src/main/res/layout/activity_main.xml → musictuner/src/main/res/layout/activity_music_tuner_layout.xml

@@ -6,10 +6,23 @@
     android:layout_height="match_parent"
     tools:context=".MusicTunerActivity">
 
+    <include
+        android:id="@+id/toolbar_include"
+        layout="@layout/common_toolbar_layout_white"/>
+
+    <com.cooleshow.musictuner.widget.DashBoardView
+        app:layout_constraintTop_toBottomOf="@+id/toolbar_include"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        android:background="#000000"
+        android:id="@+id/view_dash_board"
+        android:layout_width="303dp"
+        android:layout_height="153dp"/>
+
     <TextView
         android:id="@+id/tv_result"
         android:layout_marginTop="100dp"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/view_dash_board"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         tools:text="haha"
@@ -44,7 +57,7 @@
 
     <TextView
         app:layout_constraintBaseline_toBaselineOf="@+id/tv_result_voice_tones"
-        android:id="@+id/tv_after_result_voice_tones"
+        android:id="@+id/tv_after"
         app:layout_constraintRight_toRightOf="parent"
         tools:text="C"
         android:textColor="#000000"

musictuner/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

musictuner/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>

musictuner/src/main/res/values-night/themes.xml

@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.CooleShow" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>

musictuner/src/main/res/values/colors.xml

@@ -1,10 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
 </resources>

musictuner/src/main/res/values/strings.xml

@@ -1,3 +1,2 @@
 <resources>
-    <string name="app_name">musicTuner</string>
 </resources>

musictuner/src/main/res/values/themes.xml

@@ -1,16 +1,3 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.CooleShow" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
 </resources>

settings.gradle

@@ -30,3 +30,4 @@ include ':rong_im:live'
 include ':live_teaching'
 include ':rong_im:common_im_ui'
 include ':metronome'
+include ':musictuner'