Browse Source

更新作品合成引导页

Pq 9 months ago
parent
commit
b35c77af69
31 changed files with 385 additions and 100 deletions
  1. 100 100
      musicMerge/src/main/java/com/cooleshow/musicmerge/helper/MusicMergeGuideHelper.java
  2. BIN
      musicMerge/src/main/res/drawable-xhdpi/mh_guide_button_bg.png
  3. BIN
      musicMerge/src/main/res/drawable-xhdpi/mh_guide_button_bg2.png
  4. BIN
      musicMerge/src/main/res/drawable-xhdpi/mh_guide_button_bg3.png
  5. BIN
      musicMerge/src/main/res/drawable-xhdpi/mh_guide_step1.png
  6. BIN
      musicMerge/src/main/res/drawable-xhdpi/mh_guide_step2.png
  7. BIN
      musicMerge/src/main/res/drawable-xhdpi/mh_guide_step3.png
  8. BIN
      musicMerge/src/main/res/drawable-xhdpi/mh_guide_step4.png
  9. BIN
      musicMerge/src/main/res/drawable-xhdpi/mh_guide_step5.png
  10. BIN
      musicMerge/src/main/res/drawable-xhdpi/mh_guide_step6.png
  11. BIN
      musicMerge/src/main/res/drawable-xhdpi/mh_guide_step7.png
  12. BIN
      musicMerge/src/main/res/drawable-xxhdpi/mh_guide_button_bg.png
  13. BIN
      musicMerge/src/main/res/drawable-xxhdpi/mh_guide_button_bg2.png
  14. BIN
      musicMerge/src/main/res/drawable-xxhdpi/mh_guide_button_bg3.png
  15. BIN
      musicMerge/src/main/res/drawable-xxhdpi/mh_guide_step1.png
  16. BIN
      musicMerge/src/main/res/drawable-xxhdpi/mh_guide_step2.png
  17. BIN
      musicMerge/src/main/res/drawable-xxhdpi/mh_guide_step3.png
  18. BIN
      musicMerge/src/main/res/drawable-xxhdpi/mh_guide_step4.png
  19. BIN
      musicMerge/src/main/res/drawable-xxhdpi/mh_guide_step5.png
  20. BIN
      musicMerge/src/main/res/drawable-xxhdpi/mh_guide_step6.png
  21. BIN
      musicMerge/src/main/res/drawable-xxhdpi/mh_guide_step7.png
  22. 5 0
      musicMerge/src/main/res/drawable/shape_border_white_37dp.xml
  23. 35 0
      musicMerge/src/main/res/layout/mh_guide_step1.xml
  24. 36 0
      musicMerge/src/main/res/layout/mh_guide_step2.xml
  25. 36 0
      musicMerge/src/main/res/layout/mh_guide_step3.xml
  26. 36 0
      musicMerge/src/main/res/layout/mh_guide_step4.xml
  27. 36 0
      musicMerge/src/main/res/layout/mh_guide_step5.xml
  28. 36 0
      musicMerge/src/main/res/layout/mh_guide_step6.xml
  29. 49 0
      musicMerge/src/main/res/layout/mh_guide_step7.xml
  30. 14 0
      musicMerge/src/main/res/layout/mh_item_close_guide_layout.xml
  31. 2 0
      musicMerge/src/main/res/values/colors.xml

+ 100 - 100
musicMerge/src/main/java/com/cooleshow/musicmerge/helper/MusicMergeGuideHelper.java

