renil/lx-music-mobile-mod
1
0
Fork 0
mirror of https://github.com/ikun0014/lx-music-mobile.git synced 2025-07-03 16:02:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化拖动机制

Browse Source
This commit is contained in:
lyswhut 2022-05-14 09:44:59 +08:00
parent 71dc00d7c3
commit aa705f96c5
1 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
android/app/src/main/java/cn/toside/music/mobile/lyric/LyricView.java
View File

@ -40,8 +40,8 @@ public class LyricView extends Activity implements View.OnTouchListener {
private float nowY; private float nowY;
private float tranX; //悬浮窗移动位置的相对值 private float tranX; //悬浮窗移动位置的相对值
private float tranY; private float tranY;
private int prevViewX = 0; private float prevViewPercentageX = 0;
private int prevViewY = 0; private float prevViewPercentageY = 0;
private float widthPercentage = 1f; private float widthPercentage = 1f;
private float preY = 0; private float preY = 0;
@ -116,8 +116,8 @@ public class LyricView extends Activity implements View.OnTouchListener {
public void showLyricView(Bundle options) { public void showLyricView(Bundle options) {
isLock = options.getBoolean("isLock", isLock); isLock = options.getBoolean("isLock", isLock);
themeColor = options.getString("themeColor", themeColor); themeColor = options.getString("themeColor", themeColor);
prevViewX = (int) options.getDouble("lyricViewX", prevViewX); prevViewPercentageX = (int) options.getDouble("lyricViewX", prevViewPercentageX) / 100f;
prevViewY = (int) options.getDouble("lyricViewY", prevViewY); prevViewPercentageY = (int) options.getDouble("lyricViewY", prevViewPercentageY) / 100f;
textX = options.getString("textX", textX); textX = options.getString("textX", textX);
textY = options.getString("textY", textY); textY = options.getString("textY", textY);
alpha = (float) options.getDouble("alpha", alpha); alpha = (float) options.getDouble("alpha", alpha);
@ -228,8 +228,8 @@ public class LyricView extends Activity implements View.OnTouchListener {
layoutParams.gravity = Gravity.TOP | Gravity.START; //显示在屏幕上中部 layoutParams.gravity = Gravity.TOP | Gravity.START; //显示在屏幕上中部
//显示位置与指定位置的相对位置差 //显示位置与指定位置的相对位置差
layoutParams.x = prevViewX; layoutParams.x = (int)(maxWidth * prevViewPercentageX);
layoutParams.y = prevViewY; layoutParams.y = (int)(maxHeight * prevViewPercentageY);
updateWH(); updateWH();
@ -282,13 +282,20 @@ public class LyricView extends Activity implements View.OnTouchListener {
if (textView == null) return; if (textView == null) return;
widthPercentage = width / 100f; widthPercentage = width / 100f;
layoutParams.width = (int)(maxWidth * widthPercentage); layoutParams.width = (int)(maxWidth * widthPercentage);
int maxX = maxWidth - layoutParams.width;
int x = layoutParams.x;
if (x < 0) x = 0;
else if (x > maxX) x = maxX;
if (layoutParams.x != x) layoutParams.x = x;
windowManager.updateViewLayout(textView, layoutParams); windowManager.updateViewLayout(textView, layoutParams);
} }
@Override @Override
public boolean onTouch(View v, MotionEvent event) { public boolean onTouch(View v, MotionEvent event) {
int maxWidth = this.maxWidth - layoutParams.width; int maxX = maxWidth - layoutParams.width;
int maxHeight = this.maxHeight - layoutParams.height; int maxY = maxHeight - layoutParams.height;
switch (event.getAction()){ switch (event.getAction()){
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
@ -312,9 +319,9 @@ public class LyricView extends Activity implements View.OnTouchListener {
int x = layoutParams.x + (int)tranX; int x = layoutParams.x + (int)tranX;
int y = layoutParams.y + (int)tranY; int y = layoutParams.y + (int)tranY;
if (x < 0) x = 0; if (x < 0) x = 0;
else if (x > maxWidth) x = maxWidth; else if (x > maxX) x = maxX;
if (y < 0) y = 0; if (y < 0) y = 0;
else if (y > maxHeight) y = maxHeight; else if (y > maxY) y = maxY;
// 移动悬浮窗 // 移动悬浮窗
layoutParams.x = x; layoutParams.x = x;
@ -344,10 +351,12 @@ public class LyricView extends Activity implements View.OnTouchListener {
//根据移动的位置来判断 //根据移动的位置来判断
// dy = 0; // dy = 0;
tranY = 0; tranY = 0;
if (layoutParams.x != prevViewX || layoutParams.y != prevViewX) { int percentageX = (int)((float)layoutParams.x / (float) maxWidth * 100f);
prevViewX = layoutParams.x; int percentageY = (int)((float)layoutParams.y / (float) maxHeight * 100f);
prevViewY = layoutParams.y; if (percentageX != prevViewPercentageX || percentageY != prevViewPercentageY) {
sendPositionEvent(prevViewX, prevViewY); prevViewPercentageX = percentageX / 100f;
prevViewPercentageY = percentageY / 100f;
sendPositionEvent(percentageX, percentageY);
} }
break; break;
} }
@ -357,20 +366,26 @@ public class LyricView extends Activity implements View.OnTouchListener {
public void fixViewPosition() { public void fixViewPosition() {
updateWH(); updateWH();
int width = (int)(this.maxWidth * widthPercentage); int width = (int)(maxWidth * widthPercentage);
if (layoutParams.width != width) layoutParams.width = width; if (layoutParams.width != width) layoutParams.width = width;
int maxWidth = this.maxWidth - layoutParams.width; layoutParams.x = (int)(maxWidth * prevViewPercentageX);
int maxHeight = this.maxHeight - layoutParams.height; layoutParams.y = (int)(maxHeight * prevViewPercentageY);
int x = layoutParams.x;
int y = layoutParams.y;
if (x < 0) x = 0;
else if (x > maxWidth) x = maxWidth;
if (y < 0) y = 0;
else if (y > maxHeight) y = maxHeight;
layoutParams.x = x; // int maxX = this.maxWidth - layoutParams.width;
layoutParams.y = y; // int maxY = this.maxHeight - layoutParams.height;
// int x = layoutParams.x;
// int y = layoutParams.y;
// if (x < 0) x = 0;
// else if (x > maxX) x = maxX;
// if (y < 0) y = 0;
// else if (y > maxY) y = maxY;
// layoutParams.x = x;
// layoutParams.y = y;
Log.d("Lyric", "widthPercentage: " + widthPercentage + " prevViewPercentageX: " + prevViewPercentageX);
Log.d("Lyric", "prevViewPercentageY: " + prevViewPercentageY + " layoutParams.x: " + layoutParams.x);
Log.d("Lyric", "layoutParams.y: " + layoutParams.y + " layoutParams.width: " + layoutParams.width);
windowManager.updateViewLayout(textView, layoutParams); windowManager.updateViewLayout(textView, layoutParams);
} }