From e6a2e719794f9cce2467454dcd6282527893898f Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Fri, 5 Dec 2025 14:36:33 +0800 Subject: [PATCH] =?UTF-8?q?version:1.0.1=20fix:=20update:=E5=8A=A0?= =?UTF-8?q?=E5=85=A5multidex=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E4=B8=BAsp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 +++ .../com/xwad/os/base/BaseApplication.java | 9 ++++++ app/src/main/res/layout/activity_manual.xml | 2 +- app/src/main/res/layout/dialog_lock.xml | 4 +-- app/src/main/res/layout/dialog_removeapp.xml | 8 ++--- app/src/main/res/layout/dialog_yw_apps.xml | 2 +- app/src/main/res/layout/fg_content_dl.xml | 30 ++++++++--------- app/src/main/res/layout/fg_content_hx.xml | 26 +++++++-------- app/src/main/res/layout/fg_content_kx.xml | 24 +++++++------- app/src/main/res/layout/fg_content_ls.xml | 24 +++++++------- app/src/main/res/layout/fg_content_sw.xml | 26 +++++++-------- app/src/main/res/layout/fg_content_wl.xml | 26 +++++++-------- app/src/main/res/layout/fg_content_zz.xml | 24 +++++++------- app/src/main/res/layout/fragment_math.xml | 26 +++++++-------- app/src/main/res/layout/fragment_mine.xml | 32 +++++++++---------- app/src/main/res/layout/fragment_read.xml | 10 +++--- app/src/main/res/layout/fragment_safe.xml | 4 +-- app/src/main/res/layout/item_app_gk.xml | 4 +-- app/src/main/res/layout/item_bz.xml | 2 +- app/src/main/res/layout/item_chart.xml | 2 +- app/src/main/res/layout/item_dialog_app.xml | 2 +- app/src/main/res/layout/item_exp.xml | 6 ++-- app/src/main/res/layout/item_task.xml | 10 +++--- app/src/main/res/layout/item_wl_app.xml | 2 +- app/src/main/res/layout/item_yw_app.xml | 2 +- .../main/res/layout/layout_daily_tasks.xml | 6 ++-- .../main/res/layout/layout_dashu_dia_10.xml | 2 +- app/src/main/res/layout/layout_jiesao.xml | 8 ++--- app/src/main/res/layout/layout_tree.xml | 6 ++-- app/src/main/res/layout/toast_text_layout.xml | 2 +- 30 files changed, 174 insertions(+), 161 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 36e6dee..41ac803 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,6 +20,9 @@ android { versionName "1.0.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + multiDexEnabled true + vectorDrawables.useSupportLibrary = true compileOptions { @@ -144,6 +147,7 @@ dependencies { implementation "androidx.fragment:fragment:1.4.1" implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + implementation 'androidx.multidex:multidex:2.0.1' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.3' diff --git a/app/src/main/java/com/xwad/os/base/BaseApplication.java b/app/src/main/java/com/xwad/os/base/BaseApplication.java index 697a837..699d6ec 100644 --- a/app/src/main/java/com/xwad/os/base/BaseApplication.java +++ b/app/src/main/java/com/xwad/os/base/BaseApplication.java @@ -2,12 +2,15 @@ package com.xwad.os.base; import android.annotation.SuppressLint; import android.app.Application; +import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Handler; import android.os.Looper; import android.util.Log; +import androidx.multidex.MultiDex; + import com.arialyy.aria.core.Aria; import com.hjq.toast.Toaster; import com.tencent.bugly.crashreport.CrashReport; @@ -40,6 +43,12 @@ public class BaseApplication extends Application { return sInstance; } + @Override + protected void attachBaseContext(Context base) { + super.attachBaseContext(base); + MultiDex.install(this); + } + @Override public void onCreate() { super.onCreate(); diff --git a/app/src/main/res/layout/activity_manual.xml b/app/src/main/res/layout/activity_manual.xml index 9e8a8b4..4ecf621 100644 --- a/app/src/main/res/layout/activity_manual.xml +++ b/app/src/main/res/layout/activity_manual.xml @@ -221,7 +221,7 @@ android:layout_marginTop="4dp" android:text="了解基础操作" android:textColor="@color/black" - android:textSize="8dp" + android:textSize="8sp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/textView2" /> diff --git a/app/src/main/res/layout/dialog_lock.xml b/app/src/main/res/layout/dialog_lock.xml index 81701d1..cbc505f 100644 --- a/app/src/main/res/layout/dialog_lock.xml +++ b/app/src/main/res/layout/dialog_lock.xml @@ -22,7 +22,7 @@ android:layout_marginEnd="25dp" android:text="已被禁用,需要爸爸妈妈允许后才可恢复使用哦。" android:textColor="#010101" - android:textSize="14dp" /> + android:textSize="14sp" /> + android:textSize="12sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_removeapp.xml b/app/src/main/res/layout/dialog_removeapp.xml index d438675..11fb49c 100644 --- a/app/src/main/res/layout/dialog_removeapp.xml +++ b/app/src/main/res/layout/dialog_removeapp.xml @@ -14,7 +14,7 @@ android:layout_marginTop="31dp" android:text="搜狗输入法" android:textColor="#333333" - android:textSize="16dp" /> + android:textSize="16sp" /> + android:textSize="16sp" /> + android:textSize="12sp" /> + android:textSize="12sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_yw_apps.xml b/app/src/main/res/layout/dialog_yw_apps.xml index 2108dd2..33a2fd0 100644 --- a/app/src/main/res/layout/dialog_yw_apps.xml +++ b/app/src/main/res/layout/dialog_yw_apps.xml @@ -25,7 +25,7 @@ android:layout_marginTop="3dp" android:text="语文学习应用" android:textColor="#333333" - android:textSize="12dp" /> + android:textSize="12sp" /> + android:textSize="11sp" /> + android:textSize="11sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -304,7 +304,7 @@ android:layout_marginTop="12dp" android:text="试卷中心" android:textColor="@color/white" - android:textSize="12dp" /> + android:textSize="12sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -441,7 +441,7 @@ android:layout_centerVertical="true" android:text="学习应用" android:textColor="@color/white" - android:textSize="11dp" /> + android:textSize="11sp" /> + android:textSize="8sp" /> + android:textSize="8sp" /> diff --git a/app/src/main/res/layout/fg_content_hx.xml b/app/src/main/res/layout/fg_content_hx.xml index 6d7d38d..b207666 100644 --- a/app/src/main/res/layout/fg_content_hx.xml +++ b/app/src/main/res/layout/fg_content_hx.xml @@ -31,7 +31,7 @@ android:layout_marginTop="7dp" android:text="AI同步精准学" android:textColor="#b3b1ca" - android:textSize="11dp" + android:textSize="11sp" android:visibility="gone" /> + android:textSize="11sp" /> + android:textSize="11sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -304,7 +304,7 @@ android:layout_marginTop="12dp" android:text="试卷中心" android:textColor="@color/white" - android:textSize="12dp" /> + android:textSize="12sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -440,7 +440,7 @@ android:layout_centerVertical="true" android:text="学习应用" android:textColor="@color/white" - android:textSize="11dp" /> + android:textSize="11sp" /> + android:textSize="11sp" /> + android:textSize="11sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -304,7 +304,7 @@ android:layout_marginTop="12dp" android:text="试卷中心" android:textColor="@color/white" - android:textSize="12dp" /> + android:textSize="12sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> diff --git a/app/src/main/res/layout/fg_content_ls.xml b/app/src/main/res/layout/fg_content_ls.xml index 92dff06..97e5622 100644 --- a/app/src/main/res/layout/fg_content_ls.xml +++ b/app/src/main/res/layout/fg_content_ls.xml @@ -31,7 +31,7 @@ android:layout_marginTop="7dp" android:text="AI同步精准学" android:textColor="#b3b1ca" - android:textSize="11dp" + android:textSize="11sp" android:visibility="gone" /> + android:textSize="11sp" /> + android:textSize="11sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -304,7 +304,7 @@ android:layout_marginTop="12dp" android:text="试卷中心" android:textColor="@color/white" - android:textSize="12dp" /> + android:textSize="12sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> diff --git a/app/src/main/res/layout/fg_content_sw.xml b/app/src/main/res/layout/fg_content_sw.xml index 6a16c0f..60c8370 100644 --- a/app/src/main/res/layout/fg_content_sw.xml +++ b/app/src/main/res/layout/fg_content_sw.xml @@ -31,7 +31,7 @@ android:layout_marginTop="7dp" android:text="AI同步精准学" android:textColor="#b3b1ca" - android:textSize="11dp" + android:textSize="11sp" android:visibility="gone" /> + android:textSize="11sp" /> + android:textSize="11sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -304,7 +304,7 @@ android:layout_marginTop="12dp" android:text="试卷中心" android:textColor="@color/white" - android:textSize="12dp" /> + android:textSize="12sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -441,7 +441,7 @@ android:layout_centerVertical="true" android:text="学习应用" android:textColor="@color/white" - android:textSize="11dp" /> + android:textSize="11sp" /> + android:textSize="11sp" /> + android:textSize="11sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -304,7 +304,7 @@ android:layout_marginTop="12dp" android:text="试卷中心" android:textColor="@color/white" - android:textSize="12dp" /> + android:textSize="12sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -440,7 +440,7 @@ android:layout_centerVertical="true" android:text="学习应用" android:textColor="@color/white" - android:textSize="11dp" /> + android:textSize="11sp" /> + android:textSize="11sp" /> + android:textSize="11sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -304,7 +304,7 @@ android:layout_marginTop="12dp" android:text="试卷中心" android:textColor="@color/white" - android:textSize="12dp" /> + android:textSize="12sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> diff --git a/app/src/main/res/layout/fragment_math.xml b/app/src/main/res/layout/fragment_math.xml index 0b8622a..6f9f73e 100644 --- a/app/src/main/res/layout/fragment_math.xml +++ b/app/src/main/res/layout/fragment_math.xml @@ -52,7 +52,7 @@ android:layout_marginTop="7dp" android:text="AI同步精准学" android:textColor="#b3b1ca" - android:textSize="11dp" + android:textSize="11sp" android:visibility="gone" /> + android:textSize="11sp" /> + android:textSize="11sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -327,7 +327,7 @@ android:layout_marginTop="12dp" android:text="试卷中心" android:textColor="@color/white" - android:textSize="12dp" /> + android:textSize="12sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="9sp" /> @@ -464,7 +464,7 @@ android:layout_centerVertical="true" android:text="学习应用" android:textColor="@color/white" - android:textSize="11dp" /> + android:textSize="11sp" /> + android:textSize="7sp" /> + android:textSize="9sp" /> + android:textSize="7sp" /> + android:textSize="9sp" /> + android:textSize="7sp" /> + android:textSize="9sp" /> @@ -190,7 +190,7 @@ android:layout_gravity="center_vertical" android:text="本周累计打卡" android:textColor="@color/white" - android:textSize="12dp" + android:textSize="12sp" android:textStyle="bold" /> + android:textSize="9sp" /> + android:textSize="12sp" /> + android:textSize="9sp" /> + android:textSize="12sp" /> + android:textSize="8sp" /> + android:textSize="12sp" /> + android:textSize="8sp" /> + android:textSize="12sp" /> + android:textSize="8sp" /> diff --git a/app/src/main/res/layout/fragment_read.xml b/app/src/main/res/layout/fragment_read.xml index 3eddfa3..ff7d9c3 100644 --- a/app/src/main/res/layout/fragment_read.xml +++ b/app/src/main/res/layout/fragment_read.xml @@ -42,7 +42,7 @@ android:layout_marginTop="12dp" android:text="新课标推荐" android:textColor="@color/white" - android:textSize="12dp" /> + android:textSize="12sp" /> + android:textSize="9sp" /> + android:textSize="12sp" /> + android:textSize="12sp" /> + android:textSize="9sp" /> diff --git a/app/src/main/res/layout/fragment_safe.xml b/app/src/main/res/layout/fragment_safe.xml index db41e25..5c07d2f 100644 --- a/app/src/main/res/layout/fragment_safe.xml +++ b/app/src/main/res/layout/fragment_safe.xml @@ -46,7 +46,7 @@ android:layout_gravity="center_vertical" android:text="平板守护功能" android:textColor="@color/white" - android:textSize="12dp" + android:textSize="12sp" android:textStyle="bold" /> + android:textSize="9sp" /> @@ -77,7 +77,7 @@ android:layout_marginTop="6dp" android:singleLine="true" android:textColor="@color/white" - android:textSize="10dp" /> + android:textSize="10sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_chart.xml b/app/src/main/res/layout/item_chart.xml index dc436c4..4448589 100644 --- a/app/src/main/res/layout/item_chart.xml +++ b/app/src/main/res/layout/item_chart.xml @@ -26,5 +26,5 @@ android:layout_marginTop="1dp" android:text="05.10" android:textColor="@color/white" - android:textSize="8dp" /> + android:textSize="8sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_dialog_app.xml b/app/src/main/res/layout/item_dialog_app.xml index 4527fde..3705ffa 100644 --- a/app/src/main/res/layout/item_dialog_app.xml +++ b/app/src/main/res/layout/item_dialog_app.xml @@ -20,5 +20,5 @@ android:gravity="center" android:text="当前壁纸" android:textColor="#333333" - android:textSize="9dp" /> + android:textSize="9sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_exp.xml b/app/src/main/res/layout/item_exp.xml index f78a10e..45af628 100644 --- a/app/src/main/res/layout/item_exp.xml +++ b/app/src/main/res/layout/item_exp.xml @@ -13,7 +13,7 @@ android:gravity="top|center_horizontal" android:text="智慧学" android:textColor="@color/white" - android:textSize="7dp" + android:textSize="7sp" android:textStyle="bold" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_task.xml b/app/src/main/res/layout/item_task.xml index 596d6cb..e99ab82 100644 --- a/app/src/main/res/layout/item_task.xml +++ b/app/src/main/res/layout/item_task.xml @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:textColor="#ffffff" - android:textSize="28dp" /> + android:textSize="28sp" /> + android:textSize="28sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_wl_app.xml b/app/src/main/res/layout/item_wl_app.xml index 0dc541f..834b0c6 100644 --- a/app/src/main/res/layout/item_wl_app.xml +++ b/app/src/main/res/layout/item_wl_app.xml @@ -19,5 +19,5 @@ android:layout_marginTop="5dp" android:gravity="center" android:textColor="#ffffff" - android:textSize="8dp" /> + android:textSize="8sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_yw_app.xml b/app/src/main/res/layout/item_yw_app.xml index f1ce8e5..d2c7eae 100644 --- a/app/src/main/res/layout/item_yw_app.xml +++ b/app/src/main/res/layout/item_yw_app.xml @@ -19,5 +19,5 @@ android:layout_marginTop="5dp" android:gravity="center" android:textColor="#ffffff" - android:textSize="9dp" /> + android:textSize="9sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_daily_tasks.xml b/app/src/main/res/layout/layout_daily_tasks.xml index e5805eb..64bf1df 100644 --- a/app/src/main/res/layout/layout_daily_tasks.xml +++ b/app/src/main/res/layout/layout_daily_tasks.xml @@ -25,7 +25,7 @@ android:layout_gravity="center_vertical" android:text="每日任务" android:textColor="@color/white" - android:textSize="12dp" + android:textSize="12sp" android:textStyle="bold" /> + android:textSize="9sp" /> + android:textSize="9sp" /> + android:textSize="8sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/layout_jiesao.xml b/app/src/main/res/layout/layout_jiesao.xml index 763342b..71e1f6c 100644 --- a/app/src/main/res/layout/layout_jiesao.xml +++ b/app/src/main/res/layout/layout_jiesao.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:text="1.每天浇水一次,可增加300点经验值;" android:textColor="#ffffff" - android:textSize="8dp" /> + android:textSize="8sp" /> + android:textSize="8sp" /> + android:textSize="8sp" /> + android:textSize="8sp" /> @@ -91,7 +91,7 @@ android:paddingBottom="6dp" android:text="今天已经浇过水了哦!明天再来吧!" android:textColor="#ffffff" - android:textSize="8dp" + android:textSize="8sp" android:visibility="gone" /> + android:textSize="8sp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/toast_text_layout.xml b/app/src/main/res/layout/toast_text_layout.xml index b3cf6b4..8fdaf16 100644 --- a/app/src/main/res/layout/toast_text_layout.xml +++ b/app/src/main/res/layout/toast_text_layout.xml @@ -16,5 +16,5 @@ android:paddingBottom="9dp" android:text="Toast" android:textColor="@android:color/white" - android:textSize="20dp" /> + android:textSize="20sp" />