@@ -24,109 +24,109 @@ import com.cooleshow.musicmerge.R;
 public class MusicMergeGuideHelper {
 
     public static void showGuide(Activity activity, View[] views, OnGuideChangedListener guideChangedListener) {
-//        for (int i = 0; i < views.length; i++) {
-//            views[i].setVisibility(View.VISIBLE);
-//        }
-//        Builder builder = NewbieGuide.with(activity)
-//                .setLabel("music_merge_guide")
-//                .alwaysShow(true)
-//                .addGuidePage(GuidePage.newInstance()
-//                        .setEverywhereCancelable(true)
-//                        .setBackgroundColor(activity.getResources().getColor(com.cooleshow.base.R.color.color_ad000000))
-//                        .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
-//                            @Override
-//                            public void onLayoutInflated(View view, Controller controller) {
-//                                setStepText(view, 1, views.length);
-//                            }
-//                        })
-//                        .addHighLight(views[0], new RelativeGuide(R.layout.mh_guide_step1, Gravity.LEFT, 0), 20))
-//                .addGuidePage(GuidePage.newInstance()
-//                        .setEverywhereCancelable(true)
-//                        .setBackgroundColor(activity.getResources().getColor(com.cooleshow.base.R.color.color_ad000000))
-//                        .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
-//                            @Override
-//                            public void onLayoutInflated(View view, Controller controller) {
-//                                setStepText(view, 2, views.length);
-//                            }
-//                        })
-//                        .addHighLight(views[1], new RelativeGuide(R.layout.mh_guide_step2, RelativeGuide.LimitGravity.BOTTOM_LEFT2, SizeUtils.dp2px(0)), 20))
-//                .addGuidePage(GuidePage.newInstance()
-//                        .setEverywhereCancelable(true)
-//                        .setBackgroundColor(activity.getResources().getColor(com.cooleshow.base.R.color.color_ad000000))
-//                        .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
-//                            @Override
-//                            public void onLayoutInflated(View view, Controller controller) {
-//                                setStepText(view, 3, views.length);
-//                            }
-//                        })
-//                        .addHighLight(views[2], new RelativeGuide(R.layout.mh_guide_step3, RelativeGuide.LimitGravity.BOTTOM_LEFT2, SizeUtils.dp2px(0)), 20))
-//                .addGuidePage(GuidePage.newInstance()
-//                        .setEverywhereCancelable(true)
-//                        .setBackgroundColor(activity.getResources().getColor(com.cooleshow.base.R.color.color_ad000000))
-//                        .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
-//                            @Override
-//                            public void onLayoutInflated(View view, Controller controller) {
-//                                setStepText(view, 4, views.length);
-//                            }
-//                        })
-//                        .addHighLight(views[3], new RelativeGuide(R.layout.mh_guide_step4, RelativeGuide.LimitGravity.BOTTOM_LEFT2, SizeUtils.dp2px(0)), 20));
-//
-//        if (views.length > 6) {
-//            builder.addGuidePage(GuidePage.newInstance()
-//                    .setEverywhereCancelable(true)
-//                    .setBackgroundColor(activity.getResources().getColor(com.cooleshow.base.R.color.color_ad000000))
-//                    .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
-//                        @Override
-//                        public void onLayoutInflated(View view, Controller controller) {
-//                            setStepText(view, 5, views.length);
-//                        }
-//                    })
-//                    .addHighLight(views[4], new RelativeGuide(R.layout.mh_guide_step5, RelativeGuide.LimitGravity.TOP_RIGHT, SizeUtils.dp2px(0)), 20));
-//        }
-//        builder.addGuidePage(GuidePage.newInstance()
-//                        .setEverywhereCancelable(true)
-//                        .setBackgroundColor(activity.getResources().getColor(com.cooleshow.base.R.color.color_ad000000))
-//                        .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
-//                            @Override
-//                            public void onLayoutInflated(View view, Controller controller) {
-//                                setStepText(view, views.length - 1, views.length);
-//                            }
-//                        })
-//                        .addHighLight(views[views.length-2], new RelativeGuide(R.layout.mh_guide_step6, RelativeGuide.LimitGravity.TOP_RIGHT, SizeUtils.dp2px(0)), 20))
-//                .addGuidePage(GuidePage.newInstance()
-//                        .setEverywhereCancelable(true)
-//                        .setBackgroundColor(activity.getResources().getColor(com.cooleshow.base.R.color.color_ad000000))
-//                        .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
-//                            @Override
-//                            public void onLayoutInflated(View view, Controller controller) {
-//                                View tv_relook = view.findViewById(R.id.tv_relook);
-//                                if (tv_relook != null) {
-//                                    tv_relook.setOnClickListener(new View.OnClickListener() {
-//                                        @Override
-//                                        public void onClick(View v) {
-//                                            controller.showPage(0);
-//                                        }
-//                                    });
-//                                }
-//                            }
-//                        })
-//                        .addHighLight(views[views.length-1], new RelativeGuide(R.layout.mh_guide_step7, RelativeGuide.LimitGravity.TOP_RIGHT, SizeUtils.dp2px(0)), 20))
-//                .setOnGuideChangedListener(guideChangedListener)
-//                .setEventListener(new OnEventListener() {
-//                    @Override
-//                    public View getCloseView(FrameLayout parent) {
-//                        View view = LayoutInflater.from(activity).inflate(R.layout.mh_item_close_guide_layout, parent, false);
-//                        return view;
-//                    }
-//                });
-//        builder.show();
+        for (int i = 0; i < views.length; i++) {
+            views[i].setVisibility(View.VISIBLE);
+        }
+        Builder builder = NewbieGuide.with(activity)
+                .setLabel("music_merge_guide")
+                .alwaysShow(true)
+                .addGuidePage(GuidePage.newInstance()
+                        .setEverywhereCancelable(true)
+                        .setBackgroundColor(activity.getResources().getColor(R.color.color_ad000000))
+                        .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
+                            @Override
+                            public void onLayoutInflated(View view, Controller controller) {
+                                setStepText(view, 1, views.length);
+                            }
+                        })
+                        .addHighLight(views[0], new RelativeGuide(R.layout.mh_guide_step1, Gravity.LEFT, 0), 20))
+                .addGuidePage(GuidePage.newInstance()
+                        .setEverywhereCancelable(true)
+                        .setBackgroundColor(activity.getResources().getColor(R.color.color_ad000000))
+                        .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
+                            @Override
+                            public void onLayoutInflated(View view, Controller controller) {
+                                setStepText(view, 2, views.length);
+                            }
+                        })
+                        .addHighLight(views[1], new RelativeGuide(R.layout.mh_guide_step2, RelativeGuide.LimitGravity.BOTTOM_LEFT2, SizeUtils.dp2px(0)), 20))
+                .addGuidePage(GuidePage.newInstance()
+                        .setEverywhereCancelable(true)
+                        .setBackgroundColor(activity.getResources().getColor(R.color.color_ad000000))
+                        .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
+                            @Override
+                            public void onLayoutInflated(View view, Controller controller) {
+                                setStepText(view, 3, views.length);
+                            }
+                        })
+                        .addHighLight(views[2], new RelativeGuide(R.layout.mh_guide_step3, RelativeGuide.LimitGravity.BOTTOM_LEFT2, SizeUtils.dp2px(0)), 20))
+                .addGuidePage(GuidePage.newInstance()
+                        .setEverywhereCancelable(true)
+                        .setBackgroundColor(activity.getResources().getColor(R.color.color_ad000000))
+                        .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
+                            @Override
+                            public void onLayoutInflated(View view, Controller controller) {
+                                setStepText(view, 4, views.length);
+                            }
+                        })
+                        .addHighLight(views[3], new RelativeGuide(R.layout.mh_guide_step4, RelativeGuide.LimitGravity.BOTTOM_LEFT2, SizeUtils.dp2px(0)), 20));
+
+        if (views.length > 6) {
+            builder.addGuidePage(GuidePage.newInstance()
+                    .setEverywhereCancelable(true)
+                    .setBackgroundColor(activity.getResources().getColor(R.color.color_ad000000))
+                    .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
+                        @Override
+                        public void onLayoutInflated(View view, Controller controller) {
+                            setStepText(view, 5, views.length);
+                        }
+                    })
+                    .addHighLight(views[4], new RelativeGuide(R.layout.mh_guide_step5, RelativeGuide.LimitGravity.TOP_RIGHT, SizeUtils.dp2px(0)), 20));
+        }
+        builder.addGuidePage(GuidePage.newInstance()
+                        .setEverywhereCancelable(true)
+                        .setBackgroundColor(activity.getResources().getColor(R.color.color_ad000000))
+                        .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
+                            @Override
+                            public void onLayoutInflated(View view, Controller controller) {
+                                setStepText(view, views.length - 1, views.length);
+                            }
+                        })
+                        .addHighLight(views[views.length-2], new RelativeGuide(R.layout.mh_guide_step6, RelativeGuide.LimitGravity.TOP_RIGHT, SizeUtils.dp2px(0)), 20))
+                .addGuidePage(GuidePage.newInstance()
+                        .setEverywhereCancelable(true)
+                        .setBackgroundColor(activity.getResources().getColor(R.color.color_ad000000))
+                        .setOnLayoutInflatedListener(new OnLayoutInflatedListener() {
+                            @Override
+                            public void onLayoutInflated(View view, Controller controller) {
+                                View tv_relook = view.findViewById(R.id.tv_relook);
+                                if (tv_relook != null) {
+                                    tv_relook.setOnClickListener(new View.OnClickListener() {
+                                        @Override
+                                        public void onClick(View v) {
+                                            controller.showPage(0);
+                                        }
+                                    });
+                                }
+                            }
+                        })
+                        .addHighLight(views[views.length-1], new RelativeGuide(R.layout.mh_guide_step7, RelativeGuide.LimitGravity.TOP_RIGHT, SizeUtils.dp2px(0)), 20))
+                .setOnGuideChangedListener(guideChangedListener)
+                .setEventListener(new OnEventListener() {
+                    @Override
+                    public View getCloseView(FrameLayout parent) {
+                        View view = LayoutInflater.from(activity).inflate(R.layout.mh_item_close_guide_layout, parent, false);
+                        return view;
+                    }
+                });
+        builder.show();
     }
 
 
     private static void setStepText(View view, int step, int max) {
-//        TextView tv_next_tip = view.findViewById(R.id.tv_next_tip);
-//        if (tv_next_tip != null) {
-//            tv_next_tip.setText(String.format("下一步(%d/%d)", step, max));
-//        }
+        TextView tv_next_tip = view.findViewById(R.id.tv_next_tip);
+        if (tv_next_tip != null) {
+            tv_next_tip.setText(String.format("下一步(%d/%d)", step, max));
+        }
     }
 }

BIN
musicMerge/src/main/res/drawable-xhdpi/mh_guide_button_bg.png


BIN
musicMerge/src/main/res/drawable-xhdpi/mh_guide_button_bg2.png


BIN
musicMerge/src/main/res/drawable-xhdpi/mh_guide_button_bg3.png


BIN
musicMerge/src/main/res/drawable-xhdpi/mh_guide_step1.png


BIN
musicMerge/src/main/res/drawable-xhdpi/mh_guide_step2.png


BIN
musicMerge/src/main/res/drawable-xhdpi/mh_guide_step3.png


BIN
musicMerge/src/main/res/drawable-xhdpi/mh_guide_step4.png


BIN
musicMerge/src/main/res/drawable-xhdpi/mh_guide_step5.png


BIN
musicMerge/src/main/res/drawable-xhdpi/mh_guide_step6.png


BIN
musicMerge/src/main/res/drawable-xhdpi/mh_guide_step7.png


BIN
musicMerge/src/main/res/drawable-xxhdpi/mh_guide_button_bg.png


BIN
musicMerge/src/main/res/drawable-xxhdpi/mh_guide_button_bg2.png


BIN
musicMerge/src/main/res/drawable-xxhdpi/mh_guide_button_bg3.png


BIN
musicMerge/src/main/res/drawable-xxhdpi/mh_guide_step1.png


