diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt index e51c29c..1c9bd24 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt @@ -195,6 +195,33 @@ }, 1000, 3000) } + private fun showAddHiddenTroubleDialog() { + addHiddenTroubleDialog.initDialogContentView(object : + AddHiddenTroubleDialog.OnDialogButtonClickListener { + override fun onConfirmClick( + mainType: DictionaryModel.DataModel, subType: DictionaryModel.DataModel, + troubleName: String, troubleContent: String + ) { + hiddenTroubleViewModel.addHiddenTrouble( + context, + mainType.value, + subType.value, + RuntimeCache.sceneName, + subType.name, + "", + "", + troubleContent, + RuntimeCache.sceneName.getSceneCodeByName(), + RuntimeCache.inspectionId, + troubleName, + mainType.name, + "", + arrayOf() + ) + } + }).show() + } + override fun initEvent() { binding.stopCheckButton.setOnClickListener { stopCheck() @@ -593,33 +620,6 @@ return true } - private fun showAddHiddenTroubleDialog() { - addHiddenTroubleDialog.initDialogContentView(object : - AddHiddenTroubleDialog.OnDialogButtonClickListener { - override fun onConfirmClick( - mainType: DictionaryModel.DataModel, subType: DictionaryModel.DataModel, - troubleName: String, troubleContent: String - ) { - hiddenTroubleViewModel.addHiddenTrouble( - context, - mainType.value, - subType.value, - RuntimeCache.sceneName, - subType.name, - "", - "", - troubleContent, - RuntimeCache.sceneName.getSceneCodeByName(), - RuntimeCache.inspectionId, - troubleName, - mainType.name, - "", - arrayOf() - ) - } - }).show() - } - override fun onDestroy() { super.onDestroy() timer.cancel() diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt index e51c29c..1c9bd24 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt @@ -195,6 +195,33 @@ }, 1000, 3000) } + private fun showAddHiddenTroubleDialog() { + addHiddenTroubleDialog.initDialogContentView(object : + AddHiddenTroubleDialog.OnDialogButtonClickListener { + override fun onConfirmClick( + mainType: DictionaryModel.DataModel, subType: DictionaryModel.DataModel, + troubleName: String, troubleContent: String + ) { + hiddenTroubleViewModel.addHiddenTrouble( + context, + mainType.value, + subType.value, + RuntimeCache.sceneName, + subType.name, + "", + "", + troubleContent, + RuntimeCache.sceneName.getSceneCodeByName(), + RuntimeCache.inspectionId, + troubleName, + mainType.name, + "", + arrayOf() + ) + } + }).show() + } + override fun initEvent() { binding.stopCheckButton.setOnClickListener { stopCheck() @@ -593,33 +620,6 @@ return true } - private fun showAddHiddenTroubleDialog() { - addHiddenTroubleDialog.initDialogContentView(object : - AddHiddenTroubleDialog.OnDialogButtonClickListener { - override fun onConfirmClick( - mainType: DictionaryModel.DataModel, subType: DictionaryModel.DataModel, - troubleName: String, troubleContent: String - ) { - hiddenTroubleViewModel.addHiddenTrouble( - context, - mainType.value, - subType.value, - RuntimeCache.sceneName, - subType.name, - "", - "", - troubleContent, - RuntimeCache.sceneName.getSceneCodeByName(), - RuntimeCache.inspectionId, - troubleName, - mainType.name, - "", - arrayOf() - ) - } - }).show() - } - override fun onDestroy() { super.onDestroy() timer.cancel() diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt index 6561cf8..6c614dd 100644 --- a/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt +++ b/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt @@ -20,7 +20,7 @@ class AddHiddenTroubleDialog(context: Context) : Dialog(context) { private val binding: DialogAddHiddenTroubleBinding by binding() - private val marginOffset by lazy { 5.dp2px(context) } + private val marginOffset by lazy { 3.dp2px(context) } private lateinit var listener: OnDialogButtonClickListener private lateinit var mainDictionary: DictionaryModel.DataModel private lateinit var subDictionary: DictionaryModel.DataModel diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt index e51c29c..1c9bd24 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt @@ -195,6 +195,33 @@ }, 1000, 3000) } + private fun showAddHiddenTroubleDialog() { + addHiddenTroubleDialog.initDialogContentView(object : + AddHiddenTroubleDialog.OnDialogButtonClickListener { + override fun onConfirmClick( + mainType: DictionaryModel.DataModel, subType: DictionaryModel.DataModel, + troubleName: String, troubleContent: String + ) { + hiddenTroubleViewModel.addHiddenTrouble( + context, + mainType.value, + subType.value, + RuntimeCache.sceneName, + subType.name, + "", + "", + troubleContent, + RuntimeCache.sceneName.getSceneCodeByName(), + RuntimeCache.inspectionId, + troubleName, + mainType.name, + "", + arrayOf() + ) + } + }).show() + } + override fun initEvent() { binding.stopCheckButton.setOnClickListener { stopCheck() @@ -593,33 +620,6 @@ return true } - private fun showAddHiddenTroubleDialog() { - addHiddenTroubleDialog.initDialogContentView(object : - AddHiddenTroubleDialog.OnDialogButtonClickListener { - override fun onConfirmClick( - mainType: DictionaryModel.DataModel, subType: DictionaryModel.DataModel, - troubleName: String, troubleContent: String - ) { - hiddenTroubleViewModel.addHiddenTrouble( - context, - mainType.value, - subType.value, - RuntimeCache.sceneName, - subType.name, - "", - "", - troubleContent, - RuntimeCache.sceneName.getSceneCodeByName(), - RuntimeCache.inspectionId, - troubleName, - mainType.name, - "", - arrayOf() - ) - } - }).show() - } - override fun onDestroy() { super.onDestroy() timer.cancel() diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt index 6561cf8..6c614dd 100644 --- a/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt +++ b/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt @@ -20,7 +20,7 @@ class AddHiddenTroubleDialog(context: Context) : Dialog(context) { private val binding: DialogAddHiddenTroubleBinding by binding() - private val marginOffset by lazy { 5.dp2px(context) } + private val marginOffset by lazy { 3.dp2px(context) } private lateinit var listener: OnDialogButtonClickListener private lateinit var mainDictionary: DictionaryModel.DataModel private lateinit var subDictionary: DictionaryModel.DataModel diff --git a/app/src/main/res/layout/activity_check_result.xml b/app/src/main/res/layout/activity_check_result.xml index 64024db..2acf577 100644 --- a/app/src/main/res/layout/activity_check_result.xml +++ b/app/src/main/res/layout/activity_check_result.xml @@ -10,8 +10,8 @@ @@ -25,17 +25,33 @@ android:textSize="@dimen/sp_18" android:textStyle="bold" /> - + android:layout_height="@dimen/dp_45" + android:layout_marginVertical="@dimen/dp_30" + android:gravity="center" + android:orientation="horizontal"> + + + + + - + \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt index e51c29c..1c9bd24 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckModeActivity.kt @@ -195,6 +195,33 @@ }, 1000, 3000) } + private fun showAddHiddenTroubleDialog() { + addHiddenTroubleDialog.initDialogContentView(object : + AddHiddenTroubleDialog.OnDialogButtonClickListener { + override fun onConfirmClick( + mainType: DictionaryModel.DataModel, subType: DictionaryModel.DataModel, + troubleName: String, troubleContent: String + ) { + hiddenTroubleViewModel.addHiddenTrouble( + context, + mainType.value, + subType.value, + RuntimeCache.sceneName, + subType.name, + "", + "", + troubleContent, + RuntimeCache.sceneName.getSceneCodeByName(), + RuntimeCache.inspectionId, + troubleName, + mainType.name, + "", + arrayOf() + ) + } + }).show() + } + override fun initEvent() { binding.stopCheckButton.setOnClickListener { stopCheck() @@ -593,33 +620,6 @@ return true } - private fun showAddHiddenTroubleDialog() { - addHiddenTroubleDialog.initDialogContentView(object : - AddHiddenTroubleDialog.OnDialogButtonClickListener { - override fun onConfirmClick( - mainType: DictionaryModel.DataModel, subType: DictionaryModel.DataModel, - troubleName: String, troubleContent: String - ) { - hiddenTroubleViewModel.addHiddenTrouble( - context, - mainType.value, - subType.value, - RuntimeCache.sceneName, - subType.name, - "", - "", - troubleContent, - RuntimeCache.sceneName.getSceneCodeByName(), - RuntimeCache.inspectionId, - troubleName, - mainType.name, - "", - arrayOf() - ) - } - }).show() - } - override fun onDestroy() { super.onDestroy() timer.cancel() diff --git a/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt b/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt index 6561cf8..6c614dd 100644 --- a/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt +++ b/app/src/main/java/com/casic/br/ar/app/widgets/AddHiddenTroubleDialog.kt @@ -20,7 +20,7 @@ class AddHiddenTroubleDialog(context: Context) : Dialog(context) { private val binding: DialogAddHiddenTroubleBinding by binding() - private val marginOffset by lazy { 5.dp2px(context) } + private val marginOffset by lazy { 3.dp2px(context) } private lateinit var listener: OnDialogButtonClickListener private lateinit var mainDictionary: DictionaryModel.DataModel private lateinit var subDictionary: DictionaryModel.DataModel diff --git a/app/src/main/res/layout/activity_check_result.xml b/app/src/main/res/layout/activity_check_result.xml index 64024db..2acf577 100644 --- a/app/src/main/res/layout/activity_check_result.xml +++ b/app/src/main/res/layout/activity_check_result.xml @@ -10,8 +10,8 @@ @@ -25,17 +25,33 @@ android:textSize="@dimen/sp_18" android:textStyle="bold" /> - + android:layout_height="@dimen/dp_45" + android:layout_marginVertical="@dimen/dp_30" + android:gravity="center" + android:orientation="horizontal"> + + + + + - + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_add_hidden_trouble.xml b/app/src/main/res/layout/dialog_add_hidden_trouble.xml index 8a39c97..a23723d 100644 --- a/app/src/main/res/layout/dialog_add_hidden_trouble.xml +++ b/app/src/main/res/layout/dialog_add_hidden_trouble.xml @@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/dp_5" android:gravity="center" - android:text="结束检查" + android:text="添加隐患" android:textColor="@color/white" android:textSize="@dimen/sp_18" android:textStyle="bold" /> @@ -125,7 +125,7 @@