diff --git a/app/build.gradle b/app/build.gradle index 1984983..16d4b84 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { minSdkVersion 24 targetSdkVersion 29 - versionCode 101 - versionName "2.1.0" + versionCode 104 + versionName "2.1.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/com/uiui/zyos/utils/IconUtils.java b/app/src/main/java/com/uiui/zyos/utils/IconUtils.java index 14ed74a..ef70022 100644 --- a/app/src/main/java/com/uiui/zyos/utils/IconUtils.java +++ b/app/src/main/java/com/uiui/zyos/utils/IconUtils.java @@ -42,6 +42,7 @@ public class IconUtils { // this.add("com.ss.android.ugc.aweme");//抖音 // this.add("com.ss.android.article.news");//头条 // this.add("com.tencent.mm");//微信 + this.add("com.jxw.yyhb"); }}; public static List appIconList = new ArrayList() {{ @@ -80,6 +81,7 @@ public class IconUtils { // this.add("com_android_aweme2"); // this.add("com_android_news2"); // this.add("com_tencent_mm2"); + this.add("com_jxw_yyhb"); }}; public static List appIconList2 = new ArrayList() {{ diff --git a/app/src/main/java/com/uiui/zyos/utils/Utils.java b/app/src/main/java/com/uiui/zyos/utils/Utils.java index a3850f9..f6fd4be 100644 --- a/app/src/main/java/com/uiui/zyos/utils/Utils.java +++ b/app/src/main/java/com/uiui/zyos/utils/Utils.java @@ -255,20 +255,23 @@ public class Utils { if ("U807".equals(BuildConfig.platform) && ApkUtils.isAvailable(context, "com.uiuipad.os")) { RemoteManager.getInstance().setDefaultDesktop("com.uiuipad.os"); } else { -// RemoteManager.getInstance().setDefaultDesktop(ApkUtils.ANDROID_LAUNCHER3_PACKAGE_NAME); + RemoteManager.getInstance().setDefaultDesktop(ApkUtils.ANDROID_LAUNCHER3_PACKAGE_NAME); } if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) { if ("U807".equals(BuildConfig.platform) && ApkUtils.isAvailable(context, "com.uiuipad.os")) { + if (!ApkUtils.openPackage(context, "com.uiuipad.os", "com.uiuipad.os.Launcher")) { ApkUtils.gotoLauncher(context); } } else { + if (!ApkUtils.openPackage(context, ApkUtils.ANDROID_LAUNCHER3_PACKAGE_NAME, ApkUtils.ANDROID_LAUNCHER3_Quickstep_CLASS_NAME)) { ApkUtils.gotoLauncher(context); } } } else { + if (!ApkUtils.openPackage(context, ApkUtils.ANDROID_LAUNCHER3_PACKAGE_NAME, ApkUtils.ANDROID_LAUNCHER3_CLASS_NAME)) { ApkUtils.gotoLauncher(context); } diff --git a/app/src/main/res/drawable-hdpi/applet_qrcode.png b/app/src/main/res/drawable-hdpi/applet_qrcode.png index 1ac5538..e7a0349 100644 Binary files a/app/src/main/res/drawable-hdpi/applet_qrcode.png and b/app/src/main/res/drawable-hdpi/applet_qrcode.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_appstore.png b/app/src/main/res/drawable-hdpi/com_android_appstore.png index 9114f6c..524281c 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_appstore.png and b/app/src/main/res/drawable-hdpi/com_android_appstore.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_browser.png b/app/src/main/res/drawable-hdpi/com_android_browser.png index 88c6727..a228557 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_browser.png and b/app/src/main/res/drawable-hdpi/com_android_browser.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_calculator2.png b/app/src/main/res/drawable-hdpi/com_android_calculator2.png index f0c70af..6d12cc1 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_calculator2.png and b/app/src/main/res/drawable-hdpi/com_android_calculator2.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_camera.png b/app/src/main/res/drawable-hdpi/com_android_camera.png index 9a86f9d..bc4fda2 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_camera.png and b/app/src/main/res/drawable-hdpi/com_android_camera.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_dialer.png b/app/src/main/res/drawable-hdpi/com_android_dialer.png index c80fb2b..842ddbc 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_dialer.png and b/app/src/main/res/drawable-hdpi/com_android_dialer.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_gallery3d_app.png b/app/src/main/res/drawable-hdpi/com_android_gallery3d_app.png index e5fa2be..06ae1cd 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_gallery3d_app.png and b/app/src/main/res/drawable-hdpi/com_android_gallery3d_app.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_mms_ui.png b/app/src/main/res/drawable-hdpi/com_android_mms_ui.png index 40e2e1b..9b208be 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_mms_ui.png and b/app/src/main/res/drawable-hdpi/com_android_mms_ui.png differ diff --git a/app/src/main/res/drawable-hdpi/com_android_settings.png b/app/src/main/res/drawable-hdpi/com_android_settings.png index 8b9a273..6897fa0 100644 Binary files a/app/src/main/res/drawable-hdpi/com_android_settings.png and b/app/src/main/res/drawable-hdpi/com_android_settings.png differ diff --git a/app/src/main/res/drawable-hdpi/com_jxw_examsystem.png b/app/src/main/res/drawable-hdpi/com_jxw_examsystem.png index 4a38648..f19f415 100644 Binary files a/app/src/main/res/drawable-hdpi/com_jxw_examsystem.png and b/app/src/main/res/drawable-hdpi/com_jxw_examsystem.png differ diff --git a/app/src/main/res/drawable-hdpi/com_jxw_usagedate.png b/app/src/main/res/drawable-hdpi/com_jxw_usagedate.png index df7da0d..94b79a0 100644 Binary files a/app/src/main/res/drawable-hdpi/com_jxw_usagedate.png and b/app/src/main/res/drawable-hdpi/com_jxw_usagedate.png differ diff --git a/app/src/main/res/drawable-hdpi/com_jxw_yyhb.png b/app/src/main/res/drawable-hdpi/com_jxw_yyhb.png new file mode 100644 index 0000000..99ab2fc Binary files /dev/null and b/app/src/main/res/drawable-hdpi/com_jxw_yyhb.png differ diff --git a/app/src/main/res/drawable-hdpi/com_mediatek_filemanager.png b/app/src/main/res/drawable-hdpi/com_mediatek_filemanager.png index 0efa11e..173f809 100644 Binary files a/app/src/main/res/drawable-hdpi/com_mediatek_filemanager.png and b/app/src/main/res/drawable-hdpi/com_mediatek_filemanager.png differ diff --git a/app/src/main/res/drawable-hdpi/com_system_huyan.png b/app/src/main/res/drawable-hdpi/com_system_huyan.png index d3ce237..16e9706 100644 Binary files a/app/src/main/res/drawable-hdpi/com_system_huyan.png and b/app/src/main/res/drawable-hdpi/com_system_huyan.png differ diff --git a/app/src/main/res/drawable-hdpi/com_system_youer.png b/app/src/main/res/drawable-hdpi/com_system_youer.png index ff006f8..5c6f957 100644 Binary files a/app/src/main/res/drawable-hdpi/com_system_youer.png and b/app/src/main/res/drawable-hdpi/com_system_youer.png differ diff --git a/app/src/main/res/drawable-hdpi/com_uiui_sn.png b/app/src/main/res/drawable-hdpi/com_uiui_sn.png index 09f4b7f..9f4fa63 100644 Binary files a/app/src/main/res/drawable-hdpi/com_uiui_sn.png and b/app/src/main/res/drawable-hdpi/com_uiui_sn.png differ diff --git a/app/src/main/res/drawable-hdpi/exit_icon.png b/app/src/main/res/drawable-hdpi/exit_icon.png index 180d8d3..6a6c8bf 100644 Binary files a/app/src/main/res/drawable-hdpi/exit_icon.png and b/app/src/main/res/drawable-hdpi/exit_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/icon_dict.png b/app/src/main/res/drawable-hdpi/icon_dict.png index 9e07b22..295e236 100644 Binary files a/app/src/main/res/drawable-hdpi/icon_dict.png and b/app/src/main/res/drawable-hdpi/icon_dict.png differ diff --git a/app/src/main/res/drawable-hdpi/icon_souti.png b/app/src/main/res/drawable-hdpi/icon_souti.png index aca06e2..574c47e 100644 Binary files a/app/src/main/res/drawable-hdpi/icon_souti.png and b/app/src/main/res/drawable-hdpi/icon_souti.png differ diff --git a/app/src/main/res/drawable-hdpi/icon_update.png b/app/src/main/res/drawable-hdpi/icon_update.png index 30cfe7d..3ccd4ac 100644 Binary files a/app/src/main/res/drawable-hdpi/icon_update.png and b/app/src/main/res/drawable-hdpi/icon_update.png differ diff --git a/app/src/main/res/drawable-hdpi/icon_video.png b/app/src/main/res/drawable-hdpi/icon_video.png index 2704e3e..22882ef 100644 Binary files a/app/src/main/res/drawable-hdpi/icon_video.png and b/app/src/main/res/drawable-hdpi/icon_video.png differ diff --git a/app/src/main/res/drawable-hdpi/jxw_update.png b/app/src/main/res/drawable-hdpi/jxw_update.png index 32be015..ce6fec7 100644 Binary files a/app/src/main/res/drawable-hdpi/jxw_update.png and b/app/src/main/res/drawable-hdpi/jxw_update.png differ diff --git a/app/src/main/res/drawable-hdpi/service_icon.png b/app/src/main/res/drawable-hdpi/service_icon.png index ccedb9e..cdf3d46 100644 Binary files a/app/src/main/res/drawable-hdpi/service_icon.png and b/app/src/main/res/drawable-hdpi/service_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/uiui_zybrowser.png b/app/src/main/res/drawable-hdpi/uiui_zybrowser.png index f0ed38d..bbfc753 100644 Binary files a/app/src/main/res/drawable-hdpi/uiui_zybrowser.png and b/app/src/main/res/drawable-hdpi/uiui_zybrowser.png differ diff --git a/app/src/main/res/drawable-hdpi/wechat_bind_process.png b/app/src/main/res/drawable-hdpi/wechat_bind_process.png index 568fd26..7bbfd7f 100644 Binary files a/app/src/main/res/drawable-hdpi/wechat_bind_process.png and b/app/src/main/res/drawable-hdpi/wechat_bind_process.png differ diff --git a/app/src/main/res/drawable-hdpi/zhidu_icon.png b/app/src/main/res/drawable-hdpi/zhidu_icon.png index 0b4cd9b..f0d590f 100644 Binary files a/app/src/main/res/drawable-hdpi/zhidu_icon.png and b/app/src/main/res/drawable-hdpi/zhidu_icon.png differ diff --git a/app/src/main/res/drawable-hdpi/zwpg_icon.png b/app/src/main/res/drawable-hdpi/zwpg_icon.png index b1ea33a..60f35e5 100644 Binary files a/app/src/main/res/drawable-hdpi/zwpg_icon.png and b/app/src/main/res/drawable-hdpi/zwpg_icon.png differ diff --git a/app/src/main/res/drawable-xhdpi/biological_fine_volume.png b/app/src/main/res/drawable-xhdpi/biological_fine_volume.png index 8368676..8de98c7 100644 Binary files a/app/src/main/res/drawable-xhdpi/biological_fine_volume.png and b/app/src/main/res/drawable-xhdpi/biological_fine_volume.png differ diff --git a/app/src/main/res/drawable-xhdpi/biology_box.png b/app/src/main/res/drawable-xhdpi/biology_box.png index 23f2bbd..0e5e204 100644 Binary files a/app/src/main/res/drawable-xhdpi/biology_box.png and b/app/src/main/res/drawable-xhdpi/biology_box.png differ diff --git a/app/src/main/res/drawable-xhdpi/biology_laboratory.png b/app/src/main/res/drawable-xhdpi/biology_laboratory.png index e0a8af2..0745315 100644 Binary files a/app/src/main/res/drawable-xhdpi/biology_laboratory.png and b/app/src/main/res/drawable-xhdpi/biology_laboratory.png differ diff --git a/app/src/main/res/drawable-xhdpi/biology_synchronous_explanation.png b/app/src/main/res/drawable-xhdpi/biology_synchronous_explanation.png index 3d0ccb0..17874ef 100644 Binary files a/app/src/main/res/drawable-xhdpi/biology_synchronous_explanation.png and b/app/src/main/res/drawable-xhdpi/biology_synchronous_explanation.png differ diff --git a/app/src/main/res/drawable-xhdpi/biology_unit_testing.png b/app/src/main/res/drawable-xhdpi/biology_unit_testing.png index d7dff65..16d53f7 100644 Binary files a/app/src/main/res/drawable-xhdpi/biology_unit_testing.png and b/app/src/main/res/drawable-xhdpi/biology_unit_testing.png differ diff --git a/app/src/main/res/drawable-xhdpi/chemical_box.png b/app/src/main/res/drawable-xhdpi/chemical_box.png index 904a9cb..11a103e 100644 Binary files a/app/src/main/res/drawable-xhdpi/chemical_box.png and b/app/src/main/res/drawable-xhdpi/chemical_box.png differ diff --git a/app/src/main/res/drawable-xhdpi/chemical_fine_volume.png b/app/src/main/res/drawable-xhdpi/chemical_fine_volume.png index 5321cd2..167b019 100644 Binary files a/app/src/main/res/drawable-xhdpi/chemical_fine_volume.png and b/app/src/main/res/drawable-xhdpi/chemical_fine_volume.png differ diff --git a/app/src/main/res/drawable-xhdpi/chemical_lab.png b/app/src/main/res/drawable-xhdpi/chemical_lab.png index 03813ad..af5a086 100644 Binary files a/app/src/main/res/drawable-xhdpi/chemical_lab.png and b/app/src/main/res/drawable-xhdpi/chemical_lab.png differ diff --git a/app/src/main/res/drawable-xhdpi/chemical_synchronous_explanation.png b/app/src/main/res/drawable-xhdpi/chemical_synchronous_explanation.png index 201e4bd..de14ea7 100644 Binary files a/app/src/main/res/drawable-xhdpi/chemical_synchronous_explanation.png and b/app/src/main/res/drawable-xhdpi/chemical_synchronous_explanation.png differ diff --git a/app/src/main/res/drawable-xhdpi/chemical_synchronous_tutoring.png b/app/src/main/res/drawable-xhdpi/chemical_synchronous_tutoring.png index 7ffa38f..0125847 100644 Binary files a/app/src/main/res/drawable-xhdpi/chemical_synchronous_tutoring.png and b/app/src/main/res/drawable-xhdpi/chemical_synchronous_tutoring.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_box.png b/app/src/main/res/drawable-xhdpi/chinese_box.png index 052118b..bd8b84b 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_box.png and b/app/src/main/res/drawable-xhdpi/chinese_box.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_card_bg.png b/app/src/main/res/drawable-xhdpi/chinese_card_bg.png new file mode 100644 index 0000000..29d7149 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/chinese_card_bg.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_character.png b/app/src/main/res/drawable-xhdpi/chinese_character.png index 03aaee4..499aba3 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_character.png and b/app/src/main/res/drawable-xhdpi/chinese_character.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_classical.png b/app/src/main/res/drawable-xhdpi/chinese_classical.png index 1f7be21..031f444 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_classical.png and b/app/src/main/res/drawable-xhdpi/chinese_classical.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_excellent_volume.png b/app/src/main/res/drawable-xhdpi/chinese_excellent_volume.png index 8f96665..953bd92 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_excellent_volume.png and b/app/src/main/res/drawable-xhdpi/chinese_excellent_volume.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_featured_reading.png b/app/src/main/res/drawable-xhdpi/chinese_featured_reading.png index 6a7552b..311363e 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_featured_reading.png and b/app/src/main/res/drawable-xhdpi/chinese_featured_reading.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_near_antonyms.png b/app/src/main/res/drawable-xhdpi/chinese_near_antonyms.png index 526c736..99cd130 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_near_antonyms.png and b/app/src/main/res/drawable-xhdpi/chinese_near_antonyms.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_order_rules.png b/app/src/main/res/drawable-xhdpi/chinese_order_rules.png index 40fb0cf..b7d77cd 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_order_rules.png and b/app/src/main/res/drawable-xhdpi/chinese_order_rules.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_pinyin_learning.png b/app/src/main/res/drawable-xhdpi/chinese_pinyin_learning.png index 8e36b87..eb32e74 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_pinyin_learning.png and b/app/src/main/res/drawable-xhdpi/chinese_pinyin_learning.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_poetry_world.png b/app/src/main/res/drawable-xhdpi/chinese_poetry_world.png index 021648a..fbf2380 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_poetry_world.png and b/app/src/main/res/drawable-xhdpi/chinese_poetry_world.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_precision_science.png b/app/src/main/res/drawable-xhdpi/chinese_precision_science.png index 083d52f..776d230 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_precision_science.png and b/app/src/main/res/drawable-xhdpi/chinese_precision_science.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_punctuation.png b/app/src/main/res/drawable-xhdpi/chinese_punctuation.png index 9000c77..7dbaa25 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_punctuation.png and b/app/src/main/res/drawable-xhdpi/chinese_punctuation.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_radicals.png b/app/src/main/res/drawable-xhdpi/chinese_radicals.png index 2d14be3..15dbdbb 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_radicals.png and b/app/src/main/res/drawable-xhdpi/chinese_radicals.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_read_composition.png b/app/src/main/res/drawable-xhdpi/chinese_read_composition.png index 9c5c1d0..ca21e76 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_read_composition.png and b/app/src/main/res/drawable-xhdpi/chinese_read_composition.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_reading_improvement.png b/app/src/main/res/drawable-xhdpi/chinese_reading_improvement.png index f3d65aa..15267e4 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_reading_improvement.png and b/app/src/main/res/drawable-xhdpi/chinese_reading_improvement.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_rhetoric.png b/app/src/main/res/drawable-xhdpi/chinese_rhetoric.png index c9c7c63..69a161b 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_rhetoric.png and b/app/src/main/res/drawable-xhdpi/chinese_rhetoric.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_stroke_name.png b/app/src/main/res/drawable-xhdpi/chinese_stroke_name.png index 9a83582..27eda8d 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_stroke_name.png and b/app/src/main/res/drawable-xhdpi/chinese_stroke_name.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_synchronous_explanation.png b/app/src/main/res/drawable-xhdpi/chinese_synchronous_explanation.png index 2492dcf..fd1d52d 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_synchronous_explanation.png and b/app/src/main/res/drawable-xhdpi/chinese_synchronous_explanation.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_synchronous_tutoring.png b/app/src/main/res/drawable-xhdpi/chinese_synchronous_tutoring.png index 59a79ac..9744691 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_synchronous_tutoring.png and b/app/src/main/res/drawable-xhdpi/chinese_synchronous_tutoring.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_treasure.png b/app/src/main/res/drawable-xhdpi/chinese_treasure.png index de59ac8..3edd40d 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_treasure.png and b/app/src/main/res/drawable-xhdpi/chinese_treasure.png differ diff --git a/app/src/main/res/drawable-xhdpi/chinese_writing.png b/app/src/main/res/drawable-xhdpi/chinese_writing.png index 96abe86..e1e49bd 100644 Binary files a/app/src/main/res/drawable-xhdpi/chinese_writing.png and b/app/src/main/res/drawable-xhdpi/chinese_writing.png differ diff --git a/app/src/main/res/drawable-xhdpi/complex_book.png b/app/src/main/res/drawable-xhdpi/complex_book.png index 55062d7..3a3f718 100644 Binary files a/app/src/main/res/drawable-xhdpi/complex_book.png and b/app/src/main/res/drawable-xhdpi/complex_book.png differ diff --git a/app/src/main/res/drawable-xhdpi/complex_box.png b/app/src/main/res/drawable-xhdpi/complex_box.png index 64f1374..c7dee3b 100644 Binary files a/app/src/main/res/drawable-xhdpi/complex_box.png and b/app/src/main/res/drawable-xhdpi/complex_box.png differ diff --git a/app/src/main/res/drawable-xhdpi/complex_famous_teacher.png b/app/src/main/res/drawable-xhdpi/complex_famous_teacher.png index 2c266ef..6bcfdfd 100644 Binary files a/app/src/main/res/drawable-xhdpi/complex_famous_teacher.png and b/app/src/main/res/drawable-xhdpi/complex_famous_teacher.png differ diff --git a/app/src/main/res/drawable-xhdpi/complex_geography_box.png b/app/src/main/res/drawable-xhdpi/complex_geography_box.png index 7ef3a42..d1d5588 100644 Binary files a/app/src/main/res/drawable-xhdpi/complex_geography_box.png and b/app/src/main/res/drawable-xhdpi/complex_geography_box.png differ diff --git a/app/src/main/res/drawable-xhdpi/complex_history_box.png b/app/src/main/res/drawable-xhdpi/complex_history_box.png index 2f06e8d..826d061 100644 Binary files a/app/src/main/res/drawable-xhdpi/complex_history_box.png and b/app/src/main/res/drawable-xhdpi/complex_history_box.png differ diff --git a/app/src/main/res/drawable-xhdpi/complex_knowledge_video.png b/app/src/main/res/drawable-xhdpi/complex_knowledge_video.png index f80f9b2..0aee829 100644 Binary files a/app/src/main/res/drawable-xhdpi/complex_knowledge_video.png and b/app/src/main/res/drawable-xhdpi/complex_knowledge_video.png differ diff --git a/app/src/main/res/drawable-xhdpi/complex_politics_box.png b/app/src/main/res/drawable-xhdpi/complex_politics_box.png index c284500..1777ed2 100644 Binary files a/app/src/main/res/drawable-xhdpi/complex_politics_box.png and b/app/src/main/res/drawable-xhdpi/complex_politics_box.png differ diff --git a/app/src/main/res/drawable-xhdpi/complex_science_box.png b/app/src/main/res/drawable-xhdpi/complex_science_box.png index 7f0314e..3ad8198 100644 Binary files a/app/src/main/res/drawable-xhdpi/complex_science_box.png and b/app/src/main/res/drawable-xhdpi/complex_science_box.png differ diff --git a/app/src/main/res/drawable-xhdpi/complex_video.png b/app/src/main/res/drawable-xhdpi/complex_video.png index b6213be..fe8d23d 100644 Binary files a/app/src/main/res/drawable-xhdpi/complex_video.png and b/app/src/main/res/drawable-xhdpi/complex_video.png differ diff --git a/app/src/main/res/drawable-xhdpi/endlish_jcxx_ywzm.png b/app/src/main/res/drawable-xhdpi/endlish_jcxx_ywzm.png index c6b12d2..d1a1100 100644 Binary files a/app/src/main/res/drawable-xhdpi/endlish_jcxx_ywzm.png and b/app/src/main/res/drawable-xhdpi/endlish_jcxx_ywzm.png differ diff --git a/app/src/main/res/drawable-xhdpi/english_box.png b/app/src/main/res/drawable-xhdpi/english_box.png index bacc375..150630d 100644 Binary files a/app/src/main/res/drawable-xhdpi/english_box.png and b/app/src/main/res/drawable-xhdpi/english_box.png differ diff --git a/app/src/main/res/drawable-xhdpi/english_explanation.png b/app/src/main/res/drawable-xhdpi/english_explanation.png index a5ef061..c4da6e9 100644 Binary files a/app/src/main/res/drawable-xhdpi/english_explanation.png and b/app/src/main/res/drawable-xhdpi/english_explanation.png differ diff --git a/app/src/main/res/drawable-xhdpi/english_ice_grammar.png b/app/src/main/res/drawable-xhdpi/english_ice_grammar.png index 233733e..4459707 100644 Binary files a/app/src/main/res/drawable-xhdpi/english_ice_grammar.png and b/app/src/main/res/drawable-xhdpi/english_ice_grammar.png differ diff --git a/app/src/main/res/drawable-xhdpi/english_into_sentence.png b/app/src/main/res/drawable-xhdpi/english_into_sentence.png index 7c36f7c..9807c1b 100644 Binary files a/app/src/main/res/drawable-xhdpi/english_into_sentence.png and b/app/src/main/res/drawable-xhdpi/english_into_sentence.png differ diff --git a/app/src/main/res/drawable-xhdpi/english_jcxx_yych.png b/app/src/main/res/drawable-xhdpi/english_jcxx_yych.png index 086b053..5cc0a93 100644 Binary files a/app/src/main/res/drawable-xhdpi/english_jcxx_yych.png and b/app/src/main/res/drawable-xhdpi/english_jcxx_yych.png differ diff --git a/app/src/main/res/drawable-xhdpi/english_jcyy_jcyy.png b/app/src/main/res/drawable-xhdpi/english_jcyy_jcyy.png index ad250f7..eafc974 100644 Binary files a/app/src/main/res/drawable-xhdpi/english_jcyy_jcyy.png and b/app/src/main/res/drawable-xhdpi/english_jcyy_jcyy.png differ diff --git a/app/src/main/res/drawable-xhdpi/english_listen_and_speak_special.png b/app/src/main/res/drawable-xhdpi/english_listen_and_speak_special.png index 4f623af..ce3d45d 100644 Binary files a/app/src/main/res/drawable-xhdpi/english_listen_and_speak_special.png and b/app/src/main/res/drawable-xhdpi/english_listen_and_speak_special.png differ diff --git a/app/src/main/res/drawable-xhdpi/english_listen_read.png b/app/src/main/res/drawable-xhdpi/english_listen_read.png index 01774f9..229eec6 100644 Binary files a/app/src/main/res/drawable-xhdpi/english_listen_read.png and b/app/src/main/res/drawable-xhdpi/english_listen_read.png differ diff --git a/app/src/main/res/drawable-xhdpi/english_phonetic_alphabet.png b/app/src/main/res/drawable-xhdpi/english_phonetic_alphabet.png index ec4d2bf..1ce1699 100644 Binary files a/app/src/main/res/drawable-xhdpi/english_phonetic_alphabet.png and b/app/src/main/res/drawable-xhdpi/english_phonetic_alphabet.png differ diff --git a/app/src/main/res/drawable-xhdpi/english_precision_learning.png b/app/src/main/res/drawable-xhdpi/english_precision_learning.png index a848c7f..b48f4c8 100644 Binary files a/app/src/main/res/drawable-xhdpi/english_precision_learning.png and b/app/src/main/res/drawable-xhdpi/english_precision_learning.png differ diff --git a/app/src/main/res/drawable-xhdpi/english_remember_words.png b/app/src/main/res/drawable-xhdpi/english_remember_words.png index 5fea548..09c69fc 100644 Binary files a/app/src/main/res/drawable-xhdpi/english_remember_words.png and b/app/src/main/res/drawable-xhdpi/english_remember_words.png differ diff --git a/app/src/main/res/drawable-xhdpi/english_sentence_patterns.png b/app/src/main/res/drawable-xhdpi/english_sentence_patterns.png index 29b8462..c67c9f5 100644 Binary files a/app/src/main/res/drawable-xhdpi/english_sentence_patterns.png and b/app/src/main/res/drawable-xhdpi/english_sentence_patterns.png differ diff --git a/app/src/main/res/drawable-xhdpi/english_synchronous_vocabulary.png b/app/src/main/res/drawable-xhdpi/english_synchronous_vocabulary.png index 8d5eb10..bfb88d0 100644 Binary files a/app/src/main/res/drawable-xhdpi/english_synchronous_vocabulary.png and b/app/src/main/res/drawable-xhdpi/english_synchronous_vocabulary.png differ diff --git a/app/src/main/res/drawable-xhdpi/english_unit_practice.png b/app/src/main/res/drawable-xhdpi/english_unit_practice.png index f047ce2..aa9e983 100644 Binary files a/app/src/main/res/drawable-xhdpi/english_unit_practice.png and b/app/src/main/res/drawable-xhdpi/english_unit_practice.png differ diff --git a/app/src/main/res/drawable-xhdpi/english_writing.png b/app/src/main/res/drawable-xhdpi/english_writing.png index 808f125..0ca426e 100644 Binary files a/app/src/main/res/drawable-xhdpi/english_writing.png and b/app/src/main/res/drawable-xhdpi/english_writing.png differ diff --git a/app/src/main/res/drawable-xhdpi/main_background.png b/app/src/main/res/drawable-xhdpi/main_background.png index c3cf345..4c44b37 100644 Binary files a/app/src/main/res/drawable-xhdpi/main_background.png and b/app/src/main/res/drawable-xhdpi/main_background.png differ diff --git a/app/src/main/res/drawable-xhdpi/math_arithmetic.png b/app/src/main/res/drawable-xhdpi/math_arithmetic.png index 6d4402c..0cbc9dc 100644 Binary files a/app/src/main/res/drawable-xhdpi/math_arithmetic.png and b/app/src/main/res/drawable-xhdpi/math_arithmetic.png differ diff --git a/app/src/main/res/drawable-xhdpi/math_box.png b/app/src/main/res/drawable-xhdpi/math_box.png index 8997149..8f0825d 100644 Binary files a/app/src/main/res/drawable-xhdpi/math_box.png and b/app/src/main/res/drawable-xhdpi/math_box.png differ diff --git a/app/src/main/res/drawable-xhdpi/math_card_bg.png b/app/src/main/res/drawable-xhdpi/math_card_bg.png new file mode 100644 index 0000000..d6662fc Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/math_card_bg.png differ diff --git a/app/src/main/res/drawable-xhdpi/math_encyclopedia.png b/app/src/main/res/drawable-xhdpi/math_encyclopedia.png index 6764cef..867e9d7 100644 Binary files a/app/src/main/res/drawable-xhdpi/math_encyclopedia.png and b/app/src/main/res/drawable-xhdpi/math_encyclopedia.png differ diff --git a/app/src/main/res/drawable-xhdpi/math_equation_solution.png b/app/src/main/res/drawable-xhdpi/math_equation_solution.png index e786601..c7f7c8f 100644 Binary files a/app/src/main/res/drawable-xhdpi/math_equation_solution.png and b/app/src/main/res/drawable-xhdpi/math_equation_solution.png differ diff --git a/app/src/main/res/drawable-xhdpi/math_excellent_volume.png b/app/src/main/res/drawable-xhdpi/math_excellent_volume.png index e903a26..bb19ee6 100644 Binary files a/app/src/main/res/drawable-xhdpi/math_excellent_volume.png and b/app/src/main/res/drawable-xhdpi/math_excellent_volume.png differ diff --git a/app/src/main/res/drawable-xhdpi/math_formula.png b/app/src/main/res/drawable-xhdpi/math_formula.png index 0efdba8..59f3a3d 100644 Binary files a/app/src/main/res/drawable-xhdpi/math_formula.png and b/app/src/main/res/drawable-xhdpi/math_formula.png differ diff --git a/app/src/main/res/drawable-xhdpi/math_number.png b/app/src/main/res/drawable-xhdpi/math_number.png index 1e21acb..2694413 100644 Binary files a/app/src/main/res/drawable-xhdpi/math_number.png and b/app/src/main/res/drawable-xhdpi/math_number.png differ diff --git a/app/src/main/res/drawable-xhdpi/math_olympiad_training.png b/app/src/main/res/drawable-xhdpi/math_olympiad_training.png index 2274251..b4507e2 100644 Binary files a/app/src/main/res/drawable-xhdpi/math_olympiad_training.png and b/app/src/main/res/drawable-xhdpi/math_olympiad_training.png differ diff --git a/app/src/main/res/drawable-xhdpi/math_problem_training.png b/app/src/main/res/drawable-xhdpi/math_problem_training.png index 8541b0b..1211ef1 100644 Binary files a/app/src/main/res/drawable-xhdpi/math_problem_training.png and b/app/src/main/res/drawable-xhdpi/math_problem_training.png differ diff --git a/app/src/main/res/drawable-xhdpi/math_synchronous_explanation.png b/app/src/main/res/drawable-xhdpi/math_synchronous_explanation.png index ef6e76f..07702be 100644 Binary files a/app/src/main/res/drawable-xhdpi/math_synchronous_explanation.png and b/app/src/main/res/drawable-xhdpi/math_synchronous_explanation.png differ diff --git a/app/src/main/res/drawable-xhdpi/math_synchronous_tutoring.png b/app/src/main/res/drawable-xhdpi/math_synchronous_tutoring.png index e10ecd2..650799e 100644 Binary files a/app/src/main/res/drawable-xhdpi/math_synchronous_tutoring.png and b/app/src/main/res/drawable-xhdpi/math_synchronous_tutoring.png differ diff --git a/app/src/main/res/drawable-xhdpi/mathematical_basis.png b/app/src/main/res/drawable-xhdpi/mathematical_basis.png index 1a68219..99199cc 100644 Binary files a/app/src/main/res/drawable-xhdpi/mathematical_basis.png and b/app/src/main/res/drawable-xhdpi/mathematical_basis.png differ diff --git a/app/src/main/res/drawable-xhdpi/physical_box.png b/app/src/main/res/drawable-xhdpi/physical_box.png index a62d575..a138afd 100644 Binary files a/app/src/main/res/drawable-xhdpi/physical_box.png and b/app/src/main/res/drawable-xhdpi/physical_box.png differ diff --git a/app/src/main/res/drawable-xhdpi/physical_fine_volume.png b/app/src/main/res/drawable-xhdpi/physical_fine_volume.png index c2ad99a..cbbe125 100644 Binary files a/app/src/main/res/drawable-xhdpi/physical_fine_volume.png and b/app/src/main/res/drawable-xhdpi/physical_fine_volume.png differ diff --git a/app/src/main/res/drawable-xhdpi/physical_lab.png b/app/src/main/res/drawable-xhdpi/physical_lab.png index 466f79f..d684873 100644 Binary files a/app/src/main/res/drawable-xhdpi/physical_lab.png and b/app/src/main/res/drawable-xhdpi/physical_lab.png differ diff --git a/app/src/main/res/drawable-xhdpi/physical_synchronous_explanation.png b/app/src/main/res/drawable-xhdpi/physical_synchronous_explanation.png index 388e82c..73f311b 100644 Binary files a/app/src/main/res/drawable-xhdpi/physical_synchronous_explanation.png and b/app/src/main/res/drawable-xhdpi/physical_synchronous_explanation.png differ diff --git a/app/src/main/res/drawable-xhdpi/physical_unit_tests.png b/app/src/main/res/drawable-xhdpi/physical_unit_tests.png index 4b2214e..e932dd1 100644 Binary files a/app/src/main/res/drawable-xhdpi/physical_unit_tests.png and b/app/src/main/res/drawable-xhdpi/physical_unit_tests.png differ diff --git a/app/src/main/res/drawable-xhdpi/precision_box.png b/app/src/main/res/drawable-xhdpi/precision_box.png index 7740287..257ee3e 100644 Binary files a/app/src/main/res/drawable-xhdpi/precision_box.png and b/app/src/main/res/drawable-xhdpi/precision_box.png differ diff --git a/app/src/main/res/drawable-xhdpi/precision_favorites.png b/app/src/main/res/drawable-xhdpi/precision_favorites.png index 2d4e304..824dea3 100644 Binary files a/app/src/main/res/drawable-xhdpi/precision_favorites.png and b/app/src/main/res/drawable-xhdpi/precision_favorites.png differ diff --git a/app/src/main/res/drawable-xhdpi/precision_question_bank.png b/app/src/main/res/drawable-xhdpi/precision_question_bank.png index 98a2c57..a5e1d7b 100644 Binary files a/app/src/main/res/drawable-xhdpi/precision_question_bank.png and b/app/src/main/res/drawable-xhdpi/precision_question_bank.png differ diff --git a/app/src/main/res/drawable-xhdpi/precision_stage_test.png b/app/src/main/res/drawable-xhdpi/precision_stage_test.png index 56f12fe..7691551 100644 Binary files a/app/src/main/res/drawable-xhdpi/precision_stage_test.png and b/app/src/main/res/drawable-xhdpi/precision_stage_test.png differ diff --git a/app/src/main/res/drawable-xhdpi/precision_test_paper.png b/app/src/main/res/drawable-xhdpi/precision_test_paper.png index ee4ab24..2f5bda1 100644 Binary files a/app/src/main/res/drawable-xhdpi/precision_test_paper.png and b/app/src/main/res/drawable-xhdpi/precision_test_paper.png differ diff --git a/app/src/main/res/drawable-xhdpi/precision_wrong_book.png b/app/src/main/res/drawable-xhdpi/precision_wrong_book.png index c70b81d..5c1a601 100644 Binary files a/app/src/main/res/drawable-xhdpi/precision_wrong_book.png and b/app/src/main/res/drawable-xhdpi/precision_wrong_book.png differ diff --git a/app/src/main/res/drawable-xxhdpi/chinese_character.png b/app/src/main/res/drawable-xxhdpi/chinese_character.png new file mode 100644 index 0000000..fd631e0 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/chinese_character.png differ diff --git a/app/src/main/res/drawable-xxhdpi/chinese_classical.png b/app/src/main/res/drawable-xxhdpi/chinese_classical.png new file mode 100644 index 0000000..57fb60b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/chinese_classical.png differ diff --git a/app/src/main/res/drawable-xxhdpi/chinese_featured_reading.png b/app/src/main/res/drawable-xxhdpi/chinese_featured_reading.png new file mode 100644 index 0000000..3eeb49e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/chinese_featured_reading.png differ diff --git a/app/src/main/res/drawable-xxhdpi/chinese_near_antonyms.png b/app/src/main/res/drawable-xxhdpi/chinese_near_antonyms.png new file mode 100644 index 0000000..87ea0c7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/chinese_near_antonyms.png differ diff --git a/app/src/main/res/drawable-xxhdpi/chinese_punctuation.png b/app/src/main/res/drawable-xxhdpi/chinese_punctuation.png new file mode 100644 index 0000000..d9975d2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/chinese_punctuation.png differ diff --git a/app/src/main/res/drawable-xxhdpi/chinese_read_composition.png b/app/src/main/res/drawable-xxhdpi/chinese_read_composition.png new file mode 100644 index 0000000..1d582a7 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/chinese_read_composition.png differ diff --git a/app/src/main/res/drawable-xxhdpi/chinese_rhetoric.png b/app/src/main/res/drawable-xxhdpi/chinese_rhetoric.png new file mode 100644 index 0000000..3791efc Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/chinese_rhetoric.png differ diff --git a/app/src/main/res/drawable-xxhdpi/chinese_synchronous_tutoring.png b/app/src/main/res/drawable-xxhdpi/chinese_synchronous_tutoring.png new file mode 100644 index 0000000..4f8ae84 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/chinese_synchronous_tutoring.png differ diff --git a/app/src/main/res/drawable-xxhdpi/chinese_treasure.png b/app/src/main/res/drawable-xxhdpi/chinese_treasure.png new file mode 100644 index 0000000..8e1551f Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/chinese_treasure.png differ diff --git a/app/src/main/res/drawable-xxhdpi/math_arithmetic.png b/app/src/main/res/drawable-xxhdpi/math_arithmetic.png new file mode 100644 index 0000000..65cb4ff Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/math_arithmetic.png differ diff --git a/app/src/main/res/drawable-xxhdpi/math_encyclopedia.png b/app/src/main/res/drawable-xxhdpi/math_encyclopedia.png new file mode 100644 index 0000000..d814159 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/math_encyclopedia.png differ diff --git a/app/src/main/res/drawable-xxhdpi/math_equation_solution.png b/app/src/main/res/drawable-xxhdpi/math_equation_solution.png new file mode 100644 index 0000000..4ded0aa Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/math_equation_solution.png differ diff --git a/app/src/main/res/drawable-xxhdpi/math_formula.png b/app/src/main/res/drawable-xxhdpi/math_formula.png new file mode 100644 index 0000000..00c7cf2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/math_formula.png differ diff --git a/app/src/main/res/drawable-xxhdpi/math_number.png b/app/src/main/res/drawable-xxhdpi/math_number.png new file mode 100644 index 0000000..dd35a86 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/math_number.png differ diff --git a/app/src/main/res/drawable-xxhdpi/math_olympiad_training.png b/app/src/main/res/drawable-xxhdpi/math_olympiad_training.png new file mode 100644 index 0000000..ad57680 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/math_olympiad_training.png differ diff --git a/app/src/main/res/drawable-xxhdpi/math_problem_training.png b/app/src/main/res/drawable-xxhdpi/math_problem_training.png new file mode 100644 index 0000000..98479ac Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/math_problem_training.png differ diff --git a/app/src/main/res/drawable-xxhdpi/math_synchronous_tutoring.png b/app/src/main/res/drawable-xxhdpi/math_synchronous_tutoring.png new file mode 100644 index 0000000..4f3ac02 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/math_synchronous_tutoring.png differ diff --git a/app/src/main/res/drawable-xxhdpi/mathematical_basis.png b/app/src/main/res/drawable-xxhdpi/mathematical_basis.png new file mode 100644 index 0000000..cb1f21e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/mathematical_basis.png differ diff --git a/app/src/main/res/drawable/chinese_card_bg.xml b/app/src/main/res/drawable/chinese_card_bg.xml deleted file mode 100644 index b036056..0000000 --- a/app/src/main/res/drawable/chinese_card_bg.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_biology.xml b/app/src/main/res/layout/fragment_biology.xml index 7935c7a..d26284d 100644 --- a/app/src/main/res/layout/fragment_biology.xml +++ b/app/src/main/res/layout/fragment_biology.xml @@ -48,6 +48,7 @@ android:layout_marginTop="@dimen/dp_8" android:maxLines="1" android:text="同步学习" + android:visibility="gone" android:textColor="@color/white" android:textSize="@dimen/sp_14" app:layout_constraintBottom_toBottomOf="parent" @@ -61,6 +62,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:orientation="horizontal" + android:layout_marginTop="@dimen/dp_22" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/constraintLayout"> diff --git a/app/src/main/res/layout/fragment_chemical.xml b/app/src/main/res/layout/fragment_chemical.xml index 5108986..7994b04 100644 --- a/app/src/main/res/layout/fragment_chemical.xml +++ b/app/src/main/res/layout/fragment_chemical.xml @@ -46,6 +46,7 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" android:maxLines="1" + android:visibility="gone" android:text="同步学习" android:textColor="@color/white" android:textSize="@dimen/sp_14" @@ -60,6 +61,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:orientation="horizontal" + android:layout_marginTop="@dimen/dp_22" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/constraintLayout"> diff --git a/app/src/main/res/layout/fragment_chinese.xml b/app/src/main/res/layout/fragment_chinese.xml index b66bc23..b0f827a 100644 --- a/app/src/main/res/layout/fragment_chinese.xml +++ b/app/src/main/res/layout/fragment_chinese.xml @@ -60,6 +60,7 @@ android:layout_marginTop="@dimen/dp_8" android:maxLines="1" android:text="同步学习" + android:visibility="gone" android:textColor="@color/white" android:textSize="@dimen/sp_14" app:layout_constraintBottom_toBottomOf="parent" @@ -73,6 +74,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:orientation="horizontal" + android:layout_marginTop="@dimen/dp_22" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/constraintLayout"> diff --git a/app/src/main/res/layout/fragment_complex.xml b/app/src/main/res/layout/fragment_complex.xml index c2bddae..5b0ea68 100644 --- a/app/src/main/res/layout/fragment_complex.xml +++ b/app/src/main/res/layout/fragment_complex.xml @@ -39,6 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_8" + android:visibility="gone" android:text="综合学习" android:textColor="@color/white" android:textSize="@dimen/sp_14" @@ -57,6 +58,7 @@