Przeglądaj źródła

fix 华为手机的问题

i2edu 4 lat temu
rodzic
commit
1ef28d1c7e

+ 42 - 11
.idea/workspace.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
 <project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="NONE" />
+  </component>
   <component name="BranchesTreeState">
   <component name="BranchesTreeState">
     <expand>
     <expand>
       <path>
       <path>
@@ -21,6 +24,7 @@
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="96a4f947-f66a-4efc-b495-ae979b3315bb" name="Default Changelist" comment="">
     <list default="true" id="96a4f947-f66a-4efc-b495-ae979b3315bb" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/pubspec.lock" afterDir="false" />
     </list>
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -30,6 +34,7 @@
   <component name="DefaultGradleProjectSettings">
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
     <option name="isMigrated" value="true" />
   </component>
   </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[SerialNumber@GEY6R20512010368]" />
   <component name="FindInProjectRecents">
   <component name="FindInProjectRecents">
     <findStrings>
     <findStrings>
       <find>startCompose</find>
       <find>startCompose</find>
@@ -105,7 +110,7 @@
       <method v="2" />
       <method v="2" />
     </configuration>
     </configuration>
   </component>
   </component>
-  <component name="SpellCheckerSettings" BundledDictionaries="0" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="application-level" UseSingleDictionary="true" />
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
   <component name="SvnConfiguration">
     <configuration />
     <configuration />
   </component>
   </component>
@@ -132,7 +137,14 @@
       <option name="project" value="LOCAL" />
       <option name="project" value="LOCAL" />
       <updated>1617680948335</updated>
       <updated>1617680948335</updated>
     </task>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="update">
+      <created>1617681387041</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1617681387041</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
     <servers />
   </component>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
   <component name="TypeScriptGeneratedFilesManager">
@@ -153,9 +165,7 @@
       <map>
       <map>
         <entry key="MAIN">
         <entry key="MAIN">
           <value>
           <value>
-            <State>
-              <option name="COLUMN_ORDER" />
-            </State>
+            <State />
           </value>
           </value>
         </entry>
         </entry>
       </map>
       </map>
@@ -174,6 +184,7 @@
         </entry>
         </entry>
       </map>
       </map>
     </option>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   </component>
   <component name="VcsManagerConfiguration">
   <component name="VcsManagerConfiguration">
     <MESSAGE value="提高合成后视频的质量" />
     <MESSAGE value="提高合成后视频的质量" />
@@ -185,17 +196,37 @@
       <screen x="0" y="23" width="1920" height="985" />
       <screen x="0" y="23" width="1920" height="985" />
     </state>
     </state>
     <state x="808" y="411" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog/0.23.1920.985@0.23.1920.985" timestamp="1617681271701" />
     <state x="808" y="411" key="#com.intellij.ide.util.projectWizard.JdkChooserPanel.MyDialog/0.23.1920.985@0.23.1920.985" timestamp="1617681271701" />
-    <state x="579" y="116" key="CommitChangelistDialog2" timestamp="1617681365256">
+    <state x="579" y="116" key="CommitChangelistDialog2" timestamp="1617681386880">
+      <screen x="0" y="23" width="1920" height="985" />
+    </state>
+    <state x="579" y="116" key="CommitChangelistDialog2/0.23.1920.985@0.23.1920.985" timestamp="1617681386880" />
+    <state x="100" y="123" width="1720" height="785" key="DiffContextDialog" timestamp="1623124219189">
+      <screen x="0" y="23" width="1920" height="985" />
+    </state>
+    <state x="100" y="123" width="1720" height="785" key="DiffContextDialog/0.23.1920.985@0.23.1920.985" timestamp="1623124219189" />
+    <state width="1878" height="211" key="GridCell.Tab.0.bottom" timestamp="1623131736865">
+      <screen x="0" y="23" width="1920" height="985" />
+    </state>
+    <state width="1878" height="211" key="GridCell.Tab.0.bottom/0.23.1920.985@0.23.1920.985" timestamp="1623131736865" />
+    <state width="1878" height="211" key="GridCell.Tab.0.center" timestamp="1623131736865">
+      <screen x="0" y="23" width="1920" height="985" />
+    </state>
+    <state width="1878" height="211" key="GridCell.Tab.0.center/0.23.1920.985@0.23.1920.985" timestamp="1623131736865" />
+    <state width="1878" height="211" key="GridCell.Tab.0.left" timestamp="1623131736865">
+      <screen x="0" y="23" width="1920" height="985" />
+    </state>
+    <state width="1878" height="211" key="GridCell.Tab.0.left/0.23.1920.985@0.23.1920.985" timestamp="1623131736865" />
+    <state width="1878" height="211" key="GridCell.Tab.0.right" timestamp="1623131736865">
       <screen x="0" y="23" width="1920" height="985" />
       <screen x="0" y="23" width="1920" height="985" />
     </state>
     </state>
