From 06a8011bf757e0c0844cd6566446c245b7f27372 Mon Sep 17 00:00:00 2001 From: duzhaokun123 Date: Sun, 22 Mar 2020 20:09:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A5=E5=9B=BE=E6=90=9C=E6=BA=90=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E6=8F=90=E7=A4=BA=E7=9A=84=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../ceui/lisa/activities/MainActivity.java | 53 ++++++++++++------- .../main/java/ceui/lisa/utils/Settings.java | 10 ++++ app/src/main/res/values-en/strings.xml | 3 ++ app/src/main/res/values/strings.xml | 3 +- 5 files changed, 50 insertions(+), 21 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index b6ea2b11a..7bfef59df 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/src/main/java/ceui/lisa/activities/MainActivity.java b/app/src/main/java/ceui/lisa/activities/MainActivity.java index f16367035..b00805305 100644 --- a/app/src/main/java/ceui/lisa/activities/MainActivity.java +++ b/app/src/main/java/ceui/lisa/activities/MainActivity.java @@ -14,6 +14,8 @@ import android.view.KeyEvent; import android.view.MenuItem; import android.view.View; +import android.widget.CheckBox; +import android.widget.CompoundButton; import android.widget.ImageView; import android.widget.TextView; @@ -215,28 +217,41 @@ public boolean onNavigationItemSelected(MenuItem item) { intent.putExtra(Params.USER_ID, sUserModel.getResponse().getUser().getId()); break; case R.id.nav_reverse: - // TODO: 20-3-16 国际化 仅第一次时显示 向用户索要权限 - new AlertDialog.Builder(MainActivity.this) - .setTitle("关于以图搜源") - .setMessage("以图搜源的实质是将你选择的图片上传至 https://saucenao.com/ 进行搜索\n" + - "https://saucenao.com/ 可以算一个专门查找P站图的网站,更多信息不在这里介绍\n" + - "注意:该功能需要 READ_EXTERNAL_STORAGE 以读取图片,如果 SDK >= 23 且没有授权" + - "则功能无法实现") - .setPositiveButton(android.R.string.yes, (dialog, which) -> { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - String[] permissions = new String[] {Manifest.permission.READ_EXTERNAL_STORAGE}; - int i = ContextCompat.checkSelfPermission(this, permissions[0]); - if (i != PackageManager.PERMISSION_GRANTED) { - ActivityCompat.requestPermissions(this, permissions, 1); + // TODO: 20-3-16 国际化 向用户索要权限 + if (Shaft.sSettings.isReverseDialogNeverShowAgain()) { + gotoReverse(); + } else { + CheckBox checkBox = new CheckBox(this); + checkBox.setText(R.string.never_show_again); + checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + Shaft.sSettings.setReverseDialogNeverShowAgain(isChecked); + } + }); + new AlertDialog.Builder(MainActivity.this) + .setTitle("关于以图搜源") + .setMessage("以图搜源的实质是将你选择的图片上传至 https://saucenao.com/ 进行搜索\n" + + "https://saucenao.com/ 可以算一个专门查找P站图的网站,更多信息不在这里介绍\n" + + "注意:该功能需要 READ_EXTERNAL_STORAGE 以读取图片,如果 SDK >= 23 且没有授权" + + "则功能无法实现") + .setView(checkBox) + .setPositiveButton(android.R.string.yes, (dialog, which) -> { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + String[] permissions = new String[] {Manifest.permission.READ_EXTERNAL_STORAGE}; + int i = ContextCompat.checkSelfPermission(this, permissions[0]); + if (i != PackageManager.PERMISSION_GRANTED) { + ActivityCompat.requestPermissions(this, permissions, 1); + } else { + gotoReverse(); + } } else { gotoReverse(); } - } else { - gotoReverse(); - } - }) - .setNegativeButton(android.R.string.cancel, null) - .show(); + }) + .setNegativeButton(android.R.string.cancel, null) + .show(); + } break; case R.id.nav_send: intent = new Intent(mContext, TemplateActivity.class); diff --git a/app/src/main/java/ceui/lisa/utils/Settings.java b/app/src/main/java/ceui/lisa/utils/Settings.java index f53dfd364..fc0185046 100644 --- a/app/src/main/java/ceui/lisa/utils/Settings.java +++ b/app/src/main/java/ceui/lisa/utils/Settings.java @@ -75,6 +75,8 @@ public class Settings { private String webDownloadPath = ""; + private boolean reverseDialogNeverShowAgain = false; + public String getAppLanguage() { if(!TextUtils.isEmpty(appLanguage)){ return appLanguage; @@ -278,4 +280,12 @@ public boolean isShowPixivDialog() { public void setShowPixivDialog(boolean showPixivDialog) { this.showPixivDialog = showPixivDialog; } + + public boolean isReverseDialogNeverShowAgain() { + return reverseDialogNeverShowAgain; + } + + public void setReverseDialogNeverShowAgain(boolean reverseDialogNeverShowAgain) { + this.reverseDialogNeverShowAgain = reverseDialogNeverShowAgain; + } } diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 091506e85..86dbb21c2 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -140,4 +140,7 @@ R Ranking List Recommend for you + save + shoud not be empty + never show again \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1cf682b09..f6db11bb4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -153,6 +153,7 @@ 为你推荐 邮箱地址 操作成功 - save + 保存 不应为空 + 不再显示