From 75360a9fa2fcead8b516467d982c5cdf82c63263 Mon Sep 17 00:00:00 2001
From: Runt <qingingrunt2010@qq.com>
Date: Sun, 15 May 2022 06:44:38 +0000
Subject: [PATCH] 歌词解析 修复及优化 handler 阻塞问题优化
---
app/src/main/java/com/auto/lyric/service/FloatingWindowService.java | 152 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 113 insertions(+), 39 deletions(-)
diff --git a/app/src/main/java/com/auto/lyric/service/FloatingWindowService.java b/app/src/main/java/com/auto/lyric/service/FloatingWindowService.java
index 426ee8c..b194d21 100644
--- a/app/src/main/java/com/auto/lyric/service/FloatingWindowService.java
+++ b/app/src/main/java/com/auto/lyric/service/FloatingWindowService.java
@@ -7,6 +7,7 @@
import android.content.Intent;
import android.graphics.PixelFormat;
import android.os.Build;
+import android.os.CountDownTimer;
import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
@@ -22,6 +23,7 @@
import androidx.annotation.Nullable;
import com.auto.lyric.R;
+import com.auto.lyric.data.LyricObject;
import com.auto.lyric.data.LyricServer;
import com.auto.lyric.databinding.FloatViewBinding;
import com.auto.lyric.util.DeviceUtil;
@@ -42,25 +44,38 @@
private WindowManager.LayoutParams params;
FloatViewBinding binding;
final String TAG = "FloatingWindowService";
- final int THREAD_STOP = 0, THREAD_START = 1 , KEYBOARD_SEND = 100,UPDATE_TIME = 200;
+ final int THREAD_STOP = 0, KEYBOARD_SEND = 100;
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
SimpleDateFormat msFormat = new SimpleDateFormat("mm:ss.SSS");
- boolean pause;
- int progress;
-
+ boolean pause;//是否暂停
+ int progress;//时间进度
+ LyricObject lyricObject;//当前发送过的歌词
Handler handler;
+ //计时器
Timer timer;
- ServiceTask task;
+ CountDownTimer countDownTimer;
+ ServiceTask task;//计时器执行任务
class ServiceTask extends TimerTask{
@Override
public void run() {
int index = binding.lyric.getIndex(progress+=10);
binding.lyric.setOffsetY(220 - index * (binding.lyric.getSIZEWORD() + 44));
binding.lyric.invalidate();
- handler.sendEmptyMessage(UPDATE_TIME);
+ if(lyricObject == null || lyricObject != LyricServer.getLrc_map().get(index)){
+ lyricObject = LyricServer.getLrc_map().get(index);
+ Message message = new Message();
+ message.what = KEYBOARD_SEND;
+ message.obj = lyricObject.lrc;
+ boolean flag = handler.sendMessage(message);
+ Log.e(TAG,"sendmessge "+message.obj +" 发送成功："+flag);
+ }
+ //停止
if(index == LyricServer.getLrc_map().size()-1){
- handler.sendEmptyMessage(THREAD_STOP);
+ Message stop = new Message();
+ stop.what = THREAD_STOP;
+ boolean flag = handler.sendMessage(stop);
+ Log.e(TAG,"sendEmptyMessage THREAD_STOP 发送成功："+flag);
}
}
};
@@ -86,7 +101,7 @@
params.width = WindowManager.LayoutParams.MATCH_PARENT;
params.height = DeviceUtil.convertDpToPixel(200,getBaseContext());
binding.close.setOnClickListener(v ->{
- stopService(new Intent(this,this.getClass()));
+ stopService(new Intent(this,FloatingWindowService.class));
stopService(new Intent(this,AutoInputService.class));
});
binding.floating.setOnTouchListener(new View.OnTouchListener() {
@@ -112,17 +127,9 @@
@Override
public void onClick(View view) {
if(pause){
- pause = false;
- binding.btnPause.setText("暂停");
- binding.btnBack.setEnabled(true);
- binding.btnFast.setEnabled(true);
start();
}else{
- pause = true;
- binding.btnPause.setText("继续");
- binding.btnBack.setEnabled(false);
- binding.btnFast.setEnabled(false);
- timer.cancel();
+ pause();
}
}
});
@@ -138,20 +145,11 @@
e.printStackTrace();
}
if(binding.btnStart.getText().equals("开启")){
- progress = 0 ;
start();
- startService(new Intent(this,AutoInputService.class));
}else{
- binding.btnStart.setText("开启");
- binding.btnBack.setEnabled(false);
- binding.btnFast.setEnabled(false);
- binding.btnPause.setEnabled(false);
- progress = 0 ;
- timer.cancel();
- stopService(new Intent(this,AutoInputService.class));
+ stop();
}
});
- initHandler();
}
@Nullable
@@ -161,17 +159,12 @@
}
private void initHandler(){
- handler = new Handler(this.getMainLooper()){
+ handler = new Handler(){
@Override
public void handleMessage(@NonNull Message msg) {
super.handleMessage(msg);
- if(msg.what == THREAD_START){//开始
- AutoInputService.flag = true;
- binding.btnPause.performClick();
- }else if(msg.what == THREAD_STOP){//停止
- AutoInputService.flag = false;
- binding.btnStart.performClick();
-
+ if(msg.what == THREAD_STOP){//停止
+ stop();
}else if(msg.what == KEYBOARD_SEND){//发送文本
copy(msg.obj.toString());
Intent intent = new Intent();
@@ -183,8 +176,6 @@
}else if(msg.what == -1){//显示在输入框中
//Toast.makeText(getBaseContext(),"上一句--"+msg.obj,Toast.LENGTH_SHORT).show();
- }else if(msg.what == UPDATE_TIME){
- binding.timer.setText(msFormat.format(progress));
}
}
};
@@ -193,8 +184,51 @@
@Override
public int onStartCommand(Intent intent, int flags, int startId) {
Log.e(TAG,"onStartCommand flags:"+flags+" startId:"+startId+ " intent:"+intent);
- manager.addView(binding.getRoot(),params);
+ if(binding.getRoot().getParent() == null) {
+ manager.addView(binding.getRoot(), params);
+ }
binding.lyric.setTextSize();
+ initHandler();
+ stop();
+ progress = LyricServer.getLrc_map().get(0).begintime;
+ binding.timer.setText(msFormat.format(progress));
+ int index = binding.lyric.getIndex(progress);
+ binding.lyric.setOffsetY(220 - index * (binding.lyric.getSIZEWORD() + 44));
+ binding.lyric.invalidate();
+ binding.lyric.setOnTouchListener(new View.OnTouchListener() {
+ float touchY; //当触摸歌词View时，保存为当前触点的Y轴坐标
+ @Override
+ public boolean onTouch(View v, MotionEvent event) {
+ float tt=event.getY();
+ switch(event.getAction()){
+ case MotionEvent.ACTION_DOWN:
+ break;
+ case MotionEvent.ACTION_MOVE:
+ touchY=tt-touchY;
+ binding.lyric.setOffsetY(binding.lyric.getOffsetY()+touchY);
+ Log.e("LyricView","offsety:"+binding.lyric.getOffsetY());
+ binding.lyric.invalidate();
+ break;
+ case MotionEvent.ACTION_UP:
+ if(binding.btnStart.getText().equals("开启") || pause) {
+ int index = binding.lyric.getIndexFromOffsetY(binding.lyric.getOffsetY());
+ LyricObject lyricObject = LyricServer.getLrc_map().get(index);
+ Log.e("LyricView", "index:"+index+" object:" + lyricObject);
+ if(lyricObject != null) {
+ binding.lyric.setIndex(index);
+ binding.lyric.setOffsetY(220 - index * (binding.lyric.getSIZEWORD() + 44));
+ Log.e("LyricView", "object:" + lyricObject);
+ progress = lyricObject.begintime;
+ binding.timer.setText(msFormat.format(progress));
+ }
+ binding.lyric.invalidate();
+ }
+ break;
+ }
+ touchY=tt;
+ return true;
+ }
+ });
return super.onStartCommand(intent, flags, startId);
}
@@ -202,7 +236,11 @@
public void onDestroy() {
super.onDestroy();
Log.e(TAG,"onDestroy ");
- timer.cancel();
+ try {
+ timer.cancel();
+ countDownTimer.cancel();
+ }catch (Exception e){}
+ AutoInputService.flag = false;
manager.removeView(binding.getRoot());
}
@@ -210,6 +248,23 @@
* 开始
*/
private void start(){
+ AutoInputService.flag = true;
+ try {
+ timer.cancel();
+ countDownTimer.cancel();
+ }catch (Exception e){}
+ countDownTimer = new CountDownTimer(LyricServer.getLrc_map().get(LyricServer.getLrc_map().keySet().size()-1).begintime,10) {
+ @Override
+ public void onTick(long millisUntilFinished) {
+ binding.timer.setText(msFormat.format(progress));
+ }
+
+ @Override
+ public void onFinish() {
+
+ }
+ };
+ countDownTimer.start();
timer = new Timer();
task = new ServiceTask();
timer.schedule(task,0,10);
@@ -218,12 +273,31 @@
binding.btnBack.setEnabled(true);
binding.btnFast.setEnabled(true);
binding.btnPause.setEnabled(true);
+ pause = false;
}
+ private void pause(){
+ try {
+ timer.cancel();
+ countDownTimer.cancel();
+ }catch (Exception e){}
+ pause = true;
+ AutoInputService.flag = false;
+ binding.btnBack.setEnabled(false);
+ binding.btnFast.setEnabled(false);
+ binding.btnPause.setText("继续");
+ }
+
+ private void stop(){
+ pause();
+ binding.btnStart.setText("开启");
+ binding.btnPause.setEnabled(false);
+ }
//复制
private void copy(String data) {
+ Log.e(TAG,"copy "+data);
// 获取系统剪贴板
ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
// 创建一个剪贴数据集，包含一个普通文本数据条目（需要复制的数据）,其他的还有
--
Gitblit v1.9.1