完善音频维护

AudioPlayer/src/androidTest/java/com/yc/audioplayer/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package com.yc.audioplayer;
-
-import android.content.Context;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
-        assertEquals("com.yc.audioplayer.test", appContext.getPackageName());
-    }
-}

AudioPlayer/src/main/java/com/yc/audioplayer/spi/AudioService.java → AudioPlayer/src/main/java/com/yc/audioplayer/service/AudioService.java

@@ -1,4 +1,4 @@
-package com.yc.audioplayer.spi;
+package com.yc.audioplayer.service;
 
 import android.content.Context;
 

AudioPlayer/src/main/java/com/yc/audioplayer/spi/AudioServiceImpl.java → AudioPlayer/src/main/java/com/yc/audioplayer/service/AudioServiceImpl.java

@@ -1,4 +1,4 @@
-package com.yc.audioplayer.spi;
+package com.yc.audioplayer.service;
 
 import android.content.Context;
 

AudioPlayer/src/main/java/com/yc/audioplayer/spi/AudioServiceProvider.java → AudioPlayer/src/main/java/com/yc/audioplayer/service/AudioServiceProvider.java

@@ -1,4 +1,4 @@
-package com.yc.audioplayer.spi;
+package com.yc.audioplayer.service;
 
 import android.content.Context;
 

AudioPlayer/src/test/java/com/yc/audioplayer/ExampleUnitTest.java

@@ -1,17 +0,0 @@
-package com.yc.audioplayer;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() {
-        assertEquals(4, 2 + 2);
-    }
-}

Demo/src/main/java/com/yc/ycvideoplayer/MainActivity.java

@@ -10,21 +10,19 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.provider.Settings;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.animation.BounceInterpolator;
 import android.widget.ImageView;
 import android.widget.TextView;
-
-
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
-
 import org.yc.ycvideoplayer.R;
-
 import com.yc.music.model.AudioBean;
 import com.yc.music.service.PlayAudioService;
 import com.yc.music.tool.BaseAppHelper;
+import com.yc.video.tool.BaseToast;
 import com.yc.videotool.VideoLogUtils;
 import com.yc.videoview.FloatWindow;
 import com.yc.videoview.MoveType;
@@ -78,12 +76,12 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     }
 
     private void initView() {
-        mTv1 = (TextView) findViewById(R.id.tv_1);
-        mTv2 = (TextView) findViewById(R.id.tv_2);
-        mTv3 = (TextView) findViewById(R.id.tv_3);
-        mTv4 = (TextView) findViewById(R.id.tv_4);
-        mTv5 = (TextView) findViewById(R.id.tv_5);
-        mTv6 = (TextView) findViewById(R.id.tv_6);
+        mTv1 = findViewById(R.id.tv_1);
+        mTv2 = findViewById(R.id.tv_2);
+        mTv3 = findViewById(R.id.tv_3);
+        mTv4 = findViewById(R.id.tv_4);
+        mTv5 = findViewById(R.id.tv_5);
+        mTv6 = findViewById(R.id.tv_6);
         mTv7 = findViewById(R.id.tv_7);
 
         mTv1.setOnClickListener(this);
@@ -183,12 +181,47 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
         }
     }
 
+
+    /**
+     * 再点一次退出程序时间设置
+     */
+    private static final long WAIT_TIME = 2000L;
+    private long touchTime = 0;
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            //双击返回桌面
+            if (System.currentTimeMillis() - touchTime < WAIT_TIME) {
+                //finish();
+                //可将activity 退到后台，注意不是finish()退出。
+                //判断Activity是否是task根
+                //使用moveTaskToBack是为了让app退出时，不闪屏，退出柔和一些
+                if (this.isTaskRoot()){
+                    //参数为false——代表只有当前activity是task根，指应用启动的第一个activity时，才有效;
+                    moveTaskToBack(false);
+                } else {
+                    //参数为true——则忽略这个限制，任何activity都可以有效。
+                    //使用此方法，便不会执行Activity的onDestroy()方法
+                    moveTaskToBack(true);
+                }
+                //注意这里是finish所有activity，然后杀死进程
+                //ActivityManageUtils.getInstance().appExit(this);
+            } else {
+                touchTime = System.currentTimeMillis();
+                //参考易车，抖音自定义吐司
+                BaseToast.showRoundRectToast("再按一次退出");
+            }
+            return true;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+
     private void startActivity(Class c){
         startActivity(new Intent(this,c));
     }
 
 
