From 9c75d057df3d6336d92f389f2b89806c77fe1e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=BD=93=E6=97=B6?= <1017848709@qq.com> Date: Thu, 17 Dec 2020 22:42:02 +0800 Subject: [PATCH] =?UTF-8?q?2020-12-17=20V7.0.1=20*.[=E6=94=B9=E8=BF=9B]?= =?UTF-8?q?=E6=9A=82=E5=81=9C=E6=92=AD=E6=94=BE=E8=A7=86=E9=A2=91=E6=97=B6?= =?UTF-8?q?,=E5=B7=A6=E4=B8=8A=E8=A7=92=E7=9A=84=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BE=9D=E6=97=A7=E5=9C=A8=E6=9B=B4=E6=96=B0=E3=80=82=20*.[?= =?UTF-8?q?=E6=96=B0=E5=A2=9E]=E9=9F=B3=E9=A2=91=E6=AD=8C=E6=9B=B2?= =?UTF-8?q?=E6=AD=8C=E8=AF=8D=E7=95=8C=E9=9D=A2=E6=96=B0=E5=A2=9E=E5=B7=A6?= =?UTF-8?q?=E4=B8=8A=E8=A7=92=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E3=80=82?= =?UTF-8?q?=20*.[=E6=96=B0=E5=A2=9E]=E6=89=93=E5=BC=80=E6=AD=8C=E8=AF=8D?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=BF=87=E5=87=A0=E7=A7=92=E5=90=8E,?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=BF=9B=E5=85=A5=E5=85=A8=E5=B1=8F=E5=86=99?= =?UTF-8?q?=E7=9C=9F=E6=A8=A1=E5=BC=8F=E6=98=BE=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 9 ++- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 5 +- .../com/zlm/hp/ui/LocalVideoActivity.java | 18 ++--- .../main/java/com/zlm/hp/ui/LrcActivity.java | 65 +++++++++++++++++-- app/src/main/res/layout/layout_lrc.xml | 11 +++- gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 94 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95fe958..9937b41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,7 @@ -2020-11-28 V7.0 -暂无。 \ No newline at end of file +#### 2020-12-17 V7.0.1 +- *.[改进]暂停播放视频时,左上角的时间依旧在更新。 +- *.[新增]音频歌曲歌词界面新增左上角时间显示。 +- *.[新增]打开歌词界面过几秒后,自动进入全屏写真模式显示。 + +#### 2020-11-28 V7.0 +- 暂无。 \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 7b74cd9..e5e39ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.zlm.hp" minSdkVersion 21 targetSdkVersion 29 - versionCode 7 - versionName "V7.0" + versionCode 8 + versionName "V7.0.1" /**添加多 dex分包支持*/ multiDexEnabled true useLibrary 'org.apache.http.legacy' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6fedfb7..d65a6c4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -31,7 +31,7 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" - android:screenOrientation="portrait" + android:screenOrientation="landscape" android:supportsRtl="true" android:usesCleartextTraffic="true" android:theme="@style/AppTheme"> @@ -60,7 +60,8 @@ + android:configChanges="screenSize|keyboardHidden|orientation" + android:screenOrientation="landscape"/> diff --git a/app/src/main/java/com/zlm/hp/ui/LocalVideoActivity.java b/app/src/main/java/com/zlm/hp/ui/LocalVideoActivity.java index e579388..cbdf29a 100644 --- a/app/src/main/java/com/zlm/hp/ui/LocalVideoActivity.java +++ b/app/src/main/java/com/zlm/hp/ui/LocalVideoActivity.java @@ -184,7 +184,11 @@ public class LocalVideoActivity extends BaseActivity { super.onResume(); setFullScreenActivity(); } - + @Override + protected void onDestroy() { + mWorkerHandler.removeCallbacks(mPlayRunnable); + super.onDestroy(); + } @Override protected int setContentLayoutResID() { return R.layout.activity_video; @@ -321,8 +325,8 @@ public class LocalVideoActivity extends BaseActivity { mUIHandler.sendEmptyMessage(MESSAGE_WHAT_PAUSE); } }); + mWorkerHandler.postDelayed(mPlayRunnable, 0); mUIHandler.sendEmptyMessage(MESSAGE_WHAT_TIMECHANGE); - //播放视频 playVideo(); } @@ -494,8 +498,6 @@ public class LocalVideoActivity extends BaseActivity { if (mPlayBtn.getVisibility() != View.INVISIBLE) mPlayBtn.setVisibility(View.INVISIBLE); - mWorkerHandler.postDelayed(mPlayRunnable, 0); - mUIHandler.sendEmptyMessage(MESSAGE_WHAT_TIMECHANGE); break; case MESSAGE_WHAT_PLAYING: @@ -526,8 +528,8 @@ public class LocalVideoActivity extends BaseActivity { mOnLineVideoManager.setPlayStatus(OnLineVideoManager.PAUSE); - mWorkerHandler.removeCallbacks(mPlayRunnable); - mTimeTv.setText("乐MV"); + //mWorkerHandler.removeCallbacks(mPlayRunnable); + //mTimeTv.setText("乐MV"); if (mMediaPlayer != null) { mMediaPlayer.pause(); @@ -543,8 +545,8 @@ public class LocalVideoActivity extends BaseActivity { case MESSAGE_WHAT_FINISH: mOnLineVideoManager.setPlayStatus(OnLineVideoManager.STOP); - mWorkerHandler.removeCallbacks(mPlayRunnable); - mTimeTv.setText("乐MV"); + //mWorkerHandler.removeCallbacks(mPlayRunnable); + //mTimeTv.setText("乐MV"); mPlayBtn.setVisibility(View.VISIBLE); mPauseBtn.setVisibility(View.INVISIBLE); diff --git a/app/src/main/java/com/zlm/hp/ui/LrcActivity.java b/app/src/main/java/com/zlm/hp/ui/LrcActivity.java index 9fedbea..128e443 100644 --- a/app/src/main/java/com/zlm/hp/ui/LrcActivity.java +++ b/app/src/main/java/com/zlm/hp/ui/LrcActivity.java @@ -60,6 +60,7 @@ import com.zlm.libs.widget.MusicSeekBar; import com.zlm.libs.widget.RotateLayout; import java.io.File; +import java.util.Calendar; import java.util.List; import java.util.Map; @@ -75,7 +76,10 @@ public class LrcActivity extends BaseActivity { */ private RotateLayout mRotateLayout; private LinearLayout mLrcPlaybarLinearLayout; - + /** + * 时间 + */ + private TextView mTimeTv; /** * 歌曲名称tv */ @@ -336,7 +340,14 @@ public class LrcActivity extends BaseActivity { * 加载数据 */ private final int LOAD_DATA = 0; - + /** + * 隐藏歌词操作栏 + */ + private final int MESSAGE_WHAT_HIDEBAR = 5; + /** + * 时间变化 + */ + private final int MESSAGE_WHAT_TIMECHANGE = 6; /** * 歌手写真重新加载 */ @@ -392,7 +403,26 @@ public class LrcActivity extends BaseActivity { } break; - + case MESSAGE_WHAT_TIMECHANGE: + Calendar mCalendar= Calendar.getInstance(); + int minute=mCalendar.get(Calendar.MINUTE); + if(minute<10) { + mTimeTv.setText(mCalendar.get(Calendar.HOUR_OF_DAY) + ":0" + minute); + } + else{ + mTimeTv.setText(mCalendar.get(Calendar.HOUR_OF_DAY) + ":" +minute); + } + break; + case MESSAGE_WHAT_HIDEBAR: + LinearLayout mLrcPlaybar = findViewById(R.id.lrc_playbar); + mLrcPlaybar.setVisibility(View.GONE); + //全屏界面 + RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) mManyLineLyricsView.getLayoutParams(); + layoutParams.height=200; + //layoutParams.addRule(RelativeLayout.ABOVE,0); + layoutParams.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM); + mManyLineLyricsView.setLayoutParams(layoutParams); + break; case MESSAGE_CODE_SINGER_RELOAD: if (audioInfo != null) { @@ -413,7 +443,31 @@ public class LrcActivity extends BaseActivity { } } - + private int WaitSecond=0; + /** + * 播放线程 + */ + private Runnable mPlayRunnable = new Runnable() { + @Override + public void run() { + int playStatus = AudioPlayerManager.newInstance(mContext).getPlayStatus(); + if (playStatus==AudioPlayerManager.PLAYING) { + if(WaitSecond>=0) + {WaitSecond++;} + if(WaitSecond>3) + { + WaitSecond=-1; + mUIHandler.sendEmptyMessage(MESSAGE_WHAT_HIDEBAR); + } + } + Calendar mCalendar=Calendar.getInstance(); + int second=mCalendar.get(Calendar.SECOND); + if(second<4) { + mUIHandler.sendEmptyMessage(MESSAGE_WHAT_TIMECHANGE); + } + mWorkerHandler.postDelayed(mPlayRunnable, 1000); + } + }; private void initView() { // 隐藏状态栏 @@ -441,6 +495,7 @@ public class LrcActivity extends BaseActivity { mRotateLayout.closeView(); } }); + mTimeTv= findViewById(R.id.TimeStr); // mSongNameTextView = findViewById(R.id.songName); mSingerNameTextView = findViewById(R.id.singerName); @@ -871,6 +926,8 @@ public class LrcActivity extends BaseActivity { }); mDownloadedImg = findViewById(R.id.downloaded_img); + mWorkerHandler.postDelayed(mPlayRunnable, 0); + mUIHandler.sendEmptyMessage(MESSAGE_WHAT_TIMECHANGE); } /** diff --git a/app/src/main/res/layout/layout_lrc.xml b/app/src/main/res/layout/layout_lrc.xml index 04eaa73..f9a4103 100644 --- a/app/src/main/res/layout/layout_lrc.xml +++ b/app/src/main/res/layout/layout_lrc.xml @@ -11,7 +11,16 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:visibility="gone" /> - +