From 7b0a7a44c096794ede832f65550c3a29da23dbac Mon Sep 17 00:00:00 2001
From: Runt <qingingrunt2010@qq.com>
Date: Wed, 04 May 2022 14:13:18 +0000
Subject: [PATCH] 滑动歌词 计算时间 问题修复
---
app/src/main/java/com/auto/lyric/MainActivity.java | 77 ++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 37 deletions(-)
diff --git a/app/src/main/java/com/auto/lyric/MainActivity.java b/app/src/main/java/com/auto/lyric/MainActivity.java
index 462bbc8..121b6f9 100644
--- a/app/src/main/java/com/auto/lyric/MainActivity.java
+++ b/app/src/main/java/com/auto/lyric/MainActivity.java
@@ -1,27 +1,26 @@
package com.auto.lyric;
import android.content.Intent;
-import android.graphics.PixelFormat;
import android.net.Uri;
import android.os.Build;
-import android.os.Handler;
-import android.os.Message;
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.WindowManager;
-
-import androidx.annotation.NonNull;
+import android.widget.Toast;
import com.auto.lyric.base.activities.BaseActivity;
+import com.auto.lyric.data.LyricServer;
+import com.auto.lyric.data.TextBean;
import com.auto.lyric.databinding.ActivityMainBinding;
-import com.auto.lyric.databinding.FloatViewBinding;
import com.auto.lyric.service.AutoInputService;
import com.auto.lyric.service.FloatingWindowService;
import com.auto.lyric.vm.MainViewModel;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.regex.Pattern;
public class MainActivity extends BaseActivity<ActivityMainBinding, MainViewModel> {
@@ -33,10 +32,38 @@
Intent floatService = new Intent(getApplicationContext(), FloatingWindowService.class);
binding.button.setOnClickListener(v -> {
+ if(binding.edit.getText().toString().trim().length() == 0){
+ Toast.makeText(this,"请输入文本", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ ArrayList<TextBean> arrayList = new ArrayList<>();//解析的文本数据
+ SimpleDateFormat msFormat = new SimpleDateFormat("mm:ss.SSS");
+ String[] strings = binding.edit.getText().toString().split("\n");
+ for(String text : strings){
+ int index = text.indexOf("]");
+ if(index < 8 ){
+ continue;
+ }
+ String regex = "(?<=\\])";
+ Pattern compile = Pattern.compile(regex);
+ String[] split = compile.split(text,2);
+ long wait = 0;
+ try {
+ wait = 28800000 + msFormat.parse(split[0].replace("[","").replace("]","")).getTime();
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ arrayList.add(new TextBean(wait,split[1]));
+ }
+ if(arrayList.size() == 0){
+ return;
+ }
+
+ LyricServer.read(Arrays.asList(strings));
//申请权限
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
//开启悬浮窗
- /* if(!Settings.canDrawOverlays(getApplicationContext())) {
+ if(!Settings.canDrawOverlays(getApplicationContext())) {
//启动Activity让用户授权
Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
intent.setData(Uri.parse("package:" + getPackageName()));
@@ -47,10 +74,8 @@
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK );
startActivity(intent);
}else{//开启监听服务
- //startService(floatService);
- }*/
- startService(floatService);
- //showFloatView();
+ startService(floatService);
+ }
}
});
}
@@ -93,27 +118,5 @@
return false;
}
- private void showFloatView(){
-
-
- //View view = LayoutInflater.from(this).inflate(R.layout.float_view,null);
- FloatViewBinding binding = FloatViewBinding.inflate(getLayoutInflater());
- WindowManager manager = (WindowManager) getApplicationContext().getSystemService(WINDOW_SERVICE);
- WindowManager.LayoutParams params = new WindowManager.LayoutParams();
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- params.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
- }else {
- params.type = WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;
- }
- params.format = PixelFormat.RGBA_8888;
- params.gravity = Gravity.CENTER;
- params.flags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
- params.width = WindowManager.LayoutParams.MATCH_PARENT;
- params.height = WindowManager.LayoutParams.WRAP_CONTENT;
- binding.btnBack.setOnClickListener(v ->{
- stopService(new Intent(this,this.getClass()));
- });
- manager.addView(binding.getRoot(),params);
- }
}
\ No newline at end of file
--
Gitblit v1.9.1