From 12b860f59de01d68ad10fa2e3206dc843ed44eb3 Mon Sep 17 00:00:00 2001
From: ag2s20150909 <ag2s20150909@gmail.com>
Date: Fri, 6 Aug 2021 23:40:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8:=E4=B8=AD=E6=96=87=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=99=BE=E5=BA=A6=E6=B1=89=E8=AF=AD=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=EF=BC=8C=E8=8B=B1=E6=96=87=E4=BD=BF=E7=94=A8=E6=B5=B7=E8=AF=8D?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/cronetlib/cronet_api.jar                  | Bin 69333 -> 69333 bytes
 app/cronetlib/cronet_impl_common_java.jar     | Bin 97267 -> 97267 bytes
 app/cronetlib/src/cronet_api-src.jar          | Bin 44068 -> 44068 bytes
 .../src/cronet_impl_common_java-src.jar       | Bin 22299 -> 22299 bytes
 .../app/help/http/cronet/CronetInterceptor.kt |   7 ++-
 .../io/legado/app/ui/dict/DictViewModel.kt    |  52 ++++++++++++++++++
 6 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/app/cronetlib/cronet_api.jar b/app/cronetlib/cronet_api.jar
index d62e993bb5405bcb3ae3bd090dd231196c3254ea..5f322b8f80cba518ec8d548355cbe462d7dfa517 100644
GIT binary patch
delta 132
zcmcaQm*whQ7Ks3FW)=|!2vF2ovCwHv9SZ|P9n0kSui}#pn7F1oFtTm5=VUTAHgw=&
zFkmobWN<f2vPdyYHZ@C5H8M;!wn#KLN;6M3NlHylGEGcMHcU%2H8eI!GqRjq%_Pli
fX>2@sCX)=K@npmOVw=w}S^s4L*|L?J@f05bxXmPx

delta 133
zcmcaQm*whQ7Ks3FW)=|!2vF2wKJ@Wo9SZ|P9n0kSui}#pn7F1oFtTm5=VUTAGI!u%
zFkmobWN<f2G)qcKNi{GxOi4>lGEFv2F)&C=NwG*YO)^b2voNzvGchqVPD-0x%_Pli
gVPrCSCX)=4k@@6>f})$xFj@a)0a>$^oADGM010p<TL1t6

