tt/Xuewang365OSNeutral
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:1.7.2

Browse Source 
fix:
update:细节优化
This commit is contained in:
Fanhuitong
2024-01-09 09:26:45 +08:00
parent a232b6919d
commit 9c2f01d215
15 changed files with 564 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -16,8 +16,8 @@ android {
minSdkVersion 24 minSdkVersion 24
targetSdkVersion 29 targetSdkVersion 29
versionCode 63 versionCode 64
versionName "1.7.1" versionName "1.7.2"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true

3
app/src/main/java/com/uiui/zyos/activity/ExitActivity.java
View File

@@ -26,7 +26,6 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
public class ExitActivity extends BaseActivity { public class ExitActivity extends BaseActivity {
private static final String TAG = ExitActivity.class.getSimpleName(); private static final String TAG = ExitActivity.class.getSimpleName();
@BindView(R.id.bt_0) @BindView(R.id.bt_0)
@@ -174,7 +173,7 @@ public class ExitActivity extends BaseActivity {
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
if (soundPool!=null) { if (soundPool != null) {
soundPool.release(); soundPool.release();
soundPool = null; soundPool = null;
} }

236
app/src/main/res/layout-land/activity_exit.xml Normal file
View File

@@ -0,0 +1,236 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/control_background"
tools:context=".activity.ExitActivity">
<ImageView
android:id="@+id/imageView5"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/icon_lock"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.03" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/ll_keyboard"
app:layout_constraintTop_toBottomOf="@+id/imageView5"
app:layout_constraintVertical_bias="0.347"
tools:layout_editor_absoluteX="0dp">
<com.tuo.customview.VerificationCodeView
android:id="@+id/icv"
android:layout_width="wrap_content"
android:layout_height="@dimen/sp_26"
android:layout_centerHorizontal="true"
app:icv_et_bg_focus="@color/transparent"
app:icv_et_bg_normal="@color/transparent"
app:icv_et_divider_drawable="@drawable/shape_divider_identifying"
app:icv_et_number="6"
app:icv_et_pwd="true"
app:icv_et_pwd_radius="@dimen/dp_4"
app:icv_et_text_color="@color/transparent"
app:icv_et_width="@dimen/sp_32"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/white"
android:textSize="@dimen/sp_11"
app:layout_constraintEnd_toEndOf="@+id/icv"
app:layout_constraintStart_toStartOf="@+id/icv"
app:layout_constraintTop_toBottomOf="@+id/icv" />
<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_48"
android:layout_marginEnd="@dimen/dp_48"
android:gravity="center"
android:maxLines="2"
android:minLines="2"
android:text="退出系统"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_hint" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/ll_keyboard"
android:layout_width="@dimen/dp_200"
android:layout_height="@dimen/dp_160"
android:orientation="vertical"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/bt_1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="1"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/bt_2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="2"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/bt_3"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="3"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/bt_4"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="4"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/bt_5"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="5"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/bt_6"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="6"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/bt_7"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="7"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/bt_8"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="8"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/bt_9"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="9"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/bt_0"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="0"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/bt_del"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="清除"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/bt_confirm"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="确认"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

8
app/src/main/res/layout-land/fragment_chinese.xml
View File

@@ -16,8 +16,8 @@
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"
app:layout_constraintVertical_bias="0.35" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintVertical_bias="0.35">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout3" android:id="@+id/constraintLayout3"
@@ -111,17 +111,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4" android:layout_marginTop="@dimen/dp_4"
android:text="查看更多…" android:text="查看更多…"
android:visibility="gone"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/sp_7" android:textSize="@dimen/sp_7"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginBottom="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8" android:layout_marginTop="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_more_app" app:layout_constraintTop_toBottomOf="@+id/tv_more_app"

6
app/src/main/res/layout-land/fragment_complex.xml
View File

@@ -15,9 +15,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintVertical_bias="0.35"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.35">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout6" android:id="@+id/constraintLayout6"
@@ -52,8 +52,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_16" android:layout_marginStart="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_16"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout

7
app/src/main/res/layout-land/fragment_math.xml
View File

@@ -13,11 +13,11 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintVertical_bias="0.35"
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"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.35">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout3" android:id="@+id/constraintLayout3"
@@ -99,8 +99,7 @@
android:layout_marginBottom="@dimen/dp_8" android:layout_marginBottom="@dimen/dp_8"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent">
>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

3
app/src/main/res/layout-land/fragment_user.xml
View File

@@ -172,6 +172,7 @@
android:text="小程序绑定" android:text="小程序绑定"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_6" android:textSize="@dimen/sp_6"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -343,7 +344,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_16" android:layout_marginTop="@dimen/dp_16"
android:text="激活系统后，绑定设备" android:text="设备绑定流程"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_10" android:textSize="@dimen/sp_10"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

236
app/src/main/res/layout-sw800dp/activity_exit.xml Normal file
View File

@@ -0,0 +1,236 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/control_background"
tools:context=".activity.ExitActivity">
<ImageView
android:id="@+id/imageView5"
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_20"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/icon_lock"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.03" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@+id/ll_keyboard"
app:layout_constraintTop_toBottomOf="@+id/imageView5"
app:layout_constraintVertical_bias="0.347"
tools:layout_editor_absoluteX="0dp">
<com.tuo.customview.VerificationCodeView
android:id="@+id/icv"
android:layout_width="wrap_content"
android:layout_height="@dimen/sp_26"
android:layout_centerHorizontal="true"
app:icv_et_bg_focus="@color/transparent"
app:icv_et_bg_normal="@color/transparent"
app:icv_et_divider_drawable="@drawable/shape_divider_identifying"
app:icv_et_number="6"
app:icv_et_pwd="true"
app:icv_et_pwd_radius="@dimen/dp_4"
app:icv_et_text_color="@color/transparent"
app:icv_et_width="@dimen/sp_32"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/white"
android:textSize="@dimen/sp_11"
app:layout_constraintEnd_toEndOf="@+id/icv"
app:layout_constraintStart_toStartOf="@+id/icv"
app:layout_constraintTop_toBottomOf="@+id/icv" />
<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_48"
android:layout_marginEnd="@dimen/dp_48"
android:gravity="center"
android:maxLines="2"
android:minLines="2"
android:text="退出系统"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_hint" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/ll_keyboard"
android:layout_width="@dimen/dp_200"
android:layout_height="@dimen/dp_160"
android:orientation="vertical"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/bt_1"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="1"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/bt_2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="2"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/bt_3"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="3"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/bt_4"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="4"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/bt_5"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="5"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/bt_6"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="6"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/bt_7"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="7"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/bt_8"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="8"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/bt_9"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="9"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal">
<TextView
android:id="@+id/bt_0"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="0"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
<TextView
android:id="@+id/bt_del"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="清除"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/bt_confirm"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:text="确认"
android:textColor="@color/white"
android:textSize="@dimen/sp_14" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

137
app/src/main/res/layout-sw800dp/fragment_chinese.xml
View File

@@ -16,8 +16,8 @@
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"
app:layout_constraintVertical_bias="0.35" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintVertical_bias="0.35">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout3" android:id="@+id/constraintLayout3"
@@ -111,17 +111,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4" android:layout_marginTop="@dimen/dp_4"
android:text="查看更多…" android:text="查看更多…"
android:visibility="gone"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/sp_7" android:textSize="@dimen/sp_7"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginBottom="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8" android:layout_marginTop="@dimen/dp_8"
android:layout_marginBottom="@dimen/dp_8"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_more_app" app:layout_constraintTop_toBottomOf="@+id/tv_more_app"
@@ -151,8 +151,8 @@
<ImageView <ImageView
android:id="@+id/imageView4" android:id="@+id/imageView4"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/chinese_synchronous_tutoring" android:src="@drawable/chinese_synchronous_tutoring"
@@ -160,16 +160,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="同步辅导"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView4" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -189,8 +179,8 @@
<ImageView <ImageView
android:id="@+id/imageView5" android:id="@+id/imageView5"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/chinese_near_antonyms" android:src="@drawable/chinese_near_antonyms"
@@ -198,16 +188,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="近反义词"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView5" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -227,8 +207,8 @@
<ImageView <ImageView
android:id="@+id/imageView6" android:id="@+id/imageView6"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/chinese_read_composition" android:src="@drawable/chinese_read_composition"
@@ -236,16 +216,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="阅读写作"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView6" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -275,8 +245,8 @@
<ImageView <ImageView
android:id="@+id/imageView7" android:id="@+id/imageView7"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/chinese_featured_reading" android:src="@drawable/chinese_featured_reading"
@@ -284,17 +254,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="精选阅读"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView7" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -315,8 +274,8 @@
<ImageView <ImageView
android:id="@+id/imageView8" android:id="@+id/imageView8"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/chinese_character" android:src="@drawable/chinese_character"
@@ -324,16 +283,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="汉字学习"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView8" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -354,8 +303,8 @@
<ImageView <ImageView
android:id="@+id/imageView9" android:id="@+id/imageView9"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/chinese_classical" android:src="@drawable/chinese_classical"
@@ -363,16 +312,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="文言文"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView9" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>
@@ -401,8 +340,8 @@
<ImageView <ImageView
android:id="@+id/imageView10" android:id="@+id/imageView10"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/chinese_rhetoric" android:src="@drawable/chinese_rhetoric"
@@ -410,17 +349,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="修辞手法"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView10" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -441,8 +369,8 @@
<ImageView <ImageView
android:id="@+id/imageView11" android:id="@+id/imageView11"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/chinese_treasure" android:src="@drawable/chinese_treasure"
@@ -450,16 +378,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="中华宝典"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView11" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -477,11 +395,10 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<ImageView <ImageView
android:id="@+id/imageView12" android:id="@+id/imageView12"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/chinese_punctuation" android:src="@drawable/chinese_punctuation"
@@ -489,16 +406,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="标点符号"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView12" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>

130
app/src/main/res/layout-sw800dp/fragment_complex.xml
View File

@@ -15,9 +15,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintVertical_bias="0.35"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.35">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout6" android:id="@+id/constraintLayout6"
@@ -52,8 +52,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_16" android:layout_marginStart="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16" android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_16"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
@@ -105,23 +105,13 @@
<ImageView <ImageView
android:id="@+id/imageView14" android:id="@+id/imageView14"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:src="@drawable/complex_video" android:src="@drawable/complex_video"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="同步视频"
android:textColor="@color/colorAccent"
android:textSize="@dimen/sp_6"
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"
app:layout_constraintTop_toBottomOf="@+id/imageView14" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -140,23 +130,14 @@
<ImageView <ImageView
android:id="@+id/imageView15" android:id="@+id/imageView15"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:src="@drawable/complex_book" android:src="@drawable/complex_book"
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"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="同步辅导"
android:textColor="@color/colorAccent"
android:textSize="@dimen/sp_6"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView15" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>
@@ -206,23 +187,13 @@
<ImageView <ImageView
android:id="@+id/imageView16" android:id="@+id/imageView16"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:src="@drawable/complex_video" android:src="@drawable/complex_video"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="同步视频"
android:textColor="@color/colorAccent"
android:textSize="@dimen/sp_6"
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"
app:layout_constraintTop_toBottomOf="@+id/imageView16" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -241,23 +212,14 @@
<ImageView <ImageView
android:id="@+id/imageView17" android:id="@+id/imageView17"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:src="@drawable/complex_book" android:src="@drawable/complex_book"
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"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="同步辅导"
android:textColor="@color/colorAccent"
android:textSize="@dimen/sp_6"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView17" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>
@@ -316,23 +278,13 @@
<ImageView <ImageView
android:id="@+id/imageView18" android:id="@+id/imageView18"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:src="@drawable/complex_video" android:src="@drawable/complex_video"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="同步视频"
android:textColor="@color/colorAccent"
android:textSize="@dimen/sp_6"
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"
app:layout_constraintTop_toBottomOf="@+id/imageView18" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -351,23 +303,14 @@
<ImageView <ImageView
android:id="@+id/imageView19" android:id="@+id/imageView19"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:src="@drawable/complex_book" android:src="@drawable/complex_book"
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"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="同步辅导"
android:textColor="@color/colorAccent"
android:textSize="@dimen/sp_6"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView19" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>
@@ -419,23 +362,13 @@
<ImageView <ImageView
android:id="@+id/imageView20" android:id="@+id/imageView20"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:src="@drawable/complex_video" android:src="@drawable/complex_video"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="同步视频"
android:textColor="@color/colorAccent"
android:textSize="@dimen/sp_6"
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"
app:layout_constraintTop_toBottomOf="@+id/imageView20" /> app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -454,23 +387,14 @@
<ImageView <ImageView
android:id="@+id/imageView21" android:id="@+id/imageView21"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:src="@drawable/complex_book" android:src="@drawable/complex_book"
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"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="同步辅导"
android:textColor="@color/colorAccent"
android:textSize="@dimen/sp_6"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView21" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>

136
app/src/main/res/layout-sw800dp/fragment_math.xml
View File

@@ -13,11 +13,11 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintVertical_bias="0.35"
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"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.35">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/constraintLayout3" android:id="@+id/constraintLayout3"
@@ -99,8 +99,7 @@
android:layout_marginBottom="@dimen/dp_8" android:layout_marginBottom="@dimen/dp_8"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent">
>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -126,8 +125,8 @@
<ImageView <ImageView
android:id="@+id/imageView4" android:id="@+id/imageView4"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/math_synchronous_tutoring" android:src="@drawable/math_synchronous_tutoring"
@@ -135,16 +134,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="同步辅导"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView4" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -164,8 +153,8 @@
<ImageView <ImageView
android:id="@+id/imageView5" android:id="@+id/imageView5"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/math_problem_training" android:src="@drawable/math_problem_training"
@@ -173,16 +162,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="应用题训练"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView5" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -202,8 +181,8 @@
<ImageView <ImageView
android:id="@+id/imageView6" android:id="@+id/imageView6"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/math_olympiad_training" android:src="@drawable/math_olympiad_training"
@@ -211,16 +190,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="奥数训练"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView6" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -250,8 +219,8 @@
<ImageView <ImageView
android:id="@+id/imageView7" android:id="@+id/imageView7"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/math_equation_solution" android:src="@drawable/math_equation_solution"
@@ -259,17 +228,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="方程精解"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView7" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -290,8 +248,8 @@
<ImageView <ImageView
android:id="@+id/imageView8" android:id="@+id/imageView8"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/mathematical_basis" android:src="@drawable/mathematical_basis"
@@ -299,16 +257,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="数学基础"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView8" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -329,8 +277,8 @@
<ImageView <ImageView
android:id="@+id/imageView9" android:id="@+id/imageView9"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/math_arithmetic" android:src="@drawable/math_arithmetic"
@@ -338,16 +286,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="四则运算"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView9" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>
@@ -376,8 +314,8 @@
<ImageView <ImageView
android:id="@+id/imageView10" android:id="@+id/imageView10"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/math_encyclopedia" android:src="@drawable/math_encyclopedia"
@@ -385,17 +323,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="公式大全"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView10" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -416,8 +343,8 @@
<ImageView <ImageView
android:id="@+id/imageView11" android:id="@+id/imageView11"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/math_number" android:src="@drawable/math_number"
@@ -425,16 +352,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="认识数字"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView11" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@@ -452,11 +369,10 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">
<ImageView <ImageView
android:id="@+id/imageView12" android:id="@+id/imageView12"
android:layout_width="@dimen/dp_25" android:layout_width="@dimen/dp_28"
android:layout_height="@dimen/dp_25" android:layout_height="@dimen/dp_28"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:scaleType="centerInside" android:scaleType="centerInside"
android:src="@drawable/math_formula" android:src="@drawable/math_formula"
@@ -464,16 +380,6 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="数学公式"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView12" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout> </LinearLayout>

7
app/src/main/res/layout-sw800dp/fragment_user.xml
View File

@@ -171,6 +171,7 @@
android:text="小程序绑定" android:text="小程序绑定"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_5" android:textSize="@dimen/sp_5"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -305,7 +306,7 @@
android:id="@+id/cl_activation" android:id="@+id/cl_activation"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone"> android:visibility="visible">
<TextView <TextView
android:id="@+id/tv_date1" android:id="@+id/tv_date1"
@@ -342,7 +343,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_16" android:layout_marginTop="@dimen/dp_16"
android:text="激活系统后，绑定设备" android:text="设备绑定流程"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/sp_7" android:textSize="@dimen/sp_7"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@@ -422,7 +423,7 @@
android:id="@+id/cl_app" android:id="@+id/cl_app"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="visible"> android:visibility="gone">
<TextView <TextView
android:id="@+id/tv_date2" android:id="@+id/tv_date2"

3
app/src/main/res/layout/activity_exit.xml
View File

@@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/control_background"> android:background="@drawable/control_background"
tools:context=".activity.ExitActivity">
<ImageView <ImageView
android:id="@+id/imageView5" android:id="@+id/imageView5"

1
app/src/main/res/layout/activity_notice.xml
View File

@@ -6,7 +6,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".activity.NoticeActivity"> tools:context=".activity.NoticeActivity">
<TextView <TextView
android:id="@+id/tv_title" android:id="@+id/tv_title"
android:layout_width="wrap_content" android:layout_width="wrap_content"

1
app/src/main/res/layout/activity_passwd.xml
View File

@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".activity.PasswordActivity"
android:background="@drawable/control_background"> android:background="@drawable/control_background">
<ImageView <ImageView