diff --git a/android/ijkplayer/ijkplayer-sample/src/main/AndroidManifest.xml b/android/ijkplayer/ijkplayer-sample/src/main/AndroidManifest.xml
index 5e03e9aa480f8162ede784c8e890d992f5307b1b..358584dbfc8c3a966e99ee469cb0459d3535153f 100644
--- a/android/ijkplayer/ijkplayer-sample/src/main/AndroidManifest.xml
+++ b/android/ijkplayer/ijkplayer-sample/src/main/AndroidManifest.xml
@@ -31,6 +31,13 @@
+
+
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tv.danmaku.ijk.media.sample.activities;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import tv.danmaku.ijk.media.sample.R;
+import tv.danmaku.ijk.media.sample.application.AppActivity;
+import tv.danmaku.ijk.media.sample.fragments.SampleMediaListFragment;
+
+public class SampleMediaActivity extends AppActivity {
+ public static Intent newIntent(Context context) {
+ Intent intent = new Intent(context, SampleMediaActivity.class);
+ return intent;
+ }
+
+ public static void intentTo(Context context) {
+ context.startActivity(newIntent(context));
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ Fragment newFragment = SampleMediaListFragment.newInstance();
+ FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+
+ transaction.replace(R.id.body, newFragment);
+ transaction.commit();
+ }
+
+ @Override
+ public boolean onPrepareOptionsMenu(Menu menu) {
+ boolean show = super.onPrepareOptionsMenu(menu);
+ if (!show)
+ return show;
+
+ MenuItem item = menu.findItem(R.id.action_recent);
+ if (item != null)
+ item.setVisible(false);
+
+ return true;
+ }
+}
diff --git a/android/ijkplayer/ijkplayer-sample/src/main/java/tv/danmaku/ijk/media/sample/application/AppActivity.java b/android/ijkplayer/ijkplayer-sample/src/main/java/tv/danmaku/ijk/media/sample/application/AppActivity.java
index 0601e5fc1bb202da031f028c1be0f623beca8b6f..9ce8f8cb0f60e9b9563d2d47239893597e0047b0 100644
--- a/android/ijkplayer/ijkplayer-sample/src/main/java/tv/danmaku/ijk/media/sample/application/AppActivity.java
+++ b/android/ijkplayer/ijkplayer-sample/src/main/java/tv/danmaku/ijk/media/sample/application/AppActivity.java
@@ -24,6 +24,7 @@ import android.view.MenuItem;
import tv.danmaku.ijk.media.sample.R;
import tv.danmaku.ijk.media.sample.activities.RecentMediaActivity;
+import tv.danmaku.ijk.media.sample.activities.SampleMediaActivity;
import tv.danmaku.ijk.media.sample.activities.SettingsActivity;
public class AppActivity extends AppCompatActivity {
@@ -50,6 +51,8 @@ public class AppActivity extends AppCompatActivity {
return true;
} else if (id == R.id.action_recent) {
RecentMediaActivity.intentTo(this);
+ } else if (id == R.id.action_sample) {
+ SampleMediaActivity.intentTo(this);
}
return super.onOptionsItemSelected(item);
diff --git a/android/ijkplayer/ijkplayer-sample/src/main/java/tv/danmaku/ijk/media/sample/fragments/RecentMediaListFragment.java b/android/ijkplayer/ijkplayer-sample/src/main/java/tv/danmaku/ijk/media/sample/fragments/RecentMediaListFragment.java
index 13e96baeccf11011288d9559f99948ca6704de1e..5618530b4930bea24dec494fab6225bcff13f184 100644
--- a/android/ijkplayer/ijkplayer-sample/src/main/java/tv/danmaku/ijk/media/sample/fragments/RecentMediaListFragment.java
+++ b/android/ijkplayer/ijkplayer-sample/src/main/java/tv/danmaku/ijk/media/sample/fragments/RecentMediaListFragment.java
@@ -30,7 +30,6 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ListView;
-import android.widget.TextView;
import tv.danmaku.ijk.media.sample.R;
import tv.danmaku.ijk.media.sample.activities.VideoActivity;
@@ -144,9 +143,5 @@ public class RecentMediaListFragment extends Fragment implements LoaderManager.L
return cursor.getString(mIndex_name);
}
-
- final class ViewHolder {
- public TextView nameTextView;
- }
}
}
diff --git a/android/ijkplayer/ijkplayer-sample/src/main/java/tv/danmaku/ijk/media/sample/fragments/SampleMediaListFragment.java b/android/ijkplayer/ijkplayer-sample/src/main/java/tv/danmaku/ijk/media/sample/fragments/SampleMediaListFragment.java
new file mode 100644
index 0000000000000000000000000000000000000000..5f52762aa9d14c25d42750bb5a388320cfd87588
--- /dev/null
+++ b/android/ijkplayer/ijkplayer-sample/src/main/java/tv/danmaku/ijk/media/sample/fragments/SampleMediaListFragment.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2015 Zhang Rui
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package tv.danmaku.ijk.media.sample.fragments;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import tv.danmaku.ijk.media.sample.R;
+import tv.danmaku.ijk.media.sample.activities.VideoActivity;
+
+public class SampleMediaListFragment extends Fragment {
+ private ListView mFileListView;
+ private SampleMediaAdapter mAdapter;
+
+ public static SampleMediaListFragment newInstance() {
+ SampleMediaListFragment f = new SampleMediaListFragment();
+ return f;
+ }
+
+ @Nullable
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ ViewGroup viewGroup = (ViewGroup) inflater.inflate(R.layout.fragment_file_list, container, false);
+ mFileListView = (ListView) viewGroup.findViewById(R.id.file_list_view);
+ return viewGroup;
+ }
+
+ @Override
+ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+
+ final Activity activity = getActivity();
+
+ mAdapter = new SampleMediaAdapter(activity);
+ mFileListView.setAdapter(mAdapter);
+ mFileListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+ @Override
+ public void onItemClick(AdapterView> parent, View view, final int position, final long id) {
+ SampleMediaItem item = mAdapter.getItem(position);
+ String name = item.mName;
+ String url = item.mUrl;
+ VideoActivity.intentTo(activity, url, name);
+ }
+ });
+
+ mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/bipbop_4x3_variant.m3u8", "bipbop basic master playlist");
+ mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear1/prog_index.m3u8", "bipbop basic 400x300 @ 232 kbps");
+ mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear2/prog_index.m3u8", "bipbop basic 640x480 @ 650 kbps");
+ mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear3/prog_index.m3u8", "bipbop basic 640x480 @ 1 Mbps");
+ mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear4/prog_index.m3u8", "bipbop basic 960x720 @ 2 Mbps");
+ mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear0/prog_index.m3u8", "bipbop basic 22.050Hz stereo @ 40 kbps");
+ mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8", "bipbop advanced master playlist");
+ mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_16x9/gear1/prog_index.m3u8", "bipbop advanced 416x234 @ 265 kbps");
+ mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_16x9/gear2/prog_index.m3u8", "bipbop advanced 640x360 @ 580 kbps");
+ mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_16x9/gear3/prog_index.m3u8", "bipbop advanced 960x540 @ 910 kbps");
+ mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_16x9/gear4/prog_index.m3u8", "bipbop advanced 1289x720 @ 1 Mbps");
+ mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_16x9/gear5/prog_index.m3u8", "bipbop advanced 1920x1080 @ 2 Mbps");
+ mAdapter.addItem("http://devimages.apple.com.edgekey.net/streaming/examples/bipbop_16x9/gear0/prog_index.m3u8", "bipbop advanced 22.050Hz stereo @ 40 kbps");
+ }
+
+ final class SampleMediaItem {
+ String mUrl;
+ String mName;
+
+ public SampleMediaItem(String url, String name) {
+ mUrl = url;
+ mName = name;
+ }
+ }
+
+ final class SampleMediaAdapter extends ArrayAdapter {
+ public SampleMediaAdapter(Context context) {
+ super(context, android.R.layout.simple_list_item_2);
+ }
+
+ public void addItem(String url, String name) {
+ add(new SampleMediaItem(url, name));
+ }
+
+ @Override
+ public long getItemId(int position) {
+ return position;
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ View view = convertView;
+ if (view == null) {
+ LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+ view = inflater.inflate(android.R.layout.simple_list_item_2, parent, false);
+ }
+
+ ViewHolder viewHolder = (ViewHolder) view.getTag();
+ if (viewHolder == null) {
+ viewHolder = new ViewHolder();
+ viewHolder.mNameTextView = (TextView) view.findViewById(android.R.id.text1);
+ viewHolder.mUrlTextView = (TextView) view.findViewById(android.R.id.text2);
+ }
+
+ SampleMediaItem item = getItem(position);
+ viewHolder.mNameTextView.setText(item.mName);
+ viewHolder.mUrlTextView.setText(item.mUrl);
+
+ return view;
+ }
+
+ final class ViewHolder {
+ public TextView mNameTextView;
+ public TextView mUrlTextView;
+ }
+ }
+}
diff --git a/android/ijkplayer/ijkplayer-sample/src/main/res/menu/menu_app.xml b/android/ijkplayer/ijkplayer-sample/src/main/res/menu/menu_app.xml
index 0a56120cc444f2d668ca0097dc939722fe6dc15a..ae6999ef22c075f9040eebaf60a3cae7f4fb4c9f 100644
--- a/android/ijkplayer/ijkplayer-sample/src/main/res/menu/menu_app.xml
+++ b/android/ijkplayer/ijkplayer-sample/src/main/res/menu/menu_app.xml
@@ -3,6 +3,10 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context=".menu_app">
+
- N/A
Close
Exit
+ Sample
Recent
Settings
Render