增加清除引导页缓存逻辑

BaseLibrary/src/main/java/com/cooleshow/base/utils/MyFileUtils.java

@@ -1675,6 +1675,9 @@ public class MyFileUtils {
     }
 
     public static boolean isVideo(String filePath) {
+        if(TextUtils.isEmpty(filePath)){
+            return false;
+        }
         File file = new File(filePath);
         if (!file.exists()) {
             return false;

musicMerge/src/main/java/com/cooleshow/musicmerge/ui/MusicHandleActivity_.java

@@ -175,12 +175,11 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
         }
         this.musicRenderType = musicRenderType;
         if (!TextUtils.isEmpty(musicSheetId)) {
-            boolean isVideo = MyFileUtils.isVideo(recordFilePath);
-            initMusicScoreFragment(musicSheetId, this.musicRenderType, isVideo);
+            initMusicScoreFragment(musicSheetId, this.musicRenderType);
         }
     }
 
-    private void initMusicScoreFragment(String musicId, String musicRenderType, boolean isVideo) {
+    private void initMusicScoreFragment(String musicId, String musicRenderType) {
         if (mMusicScoreFragment == null) {
             mMusicScoreFragment = new MusicScoreFragment();
             Bundle bundle = new Bundle();
@@ -189,17 +188,17 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
             }else{
                 viewBinding.flMusicScoreContainer.setBackgroundColor(Color.TRANSPARENT);
             }
-            bundle.putString(WEB_URL, createUrl(musicId, musicRenderType, isVideo));
+            bundle.putString(WEB_URL, createUrl(musicId, musicRenderType));
             mMusicScoreFragment.setArguments(bundle);
             getSupportFragmentManager().beginTransaction().replace(R.id.fl_music_score_container, mMusicScoreFragment).commitAllowingStateLoss();
         }
     }
 
-    private String createUrl(String musicId, String musicRenderType, boolean isVideo) {
+    private String createUrl(String musicId, String musicRenderType) {
         //五线谱：staff、简谱：firstTone、固定音高：fixedTone
 //        return "https://dev.kt.colexiu.com/instrument/#/simple-detail?id=1001728&musicRenderType=staff";
-//        return "https://www.baidu.com";
-        return WebStartHelper.getWorksMusicScoreUrl(musicId, musicRenderType,String.valueOf(partIndex), isVideo);
+        return "https://www.baidu.com";
+//        return WebStartHelper.getWorksMusicScoreUrl(musicId, musicRenderType,String.valueOf(partIndex), isVideo);
     }
 
     private void initSurfaceView() {
@@ -1628,7 +1627,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(), isVideo);
+            initMusicScoreFragment(data.getMusicSheetId(), musicMergeConfigBean.getMusicRenderType());
             if (mSettingFragment != null) {
                 mSettingFragment.applyConfig(musicMergeConfigBean);
                 mSettingFragment.setAccompanyUrl(accompanyUrl, accompanyPlaySpeed);

musicMerge/src/main/res/layout/ac_music_handle_layout.xml

@@ -176,17 +176,6 @@
         
     </FrameLayout>
 
-    <ImageView
-        android:id="@+id/iv_unfold_sentting"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="18dp"
-        android:src="@drawable/tc_icon_left_arrow"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintRight_toLeftOf="@+id/fl_setting"
-        app:layout_constraintTop_toTopOf="parent" />
-
 
     <View
         android:id="@+id/view_video_bottom_bg"
@@ -223,6 +212,17 @@
 
 
     <ImageView
+        android:id="@+id/iv_unfold_sentting"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="18dp"
+        android:src="@drawable/tc_icon_left_arrow"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/fl_setting"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
         android:id="@+id/iv_play"
         android:layout_width="42dp"
         android:layout_height="42dp"

student/src/main/java/com/cooleshow/student/ui/mine/SettingActivity.java

@@ -86,6 +86,7 @@ public class SettingActivity extends BaseMVPActivity<ActivitySettingBinding, Set
             case R.id.cl_clear_cache:
                 boolean b = WebLoadFileHelper.getInstance().clearCache();
                 boolean b1 = FileUtils.clearMusicMergeCache();
+                clearGuideCache();
                 ToastUtil.getInstance().showShort("清理完成");
                 break;
         }
@@ -121,6 +122,10 @@ public class SettingActivity extends BaseMVPActivity<ActivitySettingBinding, Set
 
     }
 
+    private void clearGuideCache() {
+        UserHelper.resetGuide();
+    }
+
     @Override
     protected ActivitySettingBinding getLayoutView() {
         return ActivitySettingBinding.inflate(getLayoutInflater());

teacher/src/main/java/com/cooleshow/teacher/ui/mine/SettingActivity.java

@@ -80,6 +80,7 @@ public class SettingActivity extends BaseMVPActivity<ActivitySettingBinding, Set
             //清理缓存
             boolean b = WebLoadFileHelper.getInstance().clearCache();
             boolean b1 = FileUtils.clearMusicMergeCache();
+            clearGuideCache();
             ToastUtil.getInstance().showShort("清理完成");
         }
     }
@@ -131,6 +132,11 @@ public class SettingActivity extends BaseMVPActivity<ActivitySettingBinding, Set
 
     }
 
+    private void clearGuideCache() {
+        UserHelper.resetGuide();
+    }
+
+
     @Override
     protected ActivitySettingBinding getLayoutView() {
         return ActivitySettingBinding.inflate(getLayoutInflater());