diff --git a/code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/ui/home/HomeActivity.kt b/code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/ui/home/HomeActivity.kt index ab2f135..701d393 100644 --- a/code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/ui/home/HomeActivity.kt +++ b/code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/ui/home/HomeActivity.kt @@ -15,7 +15,7 @@ class HomeActivity : BaseActivity() { } override fun initEvents() { - home_fab.setOnClickListener(this) + note_add_button.setOnClickListener(this) // home_search.setOnQueryTextListener(object : SearchView.OnQueryTextListener{ // /** // * 提交监听 @@ -38,13 +38,13 @@ class HomeActivity : BaseActivity() { } override fun onActivityCreated() { - setSupportActionBar(home_toolbar) //设置工具栏 + //setSupportActionBar(home_toolbar) //设置工具栏 //TODO:获取服务器用户日记数据,设置列表展示 } override fun onClick(v: View?) { when(v?.id) { - R.id.home_fab -> { + R.id.note_add_button -> { startActivity(this){} } } diff --git a/code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/ui/read/ReadActivity.kt b/code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/ui/read/ReadActivity.kt index b52a707..483cf15 100644 --- a/code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/ui/read/ReadActivity.kt +++ b/code/DiaryBottleApp/app/src/main/java/com/example/diarybottleapp/ui/read/ReadActivity.kt @@ -1,31 +1,62 @@ package com.example.diarybottleapp.ui.read +import android.content.BroadcastReceiver +import android.content.Context +import android.content.Intent import android.view.View +import android.view.animation.Animation +import android.view.animation.AnimationUtils import com.example.diarybottleapp.R import com.example.diarybottleapp.base.BaseActivity +import com.example.diarybottleapp.util.TimeUtil import kotlinx.android.synthetic.main.activity_read.* class ReadActivity : BaseActivity() { + //底部页面动画 + private lateinit var bottomAnimIn: Animation + private lateinit var bottomAnimOut: Animation + override fun initTheme() { setContentView(R.layout.activity_read) } override fun initEvents() { read_save.setOnClickListener(this) - read_delete.setOnClickListener(this) read_back.setOnClickListener(this) - read_info_title.requestFocus() //初始时让内容输入框获取焦点 - + check_msg.setOnClickListener(this) + hide_msg.setOnClickListener(this) } override fun onActivityCreated() { - + read_time.text = TimeUtil.getTime() + bottomAnimIn = AnimationUtils.loadAnimation(this, R.anim.slide_bottom_in) + bottomAnimOut = AnimationUtils.loadAnimation(this, R.anim.slide_bottom_out) } override fun onClick(v: View?) { when(v?.id) { R.id.read_back -> finish() + R.id.check_msg -> { + check_msg.visibility = View.GONE + read_msg_rl.visibility = View.VISIBLE + read_msg_rl.startAnimation(bottomAnimIn) + } + R.id.hide_msg -> { + check_msg.visibility = View.VISIBLE + read_msg_rl.visibility = View.GONE + read_msg_rl.startAnimation(bottomAnimOut) + } } } + + inner class ReadBroadCastReceiver : BroadcastReceiver() { + override fun onReceive(context: Context?, intent: Intent?) { + //接收系统时间变化广播 + if(intent?.action == Intent.ACTION_TIME_TICK) { + read_time.text = TimeUtil.getTime() + } + } + } + } \ No newline at end of file diff --git a/code/DiaryBottleApp/app/src/main/res/anim/slide_bottom_in.xml b/code/DiaryBottleApp/app/src/main/res/anim/slide_bottom_in.xml new file mode 100644 index 0000000..9a6d4ac --- /dev/null +++ b/code/DiaryBottleApp/app/src/main/res/anim/slide_bottom_in.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/code/DiaryBottleApp/app/src/main/res/anim/slide_bottom_out.xml b/code/DiaryBottleApp/app/src/main/res/anim/slide_bottom_out.xml new file mode 100644 index 0000000..23ebc70 --- /dev/null +++ b/code/DiaryBottleApp/app/src/main/res/anim/slide_bottom_out.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/code/DiaryBottleApp/app/src/main/res/anim/slide_catalogue_in.xml b/code/DiaryBottleApp/app/src/main/res/anim/slide_catalogue_in.xml new file mode 100644 index 0000000..413e964 --- /dev/null +++ b/code/DiaryBottleApp/app/src/main/res/anim/slide_catalogue_in.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/code/DiaryBottleApp/app/src/main/res/anim/slide_catalogue_out.xml b/code/DiaryBottleApp/app/src/main/res/anim/slide_catalogue_out.xml new file mode 100644 index 0000000..4e9d05f --- /dev/null +++ b/code/DiaryBottleApp/app/src/main/res/anim/slide_catalogue_out.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/code/DiaryBottleApp/app/src/main/res/anim/slide_in_left.xml b/code/DiaryBottleApp/app/src/main/res/anim/slide_in_left.xml new file mode 100644 index 0000000..7c97f7c --- /dev/null +++ b/code/DiaryBottleApp/app/src/main/res/anim/slide_in_left.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/code/DiaryBottleApp/app/src/main/res/anim/slide_in_right.xml b/code/DiaryBottleApp/app/src/main/res/anim/slide_in_right.xml new file mode 100644 index 0000000..33362c0 --- /dev/null +++ b/code/DiaryBottleApp/app/src/main/res/anim/slide_in_right.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/code/DiaryBottleApp/app/src/main/res/anim/slide_out_left.xml b/code/DiaryBottleApp/app/src/main/res/anim/slide_out_left.xml new file mode 100644 index 0000000..06b83ad --- /dev/null +++ b/code/DiaryBottleApp/app/src/main/res/anim/slide_out_left.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/code/DiaryBottleApp/app/src/main/res/anim/slide_out_right.xml b/code/DiaryBottleApp/app/src/main/res/anim/slide_out_right.xml new file mode 100644 index 0000000..0fd6a33 --- /dev/null +++ b/code/DiaryBottleApp/app/src/main/res/anim/slide_out_right.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/code/DiaryBottleApp/app/src/main/res/anim/slide_top_in.xml b/code/DiaryBottleApp/app/src/main/res/anim/slide_top_in.xml new file mode 100644 index 0000000..3e86fdc --- /dev/null +++ b/code/DiaryBottleApp/app/src/main/res/anim/slide_top_in.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/code/DiaryBottleApp/app/src/main/res/anim/slide_top_out.xml b/code/DiaryBottleApp/app/src/main/res/anim/slide_top_out.xml new file mode 100644 index 0000000..3f7a2db --- /dev/null +++ b/code/DiaryBottleApp/app/src/main/res/anim/slide_top_out.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/code/DiaryBottleApp/app/src/main/res/layout/activity_home.xml b/code/DiaryBottleApp/app/src/main/res/layout/activity_home.xml index 76c600e..e222ee8 100644 --- a/code/DiaryBottleApp/app/src/main/res/layout/activity_home.xml +++ b/code/DiaryBottleApp/app/src/main/res/layout/activity_home.xml @@ -65,10 +65,11 @@ diff --git a/code/DiaryBottleApp/app/src/main/res/layout/activity_read.xml b/code/DiaryBottleApp/app/src/main/res/layout/activity_read.xml index fe8c15d..2409a35 100644 --- a/code/DiaryBottleApp/app/src/main/res/layout/activity_read.xml +++ b/code/DiaryBottleApp/app/src/main/res/layout/activity_read.xml @@ -86,19 +86,56 @@ android:textColor="@color/wordBlack" android:background="@color/white" android:textCursorDrawable="@drawable/cursor"/> - - - + + + + + + + + + + + + + + + + + + + + + + +