BIN
musicMerge/src/main/res/drawable-xxhdpi/mh_guide_step2.png


BIN
musicMerge/src/main/res/drawable-xxhdpi/mh_guide_step3.png


BIN
musicMerge/src/main/res/drawable-xxhdpi/mh_guide_step4.png


BIN
musicMerge/src/main/res/drawable-xxhdpi/mh_guide_step5.png


BIN
musicMerge/src/main/res/drawable-xxhdpi/mh_guide_step6.png


BIN
musicMerge/src/main/res/drawable-xxhdpi/mh_guide_step7.png


+ 5 - 0
musicMerge/src/main/res/drawable/shape_border_white_37dp.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="37dp"/>
+    <stroke android:color="@color/white" android:width="1dp"/>
+</shape>

+ 35 - 0
musicMerge/src/main/res/layout/mh_guide_step1.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+
+    <ImageView
+        android:layout_marginEnd="12dp"
+        android:layout_marginTop="15dp"
+        android:id="@+id/iv_bg"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:src="@drawable/mh_guide_step1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/tv_next_tip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/mh_guide_button_bg"
+        android:gravity="center"
+        android:text="下一步 (1/7)"
+        android:paddingBottom="1dp"
+        android:textColor="@color/guide_bt_text_color"
+        android:textSize="@dimen/sp_13"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="17dp"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_bg"
+        app:layout_constraintTop_toBottomOf="@+id/iv_bg" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

+ 36 - 0
musicMerge/src/main/res/layout/mh_guide_step2.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingBottom="32dp"
+    android:orientation="vertical">
+
+
+    <ImageView
+        android:layout_marginEnd="12dp"
+        android:layout_marginTop="15dp"
+        android:id="@+id/iv_bg"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:src="@drawable/mh_guide_step2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/tv_next_tip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/mh_guide_button_bg"
+        android:gravity="center"
+        android:text="下一步 (2/7)"
+        android:paddingBottom="1dp"
+        android:textColor="@color/guide_bt_text_color"
+        android:textSize="@dimen/sp_13"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="17dp"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_bg"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_bg" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

