Ver código fonte

调整midi文件初始化位置

Pq 3 anos atrás
pai
commit
e54ab3cbd4

+ 30 - 0
BaseLibrary/src/main/java/com/cooleshow/base/utils/helper/MidiFileHelper.java

@@ -0,0 +1,30 @@
+package com.cooleshow.base.utils.helper;
+
+import com.cooleshow.base.utils.FileUtils;
+import com.cooleshow.base.utils.Utils;
+
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+
+/**
+ * Author by pq, Date on 2022/7/25.
+ */
+public class MidiFileHelper {
+    public static void initMidFile() {
+        Observable.create(new ObservableOnSubscribe<Object>() {
+            @Override
+            public void subscribe(@io.reactivex.rxjava3.annotations.NonNull ObservableEmitter<Object> emitter) throws Throwable {
+                FileUtils.CopyMidiFile(Utils.getApp());
+            }
+        }).observeOn(Schedulers.io())
+                .subscribeOn(Schedulers.io())
+                .subscribe(new Consumer<Object>() {
+                    @Override
+                    public void accept(Object o) throws Throwable {
+                    }
+                });
+    }
+}

+ 0 - 16
student/src/main/java/com/cooleshow/student/App.java

@@ -73,7 +73,6 @@ public class App extends BaseApplication {
         Utils.init(this);
         initCommonParams();
         initSDK();
-        initMidFile();
     }
 
     private void initSDK() {
@@ -93,21 +92,6 @@ public class App extends BaseApplication {
         ZXingLibrary.initDisplayOpinion(this);
     }
 
-    private void initMidFile() {
-        Observable.create(new ObservableOnSubscribe<Object>() {
-            @Override
-            public void subscribe(@NonNull ObservableEmitter<Object> emitter) throws Throwable {
-                FileUtils.CopyMidiFile(App.this);
-            }
-        }).observeOn(Schedulers.io())
-                .subscribeOn(Schedulers.io())
-                .subscribe(new Consumer<Object>() {
-                    @Override
-                    public void accept(Object o) throws Throwable {
-                    }
-                });
-    }
-
     private void initUmeng() {
         if (UserHelper.isAgreePrivacy()) {
             UMConfigure.init(this, "5f2b6f03b4b08b653e91a49e", "app", UMConfigure.DEVICE_TYPE_PHONE, null);

+ 9 - 0
student/src/main/java/com/cooleshow/student/ui/main/MainActivity.java

@@ -23,12 +23,15 @@ import com.cooleshow.base.constanst.LoginStatusConstants;
 import com.cooleshow.base.event.LoginStatusEvent;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.GsonUtils;
 import com.cooleshow.base.utils.JumpUtils;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.ToastUtil;
+import com.cooleshow.base.utils.helper.MidiFileHelper;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.UpdateAppHelper;
+import com.cooleshow.student.App;
 import com.cooleshow.student.R;
 import com.cooleshow.student.adapter.HomePageAdapter;
 import com.cooleshow.student.contract.MainContract;
@@ -54,6 +57,11 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.util.ArrayList;
 
 import cn.jpush.android.api.JPushInterface;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.rong.imkit.manager.UnReadMessageManager;
 import io.rong.imlib.RongIMClient;
 
@@ -206,6 +214,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
                 .subscribe(permission -> {
                     if (permission) {
                         checkAppVersion();
+                        MidiFileHelper.initMidFile();
                     }
                 });
     }

+ 0 - 16
teacher/src/main/java/com/cooleshow/teacher/App.java

@@ -65,22 +65,6 @@ public class App extends BaseApplication {
         Utils.init(this);
         initCommonParams();
         initSDK();
-        initMidFile();
-    }
-
-    private void initMidFile() {
-        Observable.create(new ObservableOnSubscribe<Object>() {
-            @Override
-            public void subscribe(@NonNull ObservableEmitter<Object> emitter) throws Throwable {
-                FileUtils.CopyMidiFile(App.this);
-            }
-        }).observeOn(Schedulers.io())
-                .subscribeOn(Schedulers.io())
-                .subscribe(new Consumer<Object>() {
-                    @Override
-                    public void accept(Object o) throws Throwable {
-                    }
-                });
     }
 
     private void initSDK() {

+ 9 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/main/MainActivity.java

@@ -19,12 +19,15 @@ import com.cooleshow.base.constanst.LoginStatusConstants;
 import com.cooleshow.base.event.LoginStatusEvent;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.GsonUtils;
 import com.cooleshow.base.utils.JumpUtils;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.ToastUtil;
+import com.cooleshow.base.utils.helper.MidiFileHelper;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.UpdateAppHelper;
+import com.cooleshow.teacher.App;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.HomePageAdapter;
 import com.cooleshow.teacher.bean.TeacherUserInfo;
@@ -56,6 +59,11 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 
 import cn.jpush.android.api.JPushInterface;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.ObservableEmitter;
+import io.reactivex.rxjava3.core.ObservableOnSubscribe;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.rong.imkit.manager.UnReadMessageManager;
 import io.rong.imlib.RongIMClient;
 
@@ -100,7 +108,6 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
         UpdateAppHelper.getInstance().checkUpdate(this, "android-teacher");
     }
 
-
     @NonNull
     @Override
     protected ActivityMainBinding getLayoutView() {
@@ -210,6 +217,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
                 .subscribe(permission -> {
                     if (permission) {
                         checkAppVersion();
+                        MidiFileHelper.initMidFile();
                     }
                 });
     }

+ 1 - 1
teacher/src/main/res/layout/activity_setting.xml

@@ -126,7 +126,7 @@
                     android:layout_width="@dimen/dp_6"
                     android:layout_height="@dimen/dp_11"
                     android:layout_marginRight="15dp"
-                    android:background="@drawable/icon_next_right"
+                    android:background="@drawable/icon_go_right"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />