renil/lx-music-mobile-mod
1
0
Fork 0
mirror of https://github.com/ikun0014/lx-music-mobile.git synced 2025-05-23 22:37:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复歌词位置显示问题

Browse Source
This commit is contained in:
lyswhut 2021-08-07 09:57:52 +08:00
parent ff4790b534
commit a2e64dbda3
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
android/app/src/main/java/com/lxmusicmobile/lyric/Lyric.java
View File

@ -17,13 +17,7 @@ public class Lyric extends LyricPlayer {
ReactApplicationContext reactAppContext; ReactApplicationContext reactAppContext;
boolean isShowLyric = false; boolean isShowLyric = false;
boolean isLock = false;
String themeColor = "#07c556";
String lastText = "LX Music ^-^"; String lastText = "LX Music ^-^";
int lyricViewX = 0;
int lyricViewY = 0;
String textX = "LEFT";
String textY = "TOP";
Lyric(ReactApplicationContext reactContext) { Lyric(ReactApplicationContext reactContext) {
this.reactAppContext = reactContext; this.reactAppContext = reactContext;
@ -77,7 +71,7 @@ public class Lyric extends LyricPlayer {
lyricView.runOnUiThread(new Runnable() { lyricView.runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
lyricView.showLyricView(isLock, themeColor, lyricViewX, lyricViewY, textX, textY); lyricView.showLyricView();
lyricView.setLyric(lastText); lyricView.setLyric(lastText);
setTempPause(false); setTempPause(false);
} }
@ -87,12 +81,6 @@ public class Lyric extends LyricPlayer {
public void showLyric(boolean isLock, String themeColor, int lyricViewX, int lyricViewY, String textX, String textY) { public void showLyric(boolean isLock, String themeColor, int lyricViewX, int lyricViewY, String textX, String textY) {
if (lyricEvent == null) lyricEvent = new LyricEvent(reactAppContext); if (lyricEvent == null) lyricEvent = new LyricEvent(reactAppContext);
if (lyricView == null) lyricView = new LyricView(reactAppContext, lyricEvent); if (lyricView == null) lyricView = new LyricView(reactAppContext, lyricEvent);
this.isLock = isLock;
this.themeColor = themeColor;
this.lyricViewX = lyricViewX;
this.lyricViewY = lyricViewY;
this.textX = textX;
this.textY = textY;
lyricView.showLyricView(isLock, themeColor, lyricViewX, lyricViewY, textX, textY); lyricView.showLyricView(isLock, themeColor, lyricViewX, lyricViewY, textX, textY);
isShowLyric = true; isShowLyric = true;
} }
@ -129,13 +117,11 @@ public class Lyric extends LyricPlayer {
public void lockLyric() { public void lockLyric() {
if (lyricView == null) return; if (lyricView == null) return;
this.isLock = true;
lyricView.lockView(); lyricView.lockView();
} }
public void unlockLyric() { public void unlockLyric() {
if (lyricView == null) return; if (lyricView == null) return;
this.isLock = false;
lyricView.unlockView(); lyricView.unlockView();
} }
@ -145,12 +131,9 @@ public class Lyric extends LyricPlayer {
public void setColor(String color) { public void setColor(String color) {
lyricView.setColor(color); lyricView.setColor(color);
this.themeColor = color;
} }
public void setLyricTextPosition(String positionX, String positionY) { public void setLyricTextPosition(String positionX, String positionY) {
this.textX = positionX;
this.textY = positionY;
lyricView.setLyricTextPosition(positionX, positionY); lyricView.setLyricTextPosition(positionX, positionY);
} }
} }

21
android/app/src/main/java/com/lxmusicmobile/lyric/LyricView.java
View File

@ -43,12 +43,18 @@ public class LyricView extends Activity implements View.OnTouchListener {
private float preY = 0; private float preY = 0;
// private static boolean isVibrated = false; // private static boolean isVibrated = false;
private boolean isLock = false;
private String themeColor = "#07c556";
private String lastText = "LX Music ^-^";
private String textX = "LEFT";
private String textY = "TOP";
LyricView(ReactApplicationContext reactContext, LyricEvent lyricEvent) { LyricView(ReactApplicationContext reactContext, LyricEvent lyricEvent) {
this.reactContext = reactContext; this.reactContext = reactContext;
this.lyricEvent = lyricEvent; this.lyricEvent = lyricEvent;
} }
private void sendPositionEvent(int x, int y) { public void sendPositionEvent(int x, int y) {
WritableMap params = Arguments.createMap(); WritableMap params = Arguments.createMap();
params.putInt("x", x); params.putInt("x", x);
params.putInt("y", y); params.putInt("y", y);
@ -76,6 +82,19 @@ public class LyricView extends Activity implements View.OnTouchListener {
// } // }
public void showLyricView(boolean isLock, String themeColor, int lyricViewX, int lyricViewY, String textX, String textY) { public void showLyricView(boolean isLock, String themeColor, int lyricViewX, int lyricViewY, String textX, String textY) {
this.isLock = isLock;
this.themeColor = themeColor;
this.prevViewX = lyricViewX;
this.prevViewY = lyricViewY;
this.textX = textX;
this.textY = textY;
handleShowLyric(isLock, themeColor, lyricViewX, lyricViewY, textX, textY);
}
public void showLyricView() {
handleShowLyric(isLock, themeColor, prevViewX, prevViewY, textX, textY);
}
private void handleShowLyric(boolean isLock, String themeColor, int lyricViewX, int lyricViewY, String textX, String textY) {
if (windowManager == null) { if (windowManager == null) {
windowManager = (WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE); windowManager = (WindowManager) reactContext.getSystemService(Context.WINDOW_SERVICE);
//设置TextView的属性 //设置TextView的属性