From e52aeb1c15ecb94f0c5543883f29e0095fe38b6d Mon Sep 17 00:00:00 2001
From: fengyuecanzhu <1021300691@qq.com>
Date: Thu, 24 Mar 2022 13:00:42 +0800
Subject: [PATCH] fix bug

---
 .../fycz/myreader/model/third3/http/HttpHelper.kt    |  1 -
 .../myreader/ui/activity/MoreSettingActivity.java    |  2 +-
 .../xyz/fycz/myreader/ui/dialog/MyAlertDialog.java   |  6 ------
 .../xyz/fycz/myreader/ui/fragment/ProxyFragment.kt   | 12 +++++-------
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/xyz/fycz/myreader/model/third3/http/HttpHelper.kt b/app/src/main/java/xyz/fycz/myreader/model/third3/http/HttpHelper.kt
index c311f50..0da3a49 100644
--- a/app/src/main/java/xyz/fycz/myreader/model/third3/http/HttpHelper.kt
+++ b/app/src/main/java/xyz/fycz/myreader/model/third3/http/HttpHelper.kt
@@ -72,7 +72,6 @@ val globalProxy: String
 fun getProxyClient(proxy0: String? = null, noProxy: Boolean = false): OkHttpClient {
     var proxy = proxy0
     if (proxy.isNullOrEmpty()) proxy = globalProxy
-    Log.d("getProxyClient", "proxy=$proxy")
     if (proxy.isNullOrBlank() || noProxy) {
         return okHttpClient
     }
diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/MoreSettingActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/MoreSettingActivity.java
index 9a62c9c..3a5e2ef 100644
--- a/app/src/main/java/xyz/fycz/myreader/ui/activity/MoreSettingActivity.java
+++ b/app/src/main/java/xyz/fycz/myreader/ui/activity/MoreSettingActivity.java
@@ -206,7 +206,7 @@ public class MoreSettingActivity extends BaseActivity<ActivityMoreSettingBinding
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        if (curFragment == null || curFragment != mProxyFragment) {
+        if (curFragment == null || curFragment == mProxyFragment) {
             menu.findItem(R.id.action_tip).setVisible(false);
         } else {
             menu.findItem(R.id.action_tip).setVisible(true);
diff --git a/app/src/main/java/xyz/fycz/myreader/ui/dialog/MyAlertDialog.java b/app/src/main/java/xyz/fycz/myreader/ui/dialog/MyAlertDialog.java
index 2bcd798..eb4fa27 100644
--- a/app/src/main/java/xyz/fycz/myreader/ui/dialog/MyAlertDialog.java
+++ b/app/src/main/java/xyz/fycz/myreader/ui/dialog/MyAlertDialog.java
@@ -140,7 +140,6 @@ public class MyAlertDialog {
                     .show();
         }
         Button posBtn = inputDia.getButton(AlertDialog.BUTTON_POSITIVE);
-        posBtn.setEnabled(false);
         editText.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -155,11 +154,6 @@ public class MyAlertDialog {
             @Override
             public void afterTextChanged(Editable s) {
                 String text = editText.getText().toString();
-                if (editText.getText().length() > 0 && editText.getText().length() <= maxLen && !text.equals(initText)) {
-                    posBtn.setEnabled(true);
-                } else {
-                    posBtn.setEnabled(false);
-                }
                 oic.onChange(text);
             }
         });
diff --git a/app/src/main/java/xyz/fycz/myreader/ui/fragment/ProxyFragment.kt b/app/src/main/java/xyz/fycz/myreader/ui/fragment/ProxyFragment.kt
index 4323454..4f42d1d 100644
--- a/app/src/main/java/xyz/fycz/myreader/ui/fragment/ProxyFragment.kt
+++ b/app/src/main/java/xyz/fycz/myreader/ui/fragment/ProxyFragment.kt
@@ -46,7 +46,6 @@ class ProxyFragment : BaseFragment() {
 
     override fun initData(savedInstanceState: Bundle?) {
         enableProxy = SharedPreUtils.getInstance().getBoolean("enableProxy")
-        Log.d("ProxyFragment", "enableProxy=$enableProxy")
         proxyType = SharedPreUtils.getInstance().getInt("proxyType")
         proxyHost = SharedPreUtils.getInstance().getString("proxyHost")
         proxyPort = SharedPreUtils.getInstance().getString("proxyPort")
@@ -69,7 +68,6 @@ class ProxyFragment : BaseFragment() {
             enableProxy = !enableProxy
             binding.scEnableProxy.isChecked = enableProxy
             SharedPreUtils.getInstance().putBoolean("enableProxy", enableProxy)
-            Log.d("ProxyFragment", "putBoolean=$enableProxy")
             binding.llContent.visibility = if (enableProxy) View.VISIBLE else View.GONE
         }
 
@@ -79,7 +77,7 @@ class ProxyFragment : BaseFragment() {
                 .setOnMenuItemClickListener { _: BottomMenu?, _: CharSequence?, which: Int ->
                     proxyType = which
                     SharedPreUtils.getInstance().putInt("proxyType", which)
-                    binding.tvProxyType.text = proxyTypeArr[which]
+                    initWidget(null)
                     false
                 }.setCancelButton(R.string.cancel)
         }
@@ -91,8 +89,8 @@ class ProxyFragment : BaseFragment() {
                 { text: String -> tem = text }
             ) { dialog: DialogInterface, _: Int ->
                 proxyHost = tem
-                binding.tvProxyHost.text = proxyHost
                 SharedPreUtils.getInstance().putString("proxyHost", proxyHost)
+                initWidget(null)
                 dialog.dismiss()
             }
         }
@@ -110,7 +108,7 @@ class ProxyFragment : BaseFragment() {
                 .setPositiveButton(R.string.confirm) { _: DialogInterface?, _: Int ->
                     proxyPort = threadPick.value.toString()
                     SharedPreUtils.getInstance().putString("proxyPort", proxyPort)
-                    binding.tvProxyPort.text = proxyPort
+                    initWidget(null)
                 }.setNegativeButton(R.string.cancel, null)
                 .show()
         }
@@ -122,8 +120,8 @@ class ProxyFragment : BaseFragment() {
                 { text: String -> tem = text }
             ) { dialog: DialogInterface, _: Int ->
                 proxyUsername = tem
-                binding.tvProxyUsername.text = proxyUsername
                 SharedPreUtils.getInstance().putString("proxyUsername", proxyUsername)
+                initWidget(null)
                 dialog.dismiss()
             }
         }
@@ -135,8 +133,8 @@ class ProxyFragment : BaseFragment() {
                 { text: String -> tem = text }
             ) { dialog: DialogInterface, _: Int ->
                 proxyPassword = tem
-                binding.tvProxyPassword.text = proxyPassword
                 SharedPreUtils.getInstance().putString("proxyPassword", proxyPassword)
+                initWidget(null)
                 dialog.dismiss()
             }
         }