k
/
FYReader
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v2.4.2

Browse Source
pull/21/head
fengyuecanzhu 3 years ago
parent 1fb176c260
commit 3b795e9639
6 changed files with 37 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 38
      README.md
  2. 8
      app/src/main/assets/updatelog.fy
  3. 4
      app/src/main/java/xyz/fycz/myreader/common/URLCONST.java
  4. 2
      app/src/main/java/xyz/fycz/myreader/model/third3/http/HttpHelper.kt
  5. 3
      app/src/main/java/xyz/fycz/myreader/ui/activity/SourceEditActivity.java
  6. 2
      app/version_code.properties

38
README.md
Unescape View File

@ -14,10 +14,10 @@
<table>
<tr>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/p1.png" ></center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/p2.png" ></center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/p3.png" ></center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/p4.png" ></center></td>
<td ><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/FYReader/p1.png" ></center></td>
<td ><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/FYReader/p2.png" ></center></td>
<td ><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/FYReader/p3.png" ></center></td>
<td ><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/FYReader/p4.png" ></center></td>
</tr>
</table>
@ -62,9 +62,9 @@
<table>
<tr>
<td ><center><img src="https://gitee.com/fengyuecanzhu/Donate/raw/master/wx_zsm.png" width=300></center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/Donate/raw/master/zfb_skm.jpg" width=300> </center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/Donate/raw/master/qq_skm.png" width=300></center></td>
<td><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/Donate/wx_zsm.jpg" width=300>微信赞赏码</center></td>
<td><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/Donate/zfb_skm.jpg" width=300>支付宝收款码</center></td>
<td><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/Donate/qq_skm.jpg" width=300>QQ收款码</center></td>
</tr>
</table>
@ -74,21 +74,21 @@
<table>
<tr>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/1.png" ></center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/2.png" ></center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/3.png" ></center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/4.png" ></center></td>
<td ><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/FYReader/1.png" ></center></td>
<td ><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/FYReader/2.png" ></center></td>
<td ><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/FYReader/3.png" ></center></td>
<td ><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/FYReader/4.png" ></center></td>
</tr>
<tr>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/5.png" ></center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/6.png" ></center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/7.png" ></center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/8.png" ></center></td>
<td ><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/FYReader/5.png" ></center></td>
<td ><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/FYReader/6.png" ></center></td>
<td ><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/FYReader/7.png" ></center></td>
<td ><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/FYReader/8.png" ></center></td>
</tr>
<tr>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/9.png" ></center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/10.png" ></center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/11.png" ></center></td>
<td ><center><img src="https://gitee.com/fengyuecanzhu/img/raw/master/FYReader/12.png" ></center></td>
<td ><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/FYReader/9.png" ></center></td>
<td ><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/FYReader/10.png" ></center></td>
<td ><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/FYReader/11.png" ></center></td>
<td ><center><img src="https://fyreader.coding.net/p/img/d/img/git/raw/master/FYReader/12.png" ></center></td>
</tr>
</table>

8
app/src/main/assets/updatelog.fy
Unescape View File

@ -1,3 +1,11 @@
2022.03.25
风月读书v2.4.2
更新内容：
1、修复代理问题
2、修复书源debug闪退问题
3、修复日志无法上传问题
4、修改部分URL
2022.03.24
风月读书v2.4.1
更新内容：

4
app/src/main/java/xyz/fycz/myreader/common/URLCONST.java
Unescape View File

@ -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";

2
app/src/main/java/xyz/fycz/myreader/model/third3/http/HttpHelper.kt
Unescape View File

@ -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 = "" //代理服务器验证用户名

3
app/src/main/java/xyz/fycz/myreader/ui/activity/SourceEditActivity.java
Unescape View File

@ -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<ActivitySourceEditBinding>
debugEntity.setUrl(text);
}
}, (dialog, which) -> {
if (!TextUtils.isEmpty(debugEntity.getUrl())) {
Intent intent = new Intent(this, SourceDebugActivity.class);
intent.putExtra("debugEntity", debugEntity);
startActivity(intent);
}
});
}

2
app/version_code.properties
Unescape View File

@ -1,3 +1,3 @@
#Fri Jun 18 21:45:31 CST 2021
VERSION_CODE=241
VERSION_CODE=242
NEED_CREATE_RELEASE=true

Write Preview
Loading…
Cancel
Save