-
     /**
      * 检测服务
      */

Demo/src/main/java/com/yc/ycvideoplayer/audio/AudioActivity.java

@@ -9,7 +9,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.yc.audioplayer.manager.AudioManager;
-import com.yc.audioplayer.spi.AudioService;
+import com.yc.audioplayer.service.AudioService;
 import com.yc.audioplayer.bean.AudioPlayData;
 import com.yc.audioplayer.bean.AudioTtsPriority;
 
@@ -81,7 +81,7 @@ public class AudioActivity extends AppCompatActivity implements View.OnClickList
             });
         } else if (v == btnSpeakTts){
             AudioPlayData playData = new AudioPlayData.Builder()
-                    .tts("当前只有做国际版业务时，才需要调用此函数。别的业务线或其他情况下禁止调用此函数。2.若需要调用，请在初始化阶段")
+                    .tts("开始播放语音，这个是一段文字，逗比。Your goals are hindered by financial strictures.")
                     .build();
             AudioService.getInstance().play(playData);
         } else if (v == btnSpeakMedia){
@@ -103,14 +103,15 @@ public class AudioActivity extends AppCompatActivity implements View.OnClickList
             AudioService.getInstance().stop();
         } else if (v == btnHighPriority){
             AudioPlayData playData =new AudioPlayData.Builder(AudioTtsPriority.HIGH_PRIORITY)
-                    .tts("Fire in the home! Fire in the home ")
+                    .tts("It sets targets for reduction of greenhouse-gas emissions. ")
                     .build();
             AudioService.getInstance().play(playData);
         } else if (v == btnRelease){
             AudioService.getInstance().release();
         } else if (v == btnBrazil){
+            //法鱼
             AudioPlayData playData = new AudioPlayData.Builder()
-                    .tts("vire à esquerda na parada de ônibus")
+                    .tts("Dans tout ce que nous faisons, nous devons être persévérants")
                     .build();
             AudioService.getInstance().play(playData);
         } else if (v == btnTts){

Demo/src/main/java/com/yc/ycvideoplayer/video/activity/TypeActivity.java

@@ -117,10 +117,6 @@ public class TypeActivity extends AppCompatActivity implements View.OnClickListe
         mTv101 = findViewById(R.id.tv_10_1);
         mTv111 = findViewById(R.id.tv_11_1);
         mTv131 = findViewById(R.id.tv_13_1);
-
-
-        String time = getTime(20);
-        mTv11.setText(time);
     }
 
     private void initListener() {
@@ -248,66 +244,4 @@ public class TypeActivity extends AppCompatActivity implements View.OnClickListe
         }
     }
 
-    /**
-     * 获取时间
-     * @param seconds                           分钟
-     * @return
-     */
-    public static String getTime(long seconds){
-        //获取当前时间戳
-        long l = System.currentTimeMillis();
-        long total = l + seconds * 60 * 1000;
-        String time = formatDate(total);
-        return time;
-    }
-
-    /**
-     * 将千毫秒格式化mm:ss格式
-     * @param millis                            毫秒值
-     * @return
-     */
-    public static String formatDate(long millis) {
-        Date date = new Date(millis);
-        @SuppressLint("SimpleDateFormat")
-        SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
-        return sdf.format(date);
-    }
-
-
-
-    /**
-     * 再点一次退出程序时间设置
-     */
-    private static final long WAIT_TIME = 2000L;
-    private long touchTime = 0;
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
-            //双击返回桌面
-            if (System.currentTimeMillis() - touchTime < WAIT_TIME) {
-                //finish();
-                //可将activity 退到后台，注意不是finish()退出。
-                //判断Activity是否是task根
-                //使用moveTaskToBack是为了让app退出时，不闪屏，退出柔和一些
-                if (this.isTaskRoot()){
-                    //参数为false——代表只有当前activity是task根，指应用启动的第一个activity时，才有效;
-                    moveTaskToBack(false);
-                } else {
-                    //参数为true——则忽略这个限制，任何activity都可以有效。
-                    //使用此方法，便不会执行Activity的onDestroy()方法
-                    moveTaskToBack(true);
-                }
-                //注意这里是finish所有activity，然后杀死进程
-                //ActivityManageUtils.getInstance().appExit(this);
-            } else {
-                touchTime = System.currentTimeMillis();
-                //参考易车，抖音自定义吐司
-                BaseToast.showRoundRectToast("再按一次退出");
-            }
-            return true;
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
-
 }