version:1.6.6

fix:
update:优化字体大小
This commit is contained in:
2023-11-04 09:43:30 +08:00
parent a8f1198eef
commit 256c52cfc8
12 changed files with 33 additions and 31 deletions

View File

@@ -16,8 +16,8 @@ android {
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 29 targetSdkVersion 29
versionCode 56 versionCode 58
versionName "1.6.4" versionName "1.6.6"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -118,6 +118,7 @@ android {
minifyEnabled false minifyEnabled false
//Zipalign优化 //Zipalign优化
zipAlignEnabled true zipAlignEnabled true
buildConfigField "String", "platform", '"tuixin"'
signingConfig signingConfigs.tuixin signingConfig signingConfigs.tuixin
applicationVariants.all { variant -> applicationVariants.all { variant ->
variant.outputs.each { output -> variant.outputs.each { output ->
@@ -140,6 +141,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
//签名 //签名
signingConfig signingConfigs.tuixin signingConfig signingConfigs.tuixin
buildConfigField "String", "platform", '"tuixin"'
// 将release版本的包名重命名加上版本及日期 // 将release版本的包名重命名加上版本及日期
applicationVariants.all { variant -> applicationVariants.all { variant ->
variant.outputs.each { output -> variant.outputs.each { output ->

View File

@@ -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"); // ComponentName cn = new ComponentName("com.jxw.mskt.video", "com.jxw.mskt.video.VideoDownload");
Intent intent = new Intent(); // Intent intent = new Intent();
intent.setComponent(cn); // intent.setComponent(cn);
intent.putExtra("type", "新东方专区"); // intent.putExtra("type", "新东方专区");
intent.putExtra("isCourse", false); // intent.putExtra("isCourse", false);
intent.putExtra("id", 23151); // intent.putExtra("id", 23151);
intent.putExtra("name", "西游记"); // intent.putExtra("name", "西游记");
intent.addCategory(Intent.CATEGORY_LAUNCHER); // intent.addCategory(Intent.CATEGORY_LAUNCHER);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); // intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
try { // try {
startActivity(intent); // startActivity(intent);
} catch (Exception e) { // } catch (Exception e) {
Log.e(TAG, "openPackageWithArgs: " + e.getMessage()); // Log.e(TAG, "openPackageWithArgs: " + e.getMessage());
} // }
} }
@Override @Override

View File

@@ -43,7 +43,7 @@
android:maxLines="1" android:maxLines="1"
android:text="同步学习" android:text="同步学习"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_16" android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

View File

@@ -42,7 +42,7 @@
android:maxLines="1" android:maxLines="1"
android:text="同步学习" android:text="同步学习"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_16" android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

View File

@@ -55,7 +55,7 @@
android:maxLines="1" android:maxLines="1"
android:text="同步学习" android:text="同步学习"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_16" android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

View File

@@ -35,7 +35,7 @@
android:layout_marginTop="@dimen/dp_8" android:layout_marginTop="@dimen/dp_8"
android:text="综合学习" android:text="综合学习"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_16" android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />

View File

@@ -45,7 +45,7 @@
android:maxLines="1" android:maxLines="1"
android:text="同步学习" android:text="同步学习"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_16" android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -55,7 +55,7 @@
android:layout_width="@dimen/dp_214" android:layout_width="@dimen/dp_214"
android:layout_height="@dimen/dp_163" android:layout_height="@dimen/dp_163"
android:layout_marginStart="@dimen/dp_14" android:layout_marginStart="@dimen/dp_14"
android:layout_marginBottom="@dimen/dp_14" android:layout_marginBottom="@dimen/dp_8"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/english_explanation" android:src="@drawable/english_explanation"

View File

@@ -42,7 +42,7 @@
android:maxLines="1" android:maxLines="1"
android:text="同步学习" android:text="同步学习"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_16" android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

View File

@@ -42,7 +42,7 @@
android:maxLines="1" android:maxLines="1"
android:text="同步学习" android:text="同步学习"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_16" android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

View File

@@ -55,7 +55,7 @@
android:maxLines="1" android:maxLines="1"
android:text="AI精准学" android:text="AI精准学"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_16" android:textSize="@dimen/sp_14"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

View File

@@ -16,7 +16,7 @@
android:layout_height="@dimen/dp_24" android:layout_height="@dimen/dp_24"
android:layout_marginStart="@dimen/dp_8" android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_2" android:layout_marginTop="@dimen/dp_2"
android:layout_marginEnd="@dimen/dp_64" android:layout_marginEnd="@dimen/dp_32"
android:visibility="visible" android:visibility="visible"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
@@ -26,9 +26,9 @@
app:tl_indicator_style="NORMAL" app:tl_indicator_style="NORMAL"
app:tl_tab_space_equal="true" app:tl_tab_space_equal="true"
app:tl_textBold="SELECT" app:tl_textBold="SELECT"
app:tl_textSelectSize="@dimen/sp_15" app:tl_textSelectSize="@dimen/sp_13"
app:tl_textSize="@dimen/sp_12" app:tl_textSize="@dimen/sp_11"
app:tl_textUnSelectSize="@dimen/sp_12" /> app:tl_textUnSelectSize="@dimen/sp_11" />
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager" android:id="@+id/viewPager"

View File

@@ -47,7 +47,7 @@
android:maxLines="1" android:maxLines="1"
android:text="@string/default_nickname" android:text="@string/default_nickname"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_10" android:textSize="@dimen/sp_8"
app:layout_constraintStart_toEndOf="@+id/iv_avatar" app:layout_constraintStart_toEndOf="@+id/iv_avatar"
app:layout_constraintTop_toTopOf="@+id/iv_avatar" /> app:layout_constraintTop_toTopOf="@+id/iv_avatar" />
@@ -58,7 +58,7 @@
android:maxLines="1" android:maxLines="1"
android:text="@string/default_grade" android:text="@string/default_grade"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_10" android:textSize="@dimen/sp_8"
app:layout_constraintBottom_toBottomOf="@+id/iv_avatar" app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
app:layout_constraintStart_toStartOf="@+id/tv_name" /> app:layout_constraintStart_toStartOf="@+id/tv_name" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>