Commit 09f453fb authored by fallenstardust's avatar fallenstardust

只在安卓10启用此方式,支持开关

parent d2018e8e
package cn.garymb.ygomobile.ui.cards;
import android.os.Build;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Gravity;
......@@ -28,6 +29,7 @@ import cn.garymb.ygomobile.loader.ImageLoader;
import cn.garymb.ygomobile.ui.activities.BaseActivity;
import cn.garymb.ygomobile.ui.activities.WebActivity;
import cn.garymb.ygomobile.ui.adapters.CardListAdapter;
import cn.garymb.ygomobile.ui.home.HomeActivity;
import cn.garymb.ygomobile.ui.plus.AOnGestureListener;
import cn.garymb.ygomobile.ui.plus.DialogPlus;
import cn.garymb.ygomobile.ui.plus.ServiceDuelAssistant;
......@@ -60,7 +62,11 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
setContentView(R.layout.activity_search);
if (TextUtils.isEmpty(getIntent().getStringExtra(CardSearchAcitivity.SEARCH_MESSAGE))) {
ServiceDuelAssistant.cardSearchMessage = "";
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
currentCardSearchMessage = HomeActivity.cardSearchMessage;
} else {
currentCardSearchMessage = ServiceDuelAssistant.cardSearchMessage;
}
}
Toolbar toolbar = $(R.id.toolbar);
setSupportActionBar(toolbar);
......@@ -105,15 +111,23 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
@Override
protected void onRestart() {
super.onRestart();
if (!isFirstCardSearch && !currentCardSearchMessage.equals(ServiceDuelAssistant.cardSearchMessage)) {
currentCardSearchMessage = ServiceDuelAssistant.cardSearchMessage;
if (!isFirstCardSearch && !currentCardSearchMessage.equals(HomeActivity.cardSearchMessage)) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
currentCardSearchMessage = HomeActivity.cardSearchMessage;
} else {
currentCardSearchMessage = ServiceDuelAssistant.cardSearchMessage;
}
intentSearch();
}
}
private void intentSearch() {
// intentSearchMessage=getIntent().getStringExtra(CardSearchAcitivity.SEARCH_MESSAGE);
mCardSelector.search(ServiceDuelAssistant.cardSearchMessage);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
currentCardSearchMessage = HomeActivity.cardSearchMessage;
} else {
currentCardSearchMessage = ServiceDuelAssistant.cardSearchMessage;
}
}
protected void setListeners() {
......
......@@ -7,6 +7,7 @@ import android.content.Context;
import android.content.Intent;
import android.graphics.Color;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.text.TextUtils;
......@@ -147,15 +148,17 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
}
@Override
protected void onStart(){
protected void onStart() {
super.onStart();
Handler handler = new Handler();
handler.postDelayed(new Runnable() {
@Override
public void run() {
getClipboard();
}
}, 500);
if (AppsSettings.get().isServiceDuelAssistant() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
Handler handler = new Handler();
handler.postDelayed(new Runnable() {
@Override
public void run() {
getClipboard();
}
}, 500);
}
}
//检查是否有刘海
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment