小绵羊图标修改回原来样式

app/src/main/AndroidManifest.xml

@@ -105,7 +105,7 @@
         android:name=".SheepApp"
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_descriptor"
-        android:icon="@mipmap/icstartup"
+        android:icon="@mipmap/icon"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:persistent="true"

app/src/main/res/mipmap-anydpi-v26/icstartup.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/icstartup_round.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@mipmap/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

media/app/src/main/java/com/kfzs/cfyl/media/util/VideoUtil.java

@@ -191,7 +191,7 @@ public class VideoUtil {
         LogUtil.println(TAG, filePath, clipPoint, clipDuration);
         String outFilePath = getCutVideoFilePath(filePath, clipPoint, clipDuration);
         video.setFilePath(outFilePath);
-        video.setDuration(clipDuration);
+        video.setDuration(clipDuration / 1000);
         //开始剪切
         EpVideo epVideo = new EpVideo(filePath);
 //输出选项，参数为输出文件路径(目前仅支持mp4格式输出)