diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0583dda..d0a6c05 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,9 +69,5 @@ - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0583dda..d0a6c05 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,9 +69,5 @@ - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index 13ee982..9b9c93e 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -5,6 +5,7 @@ import com.casic.br.app.R import com.casic.br.app.databinding.ActivityStartCheckBinding import com.casic.br.app.extensions.initImmersionBar +import com.casic.br.app.widgets.CheckResultDialog import com.casic.br.app.widgets.SelectSceneDialog import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -26,6 +27,23 @@ } }).build().show() } + + binding.stopButton.setOnClickListener { + CheckResultDialog.Builder() + .setContext(this) + .setPositiveButton("确认,检查结束") + .setNegativeButton("返回") + .setOnDialogButtonClickListener(object : + CheckResultDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + + } + + override fun onCancelClick() { + + } + }).build().show() + } } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0583dda..d0a6c05 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,9 +69,5 @@ - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index 13ee982..9b9c93e 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -5,6 +5,7 @@ import com.casic.br.app.R import com.casic.br.app.databinding.ActivityStartCheckBinding import com.casic.br.app.extensions.initImmersionBar +import com.casic.br.app.widgets.CheckResultDialog import com.casic.br.app.widgets.SelectSceneDialog import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -26,6 +27,23 @@ } }).build().show() } + + binding.stopButton.setOnClickListener { + CheckResultDialog.Builder() + .setContext(this) + .setPositiveButton("确认,检查结束") + .setNegativeButton("返回") + .setOnDialogButtonClickListener(object : + CheckResultDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + + } + + override fun onCancelClick() { + + } + }).build().show() + } } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/app/widgets/CheckResultDialog.kt b/app/src/main/java/com/casic/br/app/widgets/CheckResultDialog.kt new file mode 100644 index 0000000..5721f81 --- /dev/null +++ b/app/src/main/java/com/casic/br/app/widgets/CheckResultDialog.kt @@ -0,0 +1,77 @@ +package com.casic.br.app.widgets + +import android.app.Dialog +import android.content.Context +import android.os.Bundle +import com.casic.br.app.R +import com.casic.br.app.databinding.DialogCheckResultBinding +import com.pengxh.kt.lite.extensions.binding +import com.pengxh.kt.lite.extensions.initDialogLayoutParams + +class CheckResultDialog private constructor(builder: Builder) : Dialog( + builder.context, R.style.UserDefinedDialogStyle +) { + private val context = builder.context + private val positiveBtn = builder.positiveBtn + private val negativeBtn = builder.negativeBtn + private val listener = builder.listener + + class Builder { + lateinit var context: Context + lateinit var positiveBtn: String + lateinit var negativeBtn: String + lateinit var listener: OnDialogButtonClickListener + + fun setContext(context: Context): Builder { + this.context = context + return this + } + + fun setPositiveButton(name: String): Builder { + this.positiveBtn = name + return this + } + + fun setNegativeButton(name: String): Builder { + this.negativeBtn = name + return this + } + + fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { + this.listener = listener + return this + } + + fun build(): CheckResultDialog { + return CheckResultDialog(this) + } + } + + private val binding: DialogCheckResultBinding by binding() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + this.initDialogLayoutParams(1f) + setCanceledOnTouchOutside(false) + + + binding.dialogConfirmButton.setOnClickListener { + + } + + + if (negativeBtn.isNotBlank()) { + binding.dialogCancelButton.text = negativeBtn + } + binding.dialogCancelButton.setOnClickListener { + listener.onCancelClick() + dismiss() + } + } + + interface OnDialogButtonClickListener { + fun onConfirmClick() + + fun onCancelClick() + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0583dda..d0a6c05 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,9 +69,5 @@ - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index 13ee982..9b9c93e 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -5,6 +5,7 @@ import com.casic.br.app.R import com.casic.br.app.databinding.ActivityStartCheckBinding import com.casic.br.app.extensions.initImmersionBar +import com.casic.br.app.widgets.CheckResultDialog import com.casic.br.app.widgets.SelectSceneDialog import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -26,6 +27,23 @@ } }).build().show() } + + binding.stopButton.setOnClickListener { + CheckResultDialog.Builder() + .setContext(this) + .setPositiveButton("确认,检查结束") + .setNegativeButton("返回") + .setOnDialogButtonClickListener(object : + CheckResultDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + + } + + override fun onCancelClick() { + + } + }).build().show() + } } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/app/widgets/CheckResultDialog.kt b/app/src/main/java/com/casic/br/app/widgets/CheckResultDialog.kt new file mode 100644 index 0000000..5721f81 --- /dev/null +++ b/app/src/main/java/com/casic/br/app/widgets/CheckResultDialog.kt @@ -0,0 +1,77 @@ +package com.casic.br.app.widgets + +import android.app.Dialog +import android.content.Context +import android.os.Bundle +import com.casic.br.app.R +import com.casic.br.app.databinding.DialogCheckResultBinding +import com.pengxh.kt.lite.extensions.binding +import com.pengxh.kt.lite.extensions.initDialogLayoutParams + +class CheckResultDialog private constructor(builder: Builder) : Dialog( + builder.context, R.style.UserDefinedDialogStyle +) { + private val context = builder.context + private val positiveBtn = builder.positiveBtn + private val negativeBtn = builder.negativeBtn + private val listener = builder.listener + + class Builder { + lateinit var context: Context + lateinit var positiveBtn: String + lateinit var negativeBtn: String + lateinit var listener: OnDialogButtonClickListener + + fun setContext(context: Context): Builder { + this.context = context + return this + } + + fun setPositiveButton(name: String): Builder { + this.positiveBtn = name + return this + } + + fun setNegativeButton(name: String): Builder { + this.negativeBtn = name + return this + } + + fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { + this.listener = listener + return this + } + + fun build(): CheckResultDialog { + return CheckResultDialog(this) + } + } + + private val binding: DialogCheckResultBinding by binding() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + this.initDialogLayoutParams(1f) + setCanceledOnTouchOutside(false) + + + binding.dialogConfirmButton.setOnClickListener { + + } + + + if (negativeBtn.isNotBlank()) { + binding.dialogCancelButton.text = negativeBtn + } + binding.dialogCancelButton.setOnClickListener { + listener.onCancelClick() + dismiss() + } + } + + interface OnDialogButtonClickListener { + fun onConfirmClick() + + fun onCancelClick() + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_gray_1.xml b/app/src/main/res/drawable/bg_stroke_gray_1.xml new file mode 100644 index 0000000..dbeb93a --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_gray_1.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0583dda..d0a6c05 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,9 +69,5 @@ - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index 13ee982..9b9c93e 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -5,6 +5,7 @@ import com.casic.br.app.R import com.casic.br.app.databinding.ActivityStartCheckBinding import com.casic.br.app.extensions.initImmersionBar +import com.casic.br.app.widgets.CheckResultDialog import com.casic.br.app.widgets.SelectSceneDialog import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -26,6 +27,23 @@ } }).build().show() } + + binding.stopButton.setOnClickListener { + CheckResultDialog.Builder() + .setContext(this) + .setPositiveButton("确认,检查结束") + .setNegativeButton("返回") + .setOnDialogButtonClickListener(object : + CheckResultDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + + } + + override fun onCancelClick() { + + } + }).build().show() + } } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/app/widgets/CheckResultDialog.kt b/app/src/main/java/com/casic/br/app/widgets/CheckResultDialog.kt new file mode 100644 index 0000000..5721f81 --- /dev/null +++ b/app/src/main/java/com/casic/br/app/widgets/CheckResultDialog.kt @@ -0,0 +1,77 @@ +package com.casic.br.app.widgets + +import android.app.Dialog +import android.content.Context +import android.os.Bundle +import com.casic.br.app.R +import com.casic.br.app.databinding.DialogCheckResultBinding +import com.pengxh.kt.lite.extensions.binding +import com.pengxh.kt.lite.extensions.initDialogLayoutParams + +class CheckResultDialog private constructor(builder: Builder) : Dialog( + builder.context, R.style.UserDefinedDialogStyle +) { + private val context = builder.context + private val positiveBtn = builder.positiveBtn + private val negativeBtn = builder.negativeBtn + private val listener = builder.listener + + class Builder { + lateinit var context: Context + lateinit var positiveBtn: String + lateinit var negativeBtn: String + lateinit var listener: OnDialogButtonClickListener + + fun setContext(context: Context): Builder { + this.context = context + return this + } + + fun setPositiveButton(name: String): Builder { + this.positiveBtn = name + return this + } + + fun setNegativeButton(name: String): Builder { + this.negativeBtn = name + return this + } + + fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { + this.listener = listener + return this + } + + fun build(): CheckResultDialog { + return CheckResultDialog(this) + } + } + + private val binding: DialogCheckResultBinding by binding() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + this.initDialogLayoutParams(1f) + setCanceledOnTouchOutside(false) + + + binding.dialogConfirmButton.setOnClickListener { + + } + + + if (negativeBtn.isNotBlank()) { + binding.dialogCancelButton.text = negativeBtn + } + binding.dialogCancelButton.setOnClickListener { + listener.onCancelClick() + dismiss() + } + } + + interface OnDialogButtonClickListener { + fun onConfirmClick() + + fun onCancelClick() + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_gray_1.xml b/app/src/main/res/drawable/bg_stroke_gray_1.xml new file mode 100644 index 0000000..dbeb93a --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_gray_1.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_stop.xml b/app/src/main/res/drawable/ic_stop.xml new file mode 100644 index 0000000..5ed4acf --- /dev/null +++ b/app/src/main/res/drawable/ic_stop.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0583dda..d0a6c05 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,9 +69,5 @@ - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index 13ee982..9b9c93e 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -5,6 +5,7 @@ import com.casic.br.app.R import com.casic.br.app.databinding.ActivityStartCheckBinding import com.casic.br.app.extensions.initImmersionBar +import com.casic.br.app.widgets.CheckResultDialog import com.casic.br.app.widgets.SelectSceneDialog import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -26,6 +27,23 @@ } }).build().show() } + + binding.stopButton.setOnClickListener { + CheckResultDialog.Builder() + .setContext(this) + .setPositiveButton("确认,检查结束") + .setNegativeButton("返回") + .setOnDialogButtonClickListener(object : + CheckResultDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + + } + + override fun onCancelClick() { + + } + }).build().show() + } } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/app/widgets/CheckResultDialog.kt b/app/src/main/java/com/casic/br/app/widgets/CheckResultDialog.kt new file mode 100644 index 0000000..5721f81 --- /dev/null +++ b/app/src/main/java/com/casic/br/app/widgets/CheckResultDialog.kt @@ -0,0 +1,77 @@ +package com.casic.br.app.widgets + +import android.app.Dialog +import android.content.Context +import android.os.Bundle +import com.casic.br.app.R +import com.casic.br.app.databinding.DialogCheckResultBinding +import com.pengxh.kt.lite.extensions.binding +import com.pengxh.kt.lite.extensions.initDialogLayoutParams + +class CheckResultDialog private constructor(builder: Builder) : Dialog( + builder.context, R.style.UserDefinedDialogStyle +) { + private val context = builder.context + private val positiveBtn = builder.positiveBtn + private val negativeBtn = builder.negativeBtn + private val listener = builder.listener + + class Builder { + lateinit var context: Context + lateinit var positiveBtn: String + lateinit var negativeBtn: String + lateinit var listener: OnDialogButtonClickListener + + fun setContext(context: Context): Builder { + this.context = context + return this + } + + fun setPositiveButton(name: String): Builder { + this.positiveBtn = name + return this + } + + fun setNegativeButton(name: String): Builder { + this.negativeBtn = name + return this + } + + fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { + this.listener = listener + return this + } + + fun build(): CheckResultDialog { + return CheckResultDialog(this) + } + } + + private val binding: DialogCheckResultBinding by binding() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + this.initDialogLayoutParams(1f) + setCanceledOnTouchOutside(false) + + + binding.dialogConfirmButton.setOnClickListener { + + } + + + if (negativeBtn.isNotBlank()) { + binding.dialogCancelButton.text = negativeBtn + } + binding.dialogCancelButton.setOnClickListener { + listener.onCancelClick() + dismiss() + } + } + + interface OnDialogButtonClickListener { + fun onConfirmClick() + + fun onCancelClick() + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_gray_1.xml b/app/src/main/res/drawable/bg_stroke_gray_1.xml new file mode 100644 index 0000000..dbeb93a --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_gray_1.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_stop.xml b/app/src/main/res/drawable/ic_stop.xml new file mode 100644 index 0000000..5ed4acf --- /dev/null +++ b/app/src/main/res/drawable/ic_stop.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/layout/activity_start_check.xml b/app/src/main/res/layout/activity_start_check.xml index 4b16f58..581ff4a 100644 --- a/app/src/main/res/layout/activity_start_check.xml +++ b/app/src/main/res/layout/activity_start_check.xml @@ -36,7 +36,7 @@ android:src="@drawable/ic_more" /> - @@ -45,5 +45,13 @@ android:id="@+id/surfaceView" android:layout_width="match_parent" android:layout_height="match_parent" /> - + + + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0583dda..d0a6c05 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,9 +69,5 @@ - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt index 13ee982..9b9c93e 100644 --- a/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StartCheckActivity.kt @@ -5,6 +5,7 @@ import com.casic.br.app.R import com.casic.br.app.databinding.ActivityStartCheckBinding import com.casic.br.app.extensions.initImmersionBar +import com.casic.br.app.widgets.CheckResultDialog import com.casic.br.app.widgets.SelectSceneDialog import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -26,6 +27,23 @@ } }).build().show() } + + binding.stopButton.setOnClickListener { + CheckResultDialog.Builder() + .setContext(this) + .setPositiveButton("确认,检查结束") + .setNegativeButton("返回") + .setOnDialogButtonClickListener(object : + CheckResultDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + + } + + override fun onCancelClick() { + + } + }).build().show() + } } override fun initOnCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/com/casic/br/app/widgets/CheckResultDialog.kt b/app/src/main/java/com/casic/br/app/widgets/CheckResultDialog.kt new file mode 100644 index 0000000..5721f81 --- /dev/null +++ b/app/src/main/java/com/casic/br/app/widgets/CheckResultDialog.kt @@ -0,0 +1,77 @@ +package com.casic.br.app.widgets + +import android.app.Dialog +import android.content.Context +import android.os.Bundle +import com.casic.br.app.R +import com.casic.br.app.databinding.DialogCheckResultBinding +import com.pengxh.kt.lite.extensions.binding +import com.pengxh.kt.lite.extensions.initDialogLayoutParams + +class CheckResultDialog private constructor(builder: Builder) : Dialog( + builder.context, R.style.UserDefinedDialogStyle +) { + private val context = builder.context + private val positiveBtn = builder.positiveBtn + private val negativeBtn = builder.negativeBtn + private val listener = builder.listener + + class Builder { + lateinit var context: Context + lateinit var positiveBtn: String + lateinit var negativeBtn: String + lateinit var listener: OnDialogButtonClickListener + + fun setContext(context: Context): Builder { + this.context = context + return this + } + + fun setPositiveButton(name: String): Builder { + this.positiveBtn = name + return this + } + + fun setNegativeButton(name: String): Builder { + this.negativeBtn = name + return this + } + + fun setOnDialogButtonClickListener(listener: OnDialogButtonClickListener): Builder { + this.listener = listener + return this + } + + fun build(): CheckResultDialog { + return CheckResultDialog(this) + } + } + + private val binding: DialogCheckResultBinding by binding() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + this.initDialogLayoutParams(1f) + setCanceledOnTouchOutside(false) + + + binding.dialogConfirmButton.setOnClickListener { + + } + + + if (negativeBtn.isNotBlank()) { + binding.dialogCancelButton.text = negativeBtn + } + binding.dialogCancelButton.setOnClickListener { + listener.onCancelClick() + dismiss() + } + } + + interface OnDialogButtonClickListener { + fun onConfirmClick() + + fun onCancelClick() + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_stroke_gray_1.xml b/app/src/main/res/drawable/bg_stroke_gray_1.xml new file mode 100644 index 0000000..dbeb93a --- /dev/null +++ b/app/src/main/res/drawable/bg_stroke_gray_1.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_stop.xml b/app/src/main/res/drawable/ic_stop.xml new file mode 100644 index 0000000..5ed4acf --- /dev/null +++ b/app/src/main/res/drawable/ic_stop.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/layout/activity_start_check.xml b/app/src/main/res/layout/activity_start_check.xml index 4b16f58..581ff4a 100644 --- a/app/src/main/res/layout/activity_start_check.xml +++ b/app/src/main/res/layout/activity_start_check.xml @@ -36,7 +36,7 @@ android:src="@drawable/ic_more" /> - @@ -45,5 +45,13 @@ android:id="@+id/surfaceView" android:layout_width="match_parent" android:layout_height="match_parent" /> - + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_check_result.xml b/app/src/main/res/layout/dialog_check_result.xml new file mode 100644 index 0000000..a353b47 --- /dev/null +++ b/app/src/main/res/layout/dialog_check_result.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + +