From 855a7e18a795f0db2453a19e3e8f26ba2ff553b4 Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期四, 29 五月 2025 16:32:41 +0800
Subject: [PATCH] UI调整
---
app/src/main/res/drawable/bg_gray_left_14.xml | 5
app/src/main/res/layout/activity_schedul_new.xml | 510 +++++++++++++++++++++++++++++++
app/src/main/res/mipmap-xxhdpi/big_erji.png | 0
app/src/main/java/com/dollearn/student/ui/home/MatchFragment.kt | 66 ++-
app/src/main/res/mipmap-xxhdpi/wenhua.png | 0
app/src/main/java/com/dollearn/student/ui/home/ScheduleActivityNew.kt | 78 ++++
app/src/main/res/mipmap-xxhdpi/arrow_down.png | 0
app/src/main/res/mipmap-xxhdpi/yuedu.png | 0
app/src/main/AndroidManifest.xml | 2
app/src/main/res/mipmap-xxhdpi/splash.png | 0
app/src/main/java/com/dollearn/student/ui/home/ListenFragment.kt | 23
app/src/main/res/layout/fragment_home.xml | 213 +++++++++++-
/dev/null | 0
app/src/main/res/mipmap-xxhdpi/en.png | 0
app/src/main/res/mipmap-xxhdpi/logo_home.png | 0
app/src/main/res/layout/dialog_recommend_info.xml | 2
app/src/main/java/com/dollearn/student/ui/SplashActivity.kt | 2
app/src/main/java/com/dollearn/student/ui/home/ListenActivity.kt | 2
app/src/main/res/drawable/bg_gradient.xml | 5
app/src/main/res/layout/fragment_listen.xml | 8
20 files changed, 844 insertions(+), 72 deletions(-)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 94191a7..3ccb4b4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -61,7 +61,7 @@
android:name=".ui.mine.ExchangeRecordActivity"
android:label="兑换记录" />
- <activity android:name=".ui.home.WeekSelectActivity" android:label="第一年学习周目选择"
+ <activity android:name=".ui.home.WeekSelectActivity" android:label="第一年 学习目标"
android:screenOrientation="landscape">
<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.MAIN" />-->
diff --git a/app/src/main/java/com/dollearn/student/ui/SplashActivity.kt b/app/src/main/java/com/dollearn/student/ui/SplashActivity.kt
index e9d0d3d..cdf681b 100644
--- a/app/src/main/java/com/dollearn/student/ui/SplashActivity.kt
+++ b/app/src/main/java/com/dollearn/student/ui/SplashActivity.kt
@@ -134,7 +134,7 @@
* 跳转下一步
*/
private fun gotoMainOrLogin(){
- object : CountDownTimer(2000, 500) {
+ object : CountDownTimer(5000, 1000) {
override fun onFinish() {
val token = SPUtils.instance().getString(Const.User.TOKEN)
if (token.isEmpty())
diff --git a/app/src/main/java/com/dollearn/student/ui/home/ListenActivity.kt b/app/src/main/java/com/dollearn/student/ui/home/ListenActivity.kt
index 5699142..51116dd 100644
--- a/app/src/main/java/com/dollearn/student/ui/home/ListenActivity.kt
+++ b/app/src/main/java/com/dollearn/student/ui/home/ListenActivity.kt
@@ -146,7 +146,7 @@
override fun destroyItem(container: ViewGroup, position: Int, `object`: Any) {
}
}
- view_pager.offscreenPageLimit = 8
+ view_pager.offscreenPageLimit = 4
view_pager.addOnPageChangeListener(object :ViewPager.OnPageChangeListener{
override fun onPageScrolled(
position: Int,
diff --git a/app/src/main/java/com/dollearn/student/ui/home/ListenFragment.kt b/app/src/main/java/com/dollearn/student/ui/home/ListenFragment.kt
index 9789583..1e343a0 100644
--- a/app/src/main/java/com/dollearn/student/ui/home/ListenFragment.kt
+++ b/app/src/main/java/com/dollearn/student/ui/home/ListenFragment.kt
@@ -17,6 +17,7 @@
import com.dollearn.student.utils.AudioUtils
import com.dollearn.student.utils.Const
import com.dollearn.student.utils.extention.clickDelay
+import com.dollearn.student.utils.glide.GlideUtil
import kotlinx.android.synthetic.main.fragment_listen.*
import org.jetbrains.anko.imageResource
@@ -96,10 +97,14 @@
data?.apply {
val originList = subjectList[group]
correctVoice = originList[index].correct
- iv_1.setImageURI(randomList[0].img)
- iv_2.setImageURI(randomList[1].img)
- iv_3.setImageURI(randomList[2].img)
- iv_4.setImageURI(randomList[3].img)
+ GlideUtil.load(requireContext(),randomList[0].img,iv_1,0)
+ GlideUtil.load(requireContext(),randomList[1].img,iv_2,0)
+ GlideUtil.load(requireContext(),randomList[2].img,iv_3,0)
+ GlideUtil.load(requireContext(),randomList[3].img,iv_4,0)
+// iv_1.setImageURI(randomList[0].img)
+// iv_2.setImageURI(randomList[1].img)
+// iv_3.setImageURI(randomList[2].img)
+// iv_4.setImageURI(randomList[3].img)
resultViewList.forEachIndexed { index, imageView ->
imageView.imageResource = if (randomList[index].correct == correctVoice){
motion.setTransition(R.id.start,if (index == 0) R.id.end_1 else if (index == 1) R.id.end_2 else if (index == 2) R.id.end_3 else R.id.end_4)
@@ -133,11 +138,11 @@
hasRight = false
right = true
handler?.sendEmptyMessageDelayed(PLAY_VOICE,200) //改为立即播放
- cl_1.progress = 0f
- cl_2.progress = 0f
- cl_3.progress = 0f
- cl_4.progress = 0f
- motion.progress = 0f
+ cl_1?.progress = 0f
+ cl_2?.progress = 0f
+ cl_3?.progress = 0f
+ cl_4?.progress = 0f
+ motion?.progress = 0f
}
companion object{
diff --git a/app/src/main/java/com/dollearn/student/ui/home/MatchFragment.kt b/app/src/main/java/com/dollearn/student/ui/home/MatchFragment.kt
index c5dbd5e..de291b6 100644
--- a/app/src/main/java/com/dollearn/student/ui/home/MatchFragment.kt
+++ b/app/src/main/java/com/dollearn/student/ui/home/MatchFragment.kt
@@ -593,44 +593,24 @@
iv1_1.visible()
iv2_1.visible()
iv_playing_1.gone()
- if (nowVoiceView!=null && data!!.subjectList[group][imgPosition].completed){
- voiceIndex = -1
- nowVoiceView = null
- isAutoPlaying = true
- cl_voice_2.callOnClick()
- }
+
}
1->{
iv1_2.visible()
iv2_2.visible()
iv_playing_2.gone()
- if (nowVoiceView!=null && data!!.subjectList[group][imgPosition].completed){
- voiceIndex = -1
- nowVoiceView = null
- isAutoPlaying = true
- cl_voice_3.callOnClick()
- }
+
}
2->{
iv1_3.visible()
iv2_3.visible()
iv_playing_3.gone()
- if (nowVoiceView!=null && data!!.subjectList[group][imgPosition].completed){
- voiceIndex = -1
- nowVoiceView = null
- isAutoPlaying = true
- cl_voice_4.callOnClick()
- }
}
3->{
iv1_4.visible()
iv2_4.visible()
iv_playing_4.gone()
- if (nowVoiceView!=null && data!!.subjectList[group][imgPosition].completed){
- voiceIndex = -1
- nowVoiceView = null
- }
}
4->{
@@ -658,16 +638,50 @@
voiceIndex = -1
}
}
- if (data!!.subjectList[group].filter { it.completed }.size == 4){ //全部答对
- handler?.sendEmptyMessage(TO_NEXT)
- }
if (errorPlaying)
errorPlaying = false
if (rightPlaying){
rightPlaying = false
- nowVoiceView?.callOnClick()
+// nowVoiceView?.callOnClick() //客户需求：回答正确后不再重播语音 直接下一题
data!!.subjectList[group][imgPosition].completed = true
+
+ when(voiceIndex){
+ 0->{
+ if (nowVoiceView!=null && data!!.subjectList[group][imgPosition].completed){
+ voiceIndex = -1
+ nowVoiceView = null
+ isAutoPlaying = true
+ cl_voice_2.callOnClick()
+ }
+ }
+ 1->{
+ if (nowVoiceView!=null && data!!.subjectList[group][imgPosition].completed){
+ voiceIndex = -1
+ nowVoiceView = null
+ isAutoPlaying = true
+ cl_voice_3.callOnClick()
+ }
+ }
+ 2->{
+ if (nowVoiceView!=null && data!!.subjectList[group][imgPosition].completed){
+ voiceIndex = -1
+ nowVoiceView = null
+ isAutoPlaying = true
+ cl_voice_4.callOnClick()
+ }
+ }
+ 3->{
+ if (nowVoiceView!=null && data!!.subjectList[group][imgPosition].completed){
+ voiceIndex = -1
+ nowVoiceView = null
+ }
+ }
+ }
+ if (data!!.subjectList[group].filter { it.completed }.size == 4){ //全部答对
+ handler?.sendEmptyMessage(TO_NEXT)
+ }
+
}
}
diff --git a/app/src/main/java/com/dollearn/student/ui/home/ScheduleActivityNew.kt b/app/src/main/java/com/dollearn/student/ui/home/ScheduleActivityNew.kt
new file mode 100644
index 0000000..9795042
--- /dev/null
+++ b/app/src/main/java/com/dollearn/student/ui/home/ScheduleActivityNew.kt
@@ -0,0 +1,78 @@
+package com.dollearn.student.ui.home
+
+import androidx.fragment.app.Fragment
+import com.dollearn.student.R
+import com.dollearn.student.network.HttpManager
+import com.dollearn.student.network.request
+import com.dollearn.student.ui.TransparentStatusBarActivity
+import com.dollearn.student.utils.Const
+import com.dollearn.student.utils.event.IntEvent
+import kotlinx.android.synthetic.main.activity_schedul.*
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+
+class ScheduleActivityNew :TransparentStatusBarActivity(){
+ override fun setContentView() = R.layout.activity_schedul_new
+
+ private val titles = arrayOf("Day 1", "Day 2", "Day 3", "Day 4", "Day 5", "自主游戏", "听故事")
+ private val frags = arrayListOf<Fragment>()
+
+ val week by lazy { intent.getIntExtra("week",0) }
+ val season by lazy { intent.getIntExtra("season",0) }
+
+ var currentDay = 1
+
+ override fun initClick() {
+ }
+
+ override fun initView() {
+ title = ""
+ getSchedule()
+ EventBus.getDefault().register(this)
+ }
+
+ private fun getSchedule(){
+ HttpManager.studySchedule(week,1).request(this){_,data->
+ data?.apply {
+ currentDay = day
+ initTab(if (computeSchedule == 100) 7 else day)
+ }
+ }
+ }
+
+ private fun initTab(day:Int) {
+ titles.forEachIndexed { index, s ->
+ if (index<5){
+ frags.add(DailyFragment.newInstance(index+1))
+ }else
+ frags.add(WeekendFragment.newInstance(index+1))
+ }
+ tab_bar.setViewPager(view_pager, titles,this,frags)
+ tab_bar.currentTab = currentDay-1
+ view_pager.offscreenPageLimit = day
+ //设置不可点击的day
+ (day until 6).forEach {
+ tab_bar.getTitleView(it).isEnabled = false
+ }
+ if (tab_bar.currentTab == 0)
+ tab_bar.updateTabStyles()
+ }
+
+ fun unLockNext(day: Int){
+ currentDay = day
+ tab_bar.getTitleView(day - 1).isEnabled = true
+ tab_bar.currentTab = currentDay-1
+ }
+
+ @Subscribe
+ fun nextSubject(e: IntEvent){
+ if (e.code == Const.EventCode.NEXT_SUBJECT){
+ (frags[view_pager.currentItem] as DailyFragment).nextSubject(e.i)
+ }
+ }
+
+ override fun onDestroy() {
+ super.onDestroy()
+ EventBus.getDefault().unregister(this)
+ }
+}
diff --git a/app/src/main/res/drawable/bg_gradient.xml b/app/src/main/res/drawable/bg_gradient.xml
index 5aa865d..0d5f261 100644
--- a/app/src/main/res/drawable/bg_gradient.xml
+++ b/app/src/main/res/drawable/bg_gradient.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<gradient
- android:endColor="#FE7703"
- android:startColor="#FD8802" />
+ android:endColor="#41A2EB"
+ android:startColor="#76CFF7"
+ android:angle="180"/>
</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_gray_left_14.xml b/app/src/main/res/drawable/bg_gray_left_14.xml
new file mode 100644
index 0000000..d5af998
--- /dev/null
+++ b/app/src/main/res/drawable/bg_gray_left_14.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:bottomLeftRadius="14dp" android:topLeftRadius="14dp"/>
+ <solid android:color="#A7A7A7"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_schedul_new.xml b/app/src/main/res/layout/activity_schedul_new.xml
new file mode 100644
index 0000000..237d76c
--- /dev/null
+++ b/app/src/main/res/layout/activity_schedul_new.xml
@@ -0,0 +1,510 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:background="@color/colorRed"
+ android:layout_height="match_parent"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/cl_top"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@drawable/bg_white_8dp"
+ android:layout_marginHorizontal="120dp"
+ app:layout_constraintTop_toTopOf="parent"
+ android:layout_marginTop="19dp">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_current"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ android:layout_marginTop="17dp"
+ android:layout_marginHorizontal="22dp"
+ android:textSize="21sp"
+ android:textStyle="bold"
+ android:textColor="@color/textColor"
+ android:text="当前进度：周目1"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_progress"
+ app:layout_constraintBaseline_toBaselineOf="@id/tv_current"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:textSize="18sp"
+ android:fontFamily="@font/impact_regular"
+ android:layout_marginEnd="12dp"
+ android:textColor="@color/colorOrange"
+ android:text="0%"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintBaseline_toBaselineOf="@id/tv_current"
+ app:layout_constraintEnd_toStartOf="@id/tv_progress"
+ android:textSize="18sp"
+ android:fontFamily="@font/impact_regular"
+ android:textColor="@color/colorOrange"
+ android:text="已完成："/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_1"
+ android:layout_marginStart="40dp"
+ app:layout_constraintTop_toTopOf="@id/tv_current"
+ app:layout_constraintBottom_toBottomOf="@id/tv_current"
+ app:layout_constraintStart_toEndOf="@id/tv_current"
+ android:textColor="@color/textColor66"
+ android:text="学习总时长："/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_total"
+ app:layout_constraintBaseline_toBaselineOf="@id/tv_1"
+ app:layout_constraintStart_toEndOf="@id/tv_1"
+ android:textColor="@color/textColor"
+ android:text="0小时"
+ android:textStyle="bold"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_2"
+ app:layout_constraintStart_toEndOf="@id/tv_total"
+ app:layout_constraintBaseline_toBaselineOf="@id/tv_1"
+ android:textColor="@color/textColor66"
+ android:text=" | 今日学习："/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_today"
+ app:layout_constraintBaseline_toBaselineOf="@id/tv_1"
+ app:layout_constraintStart_toEndOf="@id/tv_2"
+ android:textColor="@color/textColor"
+ android:text="0小时"
+ android:textStyle="bold"/>
+ <ProgressBar
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="match_parent"
+ android:layout_height="10dp"
+ android:layout_marginHorizontal="22dp"
+ app:layout_constraintTop_toBottomOf="@id/tv_current"
+ android:layout_marginTop="15dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginBottom="20dp"
+ android:max="100"
+ android:id="@+id/progress_bar"
+ android:progress="1"
+ android:progressDrawable="@drawable/progress_drawable"
+ android:thumb="@null" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <androidx.constraintlayout.widget.Guideline
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:id="@+id/center"
+ app:layout_constraintGuide_percent="0.5"/>
+
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:id="@+id/cl_erji"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@id/cl_top"
+ app:layout_constraintStart_toEndOf="@id/center"
+ app:layout_constraintEnd_toEndOf="parent"
+ android:layout_marginBottom="50dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginEnd="16dp">
+ <ImageView
+ android:layout_width="260dp"
+ android:layout_height="160dp"
+ android:src="@mipmap/big_erji"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_11"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginBottom="3dp"
+ android:text="声"
+ android:textColor="@color/black"
+ android:textStyle="bold"
+ android:textSize="22sp"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_12"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/tv_11"
+ android:text="有"
+ android:textColor="@color/black"
+ android:textStyle="bold"
+ android:textSize="22sp"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_13"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/tv_12"
+ android:text="物"
+ android:textColor="@color/black"
+ android:textStyle="bold"
+ android:textSize="22sp"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_14"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/tv_13"
+ android:text="万"
+ android:textColor="@color/black"
+ android:textStyle="bold"
+ android:textSize="22sp"/>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toBottomOf="@id/cl_erji"
+ android:text="听懂英语的声音世界"
+ android:textSize="24sp"
+ app:layout_constraintStart_toStartOf="@id/cl_erji"
+ app:layout_constraintEnd_toEndOf="@id/cl_erji"
+ android:layout_marginTop="30dp"
+ android:textColor="@color/colorTextDark"/>
+
+ <ScrollView
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintTop_toBottomOf="@id/cl_top"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginTop="10dp"
+ app:layout_constraintStart_toStartOf="@id/cl_top"
+ app:layout_constraintEnd_toStartOf="@id/center">
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/cl_1"
+ android:background="@drawable/bg_white_8dp">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_d1"
+ android:textSize="18sp"
+ android:textStyle="bold"
+ android:textColor="@color/textColor"
+ app:layout_constraintStart_toStartOf="parent"
+ android:layout_marginStart="30dp"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:text="第 1 天"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toEndOf="@id/tv_d1"
+ android:layout_marginStart="24dp"
+ android:textSize="16sp"
+ android:textStyle="bold"
+ android:id="@+id/tv_name_1"
+ android:layout_marginTop="16dp"
+ android:textColor="@color/textColor"
+ android:text="自主学习1-听音选图"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_state"
+ app:layout_constraintTop_toBottomOf="@id/tv_name_1"
+ app:layout_constraintStart_toStartOf="@id/tv_name_1"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginBottom="18dp"
+ android:paddingVertical="1dp"
+ android:paddingHorizontal="7dp"
+ android:textColor="@color/white"
+ android:layout_marginTop="9dp"
+ android:textSize="12sp"
+ android:textStyle="bold"/>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/cl_2"
+ android:layout_marginTop="10dp"
+ android:background="@drawable/bg_white_8dp">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_d2"
+ android:textSize="18sp"
+ android:textStyle="bold"
+ android:textColor="@color/textColor"
+ app:layout_constraintStart_toStartOf="parent"
+ android:layout_marginStart="30dp"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:text="第 2 天"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toEndOf="@id/tv_d2"
+ android:layout_marginStart="24dp"
+ android:textSize="16sp"
+ android:textStyle="bold"
+ android:id="@+id/tv_name_2"
+ android:layout_marginTop="16dp"
+ android:textColor="@color/textColor"
+ android:text="自主学习2-看图选音"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_state_2"
+ app:layout_constraintTop_toBottomOf="@id/tv_name_2"
+ app:layout_constraintStart_toStartOf="@id/tv_name_2"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginBottom="18dp"
+ android:paddingVertical="1dp"
+ android:paddingHorizontal="7dp"
+ android:textColor="@color/white"
+ android:layout_marginTop="9dp"
+ android:textSize="12sp"
+ android:textStyle="bold"/>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/cl_3"
+ android:layout_marginTop="10dp"
+ android:background="@drawable/bg_white_8dp">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_d3"
+ android:textSize="18sp"
+ android:textStyle="bold"
+ android:textColor="@color/textColor"
+ app:layout_constraintStart_toStartOf="parent"
+ android:layout_marginStart="30dp"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:text="第 3 天"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toEndOf="@id/tv_d3"
+ android:layout_marginStart="24dp"
+ android:textSize="16sp"
+ android:textStyle="bold"
+ android:id="@+id/tv_name_3"
+ android:layout_marginTop="16dp"
+ android:textColor="@color/textColor"
+ android:text="自主学习3-归纳排除"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_state_3"
+ app:layout_constraintTop_toBottomOf="@id/tv_name_3"
+ app:layout_constraintStart_toStartOf="@id/tv_name_3"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginBottom="18dp"
+ android:paddingVertical="1dp"
+ android:paddingHorizontal="7dp"
+ android:textColor="@color/white"
+ android:layout_marginTop="9dp"
+ android:textSize="12sp"
+ android:textStyle="bold"/>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/cl_4"
+ android:layout_marginTop="10dp"
+ android:background="@drawable/bg_white_8dp">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_d4"
+ android:textSize="18sp"
+ android:textStyle="bold"
+ android:textColor="@color/textColor"
+ app:layout_constraintStart_toStartOf="parent"
+ android:layout_marginStart="30dp"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:text="第 4 天"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toEndOf="@id/tv_d4"
+ android:layout_marginStart="24dp"
+ android:textSize="16sp"
+ android:textStyle="bold"
+ android:id="@+id/tv_name_4"
+ android:layout_marginTop="16dp"
+ android:textColor="@color/textColor"
+ android:text="自主学习4-有问有答"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_state_4"
+ app:layout_constraintTop_toBottomOf="@id/tv_name_4"
+ app:layout_constraintStart_toStartOf="@id/tv_name_4"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginBottom="18dp"
+ android:paddingVertical="1dp"
+ android:paddingHorizontal="7dp"
+ android:textColor="@color/white"
+ android:layout_marginTop="9dp"
+ android:textSize="12sp"
+ android:textStyle="bold"/>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/cl_5"
+ android:layout_marginTop="10dp"
+ android:background="@drawable/bg_white_8dp">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_d5"
+ android:textSize="18sp"
+ android:textStyle="bold"
+ android:textColor="@color/textColor"
+ app:layout_constraintStart_toStartOf="parent"
+ android:layout_marginStart="30dp"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:text="第 5 天"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toEndOf="@id/tv_d5"
+ android:layout_marginStart="24dp"
+ android:textSize="16sp"
+ android:textStyle="bold"
+ android:id="@+id/tv_name_5"
+ android:layout_marginTop="16dp"
+ android:textColor="@color/textColor"
+ android:text="自主学习5-音图相配"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_state_5"
+ app:layout_constraintTop_toBottomOf="@id/tv_name_5"
+ app:layout_constraintStart_toStartOf="@id/tv_name_5"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginBottom="18dp"
+ android:paddingVertical="1dp"
+ android:paddingHorizontal="7dp"
+ android:textColor="@color/white"
+ android:layout_marginTop="9dp"
+ android:textSize="12sp"
+ android:textStyle="bold"/>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/cl_6"
+ android:layout_marginTop="10dp"
+ android:background="@drawable/bg_white_8dp">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_d6"
+ android:textSize="18sp"
+ android:textStyle="bold"
+ android:textColor="@color/textColor"
+ app:layout_constraintStart_toStartOf="parent"
+ android:layout_marginStart="30dp"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:text="第 6 天"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toEndOf="@id/tv_d6"
+ android:layout_marginStart="24dp"
+ android:textSize="16sp"
+ android:textStyle="bold"
+ android:id="@+id/tv_name_6"
+ android:layout_marginTop="16dp"
+ android:textColor="@color/textColor"
+ android:text="自主游戏1- 超级听力"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_state_6"
+ app:layout_constraintTop_toBottomOf="@id/tv_name_6"
+ app:layout_constraintStart_toStartOf="@id/tv_name_6"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginBottom="18dp"
+ android:paddingVertical="1dp"
+ android:paddingHorizontal="7dp"
+ android:textColor="@color/white"
+ android:layout_marginTop="9dp"
+ android:textSize="12sp"
+ android:textStyle="bold"/>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+ <androidx.constraintlayout.widget.ConstraintLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/cl_7"
+ android:layout_marginTop="10dp"
+ android:background="@drawable/bg_white_8dp">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_d7"
+ android:textSize="18sp"
+ android:textStyle="bold"
+ android:textColor="@color/textColor"
+ app:layout_constraintStart_toStartOf="parent"
+ android:layout_marginStart="30dp"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:text="第 7 天"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toEndOf="@id/tv_d7"
+ android:layout_marginStart="24dp"
+ android:textSize="16sp"
+ android:textStyle="bold"
+ android:id="@+id/tv_name_7"
+ android:layout_marginTop="16dp"
+ android:textColor="@color/textColor"
+ android:text="自主游戏2-超级记忆"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:id="@+id/tv_state_7"
+ app:layout_constraintTop_toBottomOf="@id/tv_name_7"
+ app:layout_constraintStart_toStartOf="@id/tv_name_7"
+ app:layout_constraintBottom_toBottomOf="parent"
+ android:layout_marginBottom="18dp"
+ android:paddingVertical="1dp"
+ android:paddingHorizontal="7dp"
+ android:textColor="@color/white"
+ android:layout_marginTop="9dp"
+ android:textSize="12sp"
+ android:textStyle="bold"/>
+ </androidx.constraintlayout.widget.ConstraintLayout>
+
+ </LinearLayout>
+ </ScrollView>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_recommend_info.xml b/app/src/main/res/layout/dialog_recommend_info.xml
index 32513ba..cc8ed5b 100644
--- a/app/src/main/res/layout/dialog_recommend_info.xml
+++ b/app/src/main/res/layout/dialog_recommend_info.xml
@@ -14,7 +14,7 @@
android:layout_height="wrap_content"
android:id="@+id/tv_title"
app:layout_constraintTop_toTopOf="parent"
- android:text="可兑换商品"
+ android:text="天天快乐学习，月月礼品奖励！"
android:textSize="18sp"
android:textStyle="bold"
android:textColor="@color/textColor"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 16c5ee2..c9547e1 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -21,27 +21,27 @@
<View
android:layout_width="0dp"
android:layout_height="match_parent"
- android:background="@color/colorPrimary"
+ android:background="@drawable/bg_gradient"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/guide1"/>
<ImageView
android:id="@+id/iv_1"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:src="@mipmap/logo_home"
- app:layout_constraintStart_toStartOf="parent"
+ android:layout_height="0dp"
app:layout_constraintEnd_toStartOf="@id/guide1"
- android:layout_height="wrap_content"
- app:layout_constraintTop_toTopOf="parent"
- android:layout_marginTop="40dp"/>
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintDimensionRatio="289:152"
+ app:layout_constraintTop_toTopOf="parent"/>
<TextView
android:id="@+id/tv_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="欢迎使用哆能智学！"
- android:textColor="@color/white"
+ android:text="欢迎使用-哆能智学"
+ android:textColor="@color/black"
android:textStyle="bold"
- android:textSize="25sp"
- android:layout_marginTop="17dp"
+ android:textSize="22sp"
+ android:layout_marginTop="28dp"
app:layout_constraintTop_toBottomOf="@id/iv_1"
app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="18dp"/>
@@ -49,10 +49,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="孩子自己就能学好的\n英语课程体系"
- android:textColor="@color/white"
- android:textSize="20sp"
- android:alpha="0.8"
+ android:text="孩子自己就能学好的\n英语课程"
+ android:textColor="@color/black"
+ android:textSize="16sp"
android:layout_marginTop="12dp"
app:layout_constraintTop_toBottomOf="@id/tv_1"
app:layout_constraintStart_toStartOf="parent"
@@ -88,19 +87,20 @@
android:src="@mipmap/line_virtical"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="48dp"
+ android:visibility="gone"
android:layout_marginBottom="36dp"
app:layout_constraintBottom_toBottomOf="parent"
android:scaleType="center"
app:layout_constraintEnd_toStartOf="@id/guide2"/>
<LinearLayout
- android:layout_width="380dp"
- android:layout_height="88dp"
+ android:layout_width="wrap_content"
+ android:layout_height="80dp"
android:id="@+id/cl_listen"
app:layout_constraintStart_toEndOf="@id/guide1"
app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintVertical_bias="0.3"
- android:layout_marginStart="33dp">
+ app:layout_constraintVertical_chainStyle="packed"
+ app:layout_constraintBottom_toTopOf="@id/iv_2"
+ android:layout_marginStart="70dp">
<RelativeLayout
android:layout_width="99dp"
android:orientation="vertical"
@@ -119,21 +119,180 @@
android:textSize="16sp"/>
</RelativeLayout>
<TextView
- android:text="听"
+ android:text="听 - 听懂英语声音世界，建立声音认知逻辑。\n听音有物，见物有音。"
android:textColor="@color/textColor"
android:textStyle="bold"
- android:textSize="24sp"
+ android:textSize="20sp"
+ android:paddingStart="18dp"
+ android:paddingEnd="22dp"
+ android:gravity="center_vertical"
+ android:background="@drawable/bg_white_end_14"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+ </LinearLayout>
+
+ <View
+ android:layout_width="99dp"
+ android:layout_height="1px"
+ android:id="@+id/holder"
+ app:layout_constraintStart_toStartOf="@id/cl_listen"
+ app:layout_constraintBottom_toBottomOf="@id/cl_listen" />
+ <ImageView
+ android:id="@+id/iv_2"
+ android:layout_width="28dp"
+ android:layout_height="28dp"
+ android:src="@mipmap/arrow_down"
+ app:layout_constraintStart_toStartOf="@id/holder"
+ android:layout_marginTop="12dp"
+ android:layout_marginBottom="20dp"
+ app:layout_constraintTop_toBottomOf="@id/cl_listen"
+ app:layout_constraintBottom_toTopOf="@id/cl_read"
+ app:layout_constraintEnd_toEndOf="@id/holder"/>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="80dp"
+ android:id="@+id/cl_read"
+ app:layout_constraintStart_toStartOf="@id/cl_listen"
+ app:layout_constraintEnd_toEndOf="@id/cl_listen"
+ app:layout_constraintBottom_toTopOf="@id/iv_3"
+ app:layout_constraintTop_toBottomOf="@id/iv_2">
+ <LinearLayout
+ android:layout_width="99dp"
+ android:orientation="vertical"
+ android:background="@drawable/bg_gray_left_14"
android:gravity="center"
+ android:layout_height="match_parent">
+ <ImageView
+ android:layout_width="36dp"
+ android:layout_height="36dp"
+ android:src="@mipmap/en"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:text="第二年"
+ android:gravity="center"
+ android:layout_marginTop="2dp"
+ android:textColor="@color/textColor"
+ android:textStyle="bold"
+ android:textSize="16sp"/>
+ </LinearLayout>
+ <TextView
+ android:text="认读>拼读>阅读 - 建立文字认知逻辑。"
+ android:textColor="@color/textColor66"
+ android:textStyle="bold"
+ android:textSize="20sp"
+ android:paddingStart="18dp"
+ android:paddingEnd="22dp"
+ android:gravity="center_vertical"
android:background="@drawable/bg_white_end_14"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</LinearLayout>
<ImageView
- android:id="@+id/iv_2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="30dp"
- android:src="@mipmap/home_stu"
+ android:id="@+id/iv_3"
+ android:layout_width="28dp"
+ android:layout_height="28dp"
+ android:src="@mipmap/arrow_down"
+ app:layout_constraintStart_toStartOf="@id/iv_2"
+ android:layout_marginTop="12dp"
+ android:layout_marginBottom="20dp"
+ app:layout_constraintTop_toBottomOf="@id/cl_read"
+ app:layout_constraintBottom_toTopOf="@id/cl_read_more"/>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="80dp"
+ android:id="@+id/cl_read_more"
+ app:layout_constraintStart_toStartOf="@id/cl_listen"
+ app:layout_constraintEnd_toEndOf="@id/cl_listen"
+ app:layout_constraintBottom_toTopOf="@id/iv_4"
+ app:layout_constraintTop_toBottomOf="@id/iv_3">
+ <LinearLayout
+ android:layout_width="99dp"
+ android:orientation="vertical"
+ android:background="@drawable/bg_gray_left_14"
+ android:gravity="center"
+ android:layout_height="match_parent">
+ <ImageView
+ android:layout_width="36dp"
+ android:layout_height="36dp"
+ android:src="@mipmap/yuedu"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:text="第三年"
+ android:gravity="center"
+ android:layout_marginTop="2dp"
+ android:textColor="@color/textColor"
+ android:textStyle="bold"
+ android:textSize="16sp"/>
+ </LinearLayout>
+ <TextView
+ android:text="海量阅读 - 建立英语文化认知逻辑。"
+ android:textColor="@color/textColor66"
+ android:textStyle="bold"
+ android:textSize="20sp"
+ android:paddingStart="18dp"
+ android:paddingEnd="22dp"
+ android:gravity="center_vertical"
+ android:background="@drawable/bg_white_end_14"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+ </LinearLayout>
+ <ImageView
+ android:id="@+id/iv_4"
+ android:layout_width="28dp"
+ android:layout_height="28dp"
+ android:src="@mipmap/arrow_down"
+ app:layout_constraintStart_toStartOf="@id/iv_2"
+ android:layout_marginTop="12dp"
+ android:layout_marginBottom="20dp"
+ app:layout_constraintTop_toBottomOf="@id/cl_read_more"
+ app:layout_constraintBottom_toTopOf="@id/cl_exam"/>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="80dp"
+ android:id="@+id/cl_exam"
+ app:layout_constraintStart_toStartOf="@id/cl_listen"
+ app:layout_constraintEnd_toEndOf="@id/cl_listen"
app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toStartOf="@id/guide2"/>
+ app:layout_constraintTop_toBottomOf="@id/iv_4">
+ <LinearLayout
+ android:layout_width="99dp"
+ android:orientation="vertical"
+ android:background="@drawable/bg_gray_left_14"
+ android:gravity="center"
+ android:layout_height="match_parent">
+ <ImageView
+ android:layout_width="match_parent"
+ android:layout_height="18dp"
+ android:layout_marginHorizontal="10dp"
+ android:src="@mipmap/wenhua"/>
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:text="第四年"
+ android:gravity="center"
+ android:layout_marginTop="2dp"
+ android:textColor="@color/textColor"
+ android:textStyle="bold"
+ android:textSize="16sp"/>
+ </LinearLayout>
+ <TextView
+ android:text="测试通关 - 升学 游学 留学准备。"
+ android:textColor="@color/textColor66"
+ android:textStyle="bold"
+ android:textSize="20sp"
+ android:paddingStart="18dp"
+ android:paddingEnd="22dp"
+ android:gravity="center_vertical"
+ android:background="@drawable/bg_white_end_14"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+ </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_listen.xml b/app/src/main/res/layout/fragment_listen.xml
index fd483d0..6497f01 100644
--- a/app/src/main/res/layout/fragment_listen.xml
+++ b/app/src/main/res/layout/fragment_listen.xml
@@ -34,7 +34,7 @@
android:background="@color/white"
android:id="@+id/top_1"
app:layout_constraintTop_toTopOf="parent"/>
- <com.facebook.drawee.view.SimpleDraweeView
+ <ImageView
android:layout_width="match_parent"
android:id="@+id/iv_1"
android:layout_height="0dp"
@@ -64,7 +64,7 @@
android:id="@+id/top_2"
android:background="@color/white"
app:layout_constraintTop_toTopOf="parent"/>
- <com.facebook.drawee.view.SimpleDraweeView
+ <ImageView
android:layout_width="match_parent"
android:id="@+id/iv_2"
android:layout_height="0dp"
@@ -94,7 +94,7 @@
android:id="@+id/top_3"
android:background="@color/white"
app:layout_constraintTop_toTopOf="parent"/>
- <com.facebook.drawee.view.SimpleDraweeView
+ <ImageView
android:layout_width="match_parent"
android:id="@+id/iv_3"
android:layout_height="0dp"
@@ -128,7 +128,7 @@
android:id="@+id/top_4"
android:background="@color/white"
app:layout_constraintTop_toTopOf="parent"/>
- <com.facebook.drawee.view.SimpleDraweeView
+ <ImageView
android:layout_width="match_parent"
android:id="@+id/iv_4"
android:layout_height="0dp"
diff --git a/app/src/main/res/mipmap-xxhdpi/arrow_down.png b/app/src/main/res/mipmap-xxhdpi/arrow_down.png
new file mode 100644
index 0000000..fe65784
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/arrow_down.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/big_erji.png b/app/src/main/res/mipmap-xxhdpi/big_erji.png
new file mode 100644
index 0000000..a3e4e52
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/big_erji.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/en.png b/app/src/main/res/mipmap-xxhdpi/en.png
new file mode 100644
index 0000000..809f389
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/en.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/logo_home.png b/app/src/main/res/mipmap-xxhdpi/logo_home.png
index 86a1813..767adba 100644
--- a/app/src/main/res/mipmap-xxhdpi/logo_home.png
+++ b/app/src/main/res/mipmap-xxhdpi/logo_home.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/splash.jpg b/app/src/main/res/mipmap-xxhdpi/splash.jpg
deleted file mode 100644
index 02bacf1..0000000
--- a/app/src/main/res/mipmap-xxhdpi/splash.jpg
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/splash.png b/app/src/main/res/mipmap-xxhdpi/splash.png
new file mode 100644
index 0000000..76fbf32
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/splash.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/wenhua.png b/app/src/main/res/mipmap-xxhdpi/wenhua.png
new file mode 100644
index 0000000..95d9f10
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/wenhua.png
Binary files differ
diff --git a/app/src/main/res/mipmap-xxhdpi/yuedu.png b/app/src/main/res/mipmap-xxhdpi/yuedu.png
new file mode 100644
index 0000000..7d7404f
--- /dev/null
+++ b/app/src/main/res/mipmap-xxhdpi/yuedu.png
Binary files differ
--
Gitblit v1.7.1