Skip to content
This repository has been archived by the owner on Aug 9, 2022. It is now read-only.

Commit

Permalink
Merge branch 'release/v4.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Nathen committed Sep 25, 2016
2 parents 0a1b598 + f50a495 commit 5425b69
Show file tree
Hide file tree
Showing 35 changed files with 624 additions and 219 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ gradle.properties
/build
/captures
*.asc
projectFilesBackup
14 changes: 7 additions & 7 deletions README-ZH.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
--
<p align="center">
<a href="http://developer.android.com/index.html"><img src="https://img.shields.io/badge/platform-android-green.svg"></a>
<a href="http://search.maven.org/#artifactdetails%7Cfm.jiecao%7Cjiecaovideoplayer%7C4.6.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-4.6.5-green.svg"></a>
<a href="http://search.maven.org/#artifactdetails%7Cfm.jiecao%7Cjiecaovideoplayer%7C4.6.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-4.7.0-green.svg"></a>
<a href="http://choosealicense.com/licenses/mit/"><img src="https://img.shields.io/badge/license-MIT-green.svg"></a>
<a href="https://android-arsenal.com/details/1/3269"><img src="https://img.shields.io/badge/Android%20Arsenal-jiecaovideoplayer-green.svg?style=true"></a>
</p>
Expand All @@ -22,22 +22,22 @@

##效果

**[jiecaovideoplayer-4.6.5-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.6.5-demo.apk)**
**[jiecaovideoplayer-4.7.0-demo.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/4.7.0/jiecaovideoplayer-4.7.0-demo.apk)**

![Demo Screenshot][1]

##使用

1.添加类库
1.添加类库,这个版本的目的是预览自动进入小窗功能,不要用在生产环境,稳定版本仍然是v4.6.5
```gradle
compile 'fm.jiecao:jiecaovideoplayer:4.6.5'
compile 'fm.jiecao:jiecaovideoplayer:4.7.0'
```

或直接下载

* [jiecaovideoplayer-4.6.5.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.6.5.aar)
* [jiecaovideoplayer-4.6.5-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.6.5-javadoc.jar)
* [jiecaovideoplayer-4.6.5-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.6.5-sources.jar)
* [jiecaovideoplayer-4.7.0.aar](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/4.7.0/jiecaovideoplayer-4.7.0.aar)
* [jiecaovideoplayer-4.7.0-javadoc.jar](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/4.7.0/jiecaovideoplayer-4.7.0-javadoc.jar)
* [jiecaovideoplayer-4.7.0-sources.jar](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/4.7.0/jiecaovideoplayer-4.7.0-sources.jar)

