diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index 74f5f0e..817bc3e 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -102,11 +102,8 @@ } binding.managePointButton.setOnClickListener { - CameraInspectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.START_ADD_POINT_CODE) //再选择巡航线 val beans = pointBeanDao.loadAll() - if (beans.isEmpty()) return@setOnClickListener - val lines = ArrayList() beans.map { it.secondType.toString() }.toSet().forEach { lines.add("巡航线路 $it") @@ -114,6 +111,9 @@ if (lines.size < 8) { lines.add("新增巡航线路") } + + CameraInspectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.START_ADD_POINT_CODE) + BottomActionSheet.Builder() .setContext(requireContext()) .setActionItemTitle(lines) @@ -137,6 +137,12 @@ } binding.queryPointButton.setOnClickListener { + val beans = pointBeanDao.loadAll() + if (beans.isEmpty()) { + "请先添加巡航点".show(requireContext()) + return@setOnClickListener + } + ShowPointDialog.Builder() .setContext(requireContext()) .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index 74f5f0e..817bc3e 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -102,11 +102,8 @@ } binding.managePointButton.setOnClickListener { - CameraInspectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.START_ADD_POINT_CODE) //再选择巡航线 val beans = pointBeanDao.loadAll() - if (beans.isEmpty()) return@setOnClickListener - val lines = ArrayList() beans.map { it.secondType.toString() }.toSet().forEach { lines.add("巡航线路 $it") @@ -114,6 +111,9 @@ if (lines.size < 8) { lines.add("新增巡航线路") } + + CameraInspectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.START_ADD_POINT_CODE) + BottomActionSheet.Builder() .setContext(requireContext()) .setActionItemTitle(lines) @@ -137,6 +137,12 @@ } binding.queryPointButton.setOnClickListener { + val beans = pointBeanDao.loadAll() + if (beans.isEmpty()) { + "请先添加巡航点".show(requireContext()) + return@setOnClickListener + } + ShowPointDialog.Builder() .setContext(requireContext()) .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt b/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt index 8f15cb2..b4b26d4 100644 --- a/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt +++ b/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt @@ -65,6 +65,8 @@ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)) } + binding.textView.isSelected = true + binding.dialogCancelButton.setOnClickListener { listener.onCancelClick() dismiss() diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index 74f5f0e..817bc3e 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -102,11 +102,8 @@ } binding.managePointButton.setOnClickListener { - CameraInspectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.START_ADD_POINT_CODE) //再选择巡航线 val beans = pointBeanDao.loadAll() - if (beans.isEmpty()) return@setOnClickListener - val lines = ArrayList() beans.map { it.secondType.toString() }.toSet().forEach { lines.add("巡航线路 $it") @@ -114,6 +111,9 @@ if (lines.size < 8) { lines.add("新增巡航线路") } + + CameraInspectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.START_ADD_POINT_CODE) + BottomActionSheet.Builder() .setContext(requireContext()) .setActionItemTitle(lines) @@ -137,6 +137,12 @@ } binding.queryPointButton.setOnClickListener { + val beans = pointBeanDao.loadAll() + if (beans.isEmpty()) { + "请先添加巡航点".show(requireContext()) + return@setOnClickListener + } + ShowPointDialog.Builder() .setContext(requireContext()) .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt b/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt index 8f15cb2..b4b26d4 100644 --- a/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt +++ b/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt @@ -65,6 +65,8 @@ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)) } + binding.textView.isSelected = true + binding.dialogCancelButton.setOnClickListener { listener.onCancelClick() dismiss() diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml index 75893eb..7be1291 100644 --- a/app/src/main/res/drawable/ic_lock.xml +++ b/app/src/main/res/drawable/ic_lock.xml @@ -3,10 +3,16 @@ android:height="64px" android:viewportWidth="1024" android:viewportHeight="1024"> + + android:pathData="M779.2,959.6H263.7a170.5,170.5 0,0 1,-170.4 -170.3V464.9a170.6,170.6 0,0 1,170.4 -170.4h515.4a170.6,170.6 0,0 1,170.4 170.4v324.4a170.5,170.5 0,0 1,-170.4 170.3zM263.7,356a109.1,109.1 0,0 0,-109 109v324.4a109.1,109.1 0,0 0,109 108.9h515.4a109,109 0,0 0,109 -108.9V464.9a109.1,109.1 0,0 0,-109 -109z" /> + + android:fillColor="#F39800" + android:pathData="M521.1,808.2a94.6,94.6 0,0 1,-94.4 -94.5L426.6,675.8a8.3,8.3 0,0 0,-3 -5.9,143.4 143.4,0 0,1 81.2,-247.8 143.4,143.4 0,0 1,113.3 247.9,8.1 8.1,0 0,0 -2.7,5.7v38a94.6,94.6 0,0 1,-94.4 94.5zM521.1,482.7a86.1,86.1 0,0 0,-9.5 0.5,81.9 81.9,0 0,0 -46.1,141.5 69.9,69.9 0,0 1,22.7 51.2v38a33,33 0,1 0,65.9 0L554.1,675.8a69.7,69.7 0,0 1,22.5 -50.9,81 81,0 0,0 26.4,-60.2 81.9,81.9 0,0 0,-27.3 -61.1,81 81,0 0,0 -54.6,-21z" /> + + diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index 74f5f0e..817bc3e 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -102,11 +102,8 @@ } binding.managePointButton.setOnClickListener { - CameraInspectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.START_ADD_POINT_CODE) //再选择巡航线 val beans = pointBeanDao.loadAll() - if (beans.isEmpty()) return@setOnClickListener - val lines = ArrayList() beans.map { it.secondType.toString() }.toSet().forEach { lines.add("巡航线路 $it") @@ -114,6 +111,9 @@ if (lines.size < 8) { lines.add("新增巡航线路") } + + CameraInspectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.START_ADD_POINT_CODE) + BottomActionSheet.Builder() .setContext(requireContext()) .setActionItemTitle(lines) @@ -137,6 +137,12 @@ } binding.queryPointButton.setOnClickListener { + val beans = pointBeanDao.loadAll() + if (beans.isEmpty()) { + "请先添加巡航点".show(requireContext()) + return@setOnClickListener + } + ShowPointDialog.Builder() .setContext(requireContext()) .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt b/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt index 8f15cb2..b4b26d4 100644 --- a/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt +++ b/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt @@ -65,6 +65,8 @@ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)) } + binding.textView.isSelected = true + binding.dialogCancelButton.setOnClickListener { listener.onCancelClick() dismiss() diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml index 75893eb..7be1291 100644 --- a/app/src/main/res/drawable/ic_lock.xml +++ b/app/src/main/res/drawable/ic_lock.xml @@ -3,10 +3,16 @@ android:height="64px" android:viewportWidth="1024" android:viewportHeight="1024"> + + android:pathData="M779.2,959.6H263.7a170.5,170.5 0,0 1,-170.4 -170.3V464.9a170.6,170.6 0,0 1,170.4 -170.4h515.4a170.6,170.6 0,0 1,170.4 170.4v324.4a170.5,170.5 0,0 1,-170.4 170.3zM263.7,356a109.1,109.1 0,0 0,-109 109v324.4a109.1,109.1 0,0 0,109 108.9h515.4a109,109 0,0 0,109 -108.9V464.9a109.1,109.1 0,0 0,-109 -109z" /> + + android:fillColor="#F39800" + android:pathData="M521.1,808.2a94.6,94.6 0,0 1,-94.4 -94.5L426.6,675.8a8.3,8.3 0,0 0,-3 -5.9,143.4 143.4,0 0,1 81.2,-247.8 143.4,143.4 0,0 1,113.3 247.9,8.1 8.1,0 0,0 -2.7,5.7v38a94.6,94.6 0,0 1,-94.4 94.5zM521.1,482.7a86.1,86.1 0,0 0,-9.5 0.5,81.9 81.9,0 0,0 -46.1,141.5 69.9,69.9 0,0 1,22.7 51.2v38a33,33 0,1 0,65.9 0L554.1,675.8a69.7,69.7 0,0 1,22.5 -50.9,81 81,0 0,0 26.4,-60.2 81.9,81.9 0,0 0,-27.3 -61.1,81 81,0 0,0 -54.6,-21z" /> + + diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml index babfa95..318ffec 100644 --- a/app/src/main/res/drawable/ic_user.xml +++ b/app/src/main/res/drawable/ic_user.xml @@ -3,13 +3,12 @@ android:height="64px" android:viewportWidth="1024" android:viewportHeight="1024"> + + android:pathData="M669.9,469.7a223.9,223.9 0,0 0,80.2 -171.4c0,-124.4 -102.4,-225.3 -228.1,-225.3S293.8,174.1 293.8,298.2A224,224 0,0 0,373.8 469.7a343,343 0,0 0,-271.4 334.9V819.2a121.9,121.9 0,0 0,121.8 121.8h595.7A121.9,121.9 0,0 0,941.6 819.2v-14.5a343,343 0,0 0,-271.7 -335zM355.2,298.2c0,-90.5 74.8,-163.8 166.7,-163.8s166.7,73.4 166.7,163.8 -74.8,163.8 -166.7,163.8 -166.7,-73.4 -166.7,-163.8zM880.2,819.2a60.4,60.4 0,0 1,-60.3 60.3H224A60.4,60.4 0,0 1,163.8 819.2v-14.5a281.1,281.1 0,0 1,280.8 -280.8h154.8a281.2,281.2 0,0 1,280.8 280.8z" /> + - + android:fillColor="#F39800" + android:pathData="M668.6,801H375.3a30.7,30.7 0,0 1,0 -61.4h293.3a30.7,30.7 0,0 1,0 61.4z" /> diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index 74f5f0e..817bc3e 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -102,11 +102,8 @@ } binding.managePointButton.setOnClickListener { - CameraInspectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.START_ADD_POINT_CODE) //再选择巡航线 val beans = pointBeanDao.loadAll() - if (beans.isEmpty()) return@setOnClickListener - val lines = ArrayList() beans.map { it.secondType.toString() }.toSet().forEach { lines.add("巡航线路 $it") @@ -114,6 +111,9 @@ if (lines.size < 8) { lines.add("新增巡航线路") } + + CameraInspectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.START_ADD_POINT_CODE) + BottomActionSheet.Builder() .setContext(requireContext()) .setActionItemTitle(lines) @@ -137,6 +137,12 @@ } binding.queryPointButton.setOnClickListener { + val beans = pointBeanDao.loadAll() + if (beans.isEmpty()) { + "请先添加巡航点".show(requireContext()) + return@setOnClickListener + } + ShowPointDialog.Builder() .setContext(requireContext()) .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt b/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt index 8f15cb2..b4b26d4 100644 --- a/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt +++ b/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt @@ -65,6 +65,8 @@ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)) } + binding.textView.isSelected = true + binding.dialogCancelButton.setOnClickListener { listener.onCancelClick() dismiss() diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml index 75893eb..7be1291 100644 --- a/app/src/main/res/drawable/ic_lock.xml +++ b/app/src/main/res/drawable/ic_lock.xml @@ -3,10 +3,16 @@ android:height="64px" android:viewportWidth="1024" android:viewportHeight="1024"> + + android:pathData="M779.2,959.6H263.7a170.5,170.5 0,0 1,-170.4 -170.3V464.9a170.6,170.6 0,0 1,170.4 -170.4h515.4a170.6,170.6 0,0 1,170.4 170.4v324.4a170.5,170.5 0,0 1,-170.4 170.3zM263.7,356a109.1,109.1 0,0 0,-109 109v324.4a109.1,109.1 0,0 0,109 108.9h515.4a109,109 0,0 0,109 -108.9V464.9a109.1,109.1 0,0 0,-109 -109z" /> + + android:fillColor="#F39800" + android:pathData="M521.1,808.2a94.6,94.6 0,0 1,-94.4 -94.5L426.6,675.8a8.3,8.3 0,0 0,-3 -5.9,143.4 143.4,0 0,1 81.2,-247.8 143.4,143.4 0,0 1,113.3 247.9,8.1 8.1,0 0,0 -2.7,5.7v38a94.6,94.6 0,0 1,-94.4 94.5zM521.1,482.7a86.1,86.1 0,0 0,-9.5 0.5,81.9 81.9,0 0,0 -46.1,141.5 69.9,69.9 0,0 1,22.7 51.2v38a33,33 0,1 0,65.9 0L554.1,675.8a69.7,69.7 0,0 1,22.5 -50.9,81 81,0 0,0 26.4,-60.2 81.9,81.9 0,0 0,-27.3 -61.1,81 81,0 0,0 -54.6,-21z" /> + + diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml index babfa95..318ffec 100644 --- a/app/src/main/res/drawable/ic_user.xml +++ b/app/src/main/res/drawable/ic_user.xml @@ -3,13 +3,12 @@ android:height="64px" android:viewportWidth="1024" android:viewportHeight="1024"> + + android:pathData="M669.9,469.7a223.9,223.9 0,0 0,80.2 -171.4c0,-124.4 -102.4,-225.3 -228.1,-225.3S293.8,174.1 293.8,298.2A224,224 0,0 0,373.8 469.7a343,343 0,0 0,-271.4 334.9V819.2a121.9,121.9 0,0 0,121.8 121.8h595.7A121.9,121.9 0,0 0,941.6 819.2v-14.5a343,343 0,0 0,-271.7 -335zM355.2,298.2c0,-90.5 74.8,-163.8 166.7,-163.8s166.7,73.4 166.7,163.8 -74.8,163.8 -166.7,163.8 -166.7,-73.4 -166.7,-163.8zM880.2,819.2a60.4,60.4 0,0 1,-60.3 60.3H224A60.4,60.4 0,0 1,163.8 819.2v-14.5a281.1,281.1 0,0 1,280.8 -280.8h154.8a281.2,281.2 0,0 1,280.8 280.8z" /> + - + android:fillColor="#F39800" + android:pathData="M668.6,801H375.3a30.7,30.7 0,0 1,0 -61.4h293.3a30.7,30.7 0,0 1,0 61.4z" /> diff --git a/app/src/main/res/layout/dialog_manage_point.xml b/app/src/main/res/layout/dialog_manage_point.xml index 5665902..4878017 100644 --- a/app/src/main/res/layout/dialog_manage_point.xml +++ b/app/src/main/res/layout/dialog_manage_point.xml @@ -46,9 +46,15 @@ diff --git a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt index 74f5f0e..817bc3e 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragments/DeviceControllerFragment.kt @@ -102,11 +102,8 @@ } binding.managePointButton.setOnClickListener { - CameraInspectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.START_ADD_POINT_CODE) //再选择巡航线 val beans = pointBeanDao.loadAll() - if (beans.isEmpty()) return@setOnClickListener - val lines = ArrayList() beans.map { it.secondType.toString() }.toSet().forEach { lines.add("巡航线路 $it") @@ -114,6 +111,9 @@ if (lines.size < 8) { lines.add("新增巡航线路") } + + CameraInspectionService.weakReferenceHandler?.sendEmptyMessage(LocaleConstant.START_ADD_POINT_CODE) + BottomActionSheet.Builder() .setContext(requireContext()) .setActionItemTitle(lines) @@ -137,6 +137,12 @@ } binding.queryPointButton.setOnClickListener { + val beans = pointBeanDao.loadAll() + if (beans.isEmpty()) { + "请先添加巡航点".show(requireContext()) + return@setOnClickListener + } + ShowPointDialog.Builder() .setContext(requireContext()) .setOnDialogButtonClickListener(object : diff --git a/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt b/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt index 8f15cb2..b4b26d4 100644 --- a/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt +++ b/app/src/main/java/com/casic/br/operationsite/widgets/ManagePointDialog.kt @@ -65,6 +65,8 @@ binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(0f, 0f, Color.LTGRAY)) } + binding.textView.isSelected = true + binding.dialogCancelButton.setOnClickListener { listener.onCancelClick() dismiss() diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml index 75893eb..7be1291 100644 --- a/app/src/main/res/drawable/ic_lock.xml +++ b/app/src/main/res/drawable/ic_lock.xml @@ -3,10 +3,16 @@ android:height="64px" android:viewportWidth="1024" android:viewportHeight="1024"> + + android:pathData="M779.2,959.6H263.7a170.5,170.5 0,0 1,-170.4 -170.3V464.9a170.6,170.6 0,0 1,170.4 -170.4h515.4a170.6,170.6 0,0 1,170.4 170.4v324.4a170.5,170.5 0,0 1,-170.4 170.3zM263.7,356a109.1,109.1 0,0 0,-109 109v324.4a109.1,109.1 0,0 0,109 108.9h515.4a109,109 0,0 0,109 -108.9V464.9a109.1,109.1 0,0 0,-109 -109z" /> + + android:fillColor="#F39800" + android:pathData="M521.1,808.2a94.6,94.6 0,0 1,-94.4 -94.5L426.6,675.8a8.3,8.3 0,0 0,-3 -5.9,143.4 143.4,0 0,1 81.2,-247.8 143.4,143.4 0,0 1,113.3 247.9,8.1 8.1,0 0,0 -2.7,5.7v38a94.6,94.6 0,0 1,-94.4 94.5zM521.1,482.7a86.1,86.1 0,0 0,-9.5 0.5,81.9 81.9,0 0,0 -46.1,141.5 69.9,69.9 0,0 1,22.7 51.2v38a33,33 0,1 0,65.9 0L554.1,675.8a69.7,69.7 0,0 1,22.5 -50.9,81 81,0 0,0 26.4,-60.2 81.9,81.9 0,0 0,-27.3 -61.1,81 81,0 0,0 -54.6,-21z" /> + + diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml index babfa95..318ffec 100644 --- a/app/src/main/res/drawable/ic_user.xml +++ b/app/src/main/res/drawable/ic_user.xml @@ -3,13 +3,12 @@ android:height="64px" android:viewportWidth="1024" android:viewportHeight="1024"> + + android:pathData="M669.9,469.7a223.9,223.9 0,0 0,80.2 -171.4c0,-124.4 -102.4,-225.3 -228.1,-225.3S293.8,174.1 293.8,298.2A224,224 0,0 0,373.8 469.7a343,343 0,0 0,-271.4 334.9V819.2a121.9,121.9 0,0 0,121.8 121.8h595.7A121.9,121.9 0,0 0,941.6 819.2v-14.5a343,343 0,0 0,-271.7 -335zM355.2,298.2c0,-90.5 74.8,-163.8 166.7,-163.8s166.7,73.4 166.7,163.8 -74.8,163.8 -166.7,163.8 -166.7,-73.4 -166.7,-163.8zM880.2,819.2a60.4,60.4 0,0 1,-60.3 60.3H224A60.4,60.4 0,0 1,163.8 819.2v-14.5a281.1,281.1 0,0 1,280.8 -280.8h154.8a281.2,281.2 0,0 1,280.8 280.8z" /> + - + android:fillColor="#F39800" + android:pathData="M668.6,801H375.3a30.7,30.7 0,0 1,0 -61.4h293.3a30.7,30.7 0,0 1,0 61.4z" /> diff --git a/app/src/main/res/layout/dialog_manage_point.xml b/app/src/main/res/layout/dialog_manage_point.xml index 5665902..4878017 100644 --- a/app/src/main/res/layout/dialog_manage_point.xml +++ b/app/src/main/res/layout/dialog_manage_point.xml @@ -46,9 +46,15 @@ diff --git a/app/src/main/res/layout/fragment_device_controller.xml b/app/src/main/res/layout/fragment_device_controller.xml index 09629e6..1bb816e 100644 --- a/app/src/main/res/layout/fragment_device_controller.xml +++ b/app/src/main/res/layout/fragment_device_controller.xml @@ -1,109 +1,103 @@ - + android:layout_height="wrap_content"> - + android:layout_height="match_parent" + android:orientation="vertical"> - + + + + + + + + + + + + + + + + + + + + android:layout_height="@dimen/dp_60" + android:layout_marginHorizontal="@dimen/dp_10" + android:background="@drawable/bg_solid_layout_blue_10" + android:gravity="center" + android:orientation="horizontal" + android:padding="@dimen/dp_5"> - +