diff --git a/app/build.gradle b/app/build.gradle index e558525c..37193295 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,8 +22,8 @@ android { minSdk 21 //noinspection ExpiredTargetSdkVersion targetSdk 28 - versionCode 300 - versionName "3.0.0" + versionCode 302 + versionName "3.0.2" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString(), "eventBusIndex": "com.fongmi.android.tv.event.EventIndex"] diff --git a/app/src/main/java/com/fongmi/android/tv/utils/Notify.java b/app/src/main/java/com/fongmi/android/tv/utils/Notify.java index 826d449d..b6b1184f 100644 --- a/app/src/main/java/com/fongmi/android/tv/utils/Notify.java +++ b/app/src/main/java/com/fongmi/android/tv/utils/Notify.java @@ -4,8 +4,11 @@ import android.Manifest; import android.app.Notification; import android.content.Context; import android.content.pm.PackageManager; +import android.os.Handler; +import android.os.Looper; import android.text.TextUtils; import android.view.LayoutInflater; +import android.view.Gravity; import android.widget.TextView; import android.widget.Toast; @@ -25,6 +28,7 @@ public class Notify { public static final int ID = 9527; private AlertDialog mDialog; private Toast mToast; + private Handler mHandler; private static class Loader { static volatile Notify INSTANCE = new Notify(); @@ -57,6 +61,14 @@ public class Notify { get().makeText(text); } + public static void showCenter(int resId) { + if (resId != 0) showCenter(ResUtil.getString(resId)); + } + + public static void showCenter(String text) { + get().makeTextCenter(text); + } + public static void progress(Context context) { dismiss(); get().create(context); @@ -86,4 +98,23 @@ public class Notify { mToast.setDuration(Toast.LENGTH_LONG); mToast.show(); } + + private void makeTextCenter(String message) { + if (mToast != null) mToast.cancel(); + if (mHandler == null) mHandler = new Handler(Looper.getMainLooper()); + if (TextUtils.isEmpty(message)) return; + mToast = new Toast(App.get()); + TextView view = (TextView) LayoutInflater.from(App.get()).inflate(R.layout.view_toast, null); + view.setText(message); + mToast.setView(view); + mToast.setDuration(Toast.LENGTH_SHORT); + mToast.setGravity(Gravity.CENTER, 0, 0); + mToast.show(); + + // 1秒后取消Toast + mHandler.removeCallbacksAndMessages(null); + mHandler.postDelayed(() -> { + if (mToast != null) mToast.cancel(); + }, 1000); // 1000毫秒 = 1秒 + } } diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/HistoryDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/HistoryDialog.java index 5494ebf5..dbed6096 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/HistoryDialog.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/dialog/HistoryDialog.java @@ -1,15 +1,20 @@ package com.fongmi.android.tv.ui.dialog; +import android.content.ClipData; +import android.content.ClipboardManager; +import android.content.Context; import android.view.LayoutInflater; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; +import com.fongmi.android.tv.App; import com.fongmi.android.tv.bean.Config; import com.fongmi.android.tv.databinding.DialogHistoryBinding; import com.fongmi.android.tv.impl.ConfigCallback; import com.fongmi.android.tv.ui.adapter.ConfigAdapter; import com.fongmi.android.tv.ui.custom.SpaceItemDecoration; +import com.fongmi.android.tv.utils.Notify; import com.google.android.material.dialog.MaterialAlertDialogBuilder; public class HistoryDialog implements ConfigAdapter.OnClickListener { @@ -45,7 +50,6 @@ public class HistoryDialog implements ConfigAdapter.OnClickListener { binding.recycler.setHasFixedSize(true); binding.recycler.setAdapter(adapter.addAll(type)); binding.recycler.addItemDecoration(new SpaceItemDecoration(1, 8)); - binding.recycler.post(() -> binding.recycler.scrollToPosition(0)); } private void setDialog() { @@ -60,6 +64,13 @@ public class HistoryDialog implements ConfigAdapter.OnClickListener { dialog.dismiss(); } + @Override + public void onCopyClick(Config item) { + ClipboardManager manager = (ClipboardManager) App.get().getSystemService(Context.CLIPBOARD_SERVICE); + manager.setPrimaryClip(ClipData.newPlainText("url", item.getUrl())); + Notify.showCenter("复制成功"); + } + @Override public void onDeleteClick(Config item) { if (adapter.remove(item) == 0) dialog.dismiss();