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

JzvdStd #2569

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

JzvdStd #2569

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c5c3bf2
Merge pull request #1 from lipangit/develop
DB-BOY Aug 18, 2019
a98b46c
代码优化
DB-BOY Aug 18, 2019
ddf1c35
Merge pull request #2 from lipangit/develop
DB-BOY Dec 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
143 changes: 52 additions & 91 deletions jiaozivideoplayer/src/main/java/cn/jzvd/JzvdStd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,23 @@ public class JzvdStd extends Jzvd {
protected Dialog mBrightnessDialog;
protected ProgressBar mDialogBrightnessProgressBar;
protected TextView mDialogBrightnessTextView;

private BroadcastReceiver battertReceiver = new BroadcastReceiver() {
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
if (Intent.ACTION_BATTERY_CHANGED.equals(action)) {
int level = intent.getIntExtra("level", 0);
int scale = intent.getIntExtra("scale", 100);
int percent = level * 100 / scale;
LAST_GET_BATTERYLEVEL_PERCENT = percent;
setBatteryLevel();
try {
getContext().unregisterReceiver(battertReceiver);
} catch (Exception e) {
e.printStackTrace();
}
}
}
};

public JzvdStd(Context context) {
super(context);
Expand Down Expand Up @@ -219,9 +235,7 @@ public void onClick(View v) {
return;
}
if (state == STATE_NORMAL) {
if (!jzDataSource.getCurrentUrl().toString().startsWith("file") &&
!jzDataSource.getCurrentUrl().toString().startsWith("/") &&
!JZUtils.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) {
if (!jzDataSource.getCurrentUrl().toString().startsWith("file") && !jzDataSource.getCurrentUrl().toString().startsWith("/") && !JZUtils.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) {
showWifiDialog();
return;
}
Expand All @@ -236,8 +250,7 @@ public void onClick(View v) {
} else if (i == R.id.back_tiny) {
clearFloatScreen();
} else if (i == R.id.clarity) {
LayoutInflater inflater = (LayoutInflater) getContext()
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
final LinearLayout layout = (LinearLayout) inflater.inflate(R.layout.jz_layout_clarity, null);

OnClickListener mQualityListener = v1 -> {
Expand Down Expand Up @@ -280,9 +293,7 @@ public void onClick(View v) {
Toast.makeText(getContext(), getResources().getString(R.string.no_url), Toast.LENGTH_SHORT).show();
return;
}
if (!jzDataSource.getCurrentUrl().toString().startsWith("file") && !
jzDataSource.getCurrentUrl().toString().startsWith("/") &&
!JZUtils.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) {
if (!jzDataSource.getCurrentUrl().toString().startsWith("file") && !jzDataSource.getCurrentUrl().toString().startsWith("/") && !JZUtils.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) {
showWifiDialog();
return;
}
Expand Down Expand Up @@ -324,8 +335,7 @@ public void setScreenFullscreen() {
public void setScreenTiny() {
super.setScreenTiny();
tinyBackImageView.setVisibility(View.VISIBLE);
setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE,
View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
batteryTimeLayout.setVisibility(View.GONE);
clarity.setVisibility(View.GONE);
}
Expand Down Expand Up @@ -392,30 +402,29 @@ public void setSystemTimeAndBattery() {
videoCurrentTime.setText(dateFormater.format(date));
if ((System.currentTimeMillis() - LAST_GET_BATTERYLEVEL_TIME) > 30000) {
LAST_GET_BATTERYLEVEL_TIME = System.currentTimeMillis();
getContext().registerReceiver(
battertReceiver,
new IntentFilter(Intent.ACTION_BATTERY_CHANGED)
);
getContext().registerReceiver(battertReceiver, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
} else {
setBatteryLevel();
}
}

public void setBatteryLevel() {
int percent = LAST_GET_BATTERYLEVEL_PERCENT;
int drawResId = R.drawable.jz_battery_level_10;
if (percent < 15) {
batteryLevel.setBackgroundResource(R.drawable.jz_battery_level_10);
drawResId = R.drawable.jz_battery_level_10;
} else if (percent >= 15 && percent < 40) {
batteryLevel.setBackgroundResource(R.drawable.jz_battery_level_30);
drawResId = R.drawable.jz_battery_level_30;
} else if (percent >= 40 && percent < 60) {
batteryLevel.setBackgroundResource(R.drawable.jz_battery_level_50);
drawResId = R.drawable.jz_battery_level_50;
} else if (percent >= 60 && percent < 80) {
batteryLevel.setBackgroundResource(R.drawable.jz_battery_level_70);
drawResId = R.drawable.jz_battery_level_70;
} else if (percent >= 80 && percent < 95) {
batteryLevel.setBackgroundResource(R.drawable.jz_battery_level_90);
} else if (percent >= 95 && percent <= 100) {
batteryLevel.setBackgroundResource(R.drawable.jz_battery_level_100);
drawResId = R.drawable.jz_battery_level_90;
} else {
drawResId = R.drawable.jz_battery_level_100;
}
batteryLevel.setBackgroundResource(drawResId);
}

public void onCLickUiToggleToClear() {
Expand All @@ -442,17 +451,18 @@ public void onCLickUiToggleToClear() {
}
}


@Override
public void onProgress(int progress, long position, long duration) {
super.onProgress(progress, position, duration);
if (progress != 0) bottomProgressBar.setProgress(progress);
if (progress != 0)
bottomProgressBar.setProgress(progress);
}

@Override
public void setBufferProgress(int bufferProgress) {
super.setBufferProgress(bufferProgress);
if (bufferProgress != 0) bottomProgressBar.setSecondaryProgress(bufferProgress);
if (bufferProgress != 0)
bottomProgressBar.setSecondaryProgress(bufferProgress);
}

@Override
Expand All @@ -465,13 +475,8 @@ public void resetProgressAndTime() {
public void changeUiToNormal() {
switch (screen) {
case SCREEN_NORMAL:
setAllControlsVisiblity(View.VISIBLE, View.INVISIBLE, View.VISIBLE,
View.INVISIBLE, View.VISIBLE, View.INVISIBLE, View.INVISIBLE);
updateStartImage();
break;
case SCREEN_FULLSCREEN:
setAllControlsVisiblity(View.VISIBLE, View.INVISIBLE, View.VISIBLE,
View.INVISIBLE, View.VISIBLE, View.INVISIBLE, View.INVISIBLE);
setAllControlsVisiblity(View.VISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE, View.INVISIBLE);
updateStartImage();
break;
case SCREEN_TINY:
Expand All @@ -483,8 +488,7 @@ public void changeUiToPreparing() {
switch (screen) {
case SCREEN_NORMAL:
case SCREEN_FULLSCREEN:
setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE,
View.VISIBLE, View.VISIBLE, View.INVISIBLE, View.INVISIBLE);
setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.VISIBLE, View.VISIBLE, View.INVISIBLE, View.INVISIBLE);
updateStartImage();
break;
case SCREEN_TINY:
Expand All @@ -496,13 +500,8 @@ public void changeUiToPreparing() {
public void changeUiToPlayingShow() {
switch (screen) {
case SCREEN_NORMAL:
setAllControlsVisiblity(View.VISIBLE, View.VISIBLE, View.VISIBLE,
View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
updateStartImage();
break;
case SCREEN_FULLSCREEN:
setAllControlsVisiblity(View.VISIBLE, View.VISIBLE, View.VISIBLE,
View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
setAllControlsVisiblity(View.VISIBLE, View.VISIBLE, View.VISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
updateStartImage();
break;
case SCREEN_TINY:
Expand All @@ -514,12 +513,8 @@ public void changeUiToPlayingShow() {
public void changeUiToPlayingClear() {
switch (screen) {
case SCREEN_NORMAL:
setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE,
View.INVISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE);
break;
case SCREEN_FULLSCREEN:
setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE,
View.INVISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE);
setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE);
break;
case SCREEN_TINY:
break;
Expand All @@ -530,13 +525,8 @@ public void changeUiToPlayingClear() {
public void changeUiToPauseShow() {
switch (screen) {
case SCREEN_NORMAL:
setAllControlsVisiblity(View.VISIBLE, View.VISIBLE, View.VISIBLE,
View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
updateStartImage();
break;
case SCREEN_FULLSCREEN:
setAllControlsVisiblity(View.VISIBLE, View.VISIBLE, View.VISIBLE,
View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
setAllControlsVisiblity(View.VISIBLE, View.VISIBLE, View.VISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE);
updateStartImage();
break;
case SCREEN_TINY:
Expand All @@ -547,12 +537,8 @@ public void changeUiToPauseShow() {
public void changeUiToPauseClear() {
switch (screen) {
case SCREEN_NORMAL:
setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE,
View.INVISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE);
break;
case SCREEN_FULLSCREEN:
setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE,
View.INVISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE);
setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE);
break;
case SCREEN_TINY:
break;
Expand All @@ -563,13 +549,8 @@ public void changeUiToPauseClear() {
public void changeUiToComplete() {
switch (screen) {
case SCREEN_NORMAL:
setAllControlsVisiblity(View.VISIBLE, View.INVISIBLE, View.VISIBLE,
View.INVISIBLE, View.VISIBLE, View.INVISIBLE, View.INVISIBLE);
updateStartImage();
break;
case SCREEN_FULLSCREEN:
setAllControlsVisiblity(View.VISIBLE, View.INVISIBLE, View.VISIBLE,
View.INVISIBLE, View.VISIBLE, View.INVISIBLE, View.INVISIBLE);
setAllControlsVisiblity(View.VISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE, View.INVISIBLE);
updateStartImage();
break;
case SCREEN_TINY:
Expand All @@ -581,13 +562,11 @@ public void changeUiToComplete() {
public void changeUiToError() {
switch (screen) {
case SCREEN_NORMAL:
setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.VISIBLE,
View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.VISIBLE);
setAllControlsVisiblity(View.INVISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.VISIBLE);
updateStartImage();
break;
case SCREEN_FULLSCREEN:
setAllControlsVisiblity(View.VISIBLE, View.INVISIBLE, View.VISIBLE,
View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.VISIBLE);
setAllControlsVisiblity(View.VISIBLE, View.INVISIBLE, View.VISIBLE, View.INVISIBLE, View.INVISIBLE, View.INVISIBLE, View.VISIBLE);
updateStartImage();
break;
case SCREEN_TINY:
Expand All @@ -596,8 +575,7 @@ public void changeUiToError() {

}

public void setAllControlsVisiblity(int topCon, int bottomCon, int startBtn, int loadingPro,
int thumbImg, int bottomPro, int retryLayout) {
public void setAllControlsVisiblity(int topCon, int bottomCon, int startBtn, int loadingPro, int thumbImg, int bottomPro, int retryLayout) {
topContainer.setVisibility(topCon);
bottomContainer.setVisibility(bottomCon);
startButton.setVisibility(startBtn);
Expand All @@ -608,21 +586,24 @@ public void setAllControlsVisiblity(int topCon, int bottomCon, int startBtn, int
}

public void updateStartImage() {
int btnResId = R.drawable.jz_click_replay_selector;
if (state == STATE_PLAYING) {
startButton.setVisibility(VISIBLE);
startButton.setImageResource(R.drawable.jz_click_pause_selector);
btnResId = R.drawable.jz_click_pause_selector;
replayTextView.setVisibility(GONE);
} else if (state == STATE_ERROR) {
startButton.setVisibility(INVISIBLE);
replayTextView.setVisibility(GONE);
} else if (state == STATE_AUTO_COMPLETE) {
startButton.setVisibility(VISIBLE);
startButton.setImageResource(R.drawable.jz_click_replay_selector);
btnResId = R.drawable.jz_click_replay_selector;
replayTextView.setVisibility(VISIBLE);
} else {
startButton.setImageResource(R.drawable.jz_click_play_selector);
btnResId = R.drawable.jz_click_play_selector;
replayTextView.setVisibility(GONE);
}

startButton.setImageResource(btnResId);
}

@Override
Expand Down Expand Up @@ -772,9 +753,7 @@ public void reset() {
}

public void dissmissControlView() {
if (state != STATE_NORMAL
&& state != STATE_ERROR
&& state != STATE_AUTO_COMPLETE) {
if (state != STATE_NORMAL && state != STATE_ERROR && state != STATE_AUTO_COMPLETE) {
post(() -> {
bottomContainer.setVisibility(View.INVISIBLE);
topContainer.setVisibility(View.INVISIBLE);
Expand All @@ -796,22 +775,4 @@ public void run() {
dissmissControlView();
}
}

private BroadcastReceiver battertReceiver = new BroadcastReceiver() {
public void onReceive(Context context, Intent intent) {
String action = intent.getAction();
if (Intent.ACTION_BATTERY_CHANGED.equals(action)) {
int level = intent.getIntExtra("level", 0);
int scale = intent.getIntExtra("scale", 100);
int percent = level * 100 / scale;
LAST_GET_BATTERYLEVEL_PERCENT = percent;
setBatteryLevel();
try {
getContext().unregisterReceiver(battertReceiver);
} catch (Exception e) {
e.printStackTrace();
}
}
}
};
}