From f7173bcbd4d883d3942fc7e7d40fbf596a28fbb7 Mon Sep 17 00:00:00 2001
From: zhangsan <646228430@qq.com>
Date: Wed, 22 May 2024 16:04:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E3=80=81=E7=82=B9=E8=B5=9E?=
 =?UTF-8?q?=E3=80=81=E6=94=B6=E8=97=8F=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |   6 +-
 app/src/main/AndroidManifest.xml              |  64 +++++++-----------
 .../Activity/BookInformationActivity.kt       |   2 +
 app/src/main/res/drawable/readtime.png        | Bin 0 -> 963 bytes
 hwtxtreaderlib/build.gradle                   |   2 +-
 hwtxtreaderlib/src/main/AndroidManifest.xml   |  19 +++---
 6 files changed, 40 insertions(+), 53 deletions(-)
 create mode 100644 app/src/main/res/drawable/readtime.png

diff --git a/app/build.gradle b/app/build.gradle
index 7fe70a5..f51b371 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,12 +5,12 @@ plugins {
 }
 
 android {
-    compileSdk 31
+    compileSdk 30
 
     defaultConfig {
-        applicationId "com.zjgsu.jianshu"
+        applicationId "edu.whut.jianshu"
         minSdk 19
-        targetSdkVersion 31
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1752988..e16eae4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="edu.whut.jianshu">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> <!-- 监听网络的变化 -->
-    <!-- 网络权限 -->
-
-    <!--获取wifi网络状态的信息 -->
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" /> <!-- 设备休眠 -->
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.CAMERA" /> <!-- 摄像头 -->
-    <uses-permission android:name="android.permission.RECORD_AUDIO" /> <!-- 录音 -->
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.VIBRATE" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -24,6 +22,7 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Jianshu"
         android:usesCleartextTraffic="true">
+
         <activity android:name="edu.whut.jianshu.Activity.GoodBookActivity" />
         <activity android:name="edu.whut.jianshu.Activity.HotBookActivity" />
         <activity android:name="edu.whut.jianshu.Activity.BookInformationActivity" />
@@ -33,23 +32,11 @@
         <activity android:name="edu.whut.jianshu.Activity.PsychologyActivity" />
         <activity android:name="edu.whut.jianshu.Activity.ManagementActivity" />
         <activity android:name="edu.whut.jianshu.Activity.PhilosophyActivity" />
-<!--        <activity android:name=".BookShelfActivity"/>-->
         <activity android:name="edu.whut.jianshu.Activity.ScienceActivity" />
         <activity android:name="edu.whut.jianshu.Activity.Author_introductionActivity" />
-        <!--        <activity android:name=".MainActivity"-->
-<!--            android:exported="true"-->
-<!--            android:label="@string/app_name"-->
-<!--            >-->
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.MAIN" />-->
-
-<!--                <category android:name="android.intent.category.LAUNCHER" />-->
-<!--            </intent-filter>-->
-<!--        </activity>-->
         <activity android:name="edu.whut.jianshu.Activity.SendMarkingActivity" />
-         <activity android:name="edu.whut.jianshu.Activity.MainActivity"
-             android:configChanges="orientation|keyboard|keyboardHidden|navigation"
-             />
+        <activity android:name="edu.whut.jianshu.Activity.MainActivity"
+            android:configChanges="orientation|keyboard|keyboardHidden|navigation" />
         <activity android:name="edu.whut.jianshu.Activity.RegisterActivity" />
         <activity android:name="edu.whut.jianshu.Activity.BookShelfActivity" />
         <activity android:name="edu.whut.jianshu.Activity.Perception_informationActivity" />
@@ -63,9 +50,18 @@
         <activity android:name="edu.whut.jianshu.Activity.ReSexActivity" />
         <activity android:name="edu.whut.jianshu.Activity.ReSignatureActivity" />
         <activity android:name="edu.whut.jianshu.Activity.AccountManagerActivity" />
-        <activity android:name="edu.whut.jianshu.Activity.ReAddressActivity"/>
-        <activity
-            android:name="edu.whut.jianshu.Activity.LoginActivity"
+        <activity android:name="edu.whut.jianshu.Activity.ReAddressActivity" />
+        <activity android:name="com.bifan.txtreaderlib.ui.HwTxtPlayActivity"
+            android:exported="true"
+            android:theme="@style/HwTxtFullScreen"
+            tools:replace="android:exported">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+        </activity>
+        <activity android:name="edu.whut.jianshu.Activity.LoginActivity"
             android:exported="true"
             android:label="Jianshu">
             <intent-filter>
@@ -73,20 +69,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.bifan.txtreaderlib.ui.HwTxtPlayActivity"
-            android:exported="true"
-            android:theme="@style/HwTxtFullScreen">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
-        </activity>
-        <provider
-            android:name="cn.bmob.v3.util.BmobContentProvider"
-            android:authorities="com.zjgsu.jianshu.BmobContentProvider">
-        </provider>
+        <provider android:name="cn.bmob.v3.util.BmobContentProvider"
+            android:authorities="edu.whut.jianshu.BmobContentProvider"
+            android:exported="false" />
     </application>
-
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/main/java/edu/whut/jianshu/Activity/BookInformationActivity.kt b/app/src/main/java/edu/whut/jianshu/Activity/BookInformationActivity.kt
index 559c0e9..362a576 100644
--- a/app/src/main/java/edu/whut/jianshu/Activity/BookInformationActivity.kt
+++ b/app/src/main/java/edu/whut/jianshu/Activity/BookInformationActivity.kt
@@ -136,6 +136,7 @@ class BookInformationActivity : AppCompatActivity() {
                 if (e == null && bookshelfItems != null && bookshelfItems.isNotEmpty()) {
                     bookinfo_addBook.setImageResource(R.drawable.alreadyin)
                     bookinfo_mess.text="已加入"
+                    addBook2.text="已加入"
                 }
             }
         })
