diff --git a/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt index 931d1c8..e164275 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt @@ -11,6 +11,7 @@ import android.util.DisplayMetrics import android.util.Log import android.view.Surface +import android.view.View import androidx.camera.core.AspectRatio import androidx.camera.core.CameraSelector import androidx.camera.core.CameraState @@ -20,16 +21,11 @@ import androidx.camera.lifecycle.ProcessCameraProvider import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider -import com.casic.br.ar.app.R import com.casic.br.ar.app.databinding.ActivityStartCheckBinding -import com.casic.br.ar.app.extensions.initImmersionBar import com.casic.br.ar.app.vm.FileUploadViewModel -import com.casic.br.ar.app.widgets.CheckResultDialog -import com.casic.br.ar.app.widgets.SelectSceneDialog import com.google.common.util.concurrent.ListenableFuture import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.rotateImage -import com.pengxh.kt.lite.widget.TitleBarView import java.io.ByteArrayOutputStream import java.io.IOException import java.util.concurrent.ExecutionException @@ -65,13 +61,13 @@ override fun initOnCreate(savedInstanceState: Bundle?) { fileUploadViewModel = ViewModelProvider(this)[FileUploadViewModel::class.java] - fileUploadViewModel.recognizeResult.observe(this) { - if (it.code == 200) { - binding.titleView.setTitle(it.scene) - binding.detectView.updateTargetPosition(it.result) - } - isRecognizing = false - } +// fileUploadViewModel.recognizeResult.observe(this) { +// if (it.code == 200) { +// binding.titleView.setTitle(it.scene) +// binding.detectView.updateTargetPosition(it.result) +// } +// isRecognizing = false +// } // Initialize our background executor cameraExecutor = Executors.newSingleThreadExecutor() @@ -210,34 +206,7 @@ } override fun initEvent() { - binding.stopButton.setOnClickListener { - CheckResultDialog.Builder() - .setContext(this) - .setPositiveButton("确认，检查结束") - .setNegativeButton("返回") - .setOnDialogButtonClickListener(object : - CheckResultDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - } - - override fun onCancelClick() { - - } - }).build().show() - } - - binding.tipsButton.setOnClickListener { - - } - - binding.addButton.setOnClickListener { - - } - - binding.listButton.setOnClickListener { - - } } override fun initViewBinding(): ActivityStartCheckBinding { @@ -249,24 +218,8 @@ } override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.themeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - finish() - } - - override fun onRightClick() { - SelectSceneDialog.Builder() - .setContext(context) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - binding.titleView.setTitle(value) - } - }).build().show() - } - }) + val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) + window.decorView.systemUiVisibility = uiOptions } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt index 931d1c8..e164275 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt @@ -11,6 +11,7 @@ import android.util.DisplayMetrics import android.util.Log import android.view.Surface +import android.view.View import androidx.camera.core.AspectRatio import androidx.camera.core.CameraSelector import androidx.camera.core.CameraState @@ -20,16 +21,11 @@ import androidx.camera.lifecycle.ProcessCameraProvider import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider -import com.casic.br.ar.app.R import com.casic.br.ar.app.databinding.ActivityStartCheckBinding -import com.casic.br.ar.app.extensions.initImmersionBar import com.casic.br.ar.app.vm.FileUploadViewModel -import com.casic.br.ar.app.widgets.CheckResultDialog -import com.casic.br.ar.app.widgets.SelectSceneDialog import com.google.common.util.concurrent.ListenableFuture import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.rotateImage -import com.pengxh.kt.lite.widget.TitleBarView import java.io.ByteArrayOutputStream import java.io.IOException import java.util.concurrent.ExecutionException @@ -65,13 +61,13 @@ override fun initOnCreate(savedInstanceState: Bundle?) { fileUploadViewModel = ViewModelProvider(this)[FileUploadViewModel::class.java] - fileUploadViewModel.recognizeResult.observe(this) { - if (it.code == 200) { - binding.titleView.setTitle(it.scene) - binding.detectView.updateTargetPosition(it.result) - } - isRecognizing = false - } +// fileUploadViewModel.recognizeResult.observe(this) { +// if (it.code == 200) { +// binding.titleView.setTitle(it.scene) +// binding.detectView.updateTargetPosition(it.result) +// } +// isRecognizing = false +// } // Initialize our background executor cameraExecutor = Executors.newSingleThreadExecutor() @@ -210,34 +206,7 @@ } override fun initEvent() { - binding.stopButton.setOnClickListener { - CheckResultDialog.Builder() - .setContext(this) - .setPositiveButton("确认，检查结束") - .setNegativeButton("返回") - .setOnDialogButtonClickListener(object : - CheckResultDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - } - - override fun onCancelClick() { - - } - }).build().show() - } - - binding.tipsButton.setOnClickListener { - - } - - binding.addButton.setOnClickListener { - - } - - binding.listButton.setOnClickListener { - - } } override fun initViewBinding(): ActivityStartCheckBinding { @@ -249,24 +218,8 @@ } override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.themeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - finish() - } - - override fun onRightClick() { - SelectSceneDialog.Builder() - .setContext(context) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - binding.titleView.setTitle(value) - } - }).build().show() - } - }) + val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) + window.decorView.systemUiVisibility = uiOptions } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/app/src/main/res/drawable/ic_check_no.xml b/app/src/main/res/drawable/ic_check_no.xml new file mode 100644 index 0000000..6a70978 --- /dev/null +++ b/app/src/main/res/drawable/ic_check_no.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt index 931d1c8..e164275 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt @@ -11,6 +11,7 @@ import android.util.DisplayMetrics import android.util.Log import android.view.Surface +import android.view.View import androidx.camera.core.AspectRatio import androidx.camera.core.CameraSelector import androidx.camera.core.CameraState @@ -20,16 +21,11 @@ import androidx.camera.lifecycle.ProcessCameraProvider import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider -import com.casic.br.ar.app.R import com.casic.br.ar.app.databinding.ActivityStartCheckBinding -import com.casic.br.ar.app.extensions.initImmersionBar import com.casic.br.ar.app.vm.FileUploadViewModel -import com.casic.br.ar.app.widgets.CheckResultDialog -import com.casic.br.ar.app.widgets.SelectSceneDialog import com.google.common.util.concurrent.ListenableFuture import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.rotateImage -import com.pengxh.kt.lite.widget.TitleBarView import java.io.ByteArrayOutputStream import java.io.IOException import java.util.concurrent.ExecutionException @@ -65,13 +61,13 @@ override fun initOnCreate(savedInstanceState: Bundle?) { fileUploadViewModel = ViewModelProvider(this)[FileUploadViewModel::class.java] - fileUploadViewModel.recognizeResult.observe(this) { - if (it.code == 200) { - binding.titleView.setTitle(it.scene) - binding.detectView.updateTargetPosition(it.result) - } - isRecognizing = false - } +// fileUploadViewModel.recognizeResult.observe(this) { +// if (it.code == 200) { +// binding.titleView.setTitle(it.scene) +// binding.detectView.updateTargetPosition(it.result) +// } +// isRecognizing = false +// } // Initialize our background executor cameraExecutor = Executors.newSingleThreadExecutor() @@ -210,34 +206,7 @@ } override fun initEvent() { - binding.stopButton.setOnClickListener { - CheckResultDialog.Builder() - .setContext(this) - .setPositiveButton("确认，检查结束") - .setNegativeButton("返回") - .setOnDialogButtonClickListener(object : - CheckResultDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - } - - override fun onCancelClick() { - - } - }).build().show() - } - - binding.tipsButton.setOnClickListener { - - } - - binding.addButton.setOnClickListener { - - } - - binding.listButton.setOnClickListener { - - } } override fun initViewBinding(): ActivityStartCheckBinding { @@ -249,24 +218,8 @@ } override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.themeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - finish() - } - - override fun onRightClick() { - SelectSceneDialog.Builder() - .setContext(context) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - binding.titleView.setTitle(value) - } - }).build().show() - } - }) + val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) + window.decorView.systemUiVisibility = uiOptions } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/app/src/main/res/drawable/ic_check_no.xml b/app/src/main/res/drawable/ic_check_no.xml new file mode 100644 index 0000000..6a70978 --- /dev/null +++ b/app/src/main/res/drawable/ic_check_no.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_check_pass.xml b/app/src/main/res/drawable/ic_check_pass.xml new file mode 100644 index 0000000..0d8e3ca --- /dev/null +++ b/app/src/main/res/drawable/ic_check_pass.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt index 931d1c8..e164275 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt @@ -11,6 +11,7 @@ import android.util.DisplayMetrics import android.util.Log import android.view.Surface +import android.view.View import androidx.camera.core.AspectRatio import androidx.camera.core.CameraSelector import androidx.camera.core.CameraState @@ -20,16 +21,11 @@ import androidx.camera.lifecycle.ProcessCameraProvider import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider -import com.casic.br.ar.app.R import com.casic.br.ar.app.databinding.ActivityStartCheckBinding -import com.casic.br.ar.app.extensions.initImmersionBar import com.casic.br.ar.app.vm.FileUploadViewModel -import com.casic.br.ar.app.widgets.CheckResultDialog -import com.casic.br.ar.app.widgets.SelectSceneDialog import com.google.common.util.concurrent.ListenableFuture import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.rotateImage -import com.pengxh.kt.lite.widget.TitleBarView import java.io.ByteArrayOutputStream import java.io.IOException import java.util.concurrent.ExecutionException @@ -65,13 +61,13 @@ override fun initOnCreate(savedInstanceState: Bundle?) { fileUploadViewModel = ViewModelProvider(this)[FileUploadViewModel::class.java] - fileUploadViewModel.recognizeResult.observe(this) { - if (it.code == 200) { - binding.titleView.setTitle(it.scene) - binding.detectView.updateTargetPosition(it.result) - } - isRecognizing = false - } +// fileUploadViewModel.recognizeResult.observe(this) { +// if (it.code == 200) { +// binding.titleView.setTitle(it.scene) +// binding.detectView.updateTargetPosition(it.result) +// } +// isRecognizing = false +// } // Initialize our background executor cameraExecutor = Executors.newSingleThreadExecutor() @@ -210,34 +206,7 @@ } override fun initEvent() { - binding.stopButton.setOnClickListener { - CheckResultDialog.Builder() - .setContext(this) - .setPositiveButton("确认，检查结束") - .setNegativeButton("返回") - .setOnDialogButtonClickListener(object : - CheckResultDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - } - - override fun onCancelClick() { - - } - }).build().show() - } - - binding.tipsButton.setOnClickListener { - - } - - binding.addButton.setOnClickListener { - - } - - binding.listButton.setOnClickListener { - - } } override fun initViewBinding(): ActivityStartCheckBinding { @@ -249,24 +218,8 @@ } override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.themeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - finish() - } - - override fun onRightClick() { - SelectSceneDialog.Builder() - .setContext(context) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - binding.titleView.setTitle(value) - } - }).build().show() - } - }) + val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) + window.decorView.systemUiVisibility = uiOptions } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/app/src/main/res/drawable/ic_check_no.xml b/app/src/main/res/drawable/ic_check_no.xml new file mode 100644 index 0000000..6a70978 --- /dev/null +++ b/app/src/main/res/drawable/ic_check_no.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_check_pass.xml b/app/src/main/res/drawable/ic_check_pass.xml new file mode 100644 index 0000000..0d8e3ca --- /dev/null +++ b/app/src/main/res/drawable/ic_check_pass.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_check_trouble.xml b/app/src/main/res/drawable/ic_check_trouble.xml new file mode 100644 index 0000000..e56f37e --- /dev/null +++ b/app/src/main/res/drawable/ic_check_trouble.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt index 931d1c8..e164275 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt @@ -11,6 +11,7 @@ import android.util.DisplayMetrics import android.util.Log import android.view.Surface +import android.view.View import androidx.camera.core.AspectRatio import androidx.camera.core.CameraSelector import androidx.camera.core.CameraState @@ -20,16 +21,11 @@ import androidx.camera.lifecycle.ProcessCameraProvider import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider -import com.casic.br.ar.app.R import com.casic.br.ar.app.databinding.ActivityStartCheckBinding -import com.casic.br.ar.app.extensions.initImmersionBar import com.casic.br.ar.app.vm.FileUploadViewModel -import com.casic.br.ar.app.widgets.CheckResultDialog -import com.casic.br.ar.app.widgets.SelectSceneDialog import com.google.common.util.concurrent.ListenableFuture import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.rotateImage -import com.pengxh.kt.lite.widget.TitleBarView import java.io.ByteArrayOutputStream import java.io.IOException import java.util.concurrent.ExecutionException @@ -65,13 +61,13 @@ override fun initOnCreate(savedInstanceState: Bundle?) { fileUploadViewModel = ViewModelProvider(this)[FileUploadViewModel::class.java] - fileUploadViewModel.recognizeResult.observe(this) { - if (it.code == 200) { - binding.titleView.setTitle(it.scene) - binding.detectView.updateTargetPosition(it.result) - } - isRecognizing = false - } +// fileUploadViewModel.recognizeResult.observe(this) { +// if (it.code == 200) { +// binding.titleView.setTitle(it.scene) +// binding.detectView.updateTargetPosition(it.result) +// } +// isRecognizing = false +// } // Initialize our background executor cameraExecutor = Executors.newSingleThreadExecutor() @@ -210,34 +206,7 @@ } override fun initEvent() { - binding.stopButton.setOnClickListener { - CheckResultDialog.Builder() - .setContext(this) - .setPositiveButton("确认，检查结束") - .setNegativeButton("返回") - .setOnDialogButtonClickListener(object : - CheckResultDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - } - - override fun onCancelClick() { - - } - }).build().show() - } - - binding.tipsButton.setOnClickListener { - - } - - binding.addButton.setOnClickListener { - - } - - binding.listButton.setOnClickListener { - - } } override fun initViewBinding(): ActivityStartCheckBinding { @@ -249,24 +218,8 @@ } override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.themeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - finish() - } - - override fun onRightClick() { - SelectSceneDialog.Builder() - .setContext(context) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - binding.titleView.setTitle(value) - } - }).build().show() - } - }) + val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) + window.decorView.systemUiVisibility = uiOptions } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/app/src/main/res/drawable/ic_check_no.xml b/app/src/main/res/drawable/ic_check_no.xml new file mode 100644 index 0000000..6a70978 --- /dev/null +++ b/app/src/main/res/drawable/ic_check_no.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_check_pass.xml b/app/src/main/res/drawable/ic_check_pass.xml new file mode 100644 index 0000000..0d8e3ca --- /dev/null +++ b/app/src/main/res/drawable/ic_check_pass.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_check_trouble.xml b/app/src/main/res/drawable/ic_check_trouble.xml new file mode 100644 index 0000000..e56f37e --- /dev/null +++ b/app/src/main/res/drawable/ic_check_trouble.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_start_check.xml b/app/src/main/res/layout/activity_start_check.xml index ad655c3..f7a3463 100644 --- a/app/src/main/res/layout/activity_start_check.xml +++ b/app/src/main/res/layout/activity_start_check.xml @@ -1,70 +1,134 @@ - + android:background="@color/black"> - + android:layout_height="match_parent" /> - + android:layout_height="@dimen/titleViewHeight" + android:background="@color/opacity_black" + android:orientation="horizontal" + android:paddingHorizontal="@dimen/dp_5"> - - - - - + android:layout_height="match_parent" + android:gravity="center" + android:orientation="horizontal"> - + - + - + + + + + + - - \ No newline at end of file + android:layout_height="match_parent" + android:layout_marginHorizontal="@dimen/dp_30" + android:gravity="center" + android:orientation="horizontal"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt index 931d1c8..e164275 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/StartCheckActivity.kt @@ -11,6 +11,7 @@ import android.util.DisplayMetrics import android.util.Log import android.view.Surface +import android.view.View import androidx.camera.core.AspectRatio import androidx.camera.core.CameraSelector import androidx.camera.core.CameraState @@ -20,16 +21,11 @@ import androidx.camera.lifecycle.ProcessCameraProvider import androidx.core.content.ContextCompat import androidx.lifecycle.ViewModelProvider -import com.casic.br.ar.app.R import com.casic.br.ar.app.databinding.ActivityStartCheckBinding -import com.casic.br.ar.app.extensions.initImmersionBar import com.casic.br.ar.app.vm.FileUploadViewModel -import com.casic.br.ar.app.widgets.CheckResultDialog -import com.casic.br.ar.app.widgets.SelectSceneDialog import com.google.common.util.concurrent.ListenableFuture import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.extensions.rotateImage -import com.pengxh.kt.lite.widget.TitleBarView import java.io.ByteArrayOutputStream import java.io.IOException import java.util.concurrent.ExecutionException @@ -65,13 +61,13 @@ override fun initOnCreate(savedInstanceState: Bundle?) { fileUploadViewModel = ViewModelProvider(this)[FileUploadViewModel::class.java] - fileUploadViewModel.recognizeResult.observe(this) { - if (it.code == 200) { - binding.titleView.setTitle(it.scene) - binding.detectView.updateTargetPosition(it.result) - } - isRecognizing = false - } +// fileUploadViewModel.recognizeResult.observe(this) { +// if (it.code == 200) { +// binding.titleView.setTitle(it.scene) +// binding.detectView.updateTargetPosition(it.result) +// } +// isRecognizing = false +// } // Initialize our background executor cameraExecutor = Executors.newSingleThreadExecutor() @@ -210,34 +206,7 @@ } override fun initEvent() { - binding.stopButton.setOnClickListener { - CheckResultDialog.Builder() - .setContext(this) - .setPositiveButton("确认，检查结束") - .setNegativeButton("返回") - .setOnDialogButtonClickListener(object : - CheckResultDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - } - - override fun onCancelClick() { - - } - }).build().show() - } - - binding.tipsButton.setOnClickListener { - - } - - binding.addButton.setOnClickListener { - - } - - binding.listButton.setOnClickListener { - - } } override fun initViewBinding(): ActivityStartCheckBinding { @@ -249,24 +218,8 @@ } override fun setupTopBarLayout() { - binding.rootView.initImmersionBar(this, false, R.color.themeColor) - binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { - override fun onLeftClick() { - finish() - } - - override fun onRightClick() { - SelectSceneDialog.Builder() - .setContext(context) - .setPositiveButton("保存") - .setOnDialogButtonClickListener(object : - SelectSceneDialog.OnDialogButtonClickListener { - override fun onConfirmClick(value: String) { - binding.titleView.setTitle(value) - } - }).build().show() - } - }) + val uiOptions = (View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN) + window.decorView.systemUiVisibility = uiOptions } private fun aspectRatio(width: Int, height: Int): Int { diff --git a/app/src/main/res/drawable/ic_check_no.xml b/app/src/main/res/drawable/ic_check_no.xml new file mode 100644 index 0000000..6a70978 --- /dev/null +++ b/app/src/main/res/drawable/ic_check_no.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_check_pass.xml b/app/src/main/res/drawable/ic_check_pass.xml new file mode 100644 index 0000000..0d8e3ca --- /dev/null +++ b/app/src/main/res/drawable/ic_check_pass.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_check_trouble.xml b/app/src/main/res/drawable/ic_check_trouble.xml new file mode 100644 index 0000000..e56f37e --- /dev/null +++ b/app/src/main/res/drawable/ic_check_trouble.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_start_check.xml b/app/src/main/res/layout/activity_start_check.xml index ad655c3..f7a3463 100644 --- a/app/src/main/res/layout/activity_start_check.xml +++ b/app/src/main/res/layout/activity_start_check.xml @@ -1,70 +1,134 @@ - + android:background="@color/black"> - + android:layout_height="match_parent" /> - + android:layout_height="@dimen/titleViewHeight" + android:background="@color/opacity_black" + android:orientation="horizontal" + android:paddingHorizontal="@dimen/dp_5"> - - - - - + android:layout_height="match_parent" + android:gravity="center" + android:orientation="horizontal"> - + - + - + + + + + + - - \ No newline at end of file + android:layout_height="match_parent" + android:layout_marginHorizontal="@dimen/dp_30" + android:gravity="center" + android:orientation="horizontal"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 135104e..180fa33 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -10,5 +10,6 @@ #F7F7F7 #FFAAAAAA #FF000000 + #80000000 #FFFFFFFF \ No newline at end of file