Merge pull request '添加了朗读功能，并解决了字符数显示的错误' (#17) from develop into master

3 years ago · 9758c4c1e2
parent 8e5a498a32 a4d727770a
commit 9758c4c1e2
586 changed files with 6414 additions and 139 deletions
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@ -88,6 +88,7 @@
        android:windowSoftInputMode="adjustPan" >
        </activity>

+
        <activity
            android:name=".ui.SearchActivity"
            android:configChanges="keyboardHidden|orientation|screenSize"
--- a/src/main/assets/Fonts/8514fix.fon
+++ b/src/main/assets/Fonts/8514fix.fon
--- a/src/main/assets/Fonts/8514fixe.fon
+++ b/src/main/assets/Fonts/8514fixe.fon
--- a/src/main/assets/Fonts/8514fixg.fon
+++ b/src/main/assets/Fonts/8514fixg.fon
--- a/src/main/assets/Fonts/8514fixr.fon
+++ b/src/main/assets/Fonts/8514fixr.fon
--- a/src/main/assets/Fonts/8514fixt.fon
+++ b/src/main/assets/Fonts/8514fixt.fon
--- a/src/main/assets/Fonts/8514oem.fon
+++ b/src/main/assets/Fonts/8514oem.fon
--- a/src/main/assets/Fonts/8514oeme.fon
+++ b/src/main/assets/Fonts/8514oeme.fon
--- a/src/main/assets/Fonts/8514oemg.fon
+++ b/src/main/assets/Fonts/8514oemg.fon
--- a/src/main/assets/Fonts/8514oemr.fon
+++ b/src/main/assets/Fonts/8514oemr.fon
--- a/src/main/assets/Fonts/8514oemt.fon
+++ b/src/main/assets/Fonts/8514oemt.fon
--- a/src/main/assets/Fonts/8514sys.fon
+++ b/src/main/assets/Fonts/8514sys.fon
--- a/src/main/assets/Fonts/8514syse.fon
+++ b/src/main/assets/Fonts/8514syse.fon
--- a/src/main/assets/Fonts/8514sysg.fon
+++ b/src/main/assets/Fonts/8514sysg.fon
--- a/src/main/assets/Fonts/8514sysr.fon
+++ b/src/main/assets/Fonts/8514sysr.fon
--- a/src/main/assets/Fonts/8514syst.fon
+++ b/src/main/assets/Fonts/8514syst.fon
--- a/src/main/assets/Fonts/85775.fon
+++ b/src/main/assets/Fonts/85775.fon
--- a/src/main/assets/Fonts/85855.fon
+++ b/src/main/assets/Fonts/85855.fon
--- a/src/main/assets/Fonts/85f1255.fon
+++ b/src/main/assets/Fonts/85f1255.fon
--- a/src/main/assets/Fonts/85f1256.fon
+++ b/src/main/assets/Fonts/85f1256.fon
--- a/src/main/assets/Fonts/85f1257.fon
+++ b/src/main/assets/Fonts/85f1257.fon
--- a/src/main/assets/Fonts/85f874.fon
+++ b/src/main/assets/Fonts/85f874.fon
--- a/src/main/assets/Fonts/85s1255.fon
+++ b/src/main/assets/Fonts/85s1255.fon
--- a/src/main/assets/Fonts/85s1256.fon
+++ b/src/main/assets/Fonts/85s1256.fon
--- a/src/main/assets/Fonts/85s1257.fon
+++ b/src/main/assets/Fonts/85s1257.fon
--- a/src/main/assets/Fonts/85s874.fon
+++ b/src/main/assets/Fonts/85s874.fon
--- a/src/main/assets/Fonts/AGENCYB.TTF
+++ b/src/main/assets/Fonts/AGENCYB.TTF
--- a/src/main/assets/Fonts/AGENCYR.TTF
+++ b/src/main/assets/Fonts/AGENCYR.TTF
--- a/src/main/assets/Fonts/ALGER.TTF
+++ b/src/main/assets/Fonts/ALGER.TTF
--- a/src/main/assets/Fonts/ANTQUAB.TTF
+++ b/src/main/assets/Fonts/ANTQUAB.TTF
--- a/src/main/assets/Fonts/ANTQUABI.TTF
+++ b/src/main/assets/Fonts/ANTQUABI.TTF
--- a/src/main/assets/Fonts/ANTQUAI.TTF
+++ b/src/main/assets/Fonts/ANTQUAI.TTF
--- a/src/main/assets/Fonts/ARIALN.TTF
+++ b/src/main/assets/Fonts/ARIALN.TTF
--- a/src/main/assets/Fonts/ARIALNB.TTF
+++ b/src/main/assets/Fonts/ARIALNB.TTF
--- a/src/main/assets/Fonts/ARIALNBI.TTF
+++ b/src/main/assets/Fonts/ARIALNBI.TTF
--- a/src/main/assets/Fonts/ARIALNI.TTF
+++ b/src/main/assets/Fonts/ARIALNI.TTF
--- a/src/main/assets/Fonts/ARIALUNI.TTF
+++ b/src/main/assets/Fonts/ARIALUNI.TTF
--- a/src/main/assets/Fonts/ARLRDBD.TTF
+++ b/src/main/assets/Fonts/ARLRDBD.TTF
--- a/src/main/assets/Fonts/BASKVILL.TTF
+++ b/src/main/assets/Fonts/BASKVILL.TTF
--- a/src/main/assets/Fonts/BAUHS93.TTF
+++ b/src/main/assets/Fonts/BAUHS93.TTF
--- a/src/main/assets/Fonts/BELL.TTF
+++ b/src/main/assets/Fonts/BELL.TTF
--- a/src/main/assets/Fonts/BELLB.TTF
+++ b/src/main/assets/Fonts/BELLB.TTF
--- a/src/main/assets/Fonts/BELLI.TTF
+++ b/src/main/assets/Fonts/BELLI.TTF
--- a/src/main/assets/Fonts/BERNHC.TTF
+++ b/src/main/assets/Fonts/BERNHC.TTF
--- a/src/main/assets/Fonts/BKANT.TTF
+++ b/src/main/assets/Fonts/BKANT.TTF
--- a/src/main/assets/Fonts/BOD_B.TTF
+++ b/src/main/assets/Fonts/BOD_B.TTF
--- a/src/main/assets/Fonts/BOD_BI.TTF
+++ b/src/main/assets/Fonts/BOD_BI.TTF
--- a/src/main/assets/Fonts/BOD_BLAI.TTF
+++ b/src/main/assets/Fonts/BOD_BLAI.TTF
--- a/src/main/assets/Fonts/BOD_BLAR.TTF
+++ b/src/main/assets/Fonts/BOD_BLAR.TTF
--- a/src/main/assets/Fonts/BOD_CB.TTF
+++ b/src/main/assets/Fonts/BOD_CB.TTF
--- a/src/main/assets/Fonts/BOD_CBI.TTF
+++ b/src/main/assets/Fonts/BOD_CBI.TTF
--- a/src/main/assets/Fonts/BOD_CI.TTF
+++ b/src/main/assets/Fonts/BOD_CI.TTF
--- a/src/main/assets/Fonts/BOD_CR.TTF
+++ b/src/main/assets/Fonts/BOD_CR.TTF
--- a/src/main/assets/Fonts/BOD_I.TTF
+++ b/src/main/assets/Fonts/BOD_I.TTF
--- a/src/main/assets/Fonts/BOD_PSTC.TTF
+++ b/src/main/assets/Fonts/BOD_PSTC.TTF
--- a/src/main/assets/Fonts/BOD_R.TTF
+++ b/src/main/assets/Fonts/BOD_R.TTF
--- a/src/main/assets/Fonts/BOOKOS.TTF
+++ b/src/main/assets/Fonts/BOOKOS.TTF
--- a/src/main/assets/Fonts/BOOKOSB.TTF
+++ b/src/main/assets/Fonts/BOOKOSB.TTF
--- a/src/main/assets/Fonts/BOOKOSBI.TTF
+++ b/src/main/assets/Fonts/BOOKOSBI.TTF
--- a/src/main/assets/Fonts/BOOKOSI.TTF
+++ b/src/main/assets/Fonts/BOOKOSI.TTF
--- a/src/main/assets/Fonts/BRADHITC.TTF
+++ b/src/main/assets/Fonts/BRADHITC.TTF
--- a/src/main/assets/Fonts/BRITANIC.TTF
+++ b/src/main/assets/Fonts/BRITANIC.TTF
--- a/src/main/assets/Fonts/BRLNSB.TTF
+++ b/src/main/assets/Fonts/BRLNSB.TTF
--- a/src/main/assets/Fonts/BRLNSDB.TTF
+++ b/src/main/assets/Fonts/BRLNSDB.TTF
--- a/src/main/assets/Fonts/BRLNSR.TTF
+++ b/src/main/assets/Fonts/BRLNSR.TTF
--- a/src/main/assets/Fonts/BROADW.TTF
+++ b/src/main/assets/Fonts/BROADW.TTF
--- a/src/main/assets/Fonts/BRUSHSCI.TTF
+++ b/src/main/assets/Fonts/BRUSHSCI.TTF
--- a/src/main/assets/Fonts/BSSYM7.TTF
+++ b/src/main/assets/Fonts/BSSYM7.TTF
--- a/src/main/assets/Fonts/CALIFB.TTF
+++ b/src/main/assets/Fonts/CALIFB.TTF
--- a/src/main/assets/Fonts/CALIFI.TTF
+++ b/src/main/assets/Fonts/CALIFI.TTF
--- a/src/main/assets/Fonts/CALIFR.TTF
+++ b/src/main/assets/Fonts/CALIFR.TTF
--- a/src/main/assets/Fonts/CALIST.TTF
+++ b/src/main/assets/Fonts/CALIST.TTF
--- a/src/main/assets/Fonts/CALISTB.TTF
+++ b/src/main/assets/Fonts/CALISTB.TTF
--- a/src/main/assets/Fonts/CALISTBI.TTF
+++ b/src/main/assets/Fonts/CALISTBI.TTF
--- a/src/main/assets/Fonts/CALISTI.TTF
+++ b/src/main/assets/Fonts/CALISTI.TTF
--- a/src/main/assets/Fonts/CASTELAR.TTF
+++ b/src/main/assets/Fonts/CASTELAR.TTF
--- a/src/main/assets/Fonts/CENSCBK.TTF
+++ b/src/main/assets/Fonts/CENSCBK.TTF
--- a/src/main/assets/Fonts/CENTAUR.TTF
+++ b/src/main/assets/Fonts/CENTAUR.TTF
--- a/src/main/assets/Fonts/CENTURY.TTF
+++ b/src/main/assets/Fonts/CENTURY.TTF
--- a/src/main/assets/Fonts/CHILLER.TTF
+++ b/src/main/assets/Fonts/CHILLER.TTF
--- a/src/main/assets/Fonts/COLONNA.TTF
+++ b/src/main/assets/Fonts/COLONNA.TTF
--- a/src/main/assets/Fonts/COOPBL.TTF
+++ b/src/main/assets/Fonts/COOPBL.TTF
--- a/src/main/assets/Fonts/COPRGTB.TTF
+++ b/src/main/assets/Fonts/COPRGTB.TTF
--- a/src/main/assets/Fonts/COPRGTL.TTF
+++ b/src/main/assets/Fonts/COPRGTL.TTF
--- a/src/main/assets/Fonts/CURLZ___.TTF
+++ b/src/main/assets/Fonts/CURLZ___.TTF
--- a/src/main/assets/Fonts/Candara.ttf
+++ b/src/main/assets/Fonts/Candara.ttf
--- a/src/main/assets/Fonts/Candarab.ttf
+++ b/src/main/assets/Fonts/Candarab.ttf
--- a/src/main/assets/Fonts/Candarai.ttf
+++ b/src/main/assets/Fonts/Candarai.ttf
--- a/src/main/assets/Fonts/Candaral.ttf
+++ b/src/main/assets/Fonts/Candaral.ttf
--- a/src/main/assets/Fonts/Candarali.ttf
+++ b/src/main/assets/Fonts/Candarali.ttf
--- a/src/main/assets/Fonts/Candaraz.ttf
+++ b/src/main/assets/Fonts/Candaraz.ttf
--- a/src/main/assets/Fonts/DINNextLTPro-Bold.ttf
+++ b/src/main/assets/Fonts/DINNextLTPro-Bold.ttf
--- a/src/main/assets/Fonts/DINNextLTPro-Light.ttf
+++ b/src/main/assets/Fonts/DINNextLTPro-Light.ttf
--- a/src/main/assets/Fonts/DINNextLTPro-Medium.ttf
+++ b/src/main/assets/Fonts/DINNextLTPro-Medium.ttf
--- a/src/main/assets/Fonts/DINNextLTPro-Regular.ttf
+++ b/src/main/assets/Fonts/DINNextLTPro-Regular.ttf
--- a/src/main/assets/Fonts/DUBAI-BOLD.TTF
+++ b/src/main/assets/Fonts/DUBAI-BOLD.TTF
--- a/src/main/assets/Fonts/DUBAI-LIGHT.TTF
+++ b/src/main/assets/Fonts/DUBAI-LIGHT.TTF
--- a/src/main/assets/Fonts/DUBAI-MEDIUM.TTF
+++ b/src/main/assets/Fonts/DUBAI-MEDIUM.TTF
--- a/src/main/assets/Fonts/DUBAI-REGULAR.TTF
+++ b/src/main/assets/Fonts/DUBAI-REGULAR.TTF
--- a/src/main/assets/Fonts/Deng.ttf
+++ b/src/main/assets/Fonts/Deng.ttf
--- a/Show More
+++ b/Show More