-    <state x="579" y="116" key="CommitChangelistDialog2/0.23.1920.985@0.23.1920.985" timestamp="1617681365256" />
-    <state x="560" y="244" key="Vcs.Push.Dialog.v2" timestamp="1617680949391">
+    <state width="1878" height="211" key="GridCell.Tab.0.right/0.23.1920.985@0.23.1920.985" timestamp="1623131736865" />
+    <state x="560" y="244" key="Vcs.Push.Dialog.v2" timestamp="1617681388758">
       <screen x="0" y="23" width="1920" height="985" />
       <screen x="0" y="23" width="1920" height="985" />
     </state>
     </state>
-    <state x="560" y="244" key="Vcs.Push.Dialog.v2/0.23.1920.985@0.23.1920.985" timestamp="1617680949391" />
-    <state x="740" y="439" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1617681380602">
+    <state x="560" y="244" key="Vcs.Push.Dialog.v2/0.23.1920.985@0.23.1920.985" timestamp="1617681388758" />
+    <state x="740" y="439" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1623124936829">
       <screen x="0" y="23" width="1920" height="985" />
       <screen x="0" y="23" width="1920" height="985" />
     </state>
     </state>
-    <state x="740" y="439" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.23.1920.985@0.23.1920.985" timestamp="1617681380602" />
+    <state x="740" y="439" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.23.1920.985@0.23.1920.985" timestamp="1623124936829" />
   </component>
   </component>
 </project>
 </project>

+ 9 - 22
android/src/main/kotlin/cn/i2edu/dubbing_lib/audioUtils/AndroidAudioDecoder.java

@@ -1,6 +1,8 @@
 package cn.i2edu.dubbing_lib.audioUtils;
 package cn.i2edu.dubbing_lib.audioUtils;
 
 
+import android.content.res.AssetFileDescriptor;
 import android.media.MediaCodec;
 import android.media.MediaCodec;
+import android.media.MediaDataSource;
 import android.media.MediaExtractor;
 import android.media.MediaExtractor;
 import android.media.MediaFormat;
 import android.media.MediaFormat;
 import android.util.Log;
 import android.util.Log;