@@ -198,6 +199,7 @@ class BookInformationActivity : AppCompatActivity() {
                             if (saveException == null) {
                                 bookinfo_addBook.setImageResource(R.drawable.alreadyin)
                                 bookinfo_mess.text="已加入"
+                                addBook2.text="已加入"
                                 Toast.makeText(
                                     this@BookInformationActivity,
                                     "添加成功",
diff --git a/app/src/main/res/drawable/readtime.png b/app/src/main/res/drawable/readtime.png
new file mode 100644
index 0000000000000000000000000000000000000000..e01a37c5dcadab8fc8f00a089482faa01a4526e1
GIT binary patch
literal 963
zcmV;!13dhRP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&eMv+?RA@uhT5WE#FbpPek?khkN#6Ablv`}Q1%)5&PO|PK<06n3qa-qJzDXvv
z(p0HR96$DB$BxH}C;zY~*S|;xpl#cid7l3<#^Cz}zKf!OzY&bYIUmci9L4uf*LC+4
z#@huzD!nN38KKO`7`rpZzV?8L0sx9n({x=FI5-qvtuH)bTMFJe#sCQd0E%<YKNcFi
zQ*AisV9k43mRfqiUf45D6MzP)J%C?mcVmp5yRMVKosRVe(6;Sip672O5e~ZbeSdbI
zL>34y9vEXE#6u7#=V2IbJ~F)k)OG#N7`q~Y(TY>0P#l3*S1*ac_cDwV!0B|lV#)wj
zhGBT~u};Vu13f=o-n9atmIsbrE|;T8F+np3Zit5<E`v-%R<nXI0-&7doF84hY?|g5
z(ZFdvlOdX>fw+*V*_xrW0E8t#8Ts*2W;vM44K8oF=%oSirpr!R0Cin|%QP3l`IG?Y
zU1QSY0RW}W5=72Gm)1-P0L28P?ln6tcMN!8Q-VAwN38GUJ*Glx03aJD5}g+|0EqR+
zzVBaMT+IzY#G}y*8vr=x`(zyoE{6wPUf2M@X)uKQxne-dC0TL93<UslEj9(_@__Jy
z%8WRewE$x11BYY=fa@`JFDU?+|7BUehLp6qDTGq$db#3kggu~K6vO}A9>8&+1+X`O
za|0mqRUj)5ApQpDe;tLOriZFD<Q@?XKlI4jjtm+3PXL7IuGZRWFC9y;2V^N6?Ezed
zL}@QJnPO1KlB7W_?h@MLhG4PQ{t|#Q3+bx95G``7#aRenw3tG;3-W4Uawuw&Nvcv+
zB`W}?Jo}eQ+Ridvw5DP%I*@Y##$^f)@(qAJ%}g%EX*o>`&7=)YE)Y2X(*%>WrOW{!
zsHLP;ACv<EvG-$ZY7jQ-!&yn6RZ=UDW75=Q*&eo3BOTkJ?EysIWQ|O)JuSkhDEM`5
zkJ554eUr6S20@Rz%K_PMX!4{8-Iw)k%K7R>1?CED-Pp>9x=sM16T)>8{FH3KVUX{%
zyri2K0F+);U<(1efM~qC8Yg7n=M6xDFbw(D`EOAaUsY9&x@n^v^1&>5spnxf_Aumw
zI=`wam{xk<J3#=X+dRjtSP41%G9{@Xt79Qi05A~K*wrJQuJkjFWj*$<OLhUkhdkxK
l8u(f%=elGb$f=}F_J6|__)nKAB_#j=002ovPDHLkV1i?+s&4=Q

literal 0
HcmV?d00001

diff --git a/hwtxtreaderlib/build.gradle b/hwtxtreaderlib/build.gradle
index 5c16d85..40c21ad 100644
--- a/hwtxtreaderlib/build.gradle
+++ b/hwtxtreaderlib/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 30
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 30
diff --git a/hwtxtreaderlib/src/main/AndroidManifest.xml b/hwtxtreaderlib/src/main/AndroidManifest.xml
index 4db255e..46c1b8d 100644
--- a/hwtxtreaderlib/src/main/AndroidManifest.xml
+++ b/hwtxtreaderlib/src/main/AndroidManifest.xml
@@ -9,15 +9,16 @@
         android:label="@string/app_name"
         android:supportsRtl="true">
         <activity android:name=".ui.ChatWithGptActivity"></activity>
-        <activity
-            android:name="com.bifan.txtreaderlib.ui.HwTxtPlayActivity"
-            android:theme="@style/HwTxtFullScreen">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="text/plain" />
-            </intent-filter>
-        </activity>
+<!--        <activity-->
+<!--            android:name="com.bifan.txtreaderlib.ui.HwTxtPlayActivity"-->
+<!--            android:exported="true"-->
+<!--            android:theme="@style/HwTxtFullScreen">-->
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.VIEW" />-->
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--                <data android:mimeType="text/plain" />-->
+<!--            </intent-filter>-->
+<!--        </activity>-->
     </application>