diff --git a/.gitignore b/.gitignore index f577f31..312d407 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,44 @@ +# Created by .ignore support plugin (hsz.mobi) +### NetBeans template +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + +# Mac OS X Garbage +.DS_Store +Thumbs.db + +.idea/ + +### Android Studio +/jniLibs +mobile/mobile.iml +mobile/mobile.iml +tv/tv.iml +app/app.iml +app/*.iml +*.iml +mobile/*.iml +tv/*.iml +.idea/workspace.xml +.idea/libraries +.idea/ +.idea +/build +/captures +### Android template # Built application files *.apk *.ap_ - -# Files for the ART/Dalvik VM +/build +/captures +.externalNativeBuild +/.externalNativeBuild +# Files for the Dalvik VM *.dex # Java class files @@ -11,13 +47,9 @@ # Generated files bin/ gen/ -out/ # Gradle files .gradle/ -build/ -.idea/ - # Local configuration file (sdk path, etc) local.properties @@ -28,21 +60,59 @@ proguard/ # Log Files *.log -# Android Studio Navigation editor temp files -.navigation/ -# Android Studio captures folder -captures/ +### Java template +*.class -# Intellij -*.iml -.idea/workspace.xml +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + + +### Eclipse template +*.pydevproject +.metadata +.gradle +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +.settings/ +.loadpath +/build +/captures +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject -# Keystore files -*.jks +# PDT-specific +.buildpath -gradlew +# sbteclipse plugin +.target + +# TeXlipse plugin +.texlipse + +# Android Studio +*.iml -gradlew +# Keep external libs +!app/libs/*.jar -SmallVideoRecord2/copy.sh +# script output +check-dpi.txt* diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..e0dcf54 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,12 @@ +[submodule "SmallVideoRecord2"] + path = SmallVideoRecord2 + url = https://github.com/CMingTseng/mabeijianxi_SmallVideoRecord2.git +[submodule "SmallVideoRecord1"] + path = SmallVideoRecord1 + url = https://github.com/CMingTseng/mabeijianxi_SmallVideoRecord1.git +[submodule "VideoR1"] + path = VideoR1 + url = https://github.com/CMingTseng/mabeijianxi_SmallVideoRecord1 +[submodule "VideoR2"] + path = VideoR2 + url = https://github.com/CMingTseng/mabeijianxi_SmallVideoRecord2.git diff --git a/SmallVideoRecord1/.gitignore b/SmallVideoRecord1/.gitignore index f577f31..3c5b5c1 100644 --- a/SmallVideoRecord1/.gitignore +++ b/SmallVideoRecord1/.gitignore @@ -1,8 +1,42 @@ +# Created by .ignore support plugin (hsz.mobi) +### NetBeans template +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + +# Mac OS X Garbage +.DS_Store +Thumbs.db + +.idea/ + +### Android Studio +/jniLibs +mobile/mobile.iml +mobile/mobile.iml +tv/tv.iml +app/app.iml +app/*.iml +*.iml +mobile/*.iml +tv/*.iml +.idea/workspace.xml +.idea/libraries +.idea/ +.idea +/build +/captures +### Android template # Built application files *.apk *.ap_ - -# Files for the ART/Dalvik VM +/build +/captures +# Files for the Dalvik VM *.dex # Java class files @@ -11,13 +45,9 @@ # Generated files bin/ gen/ -out/ # Gradle files .gradle/ -build/ -.idea/ - # Local configuration file (sdk path, etc) local.properties @@ -28,21 +58,59 @@ proguard/ # Log Files *.log -# Android Studio Navigation editor temp files -.navigation/ -# Android Studio captures folder -captures/ +### Java template +*.class -# Intellij -*.iml -.idea/workspace.xml +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + + +### Eclipse template +*.pydevproject +.metadata +.gradle +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +.settings/ +.loadpath +/build +/captures +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject -# Keystore files -*.jks +# PDT-specific +.buildpath -gradlew +# sbteclipse plugin +.target + +# TeXlipse plugin +.texlipse + +# Android Studio +*.iml -gradlew +# Keep external libs +!app/libs/*.jar -SmallVideoRecord2/copy.sh +# script output +check-dpi.txt* diff --git a/SmallVideoRecord1/SmallVideoLib/.gitignore b/SmallVideoRecord1/SmallVideoLib/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/SmallVideoRecord1/SmallVideoLib/.gitignore @@ -0,0 +1 @@ +/build diff --git a/SmallVideoRecord1/SmallVideoLib/build.gradle b/SmallVideoRecord1/SmallVideoLib/build.gradle index 45cb2b1..de66816 100644 --- a/SmallVideoRecord1/SmallVideoLib/build.gradle +++ b/SmallVideoRecord1/SmallVideoLib/build.gradle @@ -2,12 +2,14 @@ apply plugin: 'com.android.library' apply plugin: 'com.novoda.bintray-release' android { - compileSdkVersion 22 - buildToolsVersion "23.0.3" - + compileSdkVersion 28 + buildToolsVersion "29.0.1" + lintOptions { + abortOnError false + } defaultConfig { minSdkVersion 14 - targetSdkVersion 22 + targetSdkVersion 28 versionCode 14 versionName "1.2.2" } @@ -18,12 +20,8 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } - lintOptions { - abortOnError false - } publish { - userOrg = 'mabeijianxi'//bintray.com用户名 groupId = 'com.mabeijianxi'//jcenter上的路径 artifactId = 'small-video-record'//项目名称 @@ -32,3 +30,12 @@ android { website = 'https://github.com/mabeijianxi/small-video-record'//网站，不重要 } } + +dependencies { + testImplementation 'junit:junit:4.12' + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + + implementation fileTree(dir: 'libs', include: ['*.jar']) +} diff --git a/SmallVideoRecord1/SmallVideoLib/proguard-rules.pro b/SmallVideoRecord1/SmallVideoLib/proguard-rules.pro new file mode 100644 index 0000000..b5fa7ec --- /dev/null +++ b/SmallVideoRecord1/SmallVideoLib/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Users/macdidi5/Library/Android/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/SmallVideoRecord1/build.gradle b/SmallVideoRecord1/build.gradle index f2b1a2c..59ad1da 100644 --- a/SmallVideoRecord1/build.gradle +++ b/SmallVideoRecord1/build.gradle @@ -2,11 +2,12 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.2' - classpath 'com.novoda:bintray-release:0.3.4' + classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.novoda:bintray-release:0.9' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -14,6 +15,7 @@ buildscript { allprojects { repositories { + google() jcenter() } } @@ -21,4 +23,4 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir } -tasks.getByPath(":SmallVideoLib:mavenAndroidJavadocs").enabled = false \ No newline at end of file +//tasks.getByPath(":SmallVideoLib:mavenAndroidJavadocs").enabled = false \ No newline at end of file diff --git a/SmallVideoRecord1/gradle/wrapper/gradle-wrapper.jar b/SmallVideoRecord1/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 13372ae..0000000 Binary files a/SmallVideoRecord1/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/SmallVideoRecord1/gradle/wrapper/gradle-wrapper.properties b/SmallVideoRecord1/gradle/wrapper/gradle-wrapper.properties index 122a0dc..d9be5aa 100644 --- a/SmallVideoRecord1/gradle/wrapper/gradle-wrapper.properties +++ b/SmallVideoRecord1/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Wed May 31 15:40:00 CST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/SmallVideoRecord1/sample/build.gradle b/SmallVideoRecord1/sample/build.gradle index e909c19..d9d3452 100644 --- a/SmallVideoRecord1/sample/build.gradle +++ b/SmallVideoRecord1/sample/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 22 - buildToolsVersion "23.0.3" + compileSdkVersion 28 + buildToolsVersion "29.0.1" defaultConfig { applicationId "com.mabeijianxi.smallvideo" minSdkVersion 14 - targetSdkVersion 22 + targetSdkVersion 28 versionCode 14 versionName "1.2.2" } @@ -24,8 +24,8 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:22.2.1' - compile project(':SmallVideoLib') + testImplementation 'junit:junit:4.12' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation project(':SmallVideoLib') } diff --git a/SmallVideoRecord2/.gitignore b/SmallVideoRecord2/.gitignore index 39fb081..3c5b5c1 100644 --- a/SmallVideoRecord2/.gitignore +++ b/SmallVideoRecord2/.gitignore @@ -1,9 +1,116 @@ +# Created by .ignore support plugin (hsz.mobi) +### NetBeans template +nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + +# Mac OS X Garbage +.DS_Store +Thumbs.db + +.idea/ + +### Android Studio +/jniLibs +mobile/mobile.iml +mobile/mobile.iml +tv/tv.iml +app/app.iml +app/*.iml *.iml +mobile/*.iml +tv/*.iml +.idea/workspace.xml +.idea/libraries +.idea/ +.idea +/build +/captures +### Android template +# Built application files +*.apk +*.ap_ +/build +/captures +# Files for the Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ + +# Gradle files +.gradle/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + + +### Java template +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + + +### Eclipse template +*.pydevproject +.metadata .gradle -/local.properties -/.idea/workspace.xml -/.idea/libraries -.DS_Store +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +.settings/ +.loadpath /build /captures -.externalNativeBuild +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# PDT-specific +.buildpath + +# sbteclipse plugin +.target + +# TeXlipse plugin +.texlipse + +# Android Studio +*.iml + +# Keep external libs +!app/libs/*.jar + +# script output +check-dpi.txt* diff --git a/SmallVideoRecord2/SmallVideoLib2/build.gradle b/SmallVideoRecord2/SmallVideoLib2/build.gradle index 1779ebe..3366474 100644 --- a/SmallVideoRecord2/SmallVideoLib2/build.gradle +++ b/SmallVideoRecord2/SmallVideoLib2/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.library' apply plugin: 'com.novoda.bintray-release' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 28 + buildToolsVersion '29.0.0' defaultConfig { minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 11 versionName "2.0.3" externalNativeBuild { @@ -14,8 +14,9 @@ android { cppFlags "-std=c++11" } } - ndk{ - abiFilters "armeabi","armeabi-v7a","arm64-v8a","x86","x86_64" + ndk { +// abiFilters "armeabi","armeabi-v7a","arm64-v8a","x86","x86_64" + abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64" } } buildTypes { @@ -32,9 +33,7 @@ android { path "CMakeLists.txt" } } - publish { - userOrg = 'mabeijianxi'//bintray.com用户名 groupId = 'com.mabeijianxi'//jcenter上的路径 artifactId = 'small-video-record2'//项目名称 @@ -45,5 +44,5 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.jar']) } diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-subripenc b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-subripenc index 7f35ae9..98704b5 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-subripenc +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-subripenc @@ -1,14 +1,14 @@ -1 -00:00:00,970 --> 00:00:02,540 +1 +00:00:00,970 --> 00:00:02,540 - Test 1. -- Test 2. - -2 -00:00:03,050 --> 00:00:04,740 -Test 3. - -3 -00:00:05,850 --> 00:00:08,140 +- Test 2. + +2 +00:00:03,050 --> 00:00:04,740 +Test 3. + +3 +00:00:05,850 --> 00:00:08,140 - Test 4. -- Test 5. - +- Test 5. + diff --git a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-textenc b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-textenc index f7d82ce..ca1c5a4 100644 --- a/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-textenc +++ b/SmallVideoRecord2/SmallVideoLib2/ffmpeg-3.2.5/tests/ref/fate/sub-textenc @@ -1,183 +1,183 @@ -1 -00:00:00,000 --> 00:00:00,000 -Don't show this text it may be used to insert hidden data - -2 -00:00:01,500 --> 00:00:04,500 +1 +00:00:00,000 --> 00:00:00,000 +Don't show this text it may be used to insert hidden data + +2 +00:00:01,500 --> 00:00:04,500 SubRip subtitles capability tester 1.3o by ale5000 Use VLC 1.1 or higher as reference for most things and MPC Home Cinema for others This text should be blue This text should be red This text should be black -If you see this with the normal font, the player don't (fully) support font face - -3 -00:00:04,500 --> 00:00:04,500 -Hidden - -4 -00:00:04,501 --> 00:00:07,500 +If you see this with the normal font, the player don't (fully) support font face + +3 +00:00:04,500 --> 00:00:04,500 +Hidden + +4 +00:00:04,501 --> 00:00:07,500 This text should be small This text should be normal -This text should be big - -5 -00:00:07,501 --> 00:00:11,500 +This text should be big + +5 +00:00:07,501 --> 00:00:11,500 This should be an E with an accent: È 日本語 This text should be bold, italics and underline This text should be small and green This text should be small and red -This text should be big and brown - -6 -00:00:11,501 --> 00:00:14,500 +This text should be big and brown + +6 +00:00:11,501 --> 00:00:14,500 This line should be bold This line should be italics This line should be underline This line should be strikethrough Both lines -should be underline - -7 -00:00:14,501 --> 00:00:17,500 +should be underline + +7 +00:00:14,501 --> 00:00:17,500 > It would be a good thing to hide invalid html tags that are closed and show the text in them but show un-closed invalid html tags Show not opened tags -< - -8 -00:00:17,501 --> 00:00:20,500 +< + +8 +00:00:17,501 --> 00:00:20,500 and also hide invalid html tags with parameters that are closed and show the text in them but show un-closed invalid html tags This text should be showed underlined without problems also: 2<3,5>1,4<6 -This shouldn't be underlined - -9 -00:00:20,501 --> 00:00:21,500 -This text should be in the normal position... - -10 -00:00:21,501 --> 00:00:22,500 -This text should NOT be in the normal position - -11 -00:00:22,501 --> 00:00:24,500 +This shouldn't be underlined + +9 +00:00:20,501 --> 00:00:21,500 +This text should be in the normal position... + +10 +00:00:21,501 --> 00:00:22,500 +This text should NOT be in the normal position + +11 +00:00:22,501 --> 00:00:24,500 Implementation is the same of the ASS tag This text should be at the -top and horizontally centered - -12 -00:00:22,501 --> 00:00:24,500 +top and horizontally centered + +12 +00:00:22,501 --> 00:00:24,500 This text should be at the -middle and horizontally centered - -13 -00:00:22,501 --> 00:00:24,500 +middle and horizontally centered + +13 +00:00:22,501 --> 00:00:24,500 This text should be at the -bottom and horizontally centered - -14 -00:00:24,501 --> 00:00:26,500 +bottom and horizontally centered + +14 +00:00:24,501 --> 00:00:26,500 This text should be at the -top and horizontally at the left - -15 -00:00:24,501 --> 00:00:26,500 +top and horizontally at the left + +15 +00:00:24,501 --> 00:00:26,500 This text should be at the middle and horizontally at the left -(The second position must be ignored) - -16 -00:00:24,501 --> 00:00:26,500 +(The second position must be ignored) + +16 +00:00:24,501 --> 00:00:26,500 This text should be at the -bottom and horizontally at the left - -17 -00:00:26,501 --> 00:00:28,500 +bottom and horizontally at the left + +17 +00:00:26,501 --> 00:00:28,500 This text should be at the -top and horizontally at the right - -18 -00:00:26,501 --> 00:00:28,500 +top and horizontally at the right + +18 +00:00:26,501 --> 00:00:28,500 This text should be at the -middle and horizontally at the right - -19 -00:00:26,501 --> 00:00:28,500 +middle and horizontally at the right + +19 +00:00:26,501 --> 00:00:28,500 This text should be at the -bottom and horizontally at the right - -20 -00:00:28,501 --> 00:00:31,500 -This could be the most difficult thing to implement - -21 -00:00:31,501 --> 00:00:50,500 -First text - -22 -00:00:33,500 --> 00:00:35,500 -Second, it shouldn't overlap first - -23 -00:00:35,501 --> 00:00:37,500 -Third, it should replace second - -24 -00:00:36,501 --> 00:00:50,500 -Fourth, it shouldn't overlap first and third - -25 -00:00:40,501 --> 00:00:45,500 -Fifth, it should replace third - -26 -00:00:45,501 --> 00:00:50,500 +bottom and horizontally at the right + +20 +00:00:28,501 --> 00:00:31,500 +This could be the most difficult thing to implement + +21 +00:00:31,501 --> 00:00:50,500 +First text + +22 +00:00:33,500 --> 00:00:35,500 +Second, it shouldn't overlap first + +23 +00:00:35,501 --> 00:00:37,500 +Third, it should replace second + +24 +00:00:36,501 --> 00:00:50,500 +Fourth, it shouldn't overlap first and third + +25 +00:00:40,501 --> 00:00:45,500 +Fifth, it should replace third + +26 +00:00:45,501 --> 00:00:50,500 Sixth, it shouldn't be -showed overlapped - -27 -00:00:50,501 --> 00:00:52,500 -TEXT 1 (bottom) - -28 -00:00:50,501 --> 00:00:52,500 -text 2 - -29 -00:00:52,501 --> 00:00:54,500 +showed overlapped + +27 +00:00:50,501 --> 00:00:52,500 +TEXT 1 (bottom) + +28 +00:00:50,501 --> 00:00:52,500 +text 2 + +29 +00:00:52,501 --> 00:00:54,500 Hide these tags: also hide these tags: -but show this: {normal text} - -30 -00:00:54,501 --> 00:01:00,500 +but show this: {normal text} + +30 +00:00:54,501 --> 00:01:00,500 \ N is a forced line break \ h is a hard space Normal spaces at the start and at the end of the line are trimmed while hard spaces are not trimmed. -The\hline\hwill\hnever\hbreak\hautomatically\hright\hbefore\hor\hafter\ha\hhard\hspace.\h:-D - -31 -00:00:54,501 --> 00:00:56,500 +The\hline\hwill\hnever\hbreak\hautomatically\hright\hbefore\hor\hafter\ha\hhard\hspace.\h:-D + +31 +00:00:54,501 --> 00:00:56,500 \h\h\h\h\hA (05 hard spaces followed by a letter) A (Normal spaces followed by a letter) -A (No hard spaces followed by a letter) - -32 -00:00:56,501 --> 00:00:58,500 +A (No hard spaces followed by a letter) + +32 +00:00:56,501 --> 00:00:58,500 \h\h\h\h\hA (05 hard spaces followed by a letter) A (Normal spaces followed by a letter) A (No hard spaces followed by a letter) -Show this: \TEST and this: \-) - -33 -00:00:58,501 --> 00:01:00,500 +Show this: \TEST and this: \-) + +33 +00:00:58,501 --> 00:01:00,500 A letter followed by 05 hard spaces: A\h\h\h\h\h A letter followed by normal spaces: A @@ -185,29 +185,29 @@ A letter followed by no hard spaces: A 05 hard spaces between letters: A\h\h\h\h\hA 5 normal spaces between letters: A A -^--Forced line break - -34 -00:01:00,501 --> 00:01:02,500 +^--Forced line break + +34 +00:01:00,501 --> 00:01:02,500 Both line should be strikethrough, yes. Correctly closed tags -should be hidden. - -35 -00:01:02,501 --> 00:01:04,500 +should be hidden. + +35 +00:01:02,501 --> 00:01:04,500 It shouldn't be strikethrough, not opened tag showed as text. -Not opened tag showed as text. - -36 -00:01:04,501 --> 00:01:06,500 +Not opened tag showed as text. + +36 +00:01:04,501 --> 00:01:06,500 Three lines should be strikethrough, yes. -Not closed tags showed as text - -37 -00:01:06,501 --> 00:01:08,500 +Not closed tags showed as text + +37 +00:01:06,501 --> 00:01:08,500 Both line should be strikethrough but -the wrong closing tag should be showed - +the wrong closing tag should be showed + diff --git a/SmallVideoRecord2/build.gradle b/SmallVideoRecord2/build.gradle index e8d1d78..23ac0a4 100644 --- a/SmallVideoRecord2/build.gradle +++ b/SmallVideoRecord2/build.gradle @@ -2,12 +2,12 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.2' - classpath 'com.novoda:bintray-release:0.3.4' - + classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.novoda:bintray-release:0.9' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -15,6 +15,7 @@ buildscript { allprojects { repositories { + google() jcenter() } } @@ -23,4 +24,4 @@ task clean(type: Delete) { delete rootProject.buildDir } -tasks.getByPath(":SmallVideoLib2:mavenAndroidJavadocs").enabled = false \ No newline at end of file +//tasks.getByPath(":SmallVideoLib2:mavenAndroidJavadocs").enabled = false \ No newline at end of file diff --git a/SmallVideoRecord2/gradle/wrapper/gradle-wrapper.jar b/SmallVideoRecord2/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 13372ae..0000000 Binary files a/SmallVideoRecord2/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/SmallVideoRecord2/gradle/wrapper/gradle-wrapper.properties b/SmallVideoRecord2/gradle/wrapper/gradle-wrapper.properties index 46a7f09..d9be5aa 100644 --- a/SmallVideoRecord2/gradle/wrapper/gradle-wrapper.properties +++ b/SmallVideoRecord2/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/SmallVideoRecord2/sample/build.gradle b/SmallVideoRecord2/sample/build.gradle index cbb6ddf..a935c2a 100644 --- a/SmallVideoRecord2/sample/build.gradle +++ b/SmallVideoRecord2/sample/build.gradle @@ -1,13 +1,15 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion '25.0.2' - + compileSdkVersion 28 + buildToolsVersion '29.0.1' + lintOptions { + abortOnError false + } defaultConfig { applicationId "com.mabeijianxi.smallvideo2" minSdkVersion 14 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 11 versionName "2.0.3" } @@ -16,18 +18,13 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } - } - lintOptions { - abortOnError false - } - } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:25.1.0' -// compile 'com.mabeijianxi:small-video-record2:2.0.0beta@aar' - compile project(':SmallVideoLib2') + testImplementation 'junit:junit:4.12' + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.android.support:appcompat-v7:28.0.0' +// implementation 'com.mabeijianxi:small-video-record2:2.0.0beta@aar' + implementation project(':SmallVideoLib2') }