From a046d5a804d6842796a718fba4e98c3259340a60 Mon Sep 17 00:00:00 2001
From: Runt <qingingrunt2010@qq.com>
Date: Sat, 04 Jun 2022 12:42:04 +0000
Subject: [PATCH] 接口参数问题 标题栏 添加收藏功能
---
app/src/main/java/com/auto/lyric/MainActivity.java | 139 ++++++++++++++++++++++++++++++++++------------
1 files changed, 102 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..8bed626 100644
--- a/app/src/main/java/com/auto/lyric/MainActivity.java
+++ b/app/src/main/java/com/auto/lyric/MainActivity.java
@@ -1,42 +1,101 @@
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.ActiveResult;
+import com.auto.lyric.data.LyricServer;
+import com.auto.lyric.data.TextBean;
+import com.auto.lyric.data.UserInfo;
import com.auto.lyric.databinding.ActivityMainBinding;
-import com.auto.lyric.databinding.FloatViewBinding;
+import com.auto.lyric.retrofit.observable.LoadingHttpObserver;
import com.auto.lyric.service.AutoInputService;
import com.auto.lyric.service.FloatingWindowService;
+import com.auto.lyric.ui.collect.CollectActivity;
import com.auto.lyric.vm.MainViewModel;
+import com.google.gson.Gson;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.regex.Pattern;
public class MainActivity extends BaseActivity<ActivityMainBinding, MainViewModel> {
-
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ UserInfo userInfo;
@Override
public void initViews() {
-
- Intent inputService = new Intent(getApplicationContext(), AutoInputService.class);
-
Intent floatService = new Intent(getApplicationContext(), FloatingWindowService.class);
+ String key = getStringProjectPrefrence("activeKey");
+ userInfo = new Gson().fromJson(key,UserInfo.class);
+ try {
+ if(TextUtils.isEmpty(key) || TextUtils.isEmpty(userInfo.keyDateValid)||
+ new Date().getTime() > dateFormat.parse(userInfo.keyDateValid).getTime()){
+ activeDialog();
+ }else{
+
+ viewModel.checkActive(userInfo.userId,userInfo.activeKey,new LoadingHttpObserver<ActiveResult>(this) {
+
+ @Override
+ public void onError(ActiveResult error) {
+ super.onError(error);
+ if(error.result.equals("108")){
+ activeDialog();
+ }
+ }
+
+ @Override
+ public void onComplete(ActiveResult result) {
+ userInfo = result.userInfo;
+ }
+ });
+ }
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
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,12 +106,14 @@
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK );
startActivity(intent);
}else{//开启监听服务
- //startService(floatService);
- }*/
- startService(floatService);
- //showFloatView();
+ startService(floatService);
+ startService(new Intent(this,AutoInputService.class));
+ }
+ //startService(floatService);
}
});
+ binding.collect.setOnClickListener(v -> addCollectDailog(userInfo.userId,userInfo.activeKey,binding.edit.getText().toString()));
+ binding.txtFavorite.setOnClickListener(v -> startActivity(new Intent(mContext, CollectActivity.class)));
}
public boolean isAccessibilitySettingsOn() {
@@ -93,27 +154,31 @@
return false;
}
- private void showFloatView(){
+ private void addCollectDailog(String userId,String activeKey,String lrc ){
+ showInputDialog("收藏歌词","填写歌词名称","收藏","取消",(dialog1,editText, which) -> {
+ viewModel.addToCollect(userId, activeKey, editText.getText().toString(), lrc, new LoadingHttpObserver<ActiveResult>(this) {
+ @Override
+ public void onComplete(ActiveResult error) {
- //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()));
+ }
+ });
+ },(dialog1,editText, which) -> {});
+ }
+
+ private void activeDialog(){
+ showInputDialog("软件尚未激活或已过期", "请输入激活码", "激活", "退出程序", (dialog1,editText, which) -> {
+ viewModel.register(editText.getText().toString().trim(),new LoadingHttpObserver<ActiveResult>(this) {
+ @Override
+ public void onComplete(ActiveResult result) {
+ dialog1.dismiss();
+ userInfo = result.userInfo;
+ putStringProjectPrefrence("activeKey",new Gson().toJson(result.userInfo));
+ }
+ });
+ }, (dialog1,editText, which) -> {
+ System.exit(0);
});
- manager.addView(binding.getRoot(),params);
}
}
\ No newline at end of file
--
Gitblit v1.9.1