2.添加布局
```xml
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
--
<p align="center">
<a href="http://developer.android.com/index.html"><img src="https://img.shields.io/badge/platform-android-green.svg"></a>
<a href="http://search.maven.org/#artifactdetails%7Cfm.jiecao%7Cjiecaovideoplayer%7C4.6.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-4.6.5-green.svg"></a>
<a href="http://search.maven.org/#artifactdetails%7Cfm.jiecao%7Cjiecaovideoplayer%7C4.6.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-4.7.0-green.svg"></a>
<a href="http://choosealicense.com/licenses/mit/"><img src="https://img.shields.io/badge/license-MIT-green.svg"></a>
<a href="https://android-arsenal.com/details/1/3269"><img src="https://img.shields.io/badge/Android%20Arsenal-jiecaovideoplayer-green.svg?style=true"></a>
</p>
Expand All @@ -28,22 +28,22 @@ Ambition is become the most widely used video playback control.

## Effect

**[jiecaovideoplayer-4.6.5-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.6.5-demo.apk)**
**[jiecaovideoplayer-4.7.0-demo.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/4.7.0/jiecaovideoplayer-4.7.0-demo.apk)**

![Demo Screenshot][1]

## Usage

1.Import library
1.Import library,new feature auto tiny window is not perfect this version, do not use it in you project, this is juct preview the feature , Stable version is still v4.6.5
```gradle
compile 'fm.jiecao:jiecaovideoplayer:4.6.5'
compile 'fm.jiecao:jiecaovideoplayer:4.7.0'
```

Or download lib

* [jiecaovideoplayer-4.6.5.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.6.5.aar)
* [jiecaovideoplayer-4.6.5-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.6.5-javadoc.jar)
* [jiecaovideoplayer-4.6.5-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.6.5-sources.jar)
* [jiecaovideoplayer-4.7.0.aar](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/4.7.0/jiecaovideoplayer-4.7.0.aar)
* [jiecaovideoplayer-4.7.0-javadoc.jar](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/4.7.0/jiecaovideoplayer-4.7.0-javadoc.jar)
* [jiecaovideoplayer-4.7.0-sources.jar](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/4.7.0/jiecaovideoplayer-4.7.0-sources.jar)

2.Add JCVideoPlayer in your layout
```xml
Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
applicationId "fm.jiecao.jiecaovideoplayer"
minSdkVersion 14
targetSdkVersion 24
versionCode 41
versionName "4.6.5"
versionCode 42
versionName "4.7.0"
}
buildTypes {
release {
Expand Down
10 changes: 9 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,15 @@
android:name=".UIImageLoaderActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".RecyclerViewNormalActivity"
android:name=".RecyclerViewNormalActivity"/>
<activity
android:name=".AutoTinyActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".AutoTinyListActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".AutoTinyNormalActivity"
android:screenOrientation="portrait"/>

</application>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package fm.jiecao.jiecaovideoplayer;

import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem;
import android.view.View;
import android.widget.Button;

/**
* Created by Nathen on 16/8/23.
*/
public class AutoTinyActivity extends AppCompatActivity implements View.OnClickListener {

Button normal, list;

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowHomeEnabled(true);
getSupportActionBar().setDisplayShowTitleEnabled(true);
getSupportActionBar().setDisplayUseLogoEnabled(false);
getSupportActionBar().setTitle("AutoTinyWindow");
setContentView(R.layout.activity_auto_tiny);
normal = (Button) findViewById(R.id.screen_normal);
list = (Button) findViewById(R.id.screen_list);

normal.setOnClickListener(this);
list.setOnClickListener(this);

}

@Override
public void onClick(View v) {
switch (v.getId()) {
case R.id.screen_normal:
startActivity(new Intent(this, AutoTinyNormalActivity.class));
break;
case R.id.screen_list:
startActivity(new Intent(this, AutoTinyListActivity.class));
break;
}
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
break;
}
return super.onOptionsItemSelected(item);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
package fm.jiecao.jiecaovideoplayer;

import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.MenuItem;
import android.widget.AbsListView;
import android.widget.ListView;

import fm.jiecao.jcvideoplayer_lib.JCVideoPlayer;

/**
* Created by Nathen on 16/8/23.
*/
public class AutoTinyListActivity extends AppCompatActivity {

ListView listView;
VideoListAdapter adapterVideoList;

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowHomeEnabled(true);
getSupportActionBar().setDisplayShowTitleEnabled(true);
getSupportActionBar().setDisplayUseLogoEnabled(false);
getSupportActionBar().setTitle("AutoTinyList");
setContentView(R.layout.activity_listview_content);

listView = (ListView) findViewById(R.id.listview);
adapterVideoList = new VideoListAdapter(this);
listView.setAdapter(adapterVideoList);
listView.setOnScrollListener(new AbsListView.OnScrollListener() {
@Override
public void onScrollStateChanged(AbsListView view, int scrollState) {

}

@Override
public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
// Log.i(JCVideoPlayer.TAG, "onScroll");
JCVideoPlayer.onScroll();
}
});
}

@Override
public void onBackPressed() {
if (JCVideoPlayer.backPress()) {
return;
}
super.onBackPressed();
}

@Override
protected void onPause() {
super.onPause();
JCVideoPlayer.releaseAllVideos();
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
break;
}
return super.onOptionsItemSelected(item);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
package fm.jiecao.jiecaovideoplayer;

import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem;
import android.widget.AbsListView;
import android.widget.LinearLayout;
import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.SimpleAdapter;

import com.nostra13.universalimageloader.core.ImageLoader;
import com.squareup.picasso.Picasso;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import fm.jiecao.jcvideoplayer_lib.JCVideoPlayer;
import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard;

/**
* Created by Nathen on 16/8/23.
*/
public class AutoTinyNormalActivity extends AppCompatActivity implements AbsListView.OnScrollListener {
ListView listView;
LinearLayout headerLayout;

@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setDisplayShowHomeEnabled(true);
getSupportActionBar().setDisplayShowTitleEnabled(true);
getSupportActionBar().setDisplayUseLogoEnabled(false);
getSupportActionBar().setTitle("AutoTinyNormal");
setContentView(R.layout.activity_listview_content);

listView = (ListView) findViewById(R.id.listview);
headerLayout = (LinearLayout) getLayoutInflater().inflate(R.layout.header_auto_tiny_normal, null);
listView.addHeaderView(headerLayout);

JCVideoPlayerStandard jcVideoPlayerStandard = (JCVideoPlayerStandard) headerLayout.findViewById(R.id.jc_video);
jcVideoPlayerStandard.setUp("http://2449.vod.myqcloud.com/2449_22ca37a6ea9011e5acaaf51d105342e3.f20.mp4"
, JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL, "嫂子坐这");
Picasso.with(this)
.load("http://cos.myqcloud.com/1000264/qcloud_video_attachment/842646334/vod_cover/cover1458036374.jpg")
.into(jcVideoPlayerStandard.thumbImageView);

Map<String, String> keyValuePair = new HashMap<>();
keyValuePair.put("key", "list item");
List<Map<String, String>> list = new ArrayList<>();
for (int i = 0; i < 50; i++) {
list.add(keyValuePair);
}

ListAdapter adapter = new SimpleAdapter(this, list,
android.R.layout.simple_list_item_1, new String[]{"key"}, new int[]{android.R.id.text1});

listView.setAdapter(adapter);
listView.setOnScrollListener(this);
}

@Override
public void onBackPressed() {
if (JCVideoPlayer.backPress()) {
return;
}
super.onBackPressed();
}

@Override
protected void onPause() {
super.onPause();
JCVideoPlayer.releaseAllVideos();
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
finish();
break;
}
return super.onOptionsItemSelected(item);
}

