Pq 10 місяців тому
батько
коміт
b141904a6f

+ 5 - 3
musicMerge/src/main/java/com/cooleshow/musicmerge/ui/MusicHandleActivity_.java

@@ -175,11 +175,13 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
         }
         this.musicRenderType = musicRenderType;
         if (!TextUtils.isEmpty(musicSheetId)) {
-            initMusicScoreFragment(musicSheetId, this.musicRenderType);
+            //本地文件模式
+            boolean isVideo = MyFileUtils.isVideo(recordFilePath);
+            initMusicScoreFragment(musicSheetId, this.musicRenderType,isVideo);
         }
     }
 
-    private void initMusicScoreFragment(String musicId, String musicRenderType) {
+    private void initMusicScoreFragment(String musicId, String musicRenderType,boolean isVideo) {
         if (mMusicScoreFragment == null) {
             mMusicScoreFragment = new MusicScoreFragment();
             Bundle bundle = new Bundle();
@@ -1628,7 +1630,7 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
             accompanyUrl = data.getAccompanyUrl();
             boolean isVideo = MyFileUtils.isVideoFromUrl(data.getVideoUrl());
             MusicMergeConfigBean musicMergeConfigBean = toApplyConfig(jsonConfig);
-            initMusicScoreFragment(data.getMusicSheetId(), musicMergeConfigBean.getMusicRenderType());
+            initMusicScoreFragment(data.getMusicSheetId(), musicMergeConfigBean.getMusicRenderType(),isVideo);
             if (mSettingFragment != null) {
                 mSettingFragment.applyConfig(musicMergeConfigBean);
                 mSettingFragment.setAccompanyUrl(accompanyUrl, accompanyPlaySpeed);

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


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


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


+ 15 - 8
musicMerge/src/main/res/layout/ac_music_handle_layout.xml

@@ -53,15 +53,16 @@
         app:constraint_referenced_ids="fl_setting,fl_setting" />
 
 
+
     <View
-        android:layout_marginBottom="12dp"
         android:id="@+id/view_center_point"
-        app:layout_constraintRight_toRightOf="@+id/fl_ablum"
-        app:layout_constraintLeft_toLeftOf="@+id/fl_ablum"
-        app:layout_constraintBottom_toBottomOf="@+id/fl_ablum"
-        app:layout_constraintTop_toTopOf="@+id/fl_ablum"
         android:layout_width="1px"
-        android:layout_height="1px"/>
+        android:layout_height="1px"
+        android:layout_marginBottom="15dp"
+        app:layout_constraintBottom_toBottomOf="@+id/fl_ablum"
+        app:layout_constraintLeft_toLeftOf="@+id/fl_ablum"
+        app:layout_constraintRight_toRightOf="@+id/fl_ablum"
+        app:layout_constraintTop_toTopOf="@+id/fl_ablum" />
 
     <ImageView
         android:id="@+id/iv_music_merge_shadow"
@@ -84,12 +85,14 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toLeftOf="@+id/fl_setting"
         app:layout_constraintTop_toTopOf="@+id/fl_ablum" />
-    
+
     <ImageView
         android:id="@+id/iv_gramophone_bg"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="15dp"
+        android:layout_marginBottom="21dp"
+        android:scaleX="0.9"
+        android:scaleY="0.9"
         android:src="@drawable/bg_music_merge_gramophone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
@@ -102,6 +105,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="15dp"
+        android:scaleX="0.9"
+        android:scaleY="0.9"
         app:layout_constraintLeft_toLeftOf="@+id/iv_gramophone_bg"
         app:layout_constraintRight_toRightOf="@+id/iv_gramophone_bg"
         app:layout_constraintTop_toTopOf="@+id/iv_gramophone_bg">
@@ -150,6 +155,8 @@
         app:layout_constraintTop_toTopOf="@+id/iv_gramophone_bg" />
 
     <ImageView
+        android:scaleX="0.9"
+        android:scaleY="0.9"
         android:id="@+id/iv_play_pointer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"