From 3b795e96393491f026c4a64ff4a7e2ff3b107cae Mon Sep 17 00:00:00 2001
From: fengyuecanzhu <1021300691@qq.com>
Date: Fri, 25 Mar 2022 21:58:33 +0800
Subject: [PATCH] v2.4.2
---
README.md | 38 +++++++++----------
app/src/main/assets/updatelog.fy | 8 ++++
.../xyz/fycz/myreader/common/URLCONST.java | 4 +-
.../myreader/model/third3/http/HttpHelper.kt | 2 +-
.../ui/activity/SourceEditActivity.java | 9 +++--
app/version_code.properties | 2 +-
6 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/README.md b/README.md
index 1e7f73b..a74b372 100644
--- a/README.md
+++ b/README.md
@@ -14,10 +14,10 @@
@@ -62,9 +62,9 @@
-  |
-  |
-  |
+  微信赞赏码 |
+  支付宝收款码 |
+  QQ收款码 |
@@ -74,21 +74,21 @@
-  |
-  |
-  |
-  |
+  |
+  |
+  |
+  |
-  |
-  |
-  |
-  |
+  |
+  |
+  |
+  |
-  |
-  |
-  |
-  |
+  |
+  |
+  |
+  |
diff --git a/app/src/main/assets/updatelog.fy b/app/src/main/assets/updatelog.fy
index ac8be26..3fff11f 100644
--- a/app/src/main/assets/updatelog.fy
+++ b/app/src/main/assets/updatelog.fy
@@ -1,3 +1,11 @@
+2022.03.25
+风月读书v2.4.2
+更新内容：
+1、修复代理问题
+2、修复书源debug闪退问题
+3、修复日志无法上传问题
+4、修改部分URL
+
2022.03.24
风月读书v2.4.1
更新内容：
diff --git a/app/src/main/java/xyz/fycz/myreader/common/URLCONST.java b/app/src/main/java/xyz/fycz/myreader/common/URLCONST.java
index 4ac24fa..5a66b96 100644
--- a/app/src/main/java/xyz/fycz/myreader/common/URLCONST.java
+++ b/app/src/main/java/xyz/fycz/myreader/common/URLCONST.java
@@ -32,9 +32,9 @@ public class URLCONST {
public static final String DONATE = "https://fyreader.coding.net/p/img/d/img/git/raw/master/Donate";
- public static final String WX_ZSM = DONATE + "/wx_zsm.png";
+ public static final String WX_ZSM = DONATE + "/wx_zsm.jpg";
public static final String ZFB_SKM = DONATE + "/zfb_skm.jpg";
- public static final String QQ_SKM = DONATE + "/qq_skm.png";
+ public static final String QQ_SKM = DONATE + "/qq_skm.jpg";
public static final String QUOTATION = "https://v1.hitokoto.cn/?encode=json&charset=utf-8";
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 0da3a49..8f5caff 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
@@ -78,7 +78,7 @@ fun getProxyClient(proxy0: String? = null, noProxy: Boolean = false): OkHttpClie
proxyClientCache[proxy]?.let {
return it
}
- val r = Regex("(http|socks4|socks5)://(.+):(\\d{2,5})(@.*@.*)?")
+ val r = Regex("(http|socks4|socks5)://(.*):(\\d{2,5})(@.*@.*)?")
val ms = r.findAll(proxy)
val group = ms.first()
var username = "" //代理服务器验证用户名
diff --git a/app/src/main/java/xyz/fycz/myreader/ui/activity/SourceEditActivity.java b/app/src/main/java/xyz/fycz/myreader/ui/activity/SourceEditActivity.java
index 52b81ae..a051479 100644
--- a/app/src/main/java/xyz/fycz/myreader/ui/activity/SourceEditActivity.java
+++ b/app/src/main/java/xyz/fycz/myreader/ui/activity/SourceEditActivity.java
@@ -6,6 +6,7 @@ import android.content.ClipboardManager;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.ArrayAdapter;
@@ -234,9 +235,11 @@ public class SourceEditActivity extends BaseActivity
debugEntity.setUrl(text);
}
}, (dialog, which) -> {
- Intent intent = new Intent(this, SourceDebugActivity.class);
- intent.putExtra("debugEntity", debugEntity);
- startActivity(intent);
+ if (!TextUtils.isEmpty(debugEntity.getUrl())) {
+ Intent intent = new Intent(this, SourceDebugActivity.class);
+ intent.putExtra("debugEntity", debugEntity);
+ startActivity(intent);
+ }
});
}
diff --git a/app/version_code.properties b/app/version_code.properties
index d3ee365..54a2cb3 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,3 +1,3 @@
#Fri Jun 18 21:45:31 CST 2021
-VERSION_CODE=241
+VERSION_CODE=242
NEED_CREATE_RELEASE=true
