From 256c52cfc80f82d69806eda37fc5bb033b545e2c Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Sat, 4 Nov 2023 09:43:30 +0800 Subject: [PATCH] =?UTF-8?q?version:1.6.6=20fix:=20update:=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 ++-- .../uiui/zyos/activity/main/MainActivity.java | 28 +++++++++---------- .../main/res/layout-land/fragment_biology.xml | 2 +- .../res/layout-land/fragment_chemical.xml | 2 +- .../main/res/layout-land/fragment_chinese.xml | 2 +- .../main/res/layout-land/fragment_complex.xml | 2 +- .../main/res/layout-land/fragment_english.xml | 4 +-- .../main/res/layout-land/fragment_math.xml | 2 +- .../main/res/layout-land/fragment_physics.xml | 2 +- .../res/layout-land/fragment_precision.xml | 2 +- .../main/res/layout-land/fragment_subject.xml | 8 +++--- .../main/res/layout-land/fragment_user.xml | 4 +-- 12 files changed, 33 insertions(+), 31 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 46fe89f..cd0b9c7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { minSdkVersion 24 targetSdkVersion 29 - versionCode 56 - versionName "1.6.4" + versionCode 58 + versionName "1.6.6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -118,6 +118,7 @@ android { minifyEnabled false //Zipalign优化 zipAlignEnabled true + buildConfigField "String", "platform", '"tuixin"' signingConfig signingConfigs.tuixin applicationVariants.all { variant -> variant.outputs.each { output -> @@ -140,6 +141,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' //签名 signingConfig signingConfigs.tuixin + buildConfigField "String", "platform", '"tuixin"' // 将release版本的包名重命名，加上版本及日期 applicationVariants.all { variant -> variant.outputs.each { output -> diff --git a/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java b/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java index face6e2..78f92de 100644 --- a/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java +++ b/app/src/main/java/com/uiui/zyos/activity/main/MainActivity.java @@ -288,20 +288,20 @@ public class MainActivity extends BaseActivity implements MainContact.MainView, } }); - ComponentName cn = new ComponentName("com.jxw.mskt.video", "com.jxw.mskt.video.VideoDownload"); - Intent intent = new Intent(); - intent.setComponent(cn); - intent.putExtra("type", "新东方专区"); - intent.putExtra("isCourse", false); - intent.putExtra("id", 23151); - intent.putExtra("name", "西游记"); - intent.addCategory(Intent.CATEGORY_LAUNCHER); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); - try { - startActivity(intent); - } catch (Exception e) { - Log.e(TAG, "openPackageWithArgs: " + e.getMessage()); - } +// ComponentName cn = new ComponentName("com.jxw.mskt.video", "com.jxw.mskt.video.VideoDownload"); +// Intent intent = new Intent(); +// intent.setComponent(cn); +// intent.putExtra("type", "新东方专区"); +// intent.putExtra("isCourse", false); +// intent.putExtra("id", 23151); +// intent.putExtra("name", "西游记"); +// intent.addCategory(Intent.CATEGORY_LAUNCHER); +// intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); +// try { +// startActivity(intent); +// } catch (Exception e) { +// Log.e(TAG, "openPackageWithArgs: " + e.getMessage()); +// } } @Override diff --git a/app/src/main/res/layout-land/fragment_biology.xml b/app/src/main/res/layout-land/fragment_biology.xml index 900f270..b13d959 100644 --- a/app/src/main/res/layout-land/fragment_biology.xml +++ b/app/src/main/res/layout-land/fragment_biology.xml @@ -43,7 +43,7 @@ android:maxLines="1" android:text="同步学习" android:textColor="@color/white" - android:textSize="@dimen/sp_16" + android:textSize="@dimen/sp_14" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-land/fragment_chemical.xml b/app/src/main/res/layout-land/fragment_chemical.xml index ed2b718..d361a3d 100644 --- a/app/src/main/res/layout-land/fragment_chemical.xml +++ b/app/src/main/res/layout-land/fragment_chemical.xml @@ -42,7 +42,7 @@ android:maxLines="1" android:text="同步学习" android:textColor="@color/white" - android:textSize="@dimen/sp_16" + android:textSize="@dimen/sp_14" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-land/fragment_chinese.xml b/app/src/main/res/layout-land/fragment_chinese.xml index 05629b3..ed0e5f8 100644 --- a/app/src/main/res/layout-land/fragment_chinese.xml +++ b/app/src/main/res/layout-land/fragment_chinese.xml @@ -55,7 +55,7 @@ android:maxLines="1" android:text="同步学习" android:textColor="@color/white" - android:textSize="@dimen/sp_16" + android:textSize="@dimen/sp_14" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-land/fragment_complex.xml b/app/src/main/res/layout-land/fragment_complex.xml index da8c763..6dd2bce 100644 --- a/app/src/main/res/layout-land/fragment_complex.xml +++ b/app/src/main/res/layout-land/fragment_complex.xml @@ -35,7 +35,7 @@ android:layout_marginTop="@dimen/dp_8" android:text="综合学习" android:textColor="@color/white" - android:textSize="@dimen/sp_16" + android:textSize="@dimen/sp_14" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout-land/fragment_english.xml b/app/src/main/res/layout-land/fragment_english.xml index 01f21d5..3efc02a 100644 --- a/app/src/main/res/layout-land/fragment_english.xml +++ b/app/src/main/res/layout-land/fragment_english.xml @@ -45,7 +45,7 @@ android:maxLines="1" android:text="同步学习" android:textColor="@color/white" - android:textSize="@dimen/sp_16" + android:textSize="@dimen/sp_14" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> @@ -55,7 +55,7 @@ android:layout_width="@dimen/dp_214" android:layout_height="@dimen/dp_163" android:layout_marginStart="@dimen/dp_14" - android:layout_marginBottom="@dimen/dp_14" + android:layout_marginBottom="@dimen/dp_8" android:adjustViewBounds="true" android:scaleType="centerCrop" android:src="@drawable/english_explanation" diff --git a/app/src/main/res/layout-land/fragment_math.xml b/app/src/main/res/layout-land/fragment_math.xml index d5de6da..4535e0f 100644 --- a/app/src/main/res/layout-land/fragment_math.xml +++ b/app/src/main/res/layout-land/fragment_math.xml @@ -42,7 +42,7 @@ android:maxLines="1" android:text="同步学习" android:textColor="@color/white" - android:textSize="@dimen/sp_16" + android:textSize="@dimen/sp_14" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-land/fragment_physics.xml b/app/src/main/res/layout-land/fragment_physics.xml index 3b69bf3..8a2b22d 100644 --- a/app/src/main/res/layout-land/fragment_physics.xml +++ b/app/src/main/res/layout-land/fragment_physics.xml @@ -42,7 +42,7 @@ android:maxLines="1" android:text="同步学习" android:textColor="@color/white" - android:textSize="@dimen/sp_16" + android:textSize="@dimen/sp_14" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-land/fragment_precision.xml b/app/src/main/res/layout-land/fragment_precision.xml index 4088f93..3f0643e 100644 --- a/app/src/main/res/layout-land/fragment_precision.xml +++ b/app/src/main/res/layout-land/fragment_precision.xml @@ -55,7 +55,7 @@ android:maxLines="1" android:text="AI精准学" android:textColor="@color/white" - android:textSize="@dimen/sp_16" + android:textSize="@dimen/sp_14" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout-land/fragment_subject.xml b/app/src/main/res/layout-land/fragment_subject.xml index 690e993..bf49321 100644 --- a/app/src/main/res/layout-land/fragment_subject.xml +++ b/app/src/main/res/layout-land/fragment_subject.xml @@ -16,7 +16,7 @@ android:layout_height="@dimen/dp_24" android:layout_marginStart="@dimen/dp_8" android:layout_marginTop="@dimen/dp_2" - android:layout_marginEnd="@dimen/dp_64" + android:layout_marginEnd="@dimen/dp_32" android:visibility="visible" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -26,9 +26,9 @@ app:tl_indicator_style="NORMAL" app:tl_tab_space_equal="true" app:tl_textBold="SELECT" - app:tl_textSelectSize="@dimen/sp_15" - app:tl_textSize="@dimen/sp_12" - app:tl_textUnSelectSize="@dimen/sp_12" /> + app:tl_textSelectSize="@dimen/sp_13" + app:tl_textSize="@dimen/sp_11" + app:tl_textUnSelectSize="@dimen/sp_11" /> @@ -58,7 +58,7 @@ android:maxLines="1" android:text="@string/default_grade" android:textColor="@color/white" - android:textSize="@dimen/sp_10" + android:textSize="@dimen/sp_8" app:layout_constraintBottom_toBottomOf="@+id/iv_avatar" app:layout_constraintStart_toStartOf="@+id/tv_name" />