@@ -20,34 +22,18 @@ import java.nio.ByteBuffer;
  * @version android.os.Build.VERSION.SDK_INT >= 16
  * @version android.os.Build.VERSION.SDK_INT >= 16
  */
  */
 public class AndroidAudioDecoder extends AudioDecoder {
 public class AndroidAudioDecoder extends AudioDecoder {
-
+    private  static final String TAG ="AndroidAudioDecoder";
 
 
     AndroidAudioDecoder(String encodefile) {
     AndroidAudioDecoder(String encodefile) {
         super(encodefile);
         super(encodefile);
     }
     }
 
 
-    private MediaExtractor getMediaExtractor() throws IOException {
+    private MediaExtractor getMediaExtractor(){
         MediaExtractor extractor = new MediaExtractor();
         MediaExtractor extractor = new MediaExtractor();
-        File file = new File(mEncodeFile);
-        FileInputStream fis = null;
-        try {
-            fis = new FileInputStream(file);
-            FileDescriptor fd = fis.getFD();
-            extractor.setDataSource(fd);
-        } catch (Exception e) {
-            e.printStackTrace();
-        } finally {
-            //Release stuff
-            extractor.release();
-            try {
-                if (fis != null) {
-                    fis.close();
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+        try{
+            extractor.setDataSource(mEncodeFile);
+        }catch (Exception e){
         }
         }
-//        extractor.setDataSource(mEncodeFile);
         return extractor;
         return extractor;
     }
     }
 
 
@@ -59,7 +45,8 @@ public class AndroidAudioDecoder extends AudioDecoder {
         MediaExtractor extractor = getMediaExtractor();
         MediaExtractor extractor = getMediaExtractor();
 
 
         MediaFormat mediaFormat = null;
         MediaFormat mediaFormat = null;
-        for (int i = 0; i < extractor.getTrackCount(); i++) {
+        int trackCount = extractor.getTrackCount();
+        for (int i = 0; i < trackCount; i++) {
             MediaFormat format = extractor.getTrackFormat(i);
             MediaFormat format = extractor.getTrackFormat(i);
             String mime = format.getString(MediaFormat.KEY_MIME);
             String mime = format.getString(MediaFormat.KEY_MIME);
             if (mime.startsWith("audio/")) {
             if (mime.startsWith("audio/")) {

+ 19 - 19
example/pubspec.lock

@@ -7,42 +7,42 @@ packages:
       name: async
       name: async
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "2.4.2"
+    version: "2.5.0"
   boolean_selector:
   boolean_selector:
     dependency: transitive
     dependency: transitive
     description:
     description:
       name: boolean_selector
       name: boolean_selector
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   characters:
   characters:
     dependency: transitive
     dependency: transitive
     description:
     description:
       name: characters
       name: characters
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "1.0.0"
+    version: "1.1.0"
   charcode:
   charcode:
     dependency: transitive
     dependency: transitive
     description:
     description:
       name: charcode
       name: charcode
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "1.1.3"
+    version: "1.2.0"
   clock:
   clock:
     dependency: transitive
     dependency: transitive
     description:
     description:
       name: clock
       name: clock
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "1.0.1"
+    version: "1.1.0"
   collection:
   collection:
     dependency: transitive
     dependency: transitive
     description:
     description:
       name: collection
       name: collection
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "1.14.13"
+    version: "1.15.0"
   dubbing_lib:
   dubbing_lib:
     dependency: "direct dev"
     dependency: "direct dev"
     description:
     description:
@@ -56,7 +56,7 @@ packages:
       name: fake_async
       name: fake_async
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   flutter:
   flutter:
     dependency: "direct main"
     dependency: "direct main"
     description: flutter
     description: flutter
@@ -73,21 +73,21 @@ packages:
       name: matcher
       name: matcher
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "0.12.8"
+    version: "0.12.10"
   meta:
   meta:
     dependency: transitive
     dependency: transitive
     description:
     description:
       name: meta
       name: meta
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "1.1.8"
+    version: "1.3.0"
   path:
   path:
     dependency: transitive
     dependency: transitive
     description:
     description:
       name: path
       name: path
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   sky_engine:
   sky_engine:
     dependency: transitive
     dependency: transitive
     description: flutter
     description: flutter
@@ -99,55 +99,55 @@ packages:
       name: source_span
       name: source_span
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   stack_trace:
   stack_trace:
     dependency: transitive
     dependency: transitive
     description:
     description:
       name: stack_trace
       name: stack_trace
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "1.9.5"
+    version: "1.10.0"
   stream_channel:
   stream_channel:
     dependency: transitive
     dependency: transitive
     description:
     description:
       name: stream_channel
       name: stream_channel
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "2.0.0"
+    version: "2.1.0"
   string_scanner:
   string_scanner:
     dependency: transitive
     dependency: transitive
     description:
     description:
       name: string_scanner
       name: string_scanner
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "1.0.5"
+    version: "1.1.0"
   term_glyph:
   term_glyph:
     dependency: transitive
     dependency: transitive
     description:
     description:
       name: term_glyph
       name: term_glyph
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   test_api:
   test_api:
     dependency: transitive
     dependency: transitive
     description:
     description:
       name: test_api
       name: test_api
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "0.2.17"
+    version: "0.2.19"
   typed_data:
   typed_data:
     dependency: transitive
     dependency: transitive
     description:
     description:
       name: typed_data
       name: typed_data
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   vector_math:
   vector_math:
     dependency: transitive
     dependency: transitive
     description:
     description:
       name: vector_math
       name: vector_math
       url: "https://pub.flutter-io.cn"
       url: "https://pub.flutter-io.cn"
     source: hosted
     source: hosted
-    version: "2.0.8"
+    version: "2.1.0"
 sdks:
 sdks:
-  dart: ">=2.9.0-14.0.dev <3.0.0"
+  dart: ">=2.12.0-0.0 <3.0.0"