diff --git a/app/cronetlib/cronet_impl_common_java.jar b/app/cronetlib/cronet_impl_common_java.jar
index f851e71208f9ea7a3acbce2ba1ce6ff8300a770c..4d627c1f24a3fc5608063fca90b11876c5f2738d 100644
GIT binary patch
delta 164
zcmezTo%Qo~)(yhJyz0L%r;4&LFo3Z7<iaM&&6dG08S{+|9e5aY8T1$#+|80KQp}P~
z&5~1%3{#CQ63va$%#%%$Qj?QR6O)n+(-KV$jZM;wEOm=g(~9+ziW2jZGjuaj6H|)y
zO-v0<9jcWLEsc$9*%|bC7z`K;c^Hfsq!}4_EsgXH^gs&q42=z&Cx&jH7|JLo&H{4J
K_RTqr4*UR*0xlH*

delta 164
zcmezTo%Qo~)(yhJyovl<Y(!ZY7(iHka$%F?X3OB0jQK|94m=FH40?<V?q-Q*Nl7WG
z2Iht-X~{{Z$%ZKg25BiN7Kx@wrm1EYW|nCtCWgjIX}U$JX~p_UMTvRI8M+y%i7CbU
zCZ>j_4%Nzr7Dgtu><s!m3<eB_JPbw*(u@qemPUF8dLRXQhDPSi6GOL83}uuPX92lq
K`{o=*2Yvtzb1Yc^

diff --git a/app/cronetlib/src/cronet_api-src.jar b/app/cronetlib/src/cronet_api-src.jar
index 78bf99a0e04dcad3e2705e3a511c670526e27c62..6c11000c04bea49b022924752a7a66100e0b0807 100644
GIT binary patch
delta 952
zcmV;p14sO%*aD>30<blq3f55XkA?#P067Yi@P`+Z|Emvw?Nm)~+c*%t`&SIoL))w)
z#b0THv_M?f*frodL7YvG21Si6!V)QvlwBk6f8U`fId+<)z3i<z_=B2xGo1J4g&_=7
zzR_ZlSZJTNx^SN$3=*v}QDo3BY@)OYpr58t1{u(3P_Hl!8es_k8U!^5n+O9&6`CV(
z6(i8!g<7G1mKZ~{0R~^E-%gC(qzI|tC@IY*%mQZ;B6LV|Rmd2Gq;rJvXfT{ihcFi@
z28~9}_>wKCl3oP7>Mf9HFB^^U__zVb@POI~MOe&GMfy>OVfZk-n~rWKfs1*(N(8mW
z3<&$)P*A#o!i5WIsZ*Awn=QqKjl77cN#H3n2Ku>wsKFl_Ku@m4idh6>nWd<?piG!r
zE#v|QcQ=#a{j91AU*PDX9h?T;UaJ?hI<2G2*Ab`*=--ZJ<Ke?_Oqs2&4=yk0p5v05
zOh}PAW^PB2;tEqYev#!VW+)w=lE#mgX~#vD(^*7gUkjUfo+vfghoo!TJ-l@ycmk1D
zOQdms^5vT8xJ=riiB#B403!*C$kMP@6w!3V)vyDth@LX3?4_*h=Se?urmbsxt>k;_
zvX{QQD(l7D><;S^yM_&YnKDZHIxChI7|_*R8Wo(^DI>zDxC|C(iP^CO`0x=v@6mkt
zs=SsL<%{jr*tu3K5jzd+RdMo`%96sp&?*jpaDP5eiBBzDQqwMO<4CM4ln7Q)cW&k@
zriCgD6cT^r$Su7aYE8S^qy;19`jN4kaeGbSDlT6&A!8f2zC~(l0fcW0@_ICx4Q{S)
z`}d=-<Kb*ypPe_fTy4X+KfRv~{^?Kt9=cUHi_YUS-aF&iZeiz~eQM7?@ot1X>amD_
zx8|(Z>U8JrixZ7=6Goazo}47eViURrx_W%qy6AMav_#Jr<F;yolU%GWxK-L)R)$$b
zBi&h)m!L^hk;aY{-}TGGc%p*@^0@UyD{H83Tiuf=@q||K--+fiE!BV|xj>ig3(%v{
z7Fs^{iNE0J>WDt~1{RpYF-Y(qPMdIl{?Si+`_t9$N<eey2To$;fsjk@Z>l_Fc~0Gz
zx^?>@%58KnGWMf(l^WQCJ<BTnnuOQ{dMhiH9t04eE~HmF1Bq+W>fy#boA$v#o#tqo
z*S?+piiwnwdF^fLPovyv^0f*553X4c-TraUKkoUmgx`|vYp!~r;NNnZUwg|9Z(+V|
aR(q~gqiq}i0ki9*<pu=SQ16eE)T>a%72m)B

delta 952
zcmV;p14sO%*aD>30<blq3UT`LqJ{$i067Yi@P`+Z|Emvw?Nm)~+c*%t>sJiYL))w)
z*{PkTNDD-Dg<S)V6U5o{XiySm5tc}Sr0g1j|N9O}$&u3}?PYJ(!5`Gjo8i1SF9={P
zs;y+pT*GO9Foe6D!Z??rWOWH)t#cuj4`ES&4N@SfqH;}B-wOixS5Xid=$t7~qLvAT
zM5Gk(?^3LPspK?;cnbu+&cB@~y)7sdETJ6JbWSuRghNaXQYLDi0^@j2VLBN{vv~v=
zE2!^z6-icPiIwEiPnzC*PW6T71;@u89K$`8iV4Ib3M=9d8%Bfs=ypE2p7|!`;WB5~
z8d1RXTZKWz7HSjDxW-ONQEYb@7kE`2W0Q~+L@5Y=E7pQPcz{nO*_vnyN)wGy8N*DN
zYsvT$#<$nA=x)(eg)eaQ>D2H0!_i>m4^BTGUA&BdO+a`vSxlq*Xo{JGp$oPbG|#c6
zrevIzhMAiQ6m(4sGk#W91uZEzc!Dc8S|SY>Wrb%kj(x*)?s&pfzYB@i)E&G{&XOEr
zDOMDJ$C<1)M5Z=rkH!k7w?0fb2qa6wMqotG5ZA(vr9gUYlI_LTb@Rj@6_MJsy%GGa
zHrXrJU6b|fZT5$4iG9Ngzm$#QuFjeiHTCgoCJhT_ZOQ~O8ZP}M)yVAB0K9t-pF1=k
zzOvVHqI|Z!7Q2#S%~GR*P8B0>E;K6K39aFOfOhBenE2Sj1vYKswuZ#Ef<@2*yE8Li
z6Ujuapyu>PMH7whA}MiKd$?f8To@}YNusYXT%`6@4@$B%>suGP6+rO1Ag?B~#rXQ_
zCcK+`okokUK0myo<z^eE;rwnf{wJLM9hp@)BWH1((*DOmnkDfl8KnJwmZs-q6p!eC
z+4<S0Y&aZzh_e$(GZn;=@FYLUDM?je7U=Tf&EWiWxWgrSx)?W26A8*i%R13QI?F0)
z8RJOz7Ud+Ua#0tlVa0X*{4gHrK!H5$T+zlFn%g$_L`oc?P5gJHd5TLlMoBKI$#w<s
zkyO``KlO>f;OO!QKRW~SRc#nV_;>w(9-O~-)874b^;-+54*kGL%pNela{eal8L2Al
z-s;xu2eaE~UX<iV>nbg<1ACHX{ThYX1ANOHl^z5jpscx5Isr~MsMW)bc{1&Tff~)>
zG_PDc;hM05pm}vR^`}wpHTlwn{s-4=hpzv)=O6ccUc#?Q_9a(6Q1EX#&9A);<+m_j
aH>-{-wP-u<KeOwk<pu<C`tzcb)T>a2E6|Pr

diff --git a/app/cronetlib/src/cronet_impl_common_java-src.jar b/app/cronetlib/src/cronet_impl_common_java-src.jar
index 7d7da6f3313aba503e992b022341e858295453b5..d4e43c622d08a631bd64e038779cc3550ffa0d0c 100644
GIT binary patch
delta 558
zcmV+}0@3}Ot^u2_0kCdG4Yz>T^ydKp0MP>g049@x0U47&RS<uTQC)A^Fcf{yuef3_
zEh`S;tDtI9vn<+>B3c#39+BhRB-Vl**$xsy{P#H|RIF;*{1C;-Js<ZR*M&fqd&RTd
zz@YDqV3i{TxsqF6ZNaZhE|n(W7X_S#G$_=lc9;;yb>XK*kSUm)YtXV%41vi6!Co`D
zLnSbQcn=i5F28^EwAmL31!pKM%;eMnqXJ^AnNnGa1h}x@5u$kzE|wvryg=eOC1t;9
zW|dS%SnG`lG=y)<;=!rmYgC#`OGdSov@fSQbl2g_a{ja+PFclP8CXHJhPlO^5eEnC
zDHY#QgP;vHb}Z$B7O*smiwuI7r$xBhv{di~I<o=klhJ?J8xwEnbsj!u;KG3aJl{m&
zI*csR8(kT0<syH%+5|uR#rLq*n#9v&!p0MZ0}qE&dOt|-*(gR9k7>-jl#adOC>_jt
z3RCUIiVBwZa-@lNYln}APu^@eJX)8vvfJ&R40PeSwZNp%Mpev6)%3i@ZEUl7?X`(a
z=dvnnnP-2`q@i*DTIV9yn_D;>o#t;7eY<PBWrikD(w5lH|KcW(s5U`PMTRx{gsqQ4
zQz`MbhR@J>?AYf;Ttru~KGEOw?_he{Wc{v-x)^K0FL{JJEZ)<5?d=N92h051{(o^^
w&*Nh8GuzSm15ir?1QY-O00;m803j;WR}wO;0RXe0M{5lPw}995vkz4a0w<&n@&Et;

delta 558
zcmV+}0@3}Ot^u2_0kCdG4JI5gKIZ`d0MP>g049@x0U47&RS<uTQC)AFFcf{~S6pQ;
zZMPW6NSdmeRL0O638ht&Wsi|D7qCWbWSdA)l>a^xNR>@(Ha{Q?_k7%QTo)o)?-Vae
z10&B5U|AwWrIH)oY#?k*DU~J=RuvqFG$_=lwwMveb>W9bkU5x=YtXV$41viE!Cniw
zMI|tUbO#i^F1~*awb@k&6=x_c%#_psqXJTFnR3~P47jl05t3OH&lfS|yh7qQHD$kO
zVU<)tSnrJpG=y*J>fUMLD^!|GOGdSov@gdwbXW1qV)isAPTizd8CXTNhMC2k5PJvg
zsTJQ+gP;vHb}Z+DR<JONivpsTr+K_w_f+r&26rRkkzjx9kBL9J9o)aqz=eVEdA3gC
zRh(F)A6yvj<&to*Tt|=L{CnJLP3R;|GxTo#ENAJM`I+bCSvIBPbc~bf<Sq{a|8trT
z73SJa6&0);mPj-0whkZmAN=VkI9QjhvU_uLG;jmYy#*$PHmYGps;=h^Zc>}gYp-2o
zx|B_2%RGO1CLN9Y$2w=ZUR}ff;B<ex==)v!EekY}lD5Qt{wFtOLbZuXDhh1TM{Ii(
znnsDgYxoF*hk<>b#YJ?J>LdM?_X(!gUDj{9Xp6BH!kQ<z#p*4+*WNDBytB-|?f)0&
w<vh+7Kd~L0-%v{f1QY-O00;m803j;WR}wO;0RXe0M{5lPCLAz6vkz4a0<c{CX8-^I

diff --git a/app/src/main/java/io/legado/app/help/http/cronet/CronetInterceptor.kt b/app/src/main/java/io/legado/app/help/http/cronet/CronetInterceptor.kt
index 0a0e955b3..3bc10e838 100644
--- a/app/src/main/java/io/legado/app/help/http/cronet/CronetInterceptor.kt
+++ b/app/src/main/java/io/legado/app/help/http/cronet/CronetInterceptor.kt
@@ -27,7 +27,12 @@ class CronetInterceptor(private val cookieJar: CookieJar?) : Interceptor {
             response
         } catch (e: Exception) {
             //遇到Cronet处理有问题时的情况，如证书过期等等，回退到okhttp处理
-            chain.proceed(original)
+            if (e.message.toString().contains("ERR_CERT_DATE_INVALID", true)) {
+                chain.proceed(original)
+            } else {
+                throw e
+            }
+
         }
 
 
diff --git a/app/src/main/java/io/legado/app/ui/dict/DictViewModel.kt b/app/src/main/java/io/legado/app/ui/dict/DictViewModel.kt
index 27f2724a2..96e10d0d4 100644
--- a/app/src/main/java/io/legado/app/ui/dict/DictViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/dict/DictViewModel.kt
@@ -8,12 +8,27 @@ import io.legado.app.help.http.newCallStrResponse
 import io.legado.app.help.http.okHttpClient
 import io.legado.app.utils.toastOnUi
 import org.jsoup.Jsoup
+import java.util.regex.Pattern
 
 class DictViewModel(application: Application) : BaseViewModel(application) {
 
     var dictHtmlData: MutableLiveData<String> = MutableLiveData()
 
     fun dict(word: String) {
+        if(isChinese(word)){
+            baiduDict(word)
+        }else{
+            haiciDict(word)
+        }
+
+    }
+
+    /**
+     * 海词英文词典
+     *
+     * @param word
+     */
+    private fun haiciDict(word: String) {
         execute {
             val body = okHttpClient.newCallStrResponse {
                 get("https://apii.dict.cn/mini.php", mapOf(Pair("q", word)))
@@ -25,7 +40,44 @@ class DictViewModel(application: Application) : BaseViewModel(application) {
         }.onError {
             context.toastOnUi(it.localizedMessage)
         }
+    }
+
+    /**
+     * 百度汉语词典
+     *
+     * @param word
+     */
+    private fun baiduDict(word: String) {
+        execute {
+            val body = okHttpClient.newCallStrResponse {
+                get("https://dict.baidu.com/s", mapOf(Pair("wd", word)))
+            }.body
+            val jsoup = Jsoup.parse(body!!)
+            jsoup.select("script").remove()//移除script
+            jsoup.select("#word-header").remove()//移除单字的header
+            jsoup.select("#term-header").remove()//移除词语的header
+            jsoup.select(".more-button").remove()//移除展示更多
+            jsoup.select(".disactive").remove()
+            jsoup.select("#download-wrapper").remove()//移除下载广告
+            jsoup.select("#right-panel").remove()//移除右侧广告
+            jsoup.select("#content-panel")
+        }.onSuccess {
+            dictHtmlData.postValue(it.html())
+        }.onError {
+            context.toastOnUi(it.localizedMessage)
+        }
+    }
+
+    /**
+     * 判断是否包含汉字
+     * @param str
+     * @return
+     */
 
+    fun isChinese(str: String): Boolean {
+        val p = Pattern.compile("[\u4e00-\u9fa5]")
+        val m = p.matcher(str)
+        return m.find()
     }
 
 }
\ No newline at end of file