@Override
public void onScrollStateChanged(AbsListView view, int scrollState) {

}

@Override
public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
JCVideoPlayer.onScroll();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import android.widget.TextView;

import com.nostra13.universalimageloader.core.ImageLoader;
import com.squareup.picasso.Picasso;

import fm.jiecao.jcvideoplayer_lib.JCVideoPlayer;
import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard;
Expand Down Expand Up @@ -85,8 +86,9 @@ public View getView(int position, View convertView, ViewGroup parent) {
VideoConstant.videoUrls[position], JCVideoPlayer.SCREEN_LAYOUT_LIST,
VideoConstant.videoTitles[position]);
if (setUp) {
ImageLoader.getInstance().displayImage(VideoConstant.videoThumbs[position],
viewHolder.jcVideoPlayer.thumbImageView);
Picasso.with(ListViewMultiHolderActivity.this)
.load(VideoConstant.videoThumbs[position])
.into(viewHolder.jcVideoPlayer.thumbImageView);
}
} else {
TextViewHolder textViewHolder;
Expand All @@ -99,7 +101,6 @@ public View getView(int position, View convertView, ViewGroup parent) {
textViewHolder.textView = (TextView) convertView.findViewById(R.id.textview);
convertView.setTag(textViewHolder);
}

}
return convertView;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem;
import android.widget.AbsListView;
import android.widget.ListView;

import fm.jiecao.jcvideoplayer_lib.JCVideoPlayer;
Expand Down
Loading

0 comments on commit 5425b69

Please sign in to comment.