+ 36 - 0
musicMerge/src/main/res/layout/mh_guide_step3.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingBottom="32dp"
+    android:orientation="vertical">
+
+
+    <ImageView
+        android:layout_marginEnd="12dp"
+        android:layout_marginTop="15dp"
+        android:id="@+id/iv_bg"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:src="@drawable/mh_guide_step3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/tv_next_tip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/mh_guide_button_bg"
+        android:gravity="center"
+        android:text="下一步 (3/7)"
+        android:paddingBottom="1dp"
+        android:textColor="@color/guide_bt_text_color"
+        android:textSize="@dimen/sp_13"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="17dp"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_bg"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_bg" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

+ 36 - 0
musicMerge/src/main/res/layout/mh_guide_step4.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:paddingBottom="32dp"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+
+    <ImageView
+        android:layout_marginEnd="12dp"
+        android:layout_marginTop="15dp"
+        android:id="@+id/iv_bg"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:src="@drawable/mh_guide_step4"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/tv_next_tip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/mh_guide_button_bg"
+        android:gravity="center"
+        android:text="下一步 (4/7)"
+        android:paddingBottom="1dp"
+        android:textColor="@color/guide_bt_text_color"
+        android:textSize="@dimen/sp_13"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="17dp"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_bg"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_bg" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

+ 36 - 0
musicMerge/src/main/res/layout/mh_guide_step5.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingBottom="15dp"
+    android:paddingEnd="21dp"
+    android:orientation="vertical">
+
+
+    <ImageView
+        android:id="@+id/iv_bg"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:src="@drawable/mh_guide_step5"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/tv_next_tip"
+        android:layout_marginBottom="15dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/mh_guide_button_bg"
+        android:gravity="center"
+        android:text="下一步 (5/7)"
+        android:paddingBottom="1dp"
+        android:textColor="@color/guide_bt_text_color"
+        android:textSize="@dimen/sp_13"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="17dp"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_bg"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_bg" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

+ 36 - 0
musicMerge/src/main/res/layout/mh_guide_step6.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingBottom="15dp"
+    android:orientation="vertical">
+
+
+    <ImageView
+        android:layout_marginEnd="82dp"
+        android:id="@+id/iv_bg"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:src="@drawable/mh_guide_step6"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/tv_next_tip"
+        android:layout_marginBottom="15dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/mh_guide_button_bg"
+        android:gravity="center"
+        android:paddingBottom="1dp"
+        android:text="下一步 (6/7)"
+        android:textColor="@color/guide_bt_text_color"
+        android:textSize="@dimen/sp_13"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="17dp"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_bg"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_bg" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

+ 49 - 0
musicMerge/src/main/res/layout/mh_guide_step7.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingBottom="10dp"
+    android:paddingEnd="21dp"
+    android:orientation="vertical">
+
+
+    <ImageView
+        android:id="@+id/iv_bg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/mh_guide_step7"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tv_completed"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="17dp"
+        android:layout_marginBottom="15dp"
+        android:paddingBottom="1dp"
+        android:background="@drawable/mh_guide_button_bg2"
+        android:gravity="center"
+        android:text="完成"
+        android:textColor="@color/guide_bt_text_color"
+        android:textSize="@dimen/sp_13"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_bg"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_bg" />
+
+
+    <TextView
+        android:id="@+id/tv_relook"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="14dp"
+        android:background="@drawable/mh_guide_button_bg3"
+        android:gravity="center"
+        android:text="再看一遍"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_13"
+        app:layout_constraintBaseline_toBaselineOf="@+id/tv_completed"
+        app:layout_constraintLeft_toRightOf="@+id/tv_completed" />
+</androidx.constraintlayout.widget.ConstraintLayout>

+ 14 - 0
musicMerge/src/main/res/layout/mh_item_close_guide_layout.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="30dp"
+    android:paddingEnd="15dp"
+    android:paddingStart="15dp"
+    android:layout_marginStart="20dp"
+    android:background="@drawable/shape_border_white_37dp"
+    android:layout_gravity="left|top"
+    android:layout_marginTop="20dp"
+    android:gravity="center"
+    android:text="跳过"
+    android:textColor="@color/white"
+    android:textSize="@dimen/sp_15" />

+ 2 - 0
musicMerge/src/main/res/values/colors.xml

@@ -6,5 +6,7 @@
     <color name="color_8f8f8f">#8F8F8F</color>
     <color name="color_48494b">#48494B</color>
     <color name="color_1aa48a">#1AA48A</color>
+    <color name="color_ad000000">#ad000000</color>
+    <color name="guide_bt_text_color">#00807A</color>
 </resources>