提交 03514653 编写于 作者: G guoshuyu

update support lib to 26.0.2

上级 75c43cd3
......@@ -54,7 +54,8 @@ public class DetailPlayer extends AppCompatActivity {
//String url = "http://7xjmzj.com1.z0.glb.clouddn.com/20171026175005_JObCxCE2.mp4";
//String url = "http://video.7k.cn/app_video/20171202/6c8cf3ea/v.m3u8.mp4";
String url = "http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/bipbop_4x3_variant.m3u8";
//String url = "http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/bipbop_4x3_variant.m3u8";
String url = " http://1253492636.vod2.myqcloud.com/2e5fc148vodgzp1253492636/d08af82d4564972819086152830/plHZZoSkje0A.mp4";
//String url = "rtsp://ajj:12345678@218.21.217.122:65523/h264/ch40/sub/av_stream";
//String url = "rtsp://ajj:ajj12345678@218.21.217.122:65522/h264/ch15/sub/av_stream";//String url = "rtsp://cloud.easydarwin.org:554/stream0.sdp";
......
......@@ -8,10 +8,9 @@ ext {
//Android
androidBuildToolsVersion = "26.0.2"
androidMinSdkVersion = 16
androidTargetSdkVersion = 22
androidCompileSdkVersion = 22
supportLibraryVersion = '24.2.0'
otherLibraryVersion = '22.2.1'
androidTargetSdkVersion = 26
androidCompileSdkVersion = 26
supportLibraryVersion = '26.0.2'
//ViewLibraries
butterKnifeVersion = '8.2.1'
......@@ -33,10 +32,10 @@ ext {
androidDependencies = [
recyclerView: "com.android.support:recyclerview-v7:${supportLibraryVersion}",
appcompat_v7: "com.android.support:appcompat-v7:${otherLibraryVersion}",
cardview_v7 : "com.android.support:cardview-v7:23.2.0",
appcompat_v7: "com.android.support:appcompat-v7:${supportLibraryVersion}",
cardview_v7 : "com.android.support:cardview-v7:${supportLibraryVersion}",
support_v4 : "com.android.support:support-v4:${supportLibraryVersion}",
design : "com.android.support:design:${otherLibraryVersion}",
design : "com.android.support:design:${supportLibraryVersion}",
]
viewDependencies = [
......
......@@ -37,10 +37,10 @@ dependencies {
api viewDependencies.ijkplayer_java
api viewDependencies.ijkplayer_exo
api viewDependencies.transitionseverywhere
api dataDependencies.videocache
api "com.shuyu:GSYVideoPlayer-exo2:$gsyVideoVersion"
//api project(':gsyvideoplayer-androidvideocache')
//api project(':gsyvideoplayer-exo2')
//api dataDependencies.videocache
//api "com.shuyu:GSYVideoPlayer-exo2:$gsyVideoVersion"
api project(':gsyvideoplayer-androidvideocache')
api project(':gsyvideoplayer-exo2')
//compile fileTree(dir: 'libs', include: ['*.jar'])
......
......@@ -9,7 +9,8 @@ import android.os.Build;
import android.support.v4.app.FragmentActivity;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.internal.view.ContextThemeWrapper;
import android.support.v7.view.ContextThemeWrapper;
import android.support.v7.widget.TintContextWrapper;
import android.util.DisplayMetrics;
import android.util.TypedValue;
import android.view.Surface;
......@@ -64,6 +65,8 @@ public class CommonUtil {
if (context instanceof Activity) {
return (Activity) context;
} else if (context instanceof TintContextWrapper) {
return scanForActivity(((TintContextWrapper) context).getBaseContext());
} else if (context instanceof ContextWrapper) {
return scanForActivity(((ContextWrapper) context).getBaseContext());
}
......@@ -262,6 +265,8 @@ public class CommonUtil {
return null;
else if (context instanceof Activity)
return (Activity) context;
else if (context instanceof TintContextWrapper)
return scanForActivity(((TintContextWrapper) context).getBaseContext());
else if (context instanceof ContextWrapper)
return scanForActivity(((ContextWrapper) context).getBaseContext());
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册