diff --git a/README.md b/README.md index b6913f698..55f012cf8 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ ##使用 引入类库 ```java -compile 'fm.jiecao:jiecaovideoplayer:1.2_preview' +compile 'fm.jiecao:jiecaovideoplayer:1.2' ``` 添加布局 diff --git a/app/build.gradle b/app/build.gradle index 41d29ce52..48ed4ec9c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "fm.jiecao.jiecaovideoplayer" minSdkVersion 16 targetSdkVersion 23 - versionCode 2 - versionName "1.1" + versionCode 14 + versionName "1.3" } buildTypes { release { diff --git a/app/src/main/java/fm/jiecao/jiecaovideoplayer/ListViewpagerActivity.java b/app/src/main/java/fm/jiecao/jiecaovideoplayer/ListViewpagerActivity.java index ffd8b25ad..038537e73 100644 --- a/app/src/main/java/fm/jiecao/jiecaovideoplayer/ListViewpagerActivity.java +++ b/app/src/main/java/fm/jiecao/jiecaovideoplayer/ListViewpagerActivity.java @@ -53,7 +53,7 @@ public void onPageScrolled(int position, float positionOffset, int positionOffse @Override public void onPageSelected(int position) { - JCVideoPlayer.releaseAllVideo(); + JCVideoPlayer.releaseAllVideos(); } @Override diff --git a/app/src/main/java/fm/jiecao/jiecaovideoplayer/MainActivity.java b/app/src/main/java/fm/jiecao/jiecaovideoplayer/MainActivity.java index 19585c3a0..171922231 100644 --- a/app/src/main/java/fm/jiecao/jiecaovideoplayer/MainActivity.java +++ b/app/src/main/java/fm/jiecao/jiecaovideoplayer/MainActivity.java @@ -14,7 +14,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListener { - JCVideoPlayer videoController1, videoController2; + JCVideoPlayer videoController1, videoController2, videoController3; Button btnToList, btnToListViewpager, btnToFullscreen, btnToChangecolor; @Override @@ -33,6 +33,11 @@ protected void onCreate(Bundle savedInstanceState) { "http://p.qpic.cn/videoyun/0/2449_ded7b566b37911e5942f0b208e48548d_2/640", "嫂子还摸我", false); + videoController3 = (JCVideoPlayer) findViewById(R.id.videocontroller3); + videoController3.setUp("http://121.40.64.47/resource/mp3/music_yangguang3.mp3",// + "http://p.qpic.cn/videoyun/0/2449_ded7b566b37911e5942f0b208e48548d_2/640", + "嫂子别闹"); + btnToList = (Button) findViewById(R.id.to_list_activity); btnToListViewpager = (Button) findViewById(R.id.to_list_viewpager_activity); btnToFullscreen = (Button) findViewById(R.id.to_fullscreen); @@ -48,7 +53,7 @@ protected void onCreate(Bundle savedInstanceState) { @Override protected void onPause() { super.onPause(); - JCVideoPlayer.releaseAllVideo(); + JCVideoPlayer.releaseAllVideos(); } @Override @@ -91,7 +96,7 @@ public void onEventMainThread(VideoEvents event) { @Override public void onClick(View v) { - JCVideoPlayer.releaseAllVideo(); + JCVideoPlayer.releaseAllVideos(); switch (v.getId()) { case R.id.to_list_activity: startActivity(new Intent(MainActivity.this, ListActivity.class)); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index f6a447991..f7e233228 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -34,6 +34,18 @@ android:layout_height="200dp" android:layout_marginTop="2dp" /> + + + +