diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index beeaab7..3336534 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,6 +29,9 @@ - + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index beeaab7..3336534 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,6 +29,9 @@ - + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt b/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt new file mode 100644 index 0000000..0f1b5e1 --- /dev/null +++ b/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt @@ -0,0 +1,29 @@ +package com.casic.endoscope.view + +import android.os.Bundle +import com.casic.endoscope.R +import com.casic.endoscope.databinding.ActivityAlbumBinding +import com.casic.endoscope.extensions.initImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class AlbumActivity: KotlinBaseActivity() { + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + + } + + override fun initViewBinding(): ActivityAlbumBinding { + return ActivityAlbumBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, true, R.color.white) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index beeaab7..3336534 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,6 +29,9 @@ - + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt b/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt new file mode 100644 index 0000000..0f1b5e1 --- /dev/null +++ b/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt @@ -0,0 +1,29 @@ +package com.casic.endoscope.view + +import android.os.Bundle +import com.casic.endoscope.R +import com.casic.endoscope.databinding.ActivityAlbumBinding +import com.casic.endoscope.extensions.initImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class AlbumActivity: KotlinBaseActivity() { + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + + } + + override fun initViewBinding(): ActivityAlbumBinding { + return ActivityAlbumBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, true, R.color.white) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/endoscope/view/MainActivity.kt b/app/src/main/java/com/casic/endoscope/view/MainActivity.kt index b7e94e9..a8c77df 100644 --- a/app/src/main/java/com/casic/endoscope/view/MainActivity.kt +++ b/app/src/main/java/com/casic/endoscope/view/MainActivity.kt @@ -23,6 +23,7 @@ import com.hikvision.netsdk.PTZCommand import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createImageFileDir +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -68,6 +69,14 @@ } override fun initEvent() { + binding.openAlbumButton.setOnClickListener { + if (isPreviewSuccess) { + "设备预览画面中,无法切换".show(this) + return@setOnClickListener + } + navigatePageTo() + } + binding.imageButton.setOnClickListener { if (isPreviewSuccess) { lifecycleScope.launch(Dispatchers.IO) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index beeaab7..3336534 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,6 +29,9 @@ - + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt b/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt new file mode 100644 index 0000000..0f1b5e1 --- /dev/null +++ b/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt @@ -0,0 +1,29 @@ +package com.casic.endoscope.view + +import android.os.Bundle +import com.casic.endoscope.R +import com.casic.endoscope.databinding.ActivityAlbumBinding +import com.casic.endoscope.extensions.initImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class AlbumActivity: KotlinBaseActivity() { + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + + } + + override fun initViewBinding(): ActivityAlbumBinding { + return ActivityAlbumBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, true, R.color.white) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/endoscope/view/MainActivity.kt b/app/src/main/java/com/casic/endoscope/view/MainActivity.kt index b7e94e9..a8c77df 100644 --- a/app/src/main/java/com/casic/endoscope/view/MainActivity.kt +++ b/app/src/main/java/com/casic/endoscope/view/MainActivity.kt @@ -23,6 +23,7 @@ import com.hikvision.netsdk.PTZCommand import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createImageFileDir +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -68,6 +69,14 @@ } override fun initEvent() { + binding.openAlbumButton.setOnClickListener { + if (isPreviewSuccess) { + "设备预览画面中,无法切换".show(this) + return@setOnClickListener + } + navigatePageTo() + } + binding.imageButton.setOnClickListener { if (isPreviewSuccess) { lifecycleScope.launch(Dispatchers.IO) { diff --git a/app/src/main/res/drawable/ic_album.xml b/app/src/main/res/drawable/ic_album.xml new file mode 100644 index 0000000..4efa798 --- /dev/null +++ b/app/src/main/res/drawable/ic_album.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index beeaab7..3336534 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,6 +29,9 @@ - + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt b/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt new file mode 100644 index 0000000..0f1b5e1 --- /dev/null +++ b/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt @@ -0,0 +1,29 @@ +package com.casic.endoscope.view + +import android.os.Bundle +import com.casic.endoscope.R +import com.casic.endoscope.databinding.ActivityAlbumBinding +import com.casic.endoscope.extensions.initImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class AlbumActivity: KotlinBaseActivity() { + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + + } + + override fun initViewBinding(): ActivityAlbumBinding { + return ActivityAlbumBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, true, R.color.white) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/endoscope/view/MainActivity.kt b/app/src/main/java/com/casic/endoscope/view/MainActivity.kt index b7e94e9..a8c77df 100644 --- a/app/src/main/java/com/casic/endoscope/view/MainActivity.kt +++ b/app/src/main/java/com/casic/endoscope/view/MainActivity.kt @@ -23,6 +23,7 @@ import com.hikvision.netsdk.PTZCommand import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createImageFileDir +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -68,6 +69,14 @@ } override fun initEvent() { + binding.openAlbumButton.setOnClickListener { + if (isPreviewSuccess) { + "设备预览画面中,无法切换".show(this) + return@setOnClickListener + } + navigatePageTo() + } + binding.imageButton.setOnClickListener { if (isPreviewSuccess) { lifecycleScope.launch(Dispatchers.IO) { diff --git a/app/src/main/res/drawable/ic_album.xml b/app/src/main/res/drawable/ic_album.xml new file mode 100644 index 0000000..4efa798 --- /dev/null +++ b/app/src/main/res/drawable/ic_album.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml new file mode 100644 index 0000000..6c46e40 --- /dev/null +++ b/app/src/main/res/layout/activity_album.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index beeaab7..3336534 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,6 +29,9 @@ - + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt b/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt new file mode 100644 index 0000000..0f1b5e1 --- /dev/null +++ b/app/src/main/java/com/casic/endoscope/view/AlbumActivity.kt @@ -0,0 +1,29 @@ +package com.casic.endoscope.view + +import android.os.Bundle +import com.casic.endoscope.R +import com.casic.endoscope.databinding.ActivityAlbumBinding +import com.casic.endoscope.extensions.initImmersionBar +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class AlbumActivity: KotlinBaseActivity() { + override fun initEvent() { + + } + + override fun initOnCreate(savedInstanceState: Bundle?) { + + } + + override fun initViewBinding(): ActivityAlbumBinding { + return ActivityAlbumBinding.inflate(layoutInflater) + } + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + binding.rootView.initImmersionBar(this, true, R.color.white) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/endoscope/view/MainActivity.kt b/app/src/main/java/com/casic/endoscope/view/MainActivity.kt index b7e94e9..a8c77df 100644 --- a/app/src/main/java/com/casic/endoscope/view/MainActivity.kt +++ b/app/src/main/java/com/casic/endoscope/view/MainActivity.kt @@ -23,6 +23,7 @@ import com.hikvision.netsdk.PTZCommand import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.createImageFileDir +import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -68,6 +69,14 @@ } override fun initEvent() { + binding.openAlbumButton.setOnClickListener { + if (isPreviewSuccess) { + "设备预览画面中,无法切换".show(this) + return@setOnClickListener + } + navigatePageTo() + } + binding.imageButton.setOnClickListener { if (isPreviewSuccess) { lifecycleScope.launch(Dispatchers.IO) { diff --git a/app/src/main/res/drawable/ic_album.xml b/app/src/main/res/drawable/ic_album.xml new file mode 100644 index 0000000..4efa798 --- /dev/null +++ b/app/src/main/res/drawable/ic_album.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml new file mode 100644 index 0000000..6c46e40 --- /dev/null +++ b/app/src/main/res/layout/activity_album.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index eba6242..f66ea25 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -7,14 +7,28 @@ android:background="@color/white" android:orientation="vertical"> - + android:layout_height="@dimen/titleViewHeight" + android:layout_marginHorizontal="@dimen/dp_10"> + + + + +