2020-12-17 V7.0.1

*.[改进]暂停播放视频时,左上角的时间依旧在更新。
*.[新增]音频歌曲歌词界面新增左上角时间显示。
*.[新增]打开歌词界面过几秒后,自动进入全屏写真模式显示。

CHANGELOG.md

@@ -1,2 +1,7 @@
-2020-11-28 V7.0
+####  2020-12-17 V7.0.1
-暂无。
+- *.[改进]暂停播放视频时,左上角的时间依旧在更新。
+- *.[新增]音频歌曲歌词界面新增左上角时间显示。
+- *.[新增]打开歌词界面过几秒后,自动进入全屏写真模式显示。
+
+####  2020-11-28 V7.0
+- 暂无。

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.zlm.hp"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 7
+        versionCode 8
-        versionName "V7.0"
+        versionName "V7.0.1"
         /**添加多 dex分包支持*/
         multiDexEnabled true
         useLibrary 'org.apache.http.legacy'

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 @@
 
         <activity
             android:name=".LrcActivity"
-            android:configChanges="screenSize|keyboardHidden|orientation" />
+            android:configChanges="screenSize|keyboardHidden|orientation"
+            android:screenOrientation="landscape"/>
         <activity android:name=".SearchSingerActivity" />
         <activity android:name=".SearchLrcActivity" />
         <activity android:name=".TimerPowerOffActivity" />

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);
+                //mWorkerHandler.removeCallbacks(mPlayRunnable);
-                mTimeTv.setText("乐MV");
+                //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);
+                //mWorkerHandler.removeCallbacks(mPlayRunnable);
-                mTimeTv.setText("乐MV");
+                //mTimeTv.setText("乐MV");
                 mPlayBtn.setVisibility(View.VISIBLE);
                 mPauseBtn.setVisibility(View.INVISIBLE);
 

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);
     }
 
     /**

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" />
-
+    <TextView
+        android:id="@+id/TimeStr"
+        android:layout_width="90dp"
+        android:layout_height="38dp"
+        android:layout_above="@id/backImg"
+        android:layout_marginTop="4dp"
+        android:layout_marginLeft="10dp"
+        android:textColor="@color/bg_white"
+        android:textSize="22sp"
+        android:text="乐MV" />
 
     <RelativeLayout
         android:layout_width="match_parent"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Sep 26 12:04:29 CST 2020
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
+distributionUrl=file:///C:/Users/Administrator/.gradle/wrapper/dists/gradle-6.6.1-bin/du4tvj86lhti6iga1v8h7pckb/gradle-6.6.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME