提交 2ca82200 编写于 作者: G guoshuyu

update gradle 3.3.0

update build sdk 28
update support sdk 27.1.1
update exoplayer 2.9.3
fix #1762
上级 7e34da28
...@@ -51,9 +51,9 @@ public class RecyclerItemViewHolder extends RecyclerItemBaseHolder { ...@@ -51,9 +51,9 @@ public class RecyclerItemViewHolder extends RecyclerItemBaseHolder {
listItemBtn.setOnClickListener(new View.OnClickListener() { listItemBtn.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
smallVideoHelper.setPlayPositionAndTag(position, TAG);
getRecyclerBaseAdapter().notifyDataSetChanged(); getRecyclerBaseAdapter().notifyDataSetChanged();
//listVideoUtil.setLoop(true); //listVideoUtil.setLoop(true);
smallVideoHelper.setPlayPositionAndTag(position, TAG);
String url; String url;
if (position % 2 == 0) { if (position % 2 == 0) {
url = "https://res.exexm.com/cw_145225549855002"; url = "https://res.exexm.com/cw_145225549855002";
......
...@@ -9,7 +9,7 @@ buildscript { ...@@ -9,7 +9,7 @@ buildscript {
google() google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.0.1' classpath 'com.android.tools.build:gradle:3.3.0'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
......
...@@ -9,11 +9,11 @@ allprojects { ...@@ -9,11 +9,11 @@ allprojects {
ext { ext {
//Android //Android
androidBuildToolsVersion = "27.0.2" androidBuildToolsVersion = "28.0.3"
androidMinSdkVersion = 16 androidMinSdkVersion = 16
androidTargetSdkVersion = 27 androidTargetSdkVersion = 28
androidCompileSdkVersion = 27 androidCompileSdkVersion = 28
supportLibraryVersion = '27.0.2' supportLibraryVersion = '27.1.1'
//ViewLibraries //ViewLibraries
butterKnifeVersion = '8.2.1' butterKnifeVersion = '8.2.1'
...@@ -31,7 +31,7 @@ ext { ...@@ -31,7 +31,7 @@ ext {
gsyVideoVersion = '6.0.2' gsyVideoVersion = '6.0.2'
exo_player2 = '2.9.1' exo_player2 = '2.9.3'
permissionsdispatcher = '3.2.0' permissionsdispatcher = '3.2.0'
......
...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME ...@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
...@@ -31,8 +31,6 @@ public class Exo2PlayerManager implements IPlayerManager { ...@@ -31,8 +31,6 @@ public class Exo2PlayerManager implements IPlayerManager {
private DummySurface dummySurface; private DummySurface dummySurface;
private Handler handler = new Handler(Looper.getMainLooper());
@Override @Override
public IMediaPlayer getMediaPlayer() { public IMediaPlayer getMediaPlayer() {
return mediaPlayer; return mediaPlayer;
...@@ -84,34 +82,24 @@ public class Exo2PlayerManager implements IPlayerManager { ...@@ -84,34 +82,24 @@ public class Exo2PlayerManager implements IPlayerManager {
@Override @Override
public void setSpeed(final float speed, final boolean soundTouch) { public void setSpeed(final float speed, final boolean soundTouch) {
handler.post(new Runnable() { if (mediaPlayer != null) {
@Override try {
public void run() { mediaPlayer.setSpeed(speed, 1);
if (mediaPlayer != null) { } catch (Exception e) {
try { e.printStackTrace();
mediaPlayer.setSpeed(speed, 1);
} catch (Exception e) {
e.printStackTrace();
}
}
} }
}); }
} }
@Override @Override
public void setNeedMute(final boolean needMute) { public void setNeedMute(final boolean needMute) {
handler.post(new Runnable() { if (mediaPlayer != null) {
@Override if (needMute) {
public void run() { mediaPlayer.setVolume(0, 0);
if (mediaPlayer != null) { } else {
if (needMute) { mediaPlayer.setVolume(1, 1);
mediaPlayer.setVolume(0, 0);
} else {
mediaPlayer.setVolume(1, 1);
}
}
} }
}); }
} }
...@@ -125,19 +113,14 @@ public class Exo2PlayerManager implements IPlayerManager { ...@@ -125,19 +113,14 @@ public class Exo2PlayerManager implements IPlayerManager {
@Override @Override
public void release() { public void release() {
handler.post(new Runnable() { if (mediaPlayer != null) {
@Override mediaPlayer.setSurface(null);
public void run() { mediaPlayer.release();
if (mediaPlayer != null) { }
mediaPlayer.setSurface(null); if (dummySurface != null) {
mediaPlayer.release(); dummySurface.release();
} dummySurface = null;
if (dummySurface != null) { }
dummySurface.release();
dummySurface = null;
}
}
});
} }
@Override @Override
......
...@@ -177,7 +177,7 @@ public class ExoSourceManager { ...@@ -177,7 +177,7 @@ public class ExoSourceManager {
try { try {
mCache.release(); mCache.release();
mCache = null; mCache = null;
} catch (Cache.CacheException e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
......
...@@ -145,9 +145,7 @@ public abstract class GSYVideoBaseManager implements IMediaPlayer.OnPreparedList ...@@ -145,9 +145,7 @@ public abstract class GSYVideoBaseManager implements IMediaPlayer.OnPreparedList
} }
protected void init() { protected void init() {
HandlerThread mediaHandlerThread = new HandlerThread(TAG); mMediaHandler = new MediaHandler((Looper.getMainLooper()));
mediaHandlerThread.start();
mMediaHandler = new MediaHandler((mediaHandlerThread.getLooper()));
mainThreadHandler = new Handler(); mainThreadHandler = new Handler();
} }
......
...@@ -29,10 +29,8 @@ android { ...@@ -29,10 +29,8 @@ android {
} }
dependencies { dependencies {
//implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
//compile fileTree(dir: 'libs', include: ['*.jar'])
compile fileTree(dir: 'libs', include: ['*.jar'])
} }
apply from: './bintray.gradle' apply from: './bintray.gradle'
...@@ -36,7 +36,7 @@ dependencies { ...@@ -36,7 +36,7 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
api project(':gsyVideoPlayer-java') api project(':gsyVideoPlayer-java')
//api project(':gsyVideoPlayer-exo_player2') api project(':gsyVideoPlayer-exo_player2')
//api project(':gsyVideoPlayer-armv5') //api project(':gsyVideoPlayer-armv5')
//api project(':gsyVideoPlayer-armv7a') //api project(':gsyVideoPlayer-armv7a')
//api project(':gsyVideoPlayer-armv64') //api project(':gsyVideoPlayer-armv64')
...@@ -49,7 +49,7 @@ dependencies { ...@@ -49,7 +49,7 @@ dependencies {
//api "com.shuyu:GSYVideoPlayer:$gsyVideoVersion" //api "com.shuyu:GSYVideoPlayer:$gsyVideoVersion"
//api "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion" //api "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion"
api "com.shuyu:GSYVideoPlayer-exo2:$gsyVideoVersion" //api "com.shuyu:GSYVideoPlayer-exo2:$gsyVideoVersion"
api "com.shuyu:gsyVideoPlayer-armv5:$gsyVideoVersion" api "com.shuyu:gsyVideoPlayer-armv5:$gsyVideoVersion"
api "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion" api "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion"
api "com.shuyu:gsyVideoPlayer-arm64:$gsyVideoVersion" api "com.shuyu:gsyVideoPlayer-arm64:$gsyVideoVersion"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册